Merge pull request microsoft#11373 from Microsoft/gotoDefRequire

sheetalkamat · web-flow · commit 9852c85be5e4 · 2016-10-05T17:03:43.000-07:00
Handle the require call in javascript file for getSymbolAtLocation
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -18456,6 +18456,9 @@ namespace ts {
                             (<ImportDeclaration>node.parent).moduleSpecifier === node)) {
                         return resolveExternalModuleName(node, <LiteralExpression>node);
                     }
+                    if (isInJavaScriptFile(node) && isRequireCall(node.parent, /*checkArgumentIsStringLiteral*/ false)) {
+                        return resolveExternalModuleName(node, <LiteralExpression>node);
+                    }
                 // Fall through
 
                 case SyntaxKind.NumericLiteral:
diff --git a/tests/cases/fourslash/goToDefinitionJsModuleName.ts b/tests/cases/fourslash/goToDefinitionJsModuleName.ts
@@ -0,0 +1,10 @@
+/// <reference path='fourslash.ts'/>
+
+// @allowJs: true
+// @Filename: foo.js
+/////*2*/module.exports = {};
+
+// @Filename: bar.js
+////var x = require(/*1*/"./foo");
+
+verify.goToDefinition("1", "2");

Original file line number	Diff line number	Diff line change
`@@ -18456,6 +18456,9 @@ namespace ts {`
`18456`	`18456`	`(<ImportDeclaration>node.parent).moduleSpecifier === node)) {`
`18457`	`18457`	`return resolveExternalModuleName(node, <LiteralExpression>node);`
`18458`	`18458`	`}`
	`18459`	`+ if (isInJavaScriptFile(node) && isRequireCall(node.parent, /checkArgumentIsStringLiteral/ false)) {`
	`18460`	`+ return resolveExternalModuleName(node, <LiteralExpression>node);`
	`18461`	`+ }`
`18459`	`18462`	`// Fall through`
`18460`	`18463`
`18461`	`18464`	`case SyntaxKind.NumericLiteral:`