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

QmlJs: sync qmljs parser

Browse Source 
The last version of the grammar contains some constructs that the code model
needs to know.

Task-number: QTCREATORBUG-17842
Change-Id: I6250f96431acc05b19f3fd1b6cc268a07485cf0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Benelli
2017-03-16 17:13:46 +01:00
parent aa87ee72ec
commit 61d30a20ce
24 changed files with 1411 additions and 1222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmljseditor/qmljssemantichighlighter.cpp
View File

@@ -323,8 +323,8 @@ protected:
bool visit(UiPublicMember *ast)
{
if (ast->typeToken.isValid() && !ast->memberType.isEmpty()) {
if (m_scopeChain.context()->lookupType(m_scopeChain.document().data(), QStringList(ast->memberType.toString())))
if (ast->typeToken.isValid() && ast->isValid()) {
if (m_scopeChain.context()->lookupType(m_scopeChain.document().data(), QStringList(ast->memberTypeName().toString())))
addUse(ast->typeToken, SemanticHighlighter::QmlTypeType);
}
if (ast->identifierToken.isValid())