r225982 - clang-format: Disable flag for Google's Java and Javascript styles.

[Daniel Jasper]

Author: djasper
Date: Wed Jan 14 06:24:59 2015
New Revision: 225982

URL: http://llvm.org/viewvc/llvm-project?rev=225982&view=rev
Log:
clang-format: Disable flag for Google's Java and Javascript styles.

Disable AlwaysBreakBeforeMultilineString, as the style guides don't
really say to do so.

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=225982&r1=225981&r2=225982&view=diff
==============================================================================
--- cfe/trunk/lib/Format/Format.cpp (original)
+++ cfe/trunk/lib/Format/Format.cpp Wed Jan 14 06:24:59 2015
@@ -422,6 +422,7 @@ FormatStyle getGoogleStyle(FormatStyle::
     GoogleStyle.AlignTrailingComments = false;
     GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Empty;
     GoogleStyle.AllowShortIfStatementsOnASingleLine = false;
+    GoogleStyle.AlwaysBreakBeforeMultilineStrings = false;
     GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment;
     GoogleStyle.ColumnLimit = 100;
     GoogleStyle.SpaceAfterCStyleCast = true;
@@ -431,6 +432,7 @@ FormatStyle getGoogleStyle(FormatStyle::
     GoogleStyle.MaxEmptyLinesToKeep = 3;
     GoogleStyle.SpacesInContainerLiterals = false;
     GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
+    GoogleStyle.AlwaysBreakBeforeMultilineStrings = false;
   } else if (Language == FormatStyle::LK_Proto) {
     GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None;
     GoogleStyle.SpacesInContainerLiterals = false;