OSDN Git Service

Moved quick-exit check back to the indenter.
authorErik Verbruggen <erik.verbruggen@nokia.com>
Fri, 30 Apr 2010 11:35:03 +0000 (13:35 +0200)
committerErik Verbruggen <erik.verbruggen@nokia.com>
Fri, 30 Apr 2010 11:36:09 +0000 (13:36 +0200)
Reviewed-by: ckamm
src/libs/qmljs/qmljsindenter.cpp
src/libs/qmljs/qmljslineinfo.cpp

index 49b95eb..ba941c0 100644 (file)
@@ -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);
index 29f7444..a4c8837 100644 (file)
@@ -564,9 +564,6 @@ bool LineInfo::isContinuationLine()
 
 void LineInfo::initialize(QTextBlock begin, QTextBlock end)
 {
-    if (begin == end)
-        return;
-
     yyProgram = Program(begin, end);
     startLinizer();
 }