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

QmlDesigner: Normalize expressions

Browse Source 
We have to remove whitespaces and ';' to normalize expressions.
Otherwise expressions can change when rewriting.

Change-Id: I0085a5a46c4caa2815a4e7f4f76658a4df49de75
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2016-06-14 15:02:08 +02:00
parent 89d22b6eb0
commit 12aa10158a
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
View File

@@ -1087,6 +1087,12 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
astValue = textAt(context->doc(), astValue = textAt(context->doc(),
property->statement->firstSourceLocation(), property->statement->firstSourceLocation(),
property->statement->lastSourceLocation()); property->statement->lastSourceLocation());
astValue = astValue.trimmed();
if (astValue.endsWith(QLatin1Char(';')))
astValue = astValue.left(astValue.length() - 1);
astValue = astValue.trimmed();
const TypeName &astType = property->memberType.toUtf8(); const TypeName &astType = property->memberType.toUtf8();
AbstractProperty modelProperty = modelNode.property(astName.toUtf8()); AbstractProperty modelProperty = modelNode.property(astName.toUtf8());
if (!property->statement || isLiteralValue(property->statement)) { if (!property->statement || isLiteralValue(property->statement)) {