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

QmlJSEditor: Highlight b in 'A on b {' as a property.

Browse Source 
Fixes 4f1d5ce196

Task-number: QTCREATORBUG-893
Reviewed-by: Erik Verbruggen
This commit is contained in:
Christian Kamm
2010-04-07 11:29:56 +02:00
parent db2f91ef8f
commit b19c51d609
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -147,11 +147,26 @@ void Highlighter::highlightBlock(const QString &text)
if (index + 1 < tokens.size()) { if (index + 1 < tokens.size()) {
const Token &nextToken = tokens.at(index + 1); const Token &nextToken = tokens.at(index + 1);
bool maybeBinding = (index == 0 || checkStartOfBinding(tokens.at(index - 1)));
bool maybeOnBinding = false;
if (index > 0) {
const Token &previousToken = tokens.at(index - 1);
if (text.midRef(previousToken.offset, previousToken.length) == QLatin1String("on")) {
maybeOnBinding = true;
maybeBinding = false;
}
}
if (text.at(token.offset).isUpper() if (text.at(token.offset).isUpper()
&& (nextToken.is(Token::LeftBrace) && (nextToken.is(Token::LeftBrace)
|| text.midRef(nextToken.offset, nextToken.length) == QLatin1String("on"))) { || text.midRef(nextToken.offset, nextToken.length) == QLatin1String("on"))) {
setFormat(token.offset, token.length, m_formats[TypeFormat]); setFormat(token.offset, token.length, m_formats[TypeFormat]);
} else if (index == 0 || checkStartOfBinding(tokens.at(index - 1))) { } else if (maybeBinding || maybeOnBinding) {
Token::Kind expectedTerminator = Token::Colon;
if (maybeOnBinding)
expectedTerminator = Token::LeftBrace;
const int start = index; const int start = index;
++index; // skip the identifier. ++index; // skip the identifier.
@@ -161,7 +176,7 @@ void Highlighter::highlightBlock(const QString &text)
index += 2; index += 2;
} }
if (index < tokens.size() && tokens.at(index).is(Token::Colon)) { if (index < tokens.size() && tokens.at(index).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);