summaryrefslogtreecommitdiffstats
path: root/clang/lib/Format
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2017-02-20 12:43:41 +0000
committerDaniel Jasper <djasper@google.com>2017-02-20 12:43:41 +0000
commit3d934d366ea84054e5c5693793e2035e6187a28a (patch)
treedf22f7af1e12678b742bf8c2b83fd64340f7f242 /clang/lib/Format
parent19b35bf7f44d253e9e95a0cf1e0862bae891836d (diff)
downloadbcm5719-llvm-3d934d366ea84054e5c5693793e2035e6187a28a.tar.gz
bcm5719-llvm-3d934d366ea84054e5c5693793e2035e6187a28a.zip
clang-format: [JS/TS] Improve detection for array subscripts in types.
Before: var someValue = (v as aaaaaaaaaaaaaaaaaaaa<T>[ ]).someFunction(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa); After: var someValue = (v as aaaaaaaaaaaaaaaaaaaa<T>[]) .someFunction(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa); llvm-svn: 295658
Diffstat (limited to 'clang/lib/Format')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 840fad0c33b..0bf1ca4f4dd 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -337,6 +337,9 @@ private:
Contexts.back().ContextKind == tok::l_brace &&
Parent->isOneOf(tok::l_brace, tok::comma)) {
Left->Type = TT_JsComputedPropertyName;
+ } else if (CurrentToken->is(tok::r_square) && Parent &&
+ Parent->is(TT_TemplateCloser)) {
+ Left->Type = TT_ArraySubscriptLSquare;
} else if (Style.Language == FormatStyle::LK_Proto ||
(!CppArrayTemplates && Parent &&
Parent->isOneOf(TT_BinaryOperator, TT_TemplateCloser, tok::at,
OpenPOWER on IntegriCloud