clang-format: [Java] Change a few flags for Google's Java style.
No tests added as all of these are already tested separately.
llvm-svn: 225141
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 81c9e13..adcb94f 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -419,7 +419,9 @@
if (Language == FormatStyle::LK_Java) {
GoogleStyle.AlignAfterOpenBracket = false;
GoogleStyle.AlignOperands = false;
+ GoogleStyle.AlignTrailingComments = false;
GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Empty;
+ GoogleStyle.AllowShortIfStatementsOnASingleLine = false;
GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
GoogleStyle.ColumnLimit = 100;
GoogleStyle.SpaceAfterCStyleCast = true;
@@ -440,6 +442,8 @@
FormatStyle getChromiumStyle(FormatStyle::LanguageKind Language) {
FormatStyle ChromiumStyle = getGoogleStyle(Language);
if (Language == FormatStyle::LK_Java) {
+ ChromiumStyle.AlignTrailingComments = true;
+ ChromiumStyle.AllowShortIfStatementsOnASingleLine = true;
ChromiumStyle.IndentWidth = 4;
ChromiumStyle.ContinuationIndentWidth = 8;
} else {