feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS indenter: Fix hang with invalid code.

Browse Source 
Task-number: QTCREATORBUG-7005

(cherry picked from commit 0c597a6f07)

Change-Id: I2e343fbcc6931530e7db142bf6e268dac696970f
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Robert Loehning
2012-02-29 17:19:39 +01:00
committed by Eike Ziller
parent cb6e324738
commit ff58b3102c
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/qmljs/qmljscodeformatter.cpp
View File

@@ -167,6 +167,11 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
case Signal:
case Property:
case Identifier: enter(expression_or_objectdefinition); break;
// error recovery
case RightBracket:
case RightParenthesis: leave(true); break;
default: enter(expression); continue;
} break;
@@ -251,9 +256,14 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
case expression_or_objectdefinition:
switch (kind) {
case Dot:
case Identifier: break; // need to become an objectdefinition_open in cases like "width: Qt.Foo {"
case LeftBrace: turnInto(objectdefinition_open); break;
default: enter(expression); continue; // really? identifier and more tokens might already be gone
case Identifier: break; // need to become an objectdefinition_open in cases like "width: Qt.Foo {"
case LeftBrace: turnInto(objectdefinition_open); break;
// propagate 'leave' from expression state
case RightBracket:
case RightParenthesis: leave(); continue;
default: enter(expression); continue; // really? identifier and more tokens might already be gone
} break;
case expression_or_label: