1 files changed, 26 insertions, 0 deletions
diff --git a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
index f54816f9fe..0657e58786 100644
--- a/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
+++ b/tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
@@ -125,6 +125,8 @@ private Q_SLOTS:
     void braceReturn();
     void staticVarDeclWithTypeDecl();
     void strings();
+    void initializerWithinFunctionArg();
+    void shiftWithinInitializer();
 };
 
 struct Line {
@@ -1285,6 +1287,7 @@ void tst_CodeFormatter::functionReturnType()
          << Line("A::B::foo() {}")
          << Line("std::map<int,std::vector<int>> indent() {}")
          << Line("std::map<int,std::vector<int> > indent() {}")
+         << Line("auto indent() -> std::map<int,std::vector<int>>")
          << Line("")
          ;
     checkIndent(data);
@@ -2170,6 +2173,29 @@ void tst_CodeFormatter::strings()
     checkIndent(data);
 }
 
+void tst_CodeFormatter::initializerWithinFunctionArg()
+{
+    QList<Line> data;
+    data << Line("void f() {")
+         << Line("    g(foo,")
+         << Line("      { 1, 2});", 4, 2)
+         << Line("}")
+           ;
+
+    checkIndent(data);
+}
+
+void tst_CodeFormatter::shiftWithinInitializer()
+{
+    QList<Line> data;
+    data << Line("void f() {")
+         << Line("    list << A{1 << 1};")
+         << Line("    list;") // OK, same indentation/padding as above.
+         << Line("}")
+            ;
+    checkIndent(data);
+}
+
 QTEST_MAIN(tst_CodeFormatter)
 
 #include "tst_codeformatter.moc"