Skip to content

Commit 9852c85

Browse files
authored
Merge pull request #11373 from Microsoft/gotoDefRequire
Handle the require call in javascript file for getSymbolAtLocation
2 parents 2f5e714 + 8a44f48 commit 9852c85

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

src/compiler/checker.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18456,6 +18456,9 @@ namespace ts {
1845618456
(<ImportDeclaration>node.parent).moduleSpecifier === node)) {
1845718457
return resolveExternalModuleName(node, <LiteralExpression>node);
1845818458
}
18459+
if (isInJavaScriptFile(node) && isRequireCall(node.parent, /*checkArgumentIsStringLiteral*/ false)) {
18460+
return resolveExternalModuleName(node, <LiteralExpression>node);
18461+
}
1845918462
// Fall through
1846018463

1846118464
case SyntaxKind.NumericLiteral:
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/// <reference path='fourslash.ts'/>
2+
3+
// @allowJs: true
4+
// @Filename: foo.js
5+
/////*2*/module.exports = {};
6+
7+
// @Filename: bar.js
8+
////var x = require(/*1*/"./foo");
9+
10+
verify.goToDefinition("1", "2");

0 commit comments

Comments
 (0)