Skip to content

Visit the children of an import type/require call/dynamic import when looking for those (#24663) #24670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/compiler/program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1802,11 +1802,9 @@ namespace ts {
else if (isLiteralImportTypeNode(node)) {
imports = append(imports, node.argument.literal);
}
else {
collectDynamicImportOrRequireCallsForEachChild(node);
if (hasJSDocNodes(node)) {
forEach(node.jsDoc, collectDynamicImportOrRequireCallsForEachChild);
}
collectDynamicImportOrRequireCallsForEachChild(node);
if (hasJSDocNodes(node)) {
forEach(node.jsDoc, collectDynamicImportOrRequireCallsForEachChild);
}
}

Expand Down
17 changes: 17 additions & 0 deletions tests/baselines/reference/importUsedInGenericImportResolves.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//// [tests/cases/compiler/importUsedInGenericImportResolves.ts] ////

//// [test1.d.ts]
export interface T<P> {
a: P;
}

//// [test2.d.ts]
export declare const theme: { a: string }

//// [test3.ts]
export const a: import("./test1").T<typeof import("./test2").theme> = null as any;

//// [test3.js]
"use strict";
exports.__esModule = true;
exports.a = null;
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
=== tests/cases/compiler/test1.d.ts ===
export interface T<P> {
>T : Symbol(T, Decl(test1.d.ts, 0, 0))
>P : Symbol(P, Decl(test1.d.ts, 0, 19))

a: P;
>a : Symbol(T.a, Decl(test1.d.ts, 0, 23))
>P : Symbol(P, Decl(test1.d.ts, 0, 19))
}

=== tests/cases/compiler/test2.d.ts ===
export declare const theme: { a: string }
>theme : Symbol(theme, Decl(test2.d.ts, 0, 20))
>a : Symbol(a, Decl(test2.d.ts, 0, 29))

=== tests/cases/compiler/test3.ts ===
export const a: import("./test1").T<typeof import("./test2").theme> = null as any;
>a : Symbol(a, Decl(test3.ts, 0, 12))
>T : Symbol(T, Decl(test1.d.ts, 0, 0))
>theme : Symbol(theme, Decl(test2.d.ts, 0, 20))

23 changes: 23 additions & 0 deletions tests/baselines/reference/importUsedInGenericImportResolves.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
=== tests/cases/compiler/test1.d.ts ===
export interface T<P> {
>T : T<P>
>P : P

a: P;
>a : P
>P : P
}

=== tests/cases/compiler/test2.d.ts ===
export declare const theme: { a: string }
>theme : { a: string; }
>a : string

=== tests/cases/compiler/test3.ts ===
export const a: import("./test1").T<typeof import("./test2").theme> = null as any;
>a : import("tests/cases/compiler/test1").T<{ a: string; }>
>T : import("tests/cases/compiler/test1").T<P>
>theme : any
>null as any : any
>null : null

10 changes: 10 additions & 0 deletions tests/cases/compiler/importUsedInGenericImportResolves.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// @filename: test1.d.ts
export interface T<P> {
a: P;
}

// @filename: test2.d.ts
export declare const theme: { a: string }

// @filename: test3.ts
export const a: import("./test1").T<typeof import("./test2").theme> = null as any;