From 0970a8e6d2c7fb4742bf7bef2899ce76478ecc89 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Fri, 30 Apr 2010 13:35:03 +0200
Subject: [PATCH] Moved quick-exit check back to the indenter.
Reviewed-by: ckamm
---
src/libs/qmljs/qmljsindenter.cpp | 3 +++
src/libs/qmljs/qmljslineinfo.cpp | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libs/qmljs/qmljsindenter.cpp b/src/libs/qmljs/qmljsindenter.cpp
index 49b95ebc86a..ba941c0e07c 100644
--- a/src/libs/qmljs/qmljsindenter.cpp
+++ b/src/libs/qmljs/qmljsindenter.cpp
@@ -569,6 +569,9 @@ int QmlJSIndenter::indentForStandaloneLine()
*/
int QmlJSIndenter::indentForBottomLine(QTextBlock begin, QTextBlock end, QChar typedIn)
{
+ if (begin == end)
+ return 0;
+
const QTextBlock last = end.previous();
initialize(begin, last);
diff --git a/src/libs/qmljs/qmljslineinfo.cpp b/src/libs/qmljs/qmljslineinfo.cpp
index 29f74443ad9..a4c8837d1b8 100644
--- a/src/libs/qmljs/qmljslineinfo.cpp
+++ b/src/libs/qmljs/qmljslineinfo.cpp
@@ -564,9 +564,6 @@ bool LineInfo::isContinuationLine()
void LineInfo::initialize(QTextBlock begin, QTextBlock end)
{
- if (begin == end)
- return;
-
yyProgram = Program(begin, end);
startLinizer();
}
--
GitLab