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

Update the qml code model parser

Browse Source 
Updates the qml code model from qtdeclarative dev
(commit: 164d8f66d82deea74464c68a2cdd19e5998835da).

Fixes: QTCREATORBUG-28238
Change-Id: I383c98012f1efd56110d43c258fa1b398a6f8255
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Sami Shalayel
2022-12-19 14:00:30 +01:00
parent 4e58ffcd13
commit dc67907679
18 changed files with 3970 additions and 3477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/libs/qmljs/parser/qmljsparser_p.h
View File

@@ -1,3 +1,5 @@
#line 126 "qmljs.g"
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
@@ -86,7 +88,7 @@ public:
AST::ExportClause *ExportClause;
AST::ExportDeclaration *ExportDeclaration;
AST::TypeAnnotation *TypeAnnotation;
AST::TypeArgumentList *TypeArgumentList;
AST::TypeArgument *TypeArgument;
AST::Type *Type;
AST::UiProgram *UiProgram;
@@ -160,7 +162,7 @@ public:
inline DiagnosticMessage diagnosticMessage() const
{
for (const DiagnosticMessage &d : diagnostic_messages) {
if (d.kind != Severity::Warning)
if (d.isWarning())
return d;
}
@@ -253,6 +255,7 @@ protected:
SavedToken *last_token = nullptr;
int functionNestingLevel = 0;
int classNestingLevel = 0;
enum CoverExpressionType {
CE_Invalid,
@@ -267,27 +270,27 @@ protected:
} // end of namespace QmlJS
#line 1819 "qmljs.g"
#line 1769 "qmljs.g"
#define J_SCRIPT_REGEXPLITERAL_RULE1 159
#define J_SCRIPT_REGEXPLITERAL_RULE1 163
#line 1831 "qmljs.g"
#line 1781 "qmljs.g"
#define J_SCRIPT_REGEXPLITERAL_RULE2 160
#define J_SCRIPT_REGEXPLITERAL_RULE2 164
#line 3451 "qmljs.g"
#line 3401 "qmljs.g"
#define J_SCRIPT_EXPRESSIONSTATEMENTLOOKAHEAD_RULE 461
#define J_SCRIPT_EXPRESSIONSTATEMENTLOOKAHEAD_RULE 465
#line 4103 "qmljs.g"
#line 4053 "qmljs.g"
#define J_SCRIPT_CONCISEBODYLOOKAHEAD_RULE 531
#define J_SCRIPT_CONCISEBODYLOOKAHEAD_RULE 535
#line 4645 "qmljs.g"
#line 4594 "qmljs.g"
#define J_SCRIPT_EXPORTDECLARATIONLOOKAHEAD_RULE 600
#define J_SCRIPT_EXPORTDECLARATIONLOOKAHEAD_RULE 603
#line 4929 "qmljs.g"
#line 4878 "qmljs.g"
QT_QML_END_NAMESPACE