fix(typescript): cannot convert extra file name to embedded uri

volarjs · May 30, 2024 · f3b454b · f3b454b
1 parent 5e38dfc
commit f3b454b
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/packages/typescript/lib/plugins/semantic.ts b/packages/typescript/lib/plugins/semantic.ts
@@ -184,7 +184,7 @@ export function create(
 			if (!context.language.typescript) {
 				return {};
 			}
-			const { sys, languageServiceHost, asFileName, asScriptId } = context.language.typescript;
+			const { sys, languageServiceHost, asFileName, asScriptId, getExtraServiceScript } = context.language.typescript;
 			const created = tsWithImportCache.createLanguageService(
 				ts,
 				sys,
@@ -231,7 +231,7 @@ export function create(
 				function updateSourceScriptFileNames() {
 					sourceScriptNames.clear();
 					for (const fileName of languageServiceHost.getScriptFileNames()) {
-						const uri = asScriptId(fileName);
+						const uri = ctx.fileNameToUri(fileName);
 						const sourceScript = context.language.scripts.get(uri);
 						if (sourceScript?.generated) {
 							const tsCode = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
@@ -258,20 +258,16 @@ export function create(
 					return asFileName(uri);
 				},
 				fileNameToUri(fileName) {
+					const extraServiceScript = getExtraServiceScript(fileName);
+					if (extraServiceScript) {
+						return context.encodeEmbeddedDocumentUri(extraServiceScript[0].id, extraServiceScript[1].code.id);
+					}
+
 					const uri = asScriptId(fileName);
 					const sourceScript = context.language.scripts.get(uri);
-					const extraServiceScript = context.language.typescript!.getExtraServiceScript(fileName);
-
-					let virtualCode = extraServiceScript?.code;
-
-					if (!virtualCode && sourceScript?.generated?.languagePlugin.typescript) {
-						const serviceScript = sourceScript.generated.languagePlugin.typescript.getServiceScript(sourceScript.generated.root);
-						if (serviceScript) {
-							virtualCode = serviceScript.code;
-						}
-					}
-					if (sourceScript && virtualCode) {
-						return context.encodeEmbeddedDocumentUri(sourceScript.id, virtualCode.id);
+					const serviceScript = sourceScript?.generated?.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+					if (sourceScript && serviceScript) {
+						return context.encodeEmbeddedDocumentUri(sourceScript.id, serviceScript.code.id);
 					}
 
 					return uri;