From c1a761a2251204297dfd78e0bf19cc16e53de52d Mon Sep 17 00:00:00 2001 From: Marco Benelli Date: Tue, 11 Sep 2018 10:33:02 +0200 Subject: [PATCH] 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 --- src/libs/qmljs/qmljsreformatter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libs/qmljs/qmljsreformatter.cpp b/src/libs/qmljs/qmljsreformatter.cpp index 2116fa74676..cd45a66a239 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)