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

QmlJS: fix reformatting of required properties

Browse Source 
Fixes: QTCREATORBUG-24376
Change-Id: I9ebe66f881575ce8e58cee46d34c3ff8da55ef9c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Fawzi Mohamed
2020-09-29 13:11:20 +02:00
parent 2ee1af2032
commit 89c8021c5c
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/libs/qmljs/parser/qmljsast_p.h
View File

@@ -3325,12 +3325,15 @@ public:
SourceLocation firstSourceLocation() const override SourceLocation firstSourceLocation() const override
{ {
if (requiredToken.isValid()) {
if (defaultToken.isValid() && defaultToken.offset < requiredToken.offset)
return defaultToken;
return requiredToken;
}
if (defaultToken.isValid()) if (defaultToken.isValid())
return defaultToken; return defaultToken;
else if (readonlyToken.isValid()) if (readonlyToken.isValid())
return readonlyToken; return readonlyToken;
else if (requiredToken.isValid())
return requiredToken;
return propertyToken; return propertyToken;
} }

2
src/libs/qmljs/qmljsreformatter.cpp
View File

@@ -632,6 +632,8 @@ protected:
bool visit(UiPublicMember *ast) override bool visit(UiPublicMember *ast) override
{ {
if (ast->type == UiPublicMember::Property) { if (ast->type == UiPublicMember::Property) {
if (ast->isRequired)
out("required ", ast->requiredToken);
if (ast->isDefaultMember) if (ast->isDefaultMember)
out("default ", ast->defaultToken); out("default ", ast->defaultToken);
else if (ast->isReadonlyMember) else if (ast->isReadonlyMember)