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;