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

6
src/plugins/qmljseditor/qmljsfindreferences.cpp
View File

@@ -322,7 +322,7 @@ protected:
virtual bool visit(AST::UiPublicMember *node)
{
if (node->memberType == _name){
if (node->memberTypeName() == _name){
const ObjectValue * tVal = _context->lookupType(_doc.data(), QStringList(_name));
if (tVal == _typeValue)
_usages.append(node->typeToken);
@@ -583,8 +583,8 @@ protected:
virtual bool visit(UiPublicMember *node)
{
if (containsOffset(node->typeToken)){
if (!node->memberType.isEmpty()) {
_name = node->memberType.toString();
if (node->isValid()) {
_name = node->memberTypeName().toString();
_targetValue = _scopeChain->context()->lookupType(_doc.data(), QStringList(_name));
_scope = 0;
_typeKind = TypeKind;