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

Improved the QML/JS indenter when indenting statements with inserted semicolons

Browse Source
This commit is contained in:
Roberto Raggi
2010-01-13 14:25:52 +01:00
parent 733fa8f781
commit e3e4f1b986
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -272,21 +272,36 @@ QString QScriptIndenter::trimmedCodeLine(const QString &t) const
/*
Remove C++-style comments.
*/
k = trimmed.indexOf(QLatin1String("//"));
k = trimmed.indexOf(QRegExp(QLatin1String("\\s*//")));
if (k != -1)
trimmed.truncate(k);
const QString e = trimmed.trimmed();
if (insertSemicolon || e.endsWith(QLatin1Char(',')) || e.endsWith(QLatin1Char(']')))
trimmed.append(QLatin1Char(';'));
else if (trimmed.indexOf(propertylikeKeyword) != -1) {
if (! insertSemicolon && ! trimmed.isEmpty()) {
const QChar ch = trimmed.at(trimmed.length() - 1);
if (ch.isLetterOrNumber() || ch == QLatin1Char(')') || ch == QLatin1Char(']')
|| ch == QLatin1Char('"') || ch == QLatin1Char('\''))
trimmed.append(QLatin1Char(';'));
switch (ch.unicode()) {
case ',':
case ']':
case '"':
case '\'':
case '_':
insertSemicolon = true;
break;
default:
if (ch.isLetterOrNumber()) {
if (! trimmed.endsWith(QLatin1String("else")))
insertSemicolon = true;
} else if (trimmed.indexOf(propertylikeKeyword) != -1)
insertSemicolon = true;
break;
}
}
if (insertSemicolon)
trimmed.append(QLatin1Char(';'));
return trimmed;
}