diff options
| author | Daniel Jasper <djasper@google.com> | 2014-10-28 16:15:52 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-10-28 16:15:52 +0000 |
| commit | b89fbe60e3e228a1f0d7b685c959ece15a19898a (patch) | |
| tree | 24b4509b7c03d53fa10f08f66eb37458acafd885 /clang/lib/Format | |
| parent | 4441c4d31b13adf6766b73648002c28978b14af5 (diff) | |
| download | bcm5719-llvm-b89fbe60e3e228a1f0d7b685c959ece15a19898a.tar.gz bcm5719-llvm-b89fbe60e3e228a1f0d7b685c959ece15a19898a.zip | |
clang-format: Don't put functions on a single line in Google's Java
style.
llvm-svn: 220778
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/Format.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 8960823488f..e0cce7d982c 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -409,6 +409,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) { GoogleStyle.PenaltyBreakBeforeFirstCallParameter = 1; if (Language == FormatStyle::LK_Java) { + GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_None; GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment; GoogleStyle.ColumnLimit = 100; GoogleStyle.SpaceAfterCStyleCast = true; |

