From fd4ed1840207f10bc09729620a4abd0baaebeeb3 Mon Sep 17 00:00:00 2001
From: Daniel Jasper <djasper@google.com>
Date: Sun, 4 Jan 2015 20:40:45 +0000
Subject: 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
---
 clang/lib/Format/Format.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'clang/lib/Format')

diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 81c9e130d5a..adcb94f7b9d 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -419,7 +419,9 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
   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::LanguageKind Language) {
 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 {
-- 
cgit v1.2.3