summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format/TokenAnnotator.cpp
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2015-06-03 08:57:36 +0000
committerDaniel Jasper <djasper@google.com>2015-06-03 08:57:36 +0000
commit9970df1f79a74d958f046e004ca658ebb6864f66 (patch)
tree527aa89e9d473e9dff48698ce1ead8e483c9446d /clang/lib/Format/TokenAnnotator.cpp
parent9f77f61ef31d9b04a2af9c2896e778955ccab281 (diff)
downloadbcm5719-llvm-9970df1f79a74d958f046e004ca658ebb6864f66.tar.gz
bcm5719-llvm-9970df1f79a74d958f046e004ca658ebb6864f66.zip
clang-format: [JS] More aggressively keep array literals on one line.
Before: var aaaaa: List<SomeThing> = [ new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB() ]; After: var aaaaa: List<SomeThing> = [new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB()]; llvm-svn: 238909
Diffstat (limited to 'clang/lib/Format/TokenAnnotator.cpp')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 6b59cb365cc..993eb1d8b86 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1627,7 +1627,8 @@ unsigned TokenAnnotator::splitPenalty(const AnnotatedLine &Line,
// Slightly prefer formatting local lambda definitions like functions.
if (Right.is(TT_LambdaLSquare) && Left.is(tok::equal))
return 50;
- if (!Right.isOneOf(TT_ObjCMethodExpr, TT_LambdaLSquare))
+ if (!Right.isOneOf(TT_ObjCMethodExpr, TT_LambdaLSquare,
+ TT_ArrayInitializerLSquare))
return 500;
}
OpenPOWER on IntegriCloud