summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2016-09-07 23:01:13 +0000
committerDaniel Jasper <djasper@google.com>2016-09-07 23:01:13 +0000
commit28d8a5ab43f1b0c8d34335142a8da6ead58c5ea2 (patch)
treeb6c4cd1a0efc343fb79f5333f5837b56ba1e16e0 /clang/lib/Format
parentd14c2c01392ded46ae2bc16aa6f08ab2594cc65c (diff)
downloadbcm5719-llvm-28d8a5ab43f1b0c8d34335142a8da6ead58c5ea2.tar.gz
bcm5719-llvm-28d8a5ab43f1b0c8d34335142a8da6ead58c5ea2.zip
clang-format: [JavaScript] Change default AllowShortFunctionsOnASingleLine
for Google style to "empty". llvm-svn: 280878
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/Format.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp
index 7fea162d5a7..7ada8a50c45 100644
--- a/clang/lib/Format/Format.cpp
+++ b/clang/lib/Format/Format.cpp
@@ -610,7 +610,7 @@ FormatStyle getGoogleStyle(FormatStyle::LanguageKind Language) {
} else if (Language == FormatStyle::LK_JavaScript) {
GoogleStyle.AlignAfterOpenBracket = FormatStyle::BAS_AlwaysBreak;
GoogleStyle.AlignOperands = false;
- GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;
+ GoogleStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Empty;
GoogleStyle.AlwaysBreakBeforeMultilineStrings = false;
GoogleStyle.BreakBeforeTernaryOperators = false;
GoogleStyle.CommentPragmas = "@(export|requirecss|return|see|visibility) ";
OpenPOWER on IntegriCloud