From 23a5f173b12afae0c29824adaabce48005140a85 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 3 Sep 2010 14:54:52 +0200
Subject: [PATCH] Check the traling text before inserting closing braces.
---
src/plugins/qmljseditor/qmljseditor.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp
index 0267b3743d6..d1f9832e926 100644
--- a/src/plugins/qmljseditor/qmljseditor.cpp
+++ b/src/plugins/qmljseditor/qmljseditor.cpp
@@ -1684,8 +1684,15 @@ static bool shouldInsertNewline(const QTextCursor &tc)
QString QmlJSTextEditor::insertParagraphSeparator(const QTextCursor &tc) const
{
- if (shouldInsertNewline(tc))
+ if (shouldInsertNewline(tc)) {
+ QTextCursor cursor = tc;
+ cursor.movePosition(QTextCursor::EndOfBlock, QTextCursor::KeepAnchor);
+ if (! cursor.selectedText().trimmed().isEmpty())
+ return QString();
+
return QLatin1String("}\n");
+ }
+
return QLatin1String("}");
}
--
GitLab