fix(typescript-twoslash-queries): fix invalid fileName

volarjs · May 14, 2024 · b4877d2 · b4877d2
1 parent c4fa09f
commit b4877d2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/packages/typescript-twoslash-queries/index.ts b/packages/typescript-twoslash-queries/index.ts
@@ -10,7 +10,8 @@ export function create(ts: typeof import('typescript')): LanguageServicePlugin {
 					if (isTsDocument(document.languageId)) {
 
 						const languageService = context.inject<Provide, 'typescript/languageService'>('typescript/languageService');
-						if (!languageService) {
+						const fileName = context.inject<Provide, 'typescript/documentFileName'>('typescript/documentFileName', document.uri);
+						if (!languageService || !fileName) {
 							return;
 						}
 
@@ -24,7 +25,6 @@ export function create(ts: typeof import('typescript')): LanguageServicePlugin {
 								character: pointerPosition.character,
 							});
 
-							const fileName = context.env.typescript!.uriToFileName(document.uri);
 							const quickInfo = languageService.getQuickInfoAtPosition(fileName, hoverOffset);
 							if (quickInfo) {
 								inlayHints.push({

diff --git a/packages/typescript/lib/plugins/semantic.ts b/packages/typescript/lib/plugins/semantic.ts
@@ -53,6 +53,8 @@ import type { SharedContext } from '../semanticFeatures/types';
 export interface Provide {
 	'typescript/languageService': () => ts.LanguageService;
 	'typescript/languageServiceHost': () => ts.LanguageServiceHost;
+	'typescript/documentFileName': (uri: string) => string;
+	'typescript/documentUri': (fileName: string) => string;
 }
 
 export interface CompletionItemData {
@@ -225,6 +227,8 @@ export function create(
 				provide: {
 					'typescript/languageService': () => languageService,
 					'typescript/languageServiceHost': () => languageServiceHost,
+					'typescript/documentFileName': uri => ctx.uriToFileName(uri),
+					'typescript/documentUri': fileName => ctx.fileNameToUri(fileName),
 				},
 
 				dispose() {