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

QmlDesigner: Stabilize annotation code

Browse Source 
We have to ensure to replace old blocks
if the line breaks have been removed.

Change-Id: Ice63d63bd945a3477461311ee7653f0f4cb784e1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2018-09-04 14:35:11 +02:00
parent 4d256654e0
commit 015dbeba3e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
View File

@@ -902,13 +902,13 @@ void RewriterView::delayedSetup()
static QString annotationsEnd() static QString annotationsEnd()
{ {
const static QString end = QString(" %1*/\n").arg(annotationsEscapeSequence); const static QString end = QString(" %1*/").arg(annotationsEscapeSequence);
return end; return end;
} }
static QString annotationsStart() static QString annotationsStart()
{ {
const static QString start = QString("\n/*%1 ").arg(annotationsEscapeSequence); const static QString start = QString("/*%1 ").arg(annotationsEscapeSequence);
return start; return start;
} }
@@ -944,8 +944,8 @@ void RewriterView::writeAuxiliaryData()
QString auxData = auxiliaryDataAsQML(); QString auxData = auxiliaryDataAsQML();
if (!auxData.isEmpty()) { if (!auxData.isEmpty()) {
auxData.prepend(annotationsStart()); auxData.prepend("\n" + annotationsStart());
auxData.append(annotationsEnd()); auxData.append(annotationsEnd() + "\n");
newText.append(auxData); newText.append(auxData);
} }