Remove errors were if statements were incorrectly put on a single line.

Before: if (a)  // This comment confused clang-format f();
After:  if (a)  // No more confusion
          f();
llvm-svn: 172600

1 files changed, 11 insertions, 1 deletions

diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index eb00d017ff3..ac61af3bfae 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -145,7 +145,17 @@ TEST_F(FormatTest, FormatIfWithoutCompountStatement) {
   verifyFormat("if (a) return;", getGoogleStyleWithColumns(14));
   verifyFormat("if (a)\n  return;", getGoogleStyleWithColumns(13));
   verifyFormat("if (aaaaaaaaa)\n"
-                     "  return;", getGoogleStyleWithColumns(14));
+               "  return;", getGoogleStyleWithColumns(14));
+  verifyGoogleFormat("if (a)  // Can't merge this\n"
+                     "  f();\n");
+  verifyGoogleFormat("if (a) /* still don't merge */\n"
+                     "  f();");
+  verifyGoogleFormat("if (a) {  // Never merge this\n"
+                     "  f();\n"
+                     "}");
+  verifyGoogleFormat("if (a) { /* Never merge this */\n"
+                     "  f();\n"
+                     "}");
 }
 
 TEST_F(FormatTest, ParseIfElse) {