diff options
| author | Daniel Jasper <djasper@google.com> | 2015-06-02 14:20:08 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-06-02 14:20:08 +0000 |
| commit | 4284e3623cf28d72f490b830e4520e650cdbeafc (patch) | |
| tree | 3a74fabe2ddb49e13ea6640e637659196573ebb5 /clang/lib/Format | |
| parent | 8938f5acca499f162b28ad6b5896f879359d9886 (diff) | |
| download | bcm5719-llvm-4284e3623cf28d72f490b830e4520e650cdbeafc.tar.gz bcm5719-llvm-4284e3623cf28d72f490b830e4520e650cdbeafc.zip | |
clang-format: [JS] Fix another regression when detecting array literals.
llvm-svn: 238835
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 15318deee8b..0cfcd8921dd 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -276,11 +276,12 @@ private: if (StartsObjCMethodExpr) { Left->Type = TT_ObjCMethodExpr; } else if (Style.Language == FormatStyle::LK_JavaScript && Parent && + Contexts.back().ContextKind == tok::l_brace && 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::l_paren, tok::question, tok::colon)) { Left->Type = TT_ArrayInitializerLSquare; } else { BindingIncrease = 10; |
