<div dir="ltr">We (chromium) definitely want AllowShortIfStatementsOnASingleLine true since <a href="https://source.android.com/source/code-style.html">https://source.android.com/source/code-style.html</a> explicitly allows this, but if Google style doesn't want AlignTrailingComments for Java I'd guess we don't want that either.</div><div class="gmail_extra"><br><div class="gmail_quote">On Sun, Jan 4, 2015 at 12:40 PM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Sun Jan  4 14:40:45 2015<br>
New Revision: 225141<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=225141&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=225141&view=rev</a><br>
Log:<br>
clang-format: [Java] Change a few flags for Google's Java style.<br>
<br>
No tests added as all of these are already tested separately.<br>
<br>
Modified:<br>
    cfe/trunk/lib/Format/Format.cpp<br>
<br>
Modified: cfe/trunk/lib/Format/Format.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=225141&r1=225140&r2=225141&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Format/Format.cpp?rev=225141&r1=225140&r2=225141&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Format/Format.cpp (original)<br>
+++ cfe/trunk/lib/Format/Format.cpp Sun Jan  4 14:40:45 2015<br>
@@ -419,7 +419,9 @@ FormatStyle getGoogleStyle(FormatStyle::<br>
   if (Language == FormatStyle::LK_Java) {<br>
     GoogleStyle.AlignAfterOpenBracket = false;<br>
     GoogleStyle.AlignOperands = false;<br>
+    GoogleStyle.AlignTrailingComments = false;<br>
     GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Empty;<br>
+    GoogleStyle.AllowShortIfStatementsOnASingleLine = false;<br>
     GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;<br>
     GoogleStyle.ColumnLimit = 100;<br>
     GoogleStyle.SpaceAfterCStyleCast = true;<br>
@@ -440,6 +442,8 @@ FormatStyle getGoogleStyle(FormatStyle::<br>
 FormatStyle getChromiumStyle(FormatStyle::LanguageKind Language) {<br>
   FormatStyle ChromiumStyle = getGoogleStyle(Language);<br>
   if (Language == FormatStyle::LK_Java) {<br>
+    ChromiumStyle.AlignTrailingComments = true;<br>
+    ChromiumStyle.AllowShortIfStatementsOnASingleLine = true;<br>
     ChromiumStyle.IndentWidth = 4;<br>
     ChromiumStyle.ContinuationIndentWidth = 8;<br>
   } else {<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>