Skip to content

Commit 8794318

Browse files
TypeScript Botandrewbranch
TypeScript Bot
and
andrewbranch
authored
🤖 Pick PR #59215 (Fix codefix crash on circular alias...) into release-5.5 (#59224)
Co-authored-by: Andrew Branch <[email protected]>
1 parent 381e609 commit 8794318

File tree

3 files changed

+342
-0
lines changed

3 files changed

+342
-0
lines changed

‎src/services/exportInfoMap.ts

+2
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ function isImportableSymbol(symbol: Symbol, checker: TypeChecker) {
566566
export function forEachNameOfDefaultExport<T>(defaultExport: Symbol, checker: TypeChecker, compilerOptions: CompilerOptions, preferCapitalizedNames: boolean, cb: (name: string) => T | undefined): T | undefined {
567567
let chain: Symbol[] | undefined;
568568
let current: Symbol | undefined = defaultExport;
569+
const seen = new Map<Symbol, true>();
569570

570571
while (current) {
571572
// The predecessor to this function also looked for a name on the `localSymbol`
@@ -583,6 +584,7 @@ export function forEachNameOfDefaultExport<T>(defaultExport: Symbol, checker: Ty
583584
}
584585

585586
chain = append(chain, current);
587+
if (!addToSeen(seen, current)) break;
586588
current = current.flags & SymbolFlags.Alias ? checker.getImmediateAliasedSymbol(current) : undefined;
587589
}
588590

‎tests/baselines/reference/tsserver/fourslashServer/importFixes_ambientCircularDefaultCrash.js

+321
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,321 @@
1+
currentDirectory:: / useCaseSensitiveFileNames: false
2+
Info seq [hh:mm:ss:mss] Provided types map file "/typesMap.json" doesn't exist
3+
//// [/index.ts]
4+
my
5+
6+
//// [/lib.d.ts]
7+
lib.d.ts-Text
8+
9+
//// [/lib.decorators.d.ts]
10+
lib.decorators.d.ts-Text
11+
12+
//// [/lib.decorators.legacy.d.ts]
13+
lib.decorators.legacy.d.ts-Text
14+
15+
//// [/tsconfig.json]
16+
{
17+
"compilerOptions": {
18+
"module": "preserve"
19+
}
20+
}
21+
22+
//// [/types.d.ts]
23+
declare module "mymod" {
24+
import mymod from "mymod";
25+
export default mymod;
26+
}
27+
28+
29+
Info seq [hh:mm:ss:mss] request:
30+
{
31+
"seq": 0,
32+
"type": "request",
33+
"arguments": {
34+
"file": "/tsconfig.json"
35+
},
36+
"command": "open"
37+
}
38+
Info seq [hh:mm:ss:mss] getConfigFileNameForFile:: File: /tsconfig.json ProjectRootPath: undefined:: Result: /tsconfig.json
39+
Info seq [hh:mm:ss:mss] Creating configuration project /tsconfig.json
40+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /tsconfig.json 2000 undefined Project: /tsconfig.json WatchType: Config file
41+
Info seq [hh:mm:ss:mss] event:
42+
{
43+
"seq": 0,
44+
"type": "event",
45+
"event": "projectLoadingStart",
46+
"body": {
47+
"projectName": "/tsconfig.json",
48+
"reason": "Creating possible configured project for /tsconfig.json to open"
49+
}
50+
}
51+
Info seq [hh:mm:ss:mss] Config: /tsconfig.json : {
52+
"rootNames": [
53+
"/index.ts",
54+
"/lib.d.ts",
55+
"/lib.decorators.d.ts",
56+
"/lib.decorators.legacy.d.ts",
57+
"/types.d.ts"
58+
],
59+
"options": {
60+
"module": 200,
61+
"configFilePath": "/tsconfig.json"
62+
}
63+
}
64+
Info seq [hh:mm:ss:mss] DirectoryWatcher:: Added:: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory
65+
Info seq [hh:mm:ss:mss] Elapsed:: *ms DirectoryWatcher:: Added:: WatchInfo: 1 undefined Config: /tsconfig.json WatchType: Wild card directory
66+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /index.ts 500 undefined WatchType: Closed Script info
67+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.d.ts 500 undefined WatchType: Closed Script info
68+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.decorators.d.ts 500 undefined WatchType: Closed Script info
69+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /lib.decorators.legacy.d.ts 500 undefined WatchType: Closed Script info
70+
Info seq [hh:mm:ss:mss] FileWatcher:: Added:: WatchInfo: /types.d.ts 500 undefined WatchType: Closed Script info
71+
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /tsconfig.json
72+
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /tsconfig.json projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
73+
Info seq [hh:mm:ss:mss] Project '/tsconfig.json' (Configured)
74+
Info seq [hh:mm:ss:mss] Files (5)
75+
/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
76+
/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
77+
/index.ts Text-1 "my"
78+
/lib.d.ts Text-1 lib.d.ts-Text
79+
/types.d.ts Text-1 "declare module \"mymod\" {\n import mymod from \"mymod\";\n export default mymod;\n}"
80+
81+
82+
lib.decorators.d.ts
83+
Library referenced via 'decorators' from file 'lib.d.ts'
84+
Matched by default include pattern '**/*'
85+
lib.decorators.legacy.d.ts
86+
Library referenced via 'decorators.legacy' from file 'lib.d.ts'
87+
Matched by default include pattern '**/*'
88+
index.ts
89+
Matched by default include pattern '**/*'
90+
lib.d.ts
91+
Matched by default include pattern '**/*'
92+
types.d.ts
93+
Matched by default include pattern '**/*'
94+
95+
Info seq [hh:mm:ss:mss] -----------------------------------------------
96+
Info seq [hh:mm:ss:mss] event:
97+
{
98+
"seq": 0,
99+
"type": "event",
100+
"event": "projectLoadingFinish",
101+
"body": {
102+
"projectName": "/tsconfig.json"
103+
}
104+
}
105+
Info seq [hh:mm:ss:mss] event:
106+
{
107+
"seq": 0,
108+
"type": "event",
109+
"event": "configFileDiag",
110+
"body": {
111+
"triggerFile": "/tsconfig.json",
112+
"configFile": "/tsconfig.json",
113+
"diagnostics": []
114+
}
115+
}
116+
Info seq [hh:mm:ss:mss] Starting updateGraphWorker: Project: /dev/null/inferredProject1*
117+
Info seq [hh:mm:ss:mss] Finishing updateGraphWorker: Project: /dev/null/inferredProject1* projectStateVersion: 1 projectProgramVersion: 0 structureChanged: true structureIsReused:: Not Elapsed:: *ms
118+
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
119+
Info seq [hh:mm:ss:mss] Files (4)
120+
/lib.d.ts Text-1 lib.d.ts-Text
121+
/lib.decorators.d.ts Text-1 lib.decorators.d.ts-Text
122+
/lib.decorators.legacy.d.ts Text-1 lib.decorators.legacy.d.ts-Text
123+
/tsconfig.json SVC-1-0 "{\n \"compilerOptions\": {\n \"module\": \"preserve\"\n }\n}"
124+
125+
126+
lib.d.ts
127+
Default library for target 'es5'
128+
lib.decorators.d.ts
129+
Library referenced via 'decorators' from file 'lib.d.ts'
130+
lib.decorators.legacy.d.ts
131+
Library referenced via 'decorators.legacy' from file 'lib.d.ts'
132+
tsconfig.json
133+
Root file specified for compilation
134+
135+
Info seq [hh:mm:ss:mss] -----------------------------------------------
136+
Info seq [hh:mm:ss:mss] Project '/tsconfig.json' (Configured)
137+
Info seq [hh:mm:ss:mss] Files (5)
138+
139+
Info seq [hh:mm:ss:mss] -----------------------------------------------
140+
Info seq [hh:mm:ss:mss] Project '/dev/null/inferredProject1*' (Inferred)
141+
Info seq [hh:mm:ss:mss] Files (4)
142+
143+
Info seq [hh:mm:ss:mss] -----------------------------------------------
144+
Info seq [hh:mm:ss:mss] Open files:
145+
Info seq [hh:mm:ss:mss] FileName: /tsconfig.json ProjectRootPath: undefined
146+
Info seq [hh:mm:ss:mss] Projects: /dev/null/inferredProject1*
147+
After Request
148+
watchedFiles::
149+
/index.ts: *new*
150+
{"pollingInterval":500}
151+
/lib.d.ts: *new*
152+
{"pollingInterval":500}
153+
/lib.decorators.d.ts: *new*
154+
{"pollingInterval":500}
155+
/lib.decorators.legacy.d.ts: *new*
156+
{"pollingInterval":500}
157+
/tsconfig.json: *new*
158+
{"pollingInterval":2000}
159+
/types.d.ts: *new*
160+
{"pollingInterval":500}
161+
162+
watchedDirectoriesRecursive::
163+
: *new*
164+
{}
165+
166+
Projects::
167+
/dev/null/inferredProject1* (Inferred) *new*
168+
projectStateVersion: 1
169+
projectProgramVersion: 1
170+
/tsconfig.json (Configured) *new*
171+
projectStateVersion: 1
172+
projectProgramVersion: 1
173+
noOpenRef: true
174+
175+
ScriptInfos::
176+
/index.ts *new*
177+
version: Text-1
178+
containingProjects: 1
179+
/tsconfig.json
180+
/lib.d.ts *new*
181+
version: Text-1
182+
containingProjects: 2
183+
/tsconfig.json
184+
/dev/null/inferredProject1*
185+
/lib.decorators.d.ts *new*
186+
version: Text-1
187+
containingProjects: 2
188+
/tsconfig.json
189+
/dev/null/inferredProject1*
190+
/lib.decorators.legacy.d.ts *new*
191+
version: Text-1
192+
containingProjects: 2
193+
/tsconfig.json
194+
/dev/null/inferredProject1*
195+
/tsconfig.json (Open) *new*
196+
version: SVC-1-0
197+
containingProjects: 1
198+
/dev/null/inferredProject1* *default*
199+
/types.d.ts *new*
200+
version: Text-1
201+
containingProjects: 1
202+
/tsconfig.json
203+
204+
Info seq [hh:mm:ss:mss] request:
205+
{
206+
"seq": 1,
207+
"type": "request",
208+
"arguments": {
209+
"preferences": {
210+
"includeCompletionsForModuleExports": true,
211+
"includeCompletionsWithInsertText": true
212+
}
213+
},
214+
"command": "configure"
215+
}
216+
Info seq [hh:mm:ss:mss] response:
217+
{
218+
"seq": 0,
219+
"type": "response",
220+
"command": "configure",
221+
"request_seq": 1,
222+
"success": true
223+
}
224+
Info seq [hh:mm:ss:mss] request:
225+
{
226+
"seq": 2,
227+
"type": "request",
228+
"arguments": {
229+
"file": "/index.ts",
230+
"includeLinePosition": true
231+
},
232+
"command": "syntacticDiagnosticsSync"
233+
}
234+
Info seq [hh:mm:ss:mss] response:
235+
{
236+
"seq": 0,
237+
"type": "response",
238+
"command": "syntacticDiagnosticsSync",
239+
"request_seq": 2,
240+
"success": true,
241+
"body": []
242+
}
243+
Info seq [hh:mm:ss:mss] request:
244+
{
245+
"seq": 3,
246+
"type": "request",
247+
"arguments": {
248+
"file": "/index.ts",
249+
"includeLinePosition": true
250+
},
251+
"command": "semanticDiagnosticsSync"
252+
}
253+
Info seq [hh:mm:ss:mss] response:
254+
{
255+
"seq": 0,
256+
"type": "response",
257+
"command": "semanticDiagnosticsSync",
258+
"request_seq": 3,
259+
"success": true,
260+
"body": [
261+
{
262+
"message": "Cannot find name 'my'.",
263+
"start": 0,
264+
"length": 2,
265+
"category": "error",
266+
"code": 2304,
267+
"startLocation": {
268+
"line": 1,
269+
"offset": 1
270+
},
271+
"endLocation": {
272+
"line": 1,
273+
"offset": 3
274+
}
275+
}
276+
]
277+
}
278+
Info seq [hh:mm:ss:mss] request:
279+
{
280+
"seq": 4,
281+
"type": "request",
282+
"arguments": {
283+
"file": "/index.ts",
284+
"includeLinePosition": true
285+
},
286+
"command": "suggestionDiagnosticsSync"
287+
}
288+
Info seq [hh:mm:ss:mss] response:
289+
{
290+
"seq": 0,
291+
"type": "response",
292+
"command": "suggestionDiagnosticsSync",
293+
"request_seq": 4,
294+
"success": true,
295+
"body": []
296+
}
297+
Info seq [hh:mm:ss:mss] request:
298+
{
299+
"seq": 5,
300+
"type": "request",
301+
"arguments": {
302+
"file": "/index.ts",
303+
"startLine": 1,
304+
"startOffset": 1,
305+
"endLine": 1,
306+
"endOffset": 3,
307+
"errorCodes": [
308+
2304
309+
]
310+
},
311+
"command": "getCodeFixes"
312+
}
313+
Info seq [hh:mm:ss:mss] response:
314+
{
315+
"seq": 0,
316+
"type": "response",
317+
"command": "getCodeFixes",
318+
"request_seq": 5,
319+
"success": true,
320+
"body": []
321+
}

‎tests/cases/fourslash/server/importFixes_ambientCircularDefaultCrash.ts

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
/// <reference path="../fourslash.ts" />
2+
3+
// @Filename: /tsconfig.json
4+
//// {
5+
//// "compilerOptions": {
6+
//// "module": "preserve"
7+
//// }
8+
//// }
9+
10+
// @Filename: /types.d.ts
11+
//// declare module "mymod" {
12+
//// import mymod from "mymod";
13+
//// export default mymod;
14+
//// }
15+
16+
// @Filename: /index.ts
17+
//// my/**/
18+
19+
verify.importFixModuleSpecifiers("", []);

0 commit comments

Comments
 (0)