1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index 342b426fef..967bc9321c 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -29,21 +29,16 @@
 
 #include "cppcodeformatter.h"
 
-#include <Token.h>
-#include <Lexer.h>
-
 #include <texteditor/basetextdocumentlayout.h>
-#include <texteditor/tabsettings.h>
+#include <cplusplus/Lexer.h>
+
 #include <utils/qtcassert.h>
 
 #include <QDebug>
 #include <QMetaEnum>
 #include <QTextDocument>
-#include <QTextCursor>
 #include <QTextBlock>
 
-#include "cppcodestylesettingspage.h"
-
 using namespace CPlusPlus;
 using namespace CppTools;
 using namespace TextEditor;
@@ -212,6 +207,8 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
                     // oops, the expression was a function declaration argument list, hand lbrace/colon to declaration_start
                     leave();
                     continue;
+                } else {
+                    turnInto(substatement_open);
                 }
                 break;
             default:            tryExpression(); break;