volar-service-typescript 0.0.25 → 0.0.27

package/index.d.ts

@@ -3,7 +3,6 @@ import type * as ts from 'typescript';
 export * from '@volar/typescript';
 export interface Provide {
     'typescript/typescript': () => typeof import('typescript');
-    'typescript/sys': () => ts.System;
     'typescript/languageService': () => ts.LanguageService;
     'typescript/languageServiceHost': () => ts.LanguageServiceHost;
     'typescript/syntacticLanguageService': () => ts.LanguageService;

package/index.js

@@ -16,8 +16,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = void 0;
 const semver = require("semver");
-const vscode_languageserver_textdocument_1 = require("vscode-languageserver-textdocument");
 const shared_1 = require("./lib/shared");
+const vscode_uri_1 = require("vscode-uri");
 const typescript_1 = require("@volar/typescript");
 const tsFaster = require("typescript-auto-import-cache");
 const _callHierarchy = require("./lib/features/callHierarchy");
@@ -77,30 +77,26 @@ function create(ts) {
             };
             const syntacticCtx = {
                 ...context,
-                typescript: {
-                    languageServiceHost: syntacticServiceHost,
-                    languageService: ts.createLanguageService(syntacticServiceHost, undefined, 2),
-                },
+                languageServiceHost: syntacticServiceHost,
+                languageService: ts.createLanguageService(syntacticServiceHost, undefined, 2),
                 ts,
-                getTextDocument(uri) {
-                    const fileName = context.env.uriToFileName(uri);
-                    const virtualFile = context.language.files.getVirtualFile(fileName)[0];
-                    if (virtualFile) {
-                        return context.documents.get(uri, virtualFile.languageId, virtualFile.snapshot);
+                uriToFileName: uri => {
+                    if (uri !== syntacticHostCtx.document?.uri) {
+                        throw new Error(`uriToFileName: uri not found: ${uri}`);
                     }
-                    const sourceFile = context.language.files.getSourceFile(fileName);
-                    if (sourceFile && !sourceFile.virtualFile) {
-                        return context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
+                    return syntacticHostCtx.fileName;
+                },
+                fileNameToUri: fileName => {
+                    if (fileName !== syntacticHostCtx.fileName) {
+                        throw new Error(`fileNameToUri: fileName not found: ${fileName}`);
                     }
-                    const snapshot = syntacticServiceHost.getScriptSnapshot(fileName);
-                    if (snapshot) {
-                        let document = documents.get(snapshot);
-                        if (!document) {
-                            document = vscode_languageserver_textdocument_1.TextDocument.create(uri, '', 0, snapshot.getText(0, snapshot.getLength()));
-                            documents.set(snapshot, document);
-                        }
-                        return document;
+                    return syntacticHostCtx.document.uri;
+                },
+                getTextDocument(uri) {
+                    if (uri !== syntacticHostCtx.document?.uri) {
+                        throw new Error(`getTextDocument: uri not found: ${uri}`);
                     }
+                    return syntacticHostCtx.document;
                 },
             };
             const findDocumentSymbols = documentSymbol.register(syntacticCtx);
@@ -109,19 +105,18 @@ function create(ts) {
             const syntacticService = {
                 provide: {
                     'typescript/typescript': () => ts,
-                    'typescript/sys': () => sys,
-                    'typescript/languageService': () => syntacticCtx.typescript.languageService,
-                    'typescript/languageServiceHost': () => syntacticCtx.typescript.languageServiceHost,
-                    'typescript/syntacticLanguageService': () => syntacticCtx.typescript.languageService,
-                    'typescript/syntacticLanguageServiceHost': () => syntacticCtx.typescript.languageServiceHost,
+                    'typescript/languageService': () => syntacticCtx.languageService,
+                    'typescript/languageServiceHost': () => syntacticCtx.languageServiceHost,
+                    'typescript/syntacticLanguageService': () => syntacticCtx.languageService,
+                    'typescript/syntacticLanguageServiceHost': () => syntacticCtx.languageServiceHost,
                 },
                 provideAutoInsertionEdit(document, position, lastChange) {
                     if ((document.languageId === 'javascriptreact' || document.languageId === 'typescriptreact')
                         && lastChange.text.endsWith('>')) {
                         const config = context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.autoClosingTags') ?? true;
                         if (config) {
-                            prepareSyntacticService(document);
-                            const close = syntacticCtx.typescript.languageService.getJsxClosingTagAtPosition(context.env.uriToFileName(document.uri), document.offsetAt(position));
+                            const ctx = prepareSyntacticService(document);
+                            const close = syntacticCtx.languageService.getJsxClosingTagAtPosition(ctx.fileName, document.offsetAt(position));
                             if (close) {
                                 return '$0' + close.newText;
                             }
@@ -163,7 +158,8 @@ function create(ts) {
                 provideFormattingIndentSensitiveLines(document) {
                     if (!(0, shared_1.isTsDocument)(document))
                         return;
-                    const sourceFile = ts.createSourceFile(context.env.uriToFileName(document.uri), document.getText(), ts.ScriptTarget.ESNext);
+                    const ctx = prepareSyntacticService(document);
+                    const sourceFile = ts.createSourceFile(ctx.fileName, document.getText(), ts.ScriptTarget.ESNext);
                     if (sourceFile) {
                         const lines = [];
                         sourceFile.forEachChild(function walk(node) {
@@ -192,7 +188,7 @@ function create(ts) {
             if (!context.language.typescript) {
                 return syntacticService;
             }
-            const { sys, languageServiceHost, synchronizeFileSystem } = context.language.typescript;
+            const { sys, languageServiceHost } = context.language.typescript;
             const created = tsFaster.createLanguageService(ts, sys, languageServiceHost, proxiedHost => ts.createLanguageService(proxiedHost, (0, typescript_1.getDocumentRegistry)(ts, sys.useCaseSensitiveFileNames, languageServiceHost.getCurrentDirectory())));
             const { languageService } = created;
             if (created.setPreferences && context.env.getConfiguration) {
@@ -217,7 +213,7 @@ function create(ts) {
                         updateSourceScriptFileNames();
                     }
                     for (const change of params.changes) {
-                        const fileName = context.env.uriToFileName(change.uri);
+                        const fileName = context.env.typescript.uriToFileName(change.uri);
                         if (sourceScriptNames.has(normalizeFileName(fileName))) {
                             created.projectUpdated?.(languageServiceHost.getCurrentDirectory());
                         }
@@ -226,34 +222,52 @@ function create(ts) {
                 function updateSourceScriptFileNames() {
                     sourceScriptNames.clear();
                     for (const fileName of languageServiceHost.getScriptFileNames()) {
-                        const virtualFile = context.language.files.getVirtualFile(fileName);
-                        if (virtualFile) {
-                            sourceScriptNames.add(normalizeFileName(fileName));
-                            continue;
+                        const uri = context.env.typescript.fileNameToUri(fileName);
+                        const sourceFile = context.language.files.get(uri);
+                        if (sourceFile?.generated) {
+                            const tsCode = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
+                            if (tsCode) {
+                                sourceScriptNames.add(normalizeFileName(fileName));
+                            }
                         }
-                        const sourceFile = context.language.files.getSourceFile(fileName);
-                        if (sourceFile && !sourceFile.virtualFile) {
+                        else if (sourceFile) {
                             sourceScriptNames.add(normalizeFileName(fileName));
-                            continue;
                         }
                     }
                 }
             }
-            const documents = new WeakMap();
             const semanticCtx = {
-                ...syntacticCtx,
-                typescript: {
-                    languageServiceHost,
-                    languageService,
+                ...context,
+                languageServiceHost,
+                languageService,
+                ts,
+                uriToFileName: uri => {
+                    const [_virtualCode, file] = context.documents.getVirtualCodeByUri(uri);
+                    if (file) {
+                        return context.env.typescript.uriToFileName(file.id);
+                    }
+                    else {
+                        return context.env.typescript.uriToFileName(uri);
+                    }
+                },
+                fileNameToUri: fileName => {
+                    const uri = context.env.typescript.fileNameToUri(fileName);
+                    const file = context.language.files.get(uri);
+                    if (file?.generated) {
+                        const script = file.generated.languagePlugin.typescript?.getScript(file.generated.code);
+                        if (script) {
+                            return context.documents.getVirtualCodeUri(uri, script.code.id);
+                        }
+                    }
+                    return uri;
                 },
                 getTextDocument(uri) {
-                    const fileName = context.env.uriToFileName(uri);
-                    const virtualFile = context.language.files.getVirtualFile(fileName)[0];
-                    if (virtualFile) {
-                        return context.documents.get(uri, virtualFile.languageId, virtualFile.snapshot);
+                    const virtualCode = context.documents.getVirtualCodeByUri(uri)[0];
+                    if (virtualCode) {
+                        return context.documents.get(uri, virtualCode.languageId, virtualCode.snapshot);
                     }
-                    const sourceFile = context.language.files.getSourceFile(fileName);
-                    if (sourceFile && !sourceFile.virtualFile) {
+                    const sourceFile = context.language.files.get(uri);
+                    if (sourceFile) {
                         return context.documents.get(uri, sourceFile.languageId, sourceFile.snapshot);
                     }
                 },
@@ -483,24 +497,25 @@ function create(ts) {
                 },
             };
             async function worker(token, callback) {
-                let oldSysVersion = await synchronizeFileSystem?.();
+                let oldSysVersion = await sys.sync?.();
                 let result = await callback();
-                let newSysVersion = await synchronizeFileSystem?.();
+                let newSysVersion = await sys.sync?.();
                 while (newSysVersion !== oldSysVersion && !token.isCancellationRequested) {
                     oldSysVersion = newSysVersion;
                     result = await callback();
-                    newSysVersion = await synchronizeFileSystem?.();
+                    newSysVersion = await sys.sync?.();
                 }
                 return result;
             }
             function prepareSyntacticService(document) {
-                if (syntacticHostCtx.document === document && syntacticHostCtx.fileVersion === document.version) {
-                    return;
+                if (syntacticHostCtx.document !== document || syntacticHostCtx.fileVersion !== document.version) {
+                    syntacticHostCtx.document = document;
+                    syntacticHostCtx.fileName = vscode_uri_1.URI.parse(document.uri).fsPath.replace(/\\/g, '/');
+                    syntacticHostCtx.fileVersion = document.version;
+                    syntacticHostCtx.snapshot = ts.ScriptSnapshot.fromString(document.getText());
+                    syntacticHostCtx.projectVersion++;
                 }
-                syntacticHostCtx.fileName = context.env.uriToFileName(document.uri);
-                syntacticHostCtx.fileVersion = document.version;
-                syntacticHostCtx.snapshot = ts.ScriptSnapshot.fromString(document.getText());
-                syntacticHostCtx.projectVersion++;
+                return syntacticHostCtx;
             }
         },
     };

package/lib/configs/getUserPreferences.js

@@ -22,7 +22,7 @@ async function getUserPreferences(ctx, document) {
         includeCompletionsWithSnippetText: config.suggest?.includeCompletionsWithSnippetText ?? true,
         includeCompletionsWithClassMemberSnippets: config.suggest?.classMemberSnippets?.enabled ?? true,
         includeCompletionsWithObjectLiteralMethodSnippets: config.suggest?.objectLiteralMethodSnippets?.enabled ?? true,
-        autoImportFileExcludePatterns: getAutoImportFileExcludePatternsPreference(preferencesConfig, ctx.typescript.languageServiceHost.getCurrentDirectory()),
+        autoImportFileExcludePatterns: getAutoImportFileExcludePatternsPreference(preferencesConfig, ctx.languageServiceHost.getCurrentDirectory()),
         useLabelDetailsInCompletionEntries: true,
         allowIncompleteCompletions: true,
         displayPartsForJSDoc: true,

package/lib/features/callHierarchy.js

@@ -11,9 +11,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const calls = (0, shared_1.safeCall)(() => ctx.typescript.languageService.prepareCallHierarchy(fileName, offset));
+        const calls = (0, shared_1.safeCall)(() => ctx.languageService.prepareCallHierarchy(fileName, offset));
         if (!calls)
             return [];
         const items = Array.isArray(calls) ? calls : [calls];
@@ -23,9 +23,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(item.uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(item.uri);
+        const fileName = ctx.uriToFileName(item.uri);
         const offset = document.offsetAt(item.selectionRange.start);
-        const calls = (0, shared_1.safeCall)(() => ctx.typescript.languageService.provideCallHierarchyIncomingCalls(fileName, offset));
+        const calls = (0, shared_1.safeCall)(() => ctx.languageService.provideCallHierarchyIncomingCalls(fileName, offset));
         if (!calls)
             return [];
         const items = Array.isArray(calls) ? calls : [calls];
@@ -35,9 +35,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(item.uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(item.uri);
+        const fileName = ctx.uriToFileName(item.uri);
         const offset = document.offsetAt(item.selectionRange.start);
-        const calls = (0, shared_1.safeCall)(() => ctx.typescript.languageService.provideCallHierarchyOutgoingCalls(fileName, offset));
+        const calls = (0, shared_1.safeCall)(() => ctx.languageService.provideCallHierarchyOutgoingCalls(fileName, offset));
         if (!calls)
             return [];
         const items = Array.isArray(calls) ? calls : [calls];
@@ -52,8 +52,8 @@ function register(ctx) {
         return item.kind === PConst.Kind.script || item.kind === PConst.Kind.module && item.selectionSpan.start === 0;
     }
     function fromProtocolCallHierarchyItem(item) {
-        const rootPath = ctx.typescript.languageService.getProgram()?.getCompilerOptions().rootDir ?? '';
-        const document = ctx.getTextDocument(ctx.env.fileNameToUri(item.file)); // TODO
+        const rootPath = ctx.languageService.getProgram()?.getCompilerOptions().rootDir ?? '';
+        const document = ctx.getTextDocument(ctx.fileNameToUri(item.file)); // TODO
         const useFileName = isSourceFileItem(item);
         const name = useFileName ? path.basename(item.file) : item.name;
         const detail = useFileName ? path.relative(rootPath, path.dirname(item.file)) : item.containerName ?? '';
@@ -61,7 +61,7 @@ function register(ctx) {
             kind: typeConverters.SymbolKind.fromProtocolScriptElementKind(item.kind),
             name,
             detail,
-            uri: ctx.env.fileNameToUri(item.file),
+            uri: ctx.fileNameToUri(item.file),
             range: {
                 start: document.positionAt(item.span.start),
                 end: document.positionAt(item.span.start + item.span.length),
@@ -78,7 +78,7 @@ function register(ctx) {
         return result;
     }
     function fromProtocolCallHierarchyIncomingCall(item) {
-        const document = ctx.getTextDocument(ctx.env.fileNameToUri(item.from.file));
+        const document = ctx.getTextDocument(ctx.fileNameToUri(item.from.file));
         return {
             from: fromProtocolCallHierarchyItem(item.from),
             fromRanges: item.fromSpans.map(fromSpan => ({

package/lib/features/codeAction.js

@@ -22,14 +22,14 @@ function register(ctx) {
             (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document),
             (0, getUserPreferences_1.getUserPreferences)(ctx, document),
         ]);
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const start = document.offsetAt(range.start);
         const end = document.offsetAt(range.end);
         let result = [];
         const onlyQuickFix = matchOnlyKind(`${'quickfix'}.ts`);
         if (!context.only || onlyQuickFix) {
             for (const error of context.diagnostics) {
-                const codeFixes = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getCodeFixesAtPosition(fileName, document.offsetAt(error.range.start), document.offsetAt(error.range.end), [Number(error.code)], formatOptions, preferences)) ?? [];
+                const codeFixes = (0, shared_1.safeCall)(() => ctx.languageService.getCodeFixesAtPosition(fileName, document.offsetAt(error.range.start), document.offsetAt(error.range.end), [Number(error.code)], formatOptions, preferences)) ?? [];
                 for (const codeFix of codeFixes) {
                     result = result.concat(transformCodeFix(codeFix, [error], onlyQuickFix ?? ''));
                 }
@@ -38,7 +38,7 @@ function register(ctx) {
         if (context.only) {
             for (const only of context.only) {
                 if (only.split('.')[0] === 'refactor') {
-                    const refactors = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getApplicableRefactors(fileName, { pos: start, end: end }, preferences, undefined, only)) ?? [];
+                    const refactors = (0, shared_1.safeCall)(() => ctx.languageService.getApplicableRefactors(fileName, { pos: start, end: end }, preferences, undefined, only)) ?? [];
                     for (const refactor of refactors) {
                         result = result.concat(transformRefactor(refactor));
                     }
@@ -46,7 +46,7 @@ function register(ctx) {
             }
         }
         else {
-            const refactors = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getApplicableRefactors(fileName, { pos: start, end: end }, preferences, undefined, undefined)) ?? [];
+            const refactors = (0, shared_1.safeCall)(() => ctx.languageService.getApplicableRefactors(fileName, { pos: start, end: end }, preferences, undefined, undefined)) ?? [];
             for (const refactor of refactors) {
                 result = result.concat(transformRefactor(refactor));
             }

package/lib/features/codeActionResolve.js

@@ -27,13 +27,13 @@ function register(ctx) {
 }
 exports.register = register;
 function resolveFixAllCodeAction(ctx, codeAction, data, formatOptions, preferences) {
-    const fixes = data.fixIds.map(fixId => (0, shared_1.safeCall)(() => ctx.typescript.languageService.getCombinedCodeFix({ type: 'file', fileName: data.fileName }, fixId, formatOptions, preferences)));
+    const fixes = data.fixIds.map(fixId => (0, shared_1.safeCall)(() => ctx.languageService.getCombinedCodeFix({ type: 'file', fileName: data.fileName }, fixId, formatOptions, preferences)));
     const changes = fixes.map(fix => fix?.changes ?? []).flat();
     codeAction.edit = (0, rename_1.fileTextChangesToWorkspaceEdit)(changes, ctx);
 }
 exports.resolveFixAllCodeAction = resolveFixAllCodeAction;
 function resolveRefactorCodeAction(ctx, codeAction, data, document, formatOptions, preferences) {
-    const editInfo = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getEditsForRefactor(data.fileName, formatOptions, data.range, data.refactorName, data.actionName, preferences));
+    const editInfo = (0, shared_1.safeCall)(() => ctx.languageService.getEditsForRefactor(data.fileName, formatOptions, data.range, data.refactorName, data.actionName, preferences));
     if (!editInfo) {
         return;
     }
@@ -44,7 +44,7 @@ function resolveRefactorCodeAction(ctx, codeAction, data, document, formatOption
 }
 exports.resolveRefactorCodeAction = resolveRefactorCodeAction;
 function resolveOrganizeImportsCodeAction(ctx, codeAction, data, formatOptions, preferences) {
-    const changes = (0, shared_1.safeCall)(() => ctx.typescript.languageService.organizeImports({ type: 'file', fileName: data.fileName }, formatOptions, preferences));
+    const changes = (0, shared_1.safeCall)(() => ctx.languageService.organizeImports({ type: 'file', fileName: data.fileName }, formatOptions, preferences));
     codeAction.edit = (0, rename_1.fileTextChangesToWorkspaceEdit)(changes ?? [], ctx);
 }
 exports.resolveOrganizeImportsCodeAction = resolveOrganizeImportsCodeAction;

package/lib/features/completions/basic.js

@@ -15,9 +15,9 @@ function register(ctx) {
         if (!document)
             return;
         const preferences = await (0, getUserPreferences_1.getUserPreferences)(ctx, document);
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const completionContext = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getCompletionsAtPosition(fileName, offset, {
+        const completionContext = (0, shared_1.safeCall)(() => ctx.languageService.getCompletionsAtPosition(fileName, offset, {
             ...preferences,
             ...options,
         }));

package/lib/features/completions/jsDoc.js

@@ -12,9 +12,9 @@ function register(ctx) {
             return;
         if (!isPotentiallyValidDocCompletionPosition(document, position))
             return;
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const docCommentTemplate = ctx.typescript.languageService.getDocCommentTemplateAtPosition(fileName, offset);
+        const docCommentTemplate = ctx.languageService.getDocCommentTemplateAtPosition(fileName, offset);
         if (!docCommentTemplate)
             return;
         let insertText;

package/lib/features/completions/resolve.js

@@ -26,7 +26,7 @@ function register(ctx) {
         ]) : [{}, {}];
         let details;
         try {
-            details = ctx.typescript.languageService.getCompletionEntryDetails(fileName, offset, data.originalItem.name, formatOptions, data.originalItem.source, preferences, data.originalItem.data);
+            details = ctx.languageService.getCompletionEntryDetails(fileName, offset, data.originalItem.name, formatOptions, data.originalItem.source, preferences, data.originalItem.data);
         }
         catch (err) {
             item.detail = `[TS Error]\n${err}\n${JSON.stringify(err, undefined, 2)}`;
@@ -76,7 +76,7 @@ function register(ctx) {
             const useCodeSnippetsOnMethodSuggest = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.suggest.completeFunctionCalls') ?? false;
             const useCodeSnippet = useCodeSnippetsOnMethodSuggest && (item.kind === 3 || item.kind === 2);
             if (useCodeSnippet) {
-                const shouldCompleteFunction = isValidFunctionCompletionContext(ctx.typescript.languageService, fileName, offset, document);
+                const shouldCompleteFunction = isValidFunctionCompletionContext(ctx.languageService, fileName, offset, document);
                 if (shouldCompleteFunction) {
                     const { snippet, parameterCount } = (0, snippetForFunctionCall_1.snippetForFunctionCall)({
                         insertText: item.insertText ?? item.textEdit?.newText, // insertText is dropped by LSP in some case: https://github.com/microsoft/vscode-languageserver-node/blob/9b742021fb04ad081aa3676a9eecf4fa612084b4/client/src/common/codeConverter.ts#L659-L664
@@ -104,7 +104,7 @@ function register(ctx) {
         }
         return item;
         function toResource(path) {
-            return ctx.env.fileNameToUri(path);
+            return ctx.fileNameToUri(path);
         }
     };
 }

package/lib/features/definition.js

@@ -8,9 +8,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const info = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getDefinitionAndBoundSpan(fileName, offset));
+        const info = (0, shared_1.safeCall)(() => ctx.languageService.getDefinitionAndBoundSpan(fileName, offset));
         if (!info)
             return [];
         return (0, transforms_1.boundSpanToLocationLinks)(info, document, ctx);

package/lib/features/diagnostics.js

@@ -8,21 +8,21 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
-        const program = ctx.typescript.languageService.getProgram();
+        const fileName = ctx.uriToFileName(document.uri);
+        const program = ctx.languageService.getProgram();
         const sourceFile = program?.getSourceFile(fileName);
         if (!program || !sourceFile)
             return [];
         const token = {
             isCancellationRequested() {
-                return ctx.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested() ?? false;
+                return ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested() ?? false;
             },
             throwIfCancellationRequested() { },
         };
         let errors = (0, shared_1.safeCall)(() => [
             ...options.semantic ? program.getSemanticDiagnostics(sourceFile, token) : [],
             ...options.syntactic ? program.getSyntacticDiagnostics(sourceFile, token) : [],
-            ...options.suggestion ? ctx.typescript.languageService.getSuggestionDiagnostics(fileName) : [],
+            ...options.suggestion ? ctx.languageService.getSuggestionDiagnostics(fileName) : [],
         ]) ?? [];
         if (options.declaration && getEmitDeclarations(program.getCompilerOptions())) {
             errors = errors.concat(program.getDeclarationDiagnostics(sourceFile, token));
@@ -70,7 +70,7 @@ function register(ctx) {
                 return;
             let document;
             if (diag.file) {
-                document = ctx.getTextDocument(ctx.env.fileNameToUri(diag.file.fileName));
+                document = ctx.getTextDocument(ctx.fileNameToUri(diag.file.fileName));
             }
             if (!document)
                 return;

package/lib/features/documentHighlight.js

@@ -8,9 +8,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const highlights = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getDocumentHighlights(fileName, offset, [fileName]));
+        const highlights = (0, shared_1.safeCall)(() => ctx.languageService.getDocumentHighlights(fileName, offset, [fileName]));
         if (!highlights)
             return [];
         const results = [];

package/lib/features/documentSymbol.js

@@ -29,8 +29,8 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
-        const barItems = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getNavigationTree(fileName));
+        const fileName = ctx.uriToFileName(document.uri);
+        const barItems = (0, shared_1.safeCall)(() => ctx.languageService.getNavigationTree(fileName));
         if (!barItems)
             return [];
         // The root represents the file. Ignore this when showing in the UI

package/lib/features/fileReferences.js

@@ -8,8 +8,8 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
-        const entries = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getFileReferences(fileName));
+        const fileName = ctx.uriToFileName(document.uri);
+        const entries = (0, shared_1.safeCall)(() => ctx.languageService.getFileReferences(fileName));
         if (!entries)
             return [];
         return (0, transforms_1.entriesToLocations)([...entries], ctx);

package/lib/features/fileRename.js

@@ -12,9 +12,9 @@ function register(ctx) {
             (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document),
             (0, getUserPreferences_1.getUserPreferences)(ctx, document),
         ]) : [{}, {}];
-        const fileToRename = ctx.env.uriToFileName(oldUri);
-        const newFilePath = ctx.env.uriToFileName(newUri);
-        const response = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getEditsForFileRename(fileToRename, newFilePath, formatOptions, preferences));
+        const fileToRename = ctx.uriToFileName(oldUri);
+        const newFilePath = ctx.uriToFileName(newUri);
+        const response = (0, shared_1.safeCall)(() => ctx.languageService.getEditsForFileRename(fileToRename, newFilePath, formatOptions, preferences));
         if (!response?.length)
             return;
         const edits = (0, rename_1.fileTextChangesToWorkspaceEdit)(response, ctx);

package/lib/features/foldingRanges.js

@@ -8,8 +8,8 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
-        const outliningSpans = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getOutliningSpans(fileName));
+        const fileName = ctx.uriToFileName(document.uri);
+        const outliningSpans = (0, shared_1.safeCall)(() => ctx.languageService.getOutliningSpans(fileName));
         if (!outliningSpans)
             return [];
         const foldingRanges = [];

package/lib/features/formatting.js

@@ -6,14 +6,14 @@ const shared_1 = require("../shared");
 function register(ctx) {
     return {
         onRange: async (document, range, options) => {
-            const fileName = ctx.env.uriToFileName(document.uri);
+            const fileName = ctx.uriToFileName(document.uri);
             const tsOptions = await (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, options);
             if (typeof (tsOptions.indentSize) === "boolean" || typeof (tsOptions.indentSize) === "string") {
                 tsOptions.indentSize = undefined;
             }
             const scriptEdits = range
-                ? (0, shared_1.safeCall)(() => ctx.typescript.languageService.getFormattingEditsForRange(fileName, document.offsetAt(range.start), document.offsetAt(range.end), tsOptions))
-                : (0, shared_1.safeCall)(() => ctx.typescript.languageService.getFormattingEditsForDocument(fileName, tsOptions));
+                ? (0, shared_1.safeCall)(() => ctx.languageService.getFormattingEditsForRange(fileName, document.offsetAt(range.start), document.offsetAt(range.end), tsOptions))
+                : (0, shared_1.safeCall)(() => ctx.languageService.getFormattingEditsForDocument(fileName, tsOptions));
             if (!scriptEdits)
                 return [];
             const result = [];
@@ -29,9 +29,9 @@ function register(ctx) {
             return result;
         },
         onType: async (document, options, position, key) => {
-            const fileName = ctx.env.uriToFileName(document.uri);
+            const fileName = ctx.uriToFileName(document.uri);
             const tsOptions = await (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, options);
-            const scriptEdits = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getFormattingEditsAfterKeystroke(fileName, document.offsetAt(position), key, tsOptions));
+            const scriptEdits = (0, shared_1.safeCall)(() => ctx.languageService.getFormattingEditsAfterKeystroke(fileName, document.offsetAt(position), key, tsOptions));
             if (!scriptEdits)
                 return [];
             const result = [];

package/lib/features/hover.js

@@ -9,9 +9,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return;
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const info = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getQuickInfoAtPosition(fileName, offset));
+        const info = (0, shared_1.safeCall)(() => ctx.languageService.getQuickInfoAtPosition(fileName, offset));
         if (!info)
             return;
         const parts = [];
@@ -35,7 +35,7 @@ function register(ctx) {
             },
         };
         function toResource(path) {
-            return ctx.env.fileNameToUri(path);
+            return ctx.fileNameToUri(path);
         }
     };
 }

package/lib/features/implementation.js

@@ -8,9 +8,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const entries = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getImplementationAtPosition(fileName, offset));
+        const entries = (0, shared_1.safeCall)(() => ctx.languageService.getImplementationAtPosition(fileName, offset));
         if (!entries)
             return [];
         return (0, transforms_1.entriesToLocationLinks)([...entries], ctx);

package/lib/features/inlayHints.js

@@ -10,11 +10,11 @@ function register(ctx) {
         if (!document)
             return;
         const preferences = await (0, getUserPreferences_1.getUserPreferences)(ctx, document);
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const start = document.offsetAt(range.start);
         const end = document.offsetAt(range.end);
-        const inlayHints = (0, shared_1.safeCall)(() => 'provideInlayHints' in ctx.typescript.languageService
-            ? ctx.typescript.languageService.provideInlayHints(fileName, { start, length: end - start }, preferences)
+        const inlayHints = (0, shared_1.safeCall)(() => 'provideInlayHints' in ctx.languageService
+            ? ctx.languageService.provideInlayHints(fileName, { start, length: end - start }, preferences)
             : []) ?? [];
         return inlayHints.map(inlayHint => {
             const result = {

package/lib/features/prepareRename.js

@@ -9,9 +9,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return;
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const renameInfo = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getRenameInfo(fileName, offset, exports.renameInfoOptions));
+        const renameInfo = (0, shared_1.safeCall)(() => ctx.languageService.getRenameInfo(fileName, offset, exports.renameInfoOptions));
         if (!renameInfo)
             return;
         if (!renameInfo.canRename) {

package/lib/features/references.js

@@ -8,9 +8,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const references = (0, shared_1.safeCall)(() => ctx.typescript.languageService.findReferences(fileName, offset));
+        const references = (0, shared_1.safeCall)(() => ctx.languageService.findReferences(fileName, offset));
         if (!references)
             return [];
         const result = [];

package/lib/features/rename.js

@@ -11,9 +11,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return;
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const renameInfo = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getRenameInfo(fileName, offset, prepareRename_1.renameInfoOptions));
+        const renameInfo = (0, shared_1.safeCall)(() => ctx.languageService.getRenameInfo(fileName, offset, prepareRename_1.renameInfoOptions));
         if (!renameInfo?.canRename)
             return;
         if (renameInfo.fileToRename) {
@@ -24,7 +24,7 @@ function register(ctx) {
             return renameFile(renameInfo.fileToRename, newName, formatOptions, preferences);
         }
         const { providePrefixAndSuffixTextForRename } = await (0, getUserPreferences_1.getUserPreferences)(ctx, document);
-        const entries = ctx.typescript.languageService.findRenameLocations(fileName, offset, false, false, providePrefixAndSuffixTextForRename);
+        const entries = ctx.languageService.findRenameLocations(fileName, offset, false, false, providePrefixAndSuffixTextForRename);
         if (!entries)
             return;
         const locations = locationsToWorkspaceEdit(newName, entries, ctx);
@@ -37,15 +37,15 @@ function register(ctx) {
         }
         const dirname = path.dirname(fileToRename);
         const newFilePath = path.join(dirname, newName);
-        const response = ctx.typescript.languageService.getEditsForFileRename(fileToRename, newFilePath, formatOptions, preferences);
+        const response = ctx.languageService.getEditsForFileRename(fileToRename, newFilePath, formatOptions, preferences);
         const edits = fileTextChangesToWorkspaceEdit(response, ctx);
         if (!edits.documentChanges) {
             edits.documentChanges = [];
         }
         edits.documentChanges.push({
             kind: 'rename',
-            oldUri: ctx.env.fileNameToUri(fileToRename),
-            newUri: ctx.env.fileNameToUri(newFilePath),
+            oldUri: ctx.fileNameToUri(fileToRename),
+            newUri: ctx.fileNameToUri(newFilePath),
         });
         return edits;
     }
@@ -57,7 +57,7 @@ function fileTextChangesToWorkspaceEdit(changes, ctx) {
         if (!workspaceEdit.documentChanges) {
             workspaceEdit.documentChanges = [];
         }
-        const uri = ctx.env.fileNameToUri(change.fileName);
+        const uri = ctx.fileNameToUri(change.fileName);
         let doc = ctx.getTextDocument(uri);
         if (change.isNewFile) {
             workspaceEdit.documentChanges.push({ kind: 'create', uri });
@@ -91,7 +91,7 @@ function locationsToWorkspaceEdit(newText, locations, ctx) {
         if (!workspaceEdit.changes) {
             workspaceEdit.changes = {};
         }
-        const uri = ctx.env.fileNameToUri(location.fileName);
+        const uri = ctx.fileNameToUri(location.fileName);
         const doc = ctx.getTextDocument(uri);
         if (!doc)
             continue;

package/lib/features/selectionRanges.js

@@ -9,9 +9,9 @@ function register(ctx) {
             return [];
         const result = [];
         for (const position of positions) {
-            const fileName = ctx.env.uriToFileName(document.uri);
+            const fileName = ctx.uriToFileName(document.uri);
             const offset = document.offsetAt(position);
-            const range = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getSmartSelectionRange(fileName, offset));
+            const range = (0, shared_1.safeCall)(() => ctx.languageService.getSmartSelectionRange(fileName, offset));
             if (!range)
                 continue;
             result.push(transformSelectionRange(range, document));

package/lib/features/semanticTokens.js

@@ -8,17 +8,17 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return;
-        const file = ctx.env.uriToFileName(uri);
+        const file = ctx.uriToFileName(uri);
         const start = range ? document.offsetAt(range.start) : 0;
         const length = range ? (document.offsetAt(range.end) - start) : document.getText().length;
-        if (ctx.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested())
+        if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested())
             return;
-        const response2 = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getEncodedSyntacticClassifications(file, { start, length }));
+        const response2 = (0, shared_1.safeCall)(() => ctx.languageService.getEncodedSyntacticClassifications(file, { start, length }));
         if (!response2)
             return;
-        if (ctx.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested())
+        if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested())
             return;
-        const response1 = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getEncodedSemanticClassifications(file, { start, length }, ts.SemanticClassificationFormat.TwentyTwenty));
+        const response1 = (0, shared_1.safeCall)(() => ctx.languageService.getEncodedSemanticClassifications(file, { start, length }, ts.SemanticClassificationFormat.TwentyTwenty));
         if (!response1)
             return;
         let tokenModifiersTable = [];

package/lib/features/signatureHelp.js

@@ -26,9 +26,9 @@ function register(ctx) {
                 triggerCharacter: context.triggerCharacter,
             };
         }
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const helpItems = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getSignatureHelpItems(fileName, offset, options));
+        const helpItems = (0, shared_1.safeCall)(() => ctx.languageService.getSignatureHelpItems(fileName, offset, options));
         if (!helpItems)
             return;
         return {

package/lib/features/typeDefinition.js

@@ -8,9 +8,9 @@ function register(ctx) {
         const document = ctx.getTextDocument(uri);
         if (!document)
             return [];
-        const fileName = ctx.env.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(document.uri);
         const offset = document.offsetAt(position);
-        const entries = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getTypeDefinitionAtPosition(fileName, offset));
+        const entries = (0, shared_1.safeCall)(() => ctx.languageService.getTypeDefinitionAtPosition(fileName, offset));
         if (!entries)
             return [];
         return (0, transforms_1.entriesToLocationLinks)([...entries], ctx);

package/lib/features/workspaceSymbol.js

@@ -22,7 +22,7 @@ function getSymbolKind(item) {
 }
 function register(ctx) {
     return (query) => {
-        const items = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getNavigateToItems(query));
+        const items = (0, shared_1.safeCall)(() => ctx.languageService.getNavigateToItems(query));
         if (!items)
             return [];
         return items
@@ -31,7 +31,7 @@ function register(ctx) {
             .filter((v) => !!v);
         function toWorkspaceSymbol(item) {
             const label = getLabel(item);
-            const uri = ctx.env.fileNameToUri(item.fileName);
+            const uri = ctx.fileNameToUri(item.fileName);
             const document = ctx.getTextDocument(uri);
             if (document) {
                 const range = {

package/lib/types.d.ts

@@ -2,11 +2,11 @@ import type { ServiceContext } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 export type SharedContext = ServiceContext & {
-    typescript: {
-        languageServiceHost: ts.LanguageServiceHost;
-        languageService: ts.LanguageService;
-    };
     ts: typeof import('typescript');
+    languageServiceHost: ts.LanguageServiceHost;
+    languageService: ts.LanguageService;
     getTextDocument: (uri: string) => TextDocument | undefined;
+    uriToFileName: (uri: string) => string;
+    fileNameToUri: (fileName: string) => string;
 };
 //# sourceMappingURL=types.d.ts.map

package/lib/utils/previewer.js

@@ -105,7 +105,7 @@ function convertLinkTags(parts, filePathConverter, ctx) {
                     let target = currentLink.target;
                     if (typeof currentLink.target === 'object' && 'fileName' in currentLink.target) {
                         const _target = currentLink.target;
-                        const fileDoc = ctx.getTextDocument(ctx.env.uriToFileName(_target.fileName));
+                        const fileDoc = ctx.getTextDocument(ctx.uriToFileName(_target.fileName));
                         if (fileDoc) {
                             const start = fileDoc.positionAt(_target.textSpan.start);
                             const end = fileDoc.positionAt(_target.textSpan.start + _target.textSpan.length);

package/lib/utils/transforms.js

@@ -8,7 +8,7 @@ function entriesToLocations(entries, ctx) {
 }
 exports.entriesToLocations = entriesToLocations;
 function entryToLocation(entry, ctx) {
-    const entryUri = ctx.env.fileNameToUri(entry.fileName);
+    const entryUri = ctx.fileNameToUri(entry.fileName);
     const doc = ctx.getTextDocument(entryUri);
     if (!doc)
         return;
@@ -23,7 +23,7 @@ exports.entryToLocation = entryToLocation;
 function entriesToLocationLinks(entries, ctx) {
     const locations = [];
     for (const entry of entries) {
-        const entryUri = ctx.env.fileNameToUri(entry.fileName);
+        const entryUri = ctx.fileNameToUri(entry.fileName);
         const doc = ctx.getTextDocument(entryUri);
         if (!doc)
             continue;
@@ -59,7 +59,7 @@ function boundSpanToLocationLinks(info, originalDoc, ctx) {
         end: originalDoc.positionAt(info.textSpan.start + info.textSpan.length),
     };
     for (const entry of info.definitions) {
-        const entryUri = ctx.env.fileNameToUri(entry.fileName);
+        const entryUri = ctx.fileNameToUri(entry.fileName);
         const doc = ctx.getTextDocument(entryUri);
         if (!doc)
             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.25",
+	"version": "0.0.27",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -37,13 +37,13 @@
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "next",
-		"@volar/typescript": "next"
+		"@volar/language-service": "~2.0",
+		"@volar/typescript": "~2.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "d8838f4288d4836a8829a458855f557d58732963"
+	"gitHead": "bc83e2d244f494e30f6f789b766e54eeaa0e7a01"
 }

package/lib/protocol.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=protocol.d.ts.map

package/lib/protocol.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=protocol.js.map