From ed1414a406d68540a1f8e210a2bec6f99e23ccf8 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 15 Jan 2010 12:27:25 +0100
Subject: [PATCH] Fixed indentation of single line QML/JS comments.
---
src/shared/qscripthighlighter/qscriptindenter.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/shared/qscripthighlighter/qscriptindenter.cpp b/src/shared/qscripthighlighter/qscriptindenter.cpp
index c697e16c69b..4ca6ebf4e17 100644
--- a/src/shared/qscripthighlighter/qscriptindenter.cpp
+++ b/src/shared/qscripthighlighter/qscriptindenter.cpp
@@ -226,8 +226,10 @@ QString QScriptIndenter::trimmedCodeLine(const QString &t)
int e = token.length;
if (token.offset > 0 || startState == 0) {
- trimmed.append(QLatin1String("/*"));
- i += 2;
+ if (token.length >= 2 && t.midRef(token.offset, 2) == QLatin1String("/*")) {
+ trimmed.append(QLatin1String("/*"));
+ i += 2;
+ }
}
bool needEndOfComment = false;
--
GitLab