clang-format: [JS] Support index signature types.

Patch by Martin Probst.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@234754 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Format/TokenAnnotator.cpp b/lib/Format/TokenAnnotator.cpp
index 0ea67b288d049351c89f10bc5caf4d0de69122b1..0c11c88221fe33089dd63786c82b23034708b4d3 100644 (file)
--- a/lib/Format/TokenAnnotator.cpp
+++ b/lib/Format/TokenAnnotator.cpp
@@ -413,7 +413,8 @@ private:
         if (Contexts.back().ColonIsForRangeExpr ||
             (Contexts.size() == 1 &&
              !Line.First->isOneOf(tok::kw_enum, tok::kw_case)) ||
-            Contexts.back().ContextKind == tok::l_paren) {
+            Contexts.back().ContextKind == tok::l_paren ||
+            Contexts.back().ContextKind == tok::l_square) {
           Tok->Type = TT_JsTypeColon;
           break;
         }

diff --git a/unittests/Format/FormatTestJS.cpp b/unittests/Format/FormatTestJS.cpp
index eb587f27694e3a50061344e4dd7daf5467921894..3c8c14d2ba8c136f9f885b14608aa0ccaab2b875 100644 (file)
--- a/unittests/Format/FormatTestJS.cpp
+++ b/unittests/Format/FormatTestJS.cpp
@@ -670,5 +670,9 @@ TEST_F(FormatTestJS, OptionalTypes) {
                "}");
 }
 
+TEST_F(FormatTestJS, IndexSignature) {
+  verifyFormat("var x: {[k: string]: v};");
+}
+
 } // end namespace tooling
 } // end namespace clang