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

QmlJS highlighting: Use semantics for types and binding names.

Browse Source 
This fixes some problems with highlighting like anchors {}, allows us
to only highlight correct types and to make the binding name formatting
customizable.

Change-Id: I7ab0c0ed384108b74a2998796d868d5ced4a5310
Reviewed-on: http://codereview.qt-project.org/4669
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Christian Kamm
2011-09-12 14:00:05 +02:00
parent a8b03e9c28
commit 1a0fb751cd
5 changed files with 40 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,54 +166,6 @@ void Highlighter::highlightBlock(const QString &text)
break;
}
}
if (!spell.isEmpty() && spell.at(0).isUpper())
setFormat(token.offset, token.length, m_formats[TypeFormat]);
if (index + 1 < tokens.size()) {
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 (maybeBinding || maybeOnBinding) {
Token::Kind expectedTerminator = Token::Colon;
if (maybeOnBinding)
expectedTerminator = Token::LeftBrace;
const int start = index;
// put index on last identifier not followed by .identifier
while (index + 2 < tokens.size() &&
tokens.at(index + 1).is(Token::Dot) &&
tokens.at(index + 2).is(Token::Identifier)) {
index += 2;
}
if (index + 1 < tokens.size() && tokens.at(index + 1).is(expectedTerminator)) {
// it's a binding.
for (int i = start; i <= index; ++i) {
const Token &tok = tokens.at(i);
if (tok.kind == Token::Dot)
continue;
const QStringRef tokSpell = text.midRef(tok.offset, tok.length);
if (!tokSpell.isEmpty() && tokSpell.at(0).isUpper()) {
setFormat(tok.offset, tok.length, m_formats[TypeFormat]);
} else {
setFormat(tok.offset, tok.length, m_formats[FieldFormat]);
}
}
break;
} else {
index = start;
}
}
}
} break;
case Token::Delimiter: