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

Fix syntax highlighting of multiline QMLJS strings

Browse Source
This commit is contained in:
Rhys Weatherley
2010-11-29 14:00:43 +10:00
committed by Roberto Raggi
parent 90bf956cc1
commit a9a7f0458f
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/libs/qmljs/qmljsscanner.cpp
View File

@@ -152,6 +152,25 @@ QList<Token> Scanner::operator()(const QString &text, int startState)
if (_scanComments && start != -1)
tokens.append(Token(start, index - start, Token::Comment));
} else if (_state == MultiLineStringDQuote || _state == MultiLineStringSQuote) {
const QChar quote = (_state == MultiLineStringDQuote ? QLatin1Char('"') : QLatin1Char('\''));
const int start = index;
while (index < text.length()) {
const QChar ch = text.at(index);
if (ch == quote)
break;
else if (index + 1 < text.length() && ch == QLatin1Char('\\'))
index += 2;
else
++index;
}
if (index < text.length()) {
++index;
_state = Normal;
}
if (start < index)
tokens.append(Token(start, index - start, Token::String));
}
while (index < text.length()) {
@@ -212,7 +231,10 @@ QList<Token> Scanner::operator()(const QString &text, int startState)
++index;
// good one
} else {
// unfinished
if (quote.unicode() == '"')
_state = MultiLineStringDQuote;
else
_state = MultiLineStringSQuote;
}
tokens.append(Token(start, index - start, Token::String));