Commit 1cd3c71c authored by Daniel Jasper's avatar Daniel Jasper
Browse files

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

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

llvm-svn: 225982
parent 998c9102

clang/lib/Format/Format.cpp

+2 −0
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) { 
    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::LanguageKind Language) { 
    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;