r225141 - clang-format: [Java] Change a few flags for Google's Java style.
Daniel Jasper
djasper at google.com
Sun Jan 4 12:40:45 PST 2015
Author: djasper
Date: Sun Jan 4 14:40:45 2015
New Revision: 225141
URL: http://llvm.org/viewvc/llvm-project?rev=225141&view=rev
Log:
clang-format: [Java] Change a few flags for Google's Java style.
No tests added as all of these are already tested separately.
Modified:
cfe/trunk/lib/Format/Format.cpp
Modified: cfe/trunk/lib/Format/Format.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=225141&r1=225140&r2=225141&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Sun Jan 4 14:40:45 2015
@@ -419,7 +419,9 @@ FormatStyle getGoogleStyle(FormatStyle::
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 getGoogleStyle(FormatStyle::
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 {
More information about the cfe-commits
mailing list