fix(typescript): should not suppressing getLanguageId crashes

close #253
volarjs · Dec 8, 2024 · bdbd555 · bdbd555
1 parent 3e996b3
commit bdbd555
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/packages/typescript/lib/quickstart/createAsyncLanguageServicePlugin.ts b/packages/typescript/lib/quickstart/createAsyncLanguageServicePlugin.ts
@@ -82,20 +82,23 @@ export function createAsyncLanguageServicePlugin(
 							],
 							new FileMap(ts.sys.useCaseSensitiveFileNames),
 							fileName => {
+								let snapshot: ts.IScriptSnapshot | undefined;
+
 								try { // getSnapshot could be crashed if the file is too large
-									let snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
+									snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
 									if (!snapshot) {
 										// trigger projectService.getOrCreateScriptInfoNotOpenedByClient
 										info.project.getScriptVersion(fileName);
 										snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
 									}
-									if (snapshot) {
-										language.scripts.set(fileName, snapshot);
-									}
-									else {
-										language.scripts.delete(fileName);
-									}
 								} catch { }
+
+								if (snapshot) {
+									language.scripts.set(fileName, snapshot);
+								}
+								else {
+									language.scripts.delete(fileName);
+								}
 							}
 						);
 

diff --git a/packages/typescript/lib/quickstart/createLanguageServicePlugin.ts b/packages/typescript/lib/quickstart/createLanguageServicePlugin.ts
@@ -41,20 +41,23 @@ export function createLanguageServicePlugin(
 						],
 						new FileMap(ts.sys.useCaseSensitiveFileNames),
 						fileName => {
+							let snapshot: ts.IScriptSnapshot | undefined;
+
 							try { // getSnapshot could be crashed if the file is too large
-								let snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
+								snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
 								if (!snapshot) {
 									// trigger projectService.getOrCreateScriptInfoNotOpenedByClient
 									info.project.getScriptVersion(fileName);
 									snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
 								}
-								if (snapshot) {
-									language.scripts.set(fileName, snapshot);
-								}
-								else {
-									language.scripts.delete(fileName);
-								}
 							} catch { }
+
+							if (snapshot) {
+								language.scripts.set(fileName, snapshot);
+							}
+							else {
+								language.scripts.delete(fileName);
+							}
 						}
 					);