refactor(typescript): simplify snapshot retrieval in language service…

… plugins
volarjs · Dec 13, 2024 · 404c5dc · 404c5dc
1 parent 15f8750
commit 404c5dc
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/packages/typescript/lib/quickstart/createAsyncLanguageServicePlugin.ts b/packages/typescript/lib/quickstart/createAsyncLanguageServicePlugin.ts
@@ -40,7 +40,7 @@ export function createAsyncLanguageServicePlugin(
 							if (extensions.some(ext => fileName.endsWith(ext))) {
 								return emptySnapshot;
 							}
-							if (info.project.getScriptInfo(fileName)?.isScriptOpen()) {
+							if (getScriptInfo(fileName)?.isScriptOpen()) {
 								return emptySnapshot;
 							}
 						}
@@ -51,7 +51,7 @@ export function createAsyncLanguageServicePlugin(
 							if (extensions.some(ext => fileName.endsWith(ext))) {
 								return 'initializing...';
 							}
-							if (info.project.getScriptInfo(fileName)?.isScriptOpen()) {
+							if (getScriptInfo(fileName)?.isScriptOpen()) {
 								return getScriptVersion(fileName) + ',initializing...';
 							}
 						}
@@ -92,17 +92,12 @@ 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
-									snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
-									if (!snapshot) {
-										// trigger projectService.getOrCreateScriptInfoNotOpenedByClient
-										info.project.getScriptVersion(fileName);
-										snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
-									}
-								} catch { }
-
+								let snapshot = getScriptInfo(fileName)?.getSnapshot();
+								if (!snapshot) {
+									// trigger projectService.getOrCreateScriptInfoNotOpenedByClient
+									info.project.getScriptVersion(fileName);
+									snapshot = getScriptInfo(fileName)?.getSnapshot();
+								}
 								if (snapshot) {
 									language.scripts.set(fileName, snapshot);
 								}
@@ -124,6 +119,13 @@ export function createAsyncLanguageServicePlugin(
 				}
 
 				return info.languageService;
+
+				function getScriptInfo(fileName: string) {
+					// getSnapshot could be crashed if the file is too large
+					try {
+						return info.project.getScriptInfo(fileName);
+					} catch { }
+				}
 			},
 			getExternalFiles(project, updateLevel = 0) {
 				if (

diff --git a/packages/typescript/lib/quickstart/createLanguageServicePlugin.ts b/packages/typescript/lib/quickstart/createLanguageServicePlugin.ts
@@ -41,17 +41,12 @@ 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
-								snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
-								if (!snapshot) {
-									// trigger projectService.getOrCreateScriptInfoNotOpenedByClient
-									info.project.getScriptVersion(fileName);
-									snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
-								}
-							} catch { }
-
+							let snapshot = getScriptInfo(fileName)?.getSnapshot();
+							if (!snapshot) {
+								// trigger projectService.getOrCreateScriptInfoNotOpenedByClient
+								info.project.getScriptVersion(fileName);
+								snapshot = getScriptInfo(fileName)?.getSnapshot();
+							}
 							if (snapshot) {
 								language.scripts.set(fileName, snapshot);
 							}
@@ -69,6 +64,13 @@ export function createLanguageServicePlugin(
 				}
 
 				return info.languageService;
+
+				function getScriptInfo(fileName: string) {
+					// getSnapshot could be crashed if the file is too large
+					try {
+						return info.project.getScriptInfo(fileName);
+					} catch { }
+				}
 			},
 			getExternalFiles(project, updateLevel = 0) {
 				if (