From f762d9370241609fecaab6f5cf8b7edc54495fef Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Mon, 30 May 2011 11:49:05 +0200
Subject: [PATCH] C++ indenter: Fix indent in body of function with default
 argument.

Change-Id: I9d4f5b3ae7b8a59f8350cf756979a3a430398112
Reviewed-on: http://codereview.qt.nokia.com/206
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
---
 src/plugins/cpptools/cppcodeformatter.cpp           |  2 ++
 .../cplusplus/codeformatter/tst_codeformatter.cpp   | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/plugins/cpptools/cppcodeformatter.cpp b/src/plugins/cpptools/cppcodeformatter.cpp
index b477cf06bb6..ebe66ce7920 100644
--- a/src/plugins/cpptools/cppcodeformatter.cpp
+++ b/src/plugins/cpptools/cppcodeformatter.cpp
@@ -194,6 +194,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
             case T_LBRACE:      enter(brace_list_open); break;
             case T_RBRACE:      leave(true); continue;
             case T_SEMICOLON:   leave(); continue;
+            case T_RPAREN:      leave(); continue;
             default:            enter(assign_open); continue;
             } break;
 
@@ -216,6 +217,7 @@ void CodeFormatter::recalculateStateAfter(const QTextBlock &block)
             switch (kind) {
             case T_RBRACE:      leave(true); continue;
             case T_SEMICOLON:   leave(); continue;
+            case T_RPAREN:      leave(); continue;
             default:            tryExpression(); break;
             } break;
 
diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
index d8b9a33daea..ab80877202e 100644
--- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
+++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
@@ -120,6 +120,7 @@ private Q_SLOTS:
     void caseBody5();
     void caseBody6();
     void blockBraces1();
+    void functionDefaultArgument();
 };
 
 struct Line {
@@ -1893,6 +1894,18 @@ void tst_CodeFormatter::blockBraces1()
     checkIndent(data, codeStyle);
 }
 
+void tst_CodeFormatter::functionDefaultArgument()
+{
+    QList<Line> data;
+    data << Line("void foo(int a = 3) {")
+         << Line("    if (a)")
+         << Line("        int a;")
+         << Line("}")
+         << Line("int b;")
+         ;
+    checkIndent(data);
+}
+
 QTEST_APPLESS_MAIN(tst_CodeFormatter)
 
 #include "tst_codeformatter.moc"