r220778 - clang-format: Don't put functions on a single line in Google's Java

[Daniel Jasper]

Author: djasper
Date: Tue Oct 28 11:15:52 2014
New Revision: 220778

URL: http://llvm.org/viewvc/llvm-project?rev=220778&view=rev
Log:
clang-format: Don't put functions on a single line in Google's Java
style.

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=220778&r1=220777&r2=220778&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Tue Oct 28 11:15:52 2014
@@ -409,6 +409,7 @@ FormatStyle getGoogleStyle(FormatStyle::
   GoogleStyle.PenaltyBreakBeforeFirstCallParameter = 1;
 
   if (Language == FormatStyle::LK_Java) {
+    GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
     GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
     GoogleStyle.ColumnLimit = 100;
     GoogleStyle.SpaceAfterCStyleCast = true;