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

Designer: Fix missing semicolon in case of dynamic properties

Browse Source 
Fixes: QDS-5457
Change-Id: Ib6be3ec864ffb972010e25c2fa956695201dba2c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Vikas Pachdha
2022-11-08 14:59:08 +01:00
parent 478ce3f4a4
commit 913d0e079a
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmldesigner/designercore/filemanager/addpropertyvisitor.cpp
View File

@@ -76,8 +76,16 @@ void AddPropertyVisitor::addInMembers(QmlJS::AST::UiObjectInitializer *initializ
endOfPreviousMember = insertAfter->member->lastSourceLocation(); endOfPreviousMember = insertAfter->member->lastSourceLocation();
// Find out if the previous members ends with semicolon. // Find out if the previous members ends with semicolon.
if (auto member = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding*>(insertAfter->member)) { if (auto member = insertAfter->member) {
if (auto stmt = QmlJS::AST::cast<QmlJS::AST::ExpressionStatement *>(member->statement)) { auto hasStatement = [member]() -> QmlJS::AST::ExpressionStatement * {
if (auto m = QmlJS::AST::cast<QmlJS::AST::UiScriptBinding *>(member))
return QmlJS::AST::cast<QmlJS::AST::ExpressionStatement *>(m->statement);
if (auto m = QmlJS::AST::cast<QmlJS::AST::UiPublicMember *>(member))
return QmlJS::AST::cast<QmlJS::AST::ExpressionStatement *>(m->statement);
return nullptr;
};
if (auto stmt = hasStatement()) {
previousMemberSemicolon = stmt->semicolonToken.isValid() previousMemberSemicolon = stmt->semicolonToken.isValid()
&& stmt->semicolonToken.length > 0; && stmt->semicolonToken.length > 0;
} else { } else {