Implement LS on string-literal of dynamic import

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit 2e55b6ae1667 · 2017-06-09T10:01:17.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -22665,14 +22665,16 @@ namespace ts {
                     return undefined;
 
                 case SyntaxKind.StringLiteral:
+                    // import x = require("./mo/*gotToDefinitionHere*/d")
+                    if (isExternalModuleImportEqualsDeclaration(node.parent.parent) && getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) {
+                        return resolveExternalModuleName(node, <LiteralExpression>node);
+                    }
                     // External module name in an import declaration
-                    if ((isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
-                        getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === SyntaxKind.ImportDeclaration || node.parent.kind === SyntaxKind.ExportDeclaration) &&
-                            (<ImportDeclaration>node.parent).moduleSpecifier === node)) {
+                    if ((node.parent.kind === SyntaxKind.ImportDeclaration || node.parent.kind === SyntaxKind.ExportDeclaration) && (<ImportDeclaration>node.parent).moduleSpecifier === node) {
                         return resolveExternalModuleName(node, <LiteralExpression>node);
                     }
-                    if (isInJavaScriptFile(node) && isRequireCall(node.parent, /*checkArgumentIsStringLiteral*/ false)) {
+                    if ((isInJavaScriptFile(node) && isRequireCall(node.parent, /*checkArgumentIsStringLiteral*/ false)) ||
+                        isImportCall(node.parent)) {
                         return resolveExternalModuleName(node, <LiteralExpression>node);
                     }
                     // falls through
diff --git a/src/services/findAllReferences.ts b/src/services/findAllReferences.ts
@@ -307,7 +307,7 @@ namespace ts.FindAllReferences.Core {
             case SyntaxKind.ExportDeclaration:
                 return true;
             case SyntaxKind.CallExpression:
-                return isRequireCall(node.parent as CallExpression, /*checkArgumentIsStringLiteral*/ false);
+                return isRequireCall(node.parent as CallExpression, /*checkArgumentIsStringLiteral*/ false) || isImportCall(node.parent as CallExpression);
             default:
                 return false;
         }
diff --git a/tests/cases/fourslash/findAllReferencesDynamicImport1.ts b/tests/cases/fourslash/findAllReferencesDynamicImport1.ts
@@ -0,0 +1,9 @@
+&#65279;/// <reference path='fourslash.ts' />
+
+// @Filename: foo.ts
+//// export function foo() { return "foo"; }
+
+//// import("[|./foo|]")
+//// var x = import("[|./foo|]")
+
+verify.rangesReferenceEachOther();
diff --git a/tests/cases/fourslash/goToDefinitionDynamicImport1.ts b/tests/cases/fourslash/goToDefinitionDynamicImport1.ts
@@ -0,0 +1,10 @@
+&#65279;/// <reference path='fourslash.ts' />
+
+// @Filename: foo.ts
+//// /*Destination*/export function foo() { return "foo"; }
+
+//// import("./f/*1*/oo")
+//// var x = import("./fo/*2*/o")
+
+verify.goToDefinition("1", "Destination");
+verify.goToDefinition("2", "Destination");

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ namespace ts.FindAllReferences.Core {`
`307`	`307`	`case SyntaxKind.ExportDeclaration:`
`308`	`308`	`return true;`
`309`	`309`	`case SyntaxKind.CallExpression:`
`310`		`- return isRequireCall(node.parent as CallExpression, /checkArgumentIsStringLiteral/ false);`
	`310`	`+ return isRequireCall(node.parent as CallExpression, /checkArgumentIsStringLiteral/ false) \|\| isImportCall(node.parent as CallExpression);`
`311`	`311`	`default:`
`312`	`312`	`return false;`
`313`	`313`	`}`