From 9970df1f79a74d958f046e004ca658ebb6864f66 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Wed, 3 Jun 2015 08:57:36 +0000 Subject: [PATCH] clang-format: [JS] More aggressively keep array literals on one line. Before: var aaaaa: List = [ new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB() ]; After: var aaaaa: List = [new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB()]; llvm-svn: 238909 --- clang/lib/Format/TokenAnnotator.cpp | 3 ++- clang/unittests/Format/FormatTestJS.cpp | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 6b59cb3..993eb1d 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; } diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index 3ed3cde..a64e1d0 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -248,10 +248,9 @@ TEST_F(FormatTestJS, FormatsFreestandingFunctions) { } TEST_F(FormatTestJS, ArrayLiterals) { - verifyFormat("var aaaaa: List = [\n" - " new SomeThingAAAAAAAAAAAA(),\n" - " new SomeThingBBBBBBBBB()\n" - "];"); + verifyFormat( + "var aaaaa: List =\n" + " [new SomeThingAAAAAAAAAAAA(), new SomeThingBBBBBBBBB()];"); verifyFormat("return [\n" " aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" " bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n" -- 2.7.4