typescript-bot
diff --git a/‎src/services/goToDefinition.ts
Copy file name to clipboardExpand all lines: src/services/goToDefinition.ts
+9Lines changed: 9 additions & 0 deletions b/‎src/services/goToDefinition.ts
Copy file name to clipboardExpand all lines: src/services/goToDefinition.ts
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎tests/cases/fourslash/goToDefinitionJsModuleNameAtImportName.ts
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions b/‎tests/cases/fourslash/goToDefinitionJsModuleNameAtImportName.ts
Copy file name to clipboard
+19Lines changed: 19 additions & 0 deletions
diff --git a/‎tests/cases/fourslash/goToDefinitionSignatureAlias_require.ts
Copy file name to clipboardExpand all lines: tests/cases/fourslash/goToDefinitionSignatureAlias_require.ts
+5-1Lines changed: 5 additions & 1 deletion b/‎tests/cases/fourslash/goToDefinitionSignatureAlias_require.ts
Copy file name to clipboardExpand all lines: tests/cases/fourslash/goToDefinitionSignatureAlias_require.ts
+5-1Lines changed: 5 additions & 1 deletion
@@ -207,6 +207,15 @@ namespace ts.GoToDefinition {
                 return aliased;
             }
         }
+        if (symbol && isInJSFile(node)) {
+            const requireCall = forEach(symbol.declarations, d => isVariableDeclaration(d) && !!d.initializer && isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true) ? d.initializer : undefined);
+            if (requireCall) {
+                const moduleSymbol = checker.getSymbolAtLocation(requireCall.arguments[0]);
+                if (moduleSymbol) {
+                    return checker.resolveExternalModuleSymbol(moduleSymbol);
+                }
+            }
+        }
         return symbol;
     }
 
 
@@ -0,0 +1,19 @@
+/// <reference path='fourslash.ts'/>
+
+// @allowJs: true
+
+// @Filename: /foo.js
+//// /*moduleDef*/class Blah {
+////    abc = 123;
+////}
+////module.exports.Blah = Blah;
+
+// @Filename: /bar.js
+////const [|/*importDef*/BlahModule|] = require("./foo.js");
+////new [|/*importUsage*/BlahModule|].Blah()
+
+// @Filename: /barTs.ts
+////import [|/*importDefTs*/BlahModule|] = require("./foo.js");
+////new [|/*importUsageTs*/BlahModule|].Blah()
+
+verify.goToDefinition(["importDef", "importUsage", "importDefTs", "importUsageTs"], "moduleDef");
@@ -9,4 +9,8 @@
 ////const f = require("./a");
 ////[|/*use*/f|]();
 
-verify.goToDefinition("use", "f");
+// @Filename: /bar.ts
+////import f = require("./a");
+////[|/*useTs*/f|]();
+
+verify.goToDefinition(["use", "useTs"], "f");
Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,15 @@ namespace ts.GoToDefinition {`
`207`	`207`	`return aliased;`
`208`	`208`	`}`
`209`	`209`	`}`
	`210`	`+ if (symbol && isInJSFile(node)) {`
	`211`	`+ const requireCall = forEach(symbol.declarations, d => isVariableDeclaration(d) && !!d.initializer && isRequireCall(d.initializer, /checkArgumentIsStringLiteralLike/ true) ? d.initializer : undefined);`
	`212`	`+ if (requireCall) {`
	`213`	`+ const moduleSymbol = checker.getSymbolAtLocation(requireCall.arguments[0]);`
	`214`	`+ if (moduleSymbol) {`
	`215`	`+ return checker.resolveExternalModuleSymbol(moduleSymbol);`
	`216`	`+ }`
	`217`	`+ }`
	`218`	`+ }`
`210`	`219`	`return symbol;`
`211`	`220`	`}`
`212`	`221`