feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

New smart indenter for QML files.

Browse Source
This commit is contained in:
Roberto Raggi
2010-01-12 18:01:39 +01:00
parent 126b3de16c
commit 27d2a129c2
2 changed files with 36 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/shared/qscripthighlighter/qscriptindenter.cpp
View File

@@ -87,7 +87,7 @@ QScriptIndenter::QScriptIndenter()
inlineCComment(QRegExp(QLatin1String("/\\*.*\\*/"))),
braceX(QRegExp(QLatin1String("^\\s*\\}\\s*(?:else|catch)\\b"))),
iflikeKeyword(QRegExp(QLatin1String("\\b(?:catch|do|for|if|while|with)\\b"))),
propertylikeKeyword(QRegExp(QLatin1String("^\\s*\\b(?:property|signal|import)\\b")))
propertylikeKeyword(QRegExp(QLatin1String("^\\s*\\b(?:property|signal|import|readonly|return)\\b")))
{
/*
@@ -278,13 +278,14 @@ QString QScriptIndenter::trimmedCodeLine(const QString &t) const
const QString e = trimmed.trimmed();
if (insertSemicolon
|| e.endsWith(QLatin1Char(','))
|| e.endsWith(QLatin1Char(']'))
|| trimmed.indexOf(propertylikeKeyword) != -1)
if (insertSemicolon || e.endsWith(QLatin1Char(',')) || e.endsWith(QLatin1Char(']')))
trimmed.append(QLatin1Char(';'));
//qDebug() << trimmed;
else if (trimmed.indexOf(propertylikeKeyword) != -1) {
const QChar ch = trimmed.at(trimmed.length() - 1);
if (ch.isLetterOrNumber() || ch == QLatin1Char(')') || ch == QLatin1Char(']')
|| ch == QLatin1Char('"') || ch == QLatin1Char('\''))
trimmed.append(QLatin1Char(';'));
}
return trimmed;
}