Merge pull request microsoft#14984 from Microsoft/backtick

Andy · web-flow · commit 45e44cee0699 · 2017-04-03T10:39:25.000-07:00
Support backticks in require calls
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -1564,7 +1564,7 @@ namespace ts {
         }
 
         function resolveExternalModuleNameWorker(location: Node, moduleReferenceExpression: Expression, moduleNotFoundError: DiagnosticMessage, isForAugmentation = false): Symbol {
-            if (moduleReferenceExpression.kind !== SyntaxKind.StringLiteral) {
+            if (moduleReferenceExpression.kind !== SyntaxKind.StringLiteral && moduleReferenceExpression.kind !== SyntaxKind.NoSubstitutionTemplateLiteral) {
                 return;
             }
 
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -1404,17 +1404,24 @@ namespace ts {
 
     /**
      * Returns true if the node is a CallExpression to the identifier 'require' with
-     * exactly one argument.
+     * exactly one argument (of the form 'require("name")').
      * This function does not test if the node is in a JavaScript file or not.
-    */
-    export function isRequireCall(expression: Node, checkArgumentIsStringLiteral: boolean): expression is CallExpression {
-        // of the form 'require("name")'
-        const isRequire = expression.kind === SyntaxKind.CallExpression &&
-            (<CallExpression>expression).expression.kind === SyntaxKind.Identifier &&
-            (<Identifier>(<CallExpression>expression).expression).text === "require" &&
-            (<CallExpression>expression).arguments.length === 1;
-
-        return isRequire && (!checkArgumentIsStringLiteral || (<CallExpression>expression).arguments[0].kind === SyntaxKind.StringLiteral);
+     */
+    export function isRequireCall(callExpression: Node, checkArgumentIsStringLiteral: boolean): callExpression is CallExpression {
+        if (callExpression.kind !== SyntaxKind.CallExpression) {
+            return false;
+        }
+        const { expression, arguments } = callExpression as CallExpression;
+
+        if (expression.kind !== SyntaxKind.Identifier || (expression as Identifier).text !== "require") {
+            return false;
+        }
+
+        if (arguments.length !== 1) {
+            return false;
+        }
+        const arg = arguments[0];
+        return !checkArgumentIsStringLiteral || arg.kind === SyntaxKind.StringLiteral || arg.kind === SyntaxKind.NoSubstitutionTemplateLiteral;
     }
 
     export function isSingleOrDoubleQuote(charCode: number) {
diff --git a/tests/cases/fourslash/javaScriptModulesWithBackticks.ts b/tests/cases/fourslash/javaScriptModulesWithBackticks.ts
@@ -0,0 +1,12 @@
+///<reference path="fourslash.ts" />
+
+// @allowJs: true
+// @Filename: a.js
+//// exports.x = 0;
+
+// @Filename: consumer.js
+//// var a = require(`./a`);
+//// a./**/;
+
+goTo.marker();
+verify.completionListContains("x");

Original file line number	Diff line number	Diff line change
`@@ -1564,7 +1564,7 @@ namespace ts {`
`1564`	`1564`	`}`
`1565`	`1565`
`1566`	`1566`	`function resolveExternalModuleNameWorker(location: Node, moduleReferenceExpression: Expression, moduleNotFoundError: DiagnosticMessage, isForAugmentation = false): Symbol {`
`1567`		`- if (moduleReferenceExpression.kind !== SyntaxKind.StringLiteral) {`
	`1567`	`+ if (moduleReferenceExpression.kind !== SyntaxKind.StringLiteral && moduleReferenceExpression.kind !== SyntaxKind.NoSubstitutionTemplateLiteral) {`
`1568`	`1568`	`return;`
`1569`	`1569`	`}`
`1570`	`1570`