diff options
author | Daniel Jasper <djasper@google.com> | 2015-06-02 13:56:43 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2015-06-02 13:56:43 +0000 |
commit | 5ce80de4deb139fb8d89335eae8d82de7e2ef594 (patch) | |
tree | f787937e421a38c9e419a0cb20c9814e74cf8cea /clang/lib/Format | |
parent | 5b31205211395ca094999e173ecc326dd49b0729 (diff) | |
download | bcm5719-llvm-5ce80de4deb139fb8d89335eae8d82de7e2ef594.tar.gz bcm5719-llvm-5ce80de4deb139fb8d89335eae8d82de7e2ef594.zip |
clang-format: [JS] Fix regression of detecting array literals.
llvm-svn: 238832
Diffstat (limited to 'clang/lib/Format')
-rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 501865e9ad8..15318deee8b 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -278,7 +278,9 @@ private: } else if (Style.Language == FormatStyle::LK_JavaScript && Parent && Parent->isOneOf(tok::l_brace, tok::comma)) { Left->Type = TT_JsComputedPropertyName; - } else if (Parent && Parent->isOneOf(tok::at, tok::equal, tok::comma)) { + } else if (Parent && + Parent->isOneOf(tok::at, tok::equal, tok::comma, + tok::l_paren)) { Left->Type = TT_ArrayInitializerLSquare; } else { BindingIncrease = 10; |