From 40432cee93578aeee09328ed704dcba445cc4f1b Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Tue, 2 Jun 2015 15:04:29 +0000 Subject: clang-format: [JS] Array literal detection fix #3. llvm-svn: 238839 --- clang/lib/Format/TokenAnnotator.cpp | 4 ++-- clang/unittests/Format/FormatTestJS.cpp | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 0cfcd8921dd..19b47baeb40 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -280,8 +280,8 @@ private: Parent->isOneOf(tok::l_brace, tok::comma)) { Left->Type = TT_JsComputedPropertyName; } else if (Parent && - Parent->isOneOf(tok::at, tok::equal, tok::comma, - tok::l_paren, tok::question, tok::colon)) { + Parent->isOneOf(tok::at, tok::equal, tok::comma, tok::l_paren, + tok::l_square, tok::question, tok::colon)) { Left->Type = TT_ArrayInitializerLSquare; } else { BindingIncrease = 10; diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp index 583188d3ebc..25113ab7589 100644 --- a/clang/unittests/Format/FormatTestJS.cpp +++ b/clang/unittests/Format/FormatTestJS.cpp @@ -257,6 +257,9 @@ TEST_F(FormatTestJS, ArrayLiterals) { " bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n" " ccccccccccccccccccccccccccc\n" "]);"); + verifyFormat("var someVariable = SomeFuntion([\n" + " [aaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbb],\n" + "]);"); verifyFormat("var someVariable = SomeFuntion(aaaa, [\n" " aaaaaaaaaaaaaaaaaaaaaaaaaaa,\n" " bbbbbbbbbbbbbbbbbbbbbbbbbbb,\n" -- cgit v1.2.1