Disable inlining of short ifs in Google style.
Various reasons seem to speak against it, so I am disabling this for
now.
Changed tests to still test this option.
llvm-svn: 172618
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index f4fa6fc..4be41da 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -167,7 +167,7 @@
GoogleStyle.SpacesBeforeTrailingComments = 2;
GoogleStyle.BinPackParameters = false;
GoogleStyle.ConstructorInitializerAllOnOneLineOrOnePerLine = true;
- GoogleStyle.AllowShortIfStatementsOnASingleLine = true;
+ GoogleStyle.AllowShortIfStatementsOnASingleLine = false;
GoogleStyle.ObjCSpaceBeforeProtocolList = false;
GoogleStyle.ObjCSpaceBeforeReturnType = false;
return GoogleStyle;
diff --git a/clang/unittests/Format/FormatTest.cpp b/clang/unittests/Format/FormatTest.cpp
index 066e888..7d8ed14 100644
--- a/clang/unittests/Format/FormatTest.cpp
+++ b/clang/unittests/Format/FormatTest.cpp
@@ -151,23 +151,31 @@
verifyFormat("if (true)\n f();\ng();");
verifyFormat("if (a)\n if (b)\n if (c)\n g();\nh();");
verifyFormat("if (a)\n if (b) {\n f();\n }\ng();");
- verifyGoogleFormat("if (a)\n"
- " // comment\n"
- " f();");
- verifyFormat("if (a) return;", getGoogleStyleWithColumns(14));
- verifyFormat("if (a)\n return;", getGoogleStyleWithColumns(13));
+
+ FormatStyle AllowsMergedIf = getGoogleStyle();
+ AllowsMergedIf.AllowShortIfStatementsOnASingleLine = true;
+ verifyFormat("if (a)\n"
+ " // comment\n"
+ " f();", AllowsMergedIf);
+
+ verifyFormat("if (a) // Can't merge this\n"
+ " f();\n", AllowsMergedIf);
+ verifyFormat("if (a) /* still don't merge */\n"
+ " f();", AllowsMergedIf);
+ verifyFormat("if (a) { // Never merge this\n"
+ " f();\n"
+ "}", AllowsMergedIf);
+ verifyFormat("if (a) { /* Never merge this */\n"
+ " f();\n"
+ "}", AllowsMergedIf);
+
+ AllowsMergedIf.ColumnLimit = 14;
+ verifyFormat("if (a) return;", AllowsMergedIf);
verifyFormat("if (aaaaaaaaa)\n"
- " 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"
- "}");
+ " return;", AllowsMergedIf);
+
+ AllowsMergedIf.ColumnLimit = 13;
+ verifyFormat("if (a)\n return;", AllowsMergedIf);
}
TEST_F(FormatTest, ParseIfElse) {