aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm/tools/clang/lib/Format/Format.cpp
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2017-01-04 22:19:42 +0000
committerDimitry Andric <dim@FreeBSD.org>2017-01-04 22:19:42 +0000
commit8e0f8b8c96c8b0cf053dbf78cba1d534f05c99a2 (patch)
tree2173cb011a5acb1fa9d98fcd6a549fec31595377 /contrib/llvm/tools/clang/lib/Format/Format.cpp
parentd8c03e73dcf4987b182e9ba75540b289daaffc06 (diff)
parent0c75eea8f661a82866688fd1fc4465883c4dd7d5 (diff)
Notes
Diffstat (limited to 'contrib/llvm/tools/clang/lib/Format/Format.cpp')
-rw-r--r--contrib/llvm/tools/clang/lib/Format/Format.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/llvm/tools/clang/lib/Format/Format.cpp b/contrib/llvm/tools/clang/lib/Format/Format.cpp
index 70b90d6fa14e..389761d48249 100644
--- a/contrib/llvm/tools/clang/lib/Format/Format.cpp
+++ b/contrib/llvm/tools/clang/lib/Format/Format.cpp
@@ -638,6 +638,9 @@ FormatStyle getChromiumStyle(FormatStyle::LanguageKind Language) {
ChromiumStyle.BreakAfterJavaFieldAnnotations = true;
ChromiumStyle.ContinuationIndentWidth = 8;
ChromiumStyle.IndentWidth = 4;
+ } else if (Language == FormatStyle::LK_JavaScript) {
+ ChromiumStyle.AllowShortIfStatementsOnASingleLine = false;
+ ChromiumStyle.AllowShortLoopsOnASingleLine = false;
} else {
ChromiumStyle.AllowAllParametersOfDeclarationOnNextLine = false;
ChromiumStyle.AllowShortFunctionsOnASingleLine = FormatStyle::SFS_Inline;