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

qmljs: update parser

Browse Source 
Update the qtcreator qmljs parser to the
one of Qt 5.12. It supports EcmaScript 7.

Task-number: QTCREATORBUG-20341
Change-Id: I0d1cff71402ba17e22cde6b46c65614e162280de
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
This commit is contained in:
Marco Benelli
2018-10-16 15:32:58 +02:00
parent fe8a372773
commit 4646acad0d
46 changed files with 10604 additions and 5872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmljstools/qmljslocatordata.cpp
View File

@@ -134,8 +134,8 @@ protected:
for (FormalParameterList *it = ast->formals; it; it = it->next) {
if (it != ast->formals)
entry.displayName += QLatin1String(", ");
if (!it->name.isEmpty())
entry.displayName += it->name.toString();
if (!it->element->bindingIdentifier.isEmpty())
entry.displayName += it->element->bindingIdentifier.toString();
}
entry.displayName += QLatin1Char(')');
entry.symbolName = entry.displayName;
@@ -214,8 +214,8 @@ protected:
for (FormalParameterList *it = funcExpr->formals; it; it = it->next) {
if (it != funcExpr->formals)
entry.displayName += QLatin1String(", ");
if (!it->name.isEmpty())
entry.displayName += it->name.toString();
if (!it->element->bindingIdentifier.isEmpty())
entry.displayName += it->element->bindingIdentifier.toString();
}
entry.displayName += QLatin1Char(')');
entry.symbolName = entry.displayName;