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

QmlJSEditor: Fix brace matching for "A on b {" syntax.

Browse Source 
Reviewed-by: Roberto Raggi
This commit is contained in:
Christian Kamm
2010-04-15 15:35:52 +02:00
parent 407fa3c3d5
commit e145c6ae53
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmljseditor/qmljshighlighter.cpp
View File

@@ -169,16 +169,16 @@ void Highlighter::highlightBlock(const QString &text)
const int start = index; const int start = index;
++index; // skip the identifier. // put index on last identifier not followed by .identifier
while (index + 1 < tokens.size() && while (index + 2 < tokens.size() &&
tokens.at(index).is(Token::Dot) && tokens.at(index + 1).is(Token::Dot) &&
tokens.at(index + 1).is(Token::Identifier)) { tokens.at(index + 2).is(Token::Identifier)) {
index += 2; index += 2;
} }
if (index < tokens.size() && tokens.at(index).is(expectedTerminator)) { if (index + 1 < tokens.size() && tokens.at(index + 1).is(expectedTerminator)) {
// it's a binding. // it's a binding.
for (int i = start; i < index; ++i) { for (int i = start; i <= index; ++i) {
const Token &tok = tokens.at(i); const Token &tok = tokens.at(i);
setFormat(tok.offset, tok.length, m_formats[LabelFormat]); setFormat(tok.offset, tok.length, m_formats[LabelFormat]);
} }