aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Benelli <marco.benelli@qt.io>2018-09-11 10:33:02 +0200
committerMarco Benelli <marco.benelli@qt.io>2018-09-11 11:57:22 +0000
commitc1a761a2251204297dfd78e0bf19cc16e53de52d (patch)
tree55ce2978b2407eedd36f63e2b610b206ac1d3a7b
parent28ab852e538643a0762ce6be5b0fee1daa41f3a9 (diff)
qmljs: fix bug in reformatting
Reformatting multi-line comments caused, in some cases, the deletion of the preceding line. Task-number: QTCREATORBUG-21036 Change-Id: I9bf9627e5992e9821c0dd62a13601a3ca6367e65 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
-rw-r--r--src/libs/qmljs/qmljsreformatter.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp
index 2116fa7467..cd45a66a23 100644
--- a/src/libs/qmljs/qmljsreformatter.cpp
+++ b/src/libs/qmljs/qmljsreformatter.cpp
@@ -173,8 +173,11 @@ protected:
QStringList lines = str.split(QLatin1Char('\n'));
bool multiline = lines.length() > 1;
for (int i = 0; i < lines.size(); ++i) {
- if (multiline)
+ if (multiline) {
+ if (i == 0)
+ newLine();
_line = lines.at(i); // multiline comments don't keep track of previos lines
+ }
else
_line += lines.at(i);
if (i != lines.size() - 1)