diff options
| author | Daniel Jasper <djasper@google.com> | 2014-11-05 17:22:31 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-11-05 17:22:31 +0000 |
| commit | e551bb70a34ab3be4f0f9146b6ffc6c6dd61fcfe (patch) | |
| tree | 6bc5e99921f1cb4510ab9dddbacfcb88df1ec261 /clang/lib/Format/Format.cpp | |
| parent | f20091118cde5ef85d281a252846e06f748d6353 (diff) | |
| download | bcm5719-llvm-e551bb70a34ab3be4f0f9146b6ffc6c6dd61fcfe.tar.gz bcm5719-llvm-e551bb70a34ab3be4f0f9146b6ffc6c6dd61fcfe.zip | |
Revert "clang-format: [js] Updates to Google's JavaScript style."
This reverts commit eefd2eaad43c5c2b17953ae7ed1e72b28e696f7b.
Apparently, this change was a bit premature.
llvm-svn: 221365
Diffstat (limited to 'clang/lib/Format/Format.cpp')
| -rw-r--r-- | clang/lib/Format/Format.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index 1eb6d97fc5c..8e4be3e053d 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -416,7 +416,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) { GoogleStyle.ColumnLimit = 100; GoogleStyle.SpaceAfterCStyleCast = true; } else if (Language == FormatStyle::LK_JavaScript) { - GoogleStyle.BreakBeforeBinaryOperators = FormatStyle::BOS_NonAssignment; + GoogleStyle.BreakBeforeTernaryOperators = false; GoogleStyle.MaxEmptyLinesToKeep = 3; GoogleStyle.SpacesInContainerLiterals = false; GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline; |
