Fixes issues around pulling in the next line in simple if statements.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@172822 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/unittests/Format/FormatTest.cpp b/unittests/Format/FormatTest.cpp
index 6b77868..1434f32 100644
--- a/unittests/Format/FormatTest.cpp
+++ b/unittests/Format/FormatTest.cpp
@@ -1542,20 +1542,23 @@
AllowsMergedIf.AllowShortIfStatementsOnASingleLine = true;
verifyFormat("void f() { f(); }\n#error E", AllowsMergedIf);
verifyFormat("if (true) return 42;\n#error E", AllowsMergedIf);
-
- // FIXME:
- // verifyFormat("if (true)\n#error E\n return 42;", AllowsMergedIf);
+ verifyFormat("if (true)\n#error E\n return 42;", AllowsMergedIf);
+ EXPECT_EQ("if (true) return 42;",
+ format("if (true)\nreturn 42;", AllowsMergedIf));
+ FormatStyle ShortMergedIf = AllowsMergedIf;
+ ShortMergedIf.ColumnLimit = 25;
+ verifyFormat("#define A \\\n"
+ " if (true) return 42;", ShortMergedIf);
+ verifyFormat("#define A \\\n"
+ " f(); \\\n"
+ " if (true)\n"
+ "#define B", ShortMergedIf);
+ verifyFormat("#define A \\\n"
+ " f(); \\\n"
+ " if (true)\n"
+ "g();", ShortMergedIf);
}
-// FIXME: This breaks the order of the unwrapped lines:
-// TEST_F(FormatTest, OrderUnwrappedLines) {
-// verifyFormat("{\n"
-// " bool a; //\n"
-// "#error {\n"
-// " int a;\n"
-// "}");
-// }
-
//===----------------------------------------------------------------------===//
// Objective-C tests.
//===----------------------------------------------------------------------===//