diff options
| author | Daniel Jasper <djasper@google.com> | 2015-01-14 12:24:59 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-01-14 12:24:59 +0000 |
| commit | 1cd3c71c017e150d3249047e7694d0eff04cbb30 (patch) | |
| tree | 0a9733b8fe2b346db2f1956016d67d6e7eb17f64 /clang/lib/Format | |
| parent | 998c9102625acb7dc42af7b082e8c90a81218279 (diff) | |
| download | bcm5719-llvm-1cd3c71c017e150d3249047e7694d0eff04cbb30.tar.gz bcm5719-llvm-1cd3c71c017e150d3249047e7694d0eff04cbb30.zip | |
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
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/Format.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index c7a760a515c..2a4721f2b3b 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -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; |
