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

QmlJS indenter: Fix labelled statements and break/continue with label.

Browse Source 
Also do some cleanup to make handling of substatements nicer.

Change-Id: I78773fc81d9b0058fa97c5cef393cca34b7fd885
Reviewed-on: http://codereview.qt-project.org/4413
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
This commit is contained in:
Christian Kamm
2011-09-07 13:30:48 +02:00
parent bbc48690e8
commit 16b4a6fe73
4 changed files with 187 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/qmljs/qmljscodeformatter.h
View File

@@ -133,6 +133,7 @@ public: // must be public to make Q_GADGET introspection work
expression_continuation, // at the end of the line, when the next line definitely is a continuation
expression_maybe_continuation, // at the end of the line, when the next line may be an expression
expression_or_objectdefinition, // after a binding starting with an identifier ("x: foo")
expression_or_label, // when expecting a statement and getting an identifier
paren_open, // opening ( in expression
bracket_open, // opening [ in expression
@@ -148,7 +149,7 @@ public: // must be public to make Q_GADGET introspection work
jsblock_open,
empty_statement, // for a ';', will be popped directly
breakcontinue_statement, // for continue/break, will be popped directly
breakcontinue_statement, // for continue/break, may be followed by identifier
if_statement, // After 'if'
maybe_else, // after the first substatement in an if
@@ -160,6 +161,8 @@ public: // must be public to make Q_GADGET introspection work
substatement, // The first line after a conditional or loop construct.
substatement_open, // The brace that opens a substatement block.
labelled_statement, // after a label
return_statement, // After 'return'
throw_statement, // After 'throw'