clang-format: [JS] support goog.requireType.

mprobst · mprobst · commit 55b6d4b9f9e8 · 2019-01-07T13:12:50.000Z
Summary: It's a new primitive for importing symbols, and should be treated like the (previously handled) `goog.require` and `goog.forwardDeclare`. Reviewers: krasimir Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D56385 llvm-svn: 350516
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
@@ -1123,6 +1123,7 @@ class AnnotatingParser {
            (Tok.Next->Next->TokenText == "module" ||
             Tok.Next->Next->TokenText == "provide" ||
             Tok.Next->Next->TokenText == "require" ||
+            Tok.Next->Next->TokenText == "requireType" ||
             Tok.Next->Next->TokenText == "forwardDeclare") &&
            Tok.Next->Next->Next && Tok.Next->Next->Next->is(tok::l_paren);
   }
diff --git a/clang/unittests/Format/FormatTestJS.cpp b/clang/unittests/Format/FormatTestJS.cpp
@@ -600,6 +600,8 @@ TEST_F(FormatTestJS, GoogModules) {
                getGoogleJSStyleWithColumns(40));
   verifyFormat("var long = goog.require('this.is.really.absurdly.long');",
                getGoogleJSStyleWithColumns(40));
+  verifyFormat("const X = goog.requireType('this.is.really.absurdly.long');",
+               getGoogleJSStyleWithColumns(40));
   verifyFormat("goog.forwardDeclare('this.is.really.absurdly.long');",
                getGoogleJSStyleWithColumns(40));
 

Original file line number	Diff line number	Diff line change
`@@ -1123,6 +1123,7 @@ class AnnotatingParser {`
`1123`	`1123`	`(Tok.Next->Next->TokenText == "module" \|\|`
`1124`	`1124`	`Tok.Next->Next->TokenText == "provide" \|\|`
`1125`	`1125`	`Tok.Next->Next->TokenText == "require" \|\|`
	`1126`	`+ Tok.Next->Next->TokenText == "requireType" \|\|`
`1126`	`1127`	`Tok.Next->Next->TokenText == "forwardDeclare") &&`
`1127`	`1128`	`Tok.Next->Next->Next && Tok.Next->Next->Next->is(tok::l_paren);`
`1128`	`1129`	`}`