clang-format: [JS] supports casts to types starting with punctuation ("{[(").

mprobst · mprobst · commit ed87d788d610 · 2016-08-22T14:23:30.000Z
Before: x as{x: number} After: x as {x: number} Reviewers: djasper Subscribers: klimek, cfe-commits Differential Revision: https://reviews.llvm.org/D23761 llvm-svn: 279436
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
@@ -2121,6 +2121,9 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
                      Keywords.kw_of, tok::kw_const) &&
         (!Left.Previous || !Left.Previous->is(tok::period)))
       return true;
+    if (Left.is(Keywords.kw_as) &&
+        Right.isOneOf(tok::l_square, tok::l_brace, tok::l_paren))
+      return true;
     if (Left.is(tok::kw_default) && Left.Previous &&
         Left.Previous->is(tok::kw_export))
       return true;
diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp
@@ -1219,6 +1219,9 @@ TEST_F(FormatTestJS, CastSyntax) {
                "  2\n"
                "];");
   verifyFormat("var x = [{x: 1} as type];");
+  verifyFormat("x = x as [a, b];");
+  verifyFormat("x = x as {a: string};");
+  verifyFormat("x = x as (string);");
 }
 
 TEST_F(FormatTestJS, TypeArguments) {

Original file line number	Diff line number	Diff line change
`@@ -1219,6 +1219,9 @@ TEST_F(FormatTestJS, CastSyntax) {`
`1219`	`1219`	`" 2\n"`
`1220`	`1220`	`"];");`
`1221`	`1221`	`verifyFormat("var x = [{x: 1} as type];");`
	`1222`	`+ verifyFormat("x = x as [a, b];");`
	`1223`	`+ verifyFormat("x = x as {a: string};");`
	`1224`	`+ verifyFormat("x = x as (string);");`
`1222`	`1225`	`}`
`1223`	`1226`
`1224`	`1227`	`TEST_F(FormatTestJS, TypeArguments) {`