volar-service-typescript 0.0.46 → 0.0.48

package/lib/configs/getFormatCodeSettings.d.ts

@@ -1,5 +1,5 @@
-import type { FormattingOptions, ServiceContext } from '@volar/language-service';
+import type { FormattingOptions, LanguageServiceContext } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare function getFormatCodeSettings(ctx: ServiceContext, document: TextDocument, options: FormattingOptions | undefined): Promise<ts.FormatCodeSettings>;
+export declare function getFormatCodeSettings(ctx: LanguageServiceContext, document: TextDocument, options: FormattingOptions | undefined): Promise<ts.FormatCodeSettings>;
 //# sourceMappingURL=getFormatCodeSettings.d.ts.map

package/lib/configs/getUserPreferences.d.ts

@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-import type { ServiceContext } from '@volar/language-service';
-export declare function getUserPreferences(ctx: ServiceContext, document: TextDocument): Promise<ts.UserPreferences>;
+import type { LanguageServiceContext } from '@volar/language-service';
+export declare function getUserPreferences(ctx: LanguageServiceContext, document: TextDocument): Promise<ts.UserPreferences>;
 //# sourceMappingURL=getUserPreferences.d.ts.map

package/lib/configs/getUserPreferences.js

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserPreferences = void 0;
 const path = require("path-browserify");
 const shared_1 = require("../shared");
+const vscode_uri_1 = require("vscode-uri");
 async function getUserPreferences(ctx, document) {
     let currentDirectory = '';
     if (ctx.language.typescript) {
         currentDirectory = ctx.language.typescript.languageServiceHost.getCurrentDirectory();
     }
-    const documentUri = ctx.decodeEmbeddedDocumentUri(document.uri)?.[0] ?? document.uri;
+    const uri = vscode_uri_1.URI.parse(document.uri);
+    const documentUri = ctx.decodeEmbeddedDocumentUri(uri)?.[0] ?? uri;
     const config = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document)) ?? {};
     const preferencesConfig = config?.preferences ?? {};
     const preferences = {
@@ -17,7 +19,7 @@ async function getUserPreferences(ctx, document) {
         importModuleSpecifierPreference: getImportModuleSpecifierPreference(preferencesConfig),
         importModuleSpecifierEnding: getImportModuleSpecifierEndingPreference(preferencesConfig),
         jsxAttributeCompletionStyle: getJsxAttributeCompletionStyle(preferencesConfig),
-        allowTextChangesInNewFiles: documentUri.startsWith('file://'),
+        allowTextChangesInNewFiles: documentUri.scheme === 'file',
         providePrefixAndSuffixTextForRename: (preferencesConfig.renameShorthandProperties ?? true) === false ? false : (preferencesConfig.useAliasesForRenames ?? true),
         allowRenameOfImportPath: true,
         includeAutomaticOptionalChainCompletions: config.suggest?.includeAutomaticOptionalChainCompletions ?? true,

package/lib/plugins/directiveComment.js

@@ -22,7 +22,11 @@ const directives = [
 function create() {
     return {
         name: 'typescript-directive-comment',
-        triggerCharacters: ['@'],
+        capabilities: {
+            completionProvider: {
+                triggerCharacters: ['@'],
+            },
+        },
         create() {
             return {
                 provideCompletionItems(document, position) {

package/lib/plugins/docCommentTemplate.js

@@ -10,7 +10,11 @@ const defaultJsDoc = `/**\n * $0\n */`;
 function create(ts) {
     return {
         name: 'typescript-doc-comment-template',
-        triggerCharacters: ['*'],
+        capabilities: {
+            completionProvider: {
+                triggerCharacters: ['*'],
+            },
+        },
         create() {
             return {
                 provideCompletionItems(document, position) {

package/lib/plugins/semantic.d.ts

@@ -1,11 +1,12 @@
-import type { ProviderResult, ServiceContext, LanguageServicePlugin } from '@volar/language-service';
+import type { ProviderResult, LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
+import { URI } from 'vscode-uri';
 export interface Provide {
     'typescript/languageService': () => ts.LanguageService;
     'typescript/languageServiceHost': () => ts.LanguageServiceHost;
-    'typescript/documentFileName': (uri: string) => string;
-    'typescript/documentUri': (fileName: string) => string;
+    'typescript/documentFileName': (uri: URI) => string;
+    'typescript/documentUri': (fileName: string) => URI;
 }
 export interface CompletionItemData {
     uri: string;
@@ -19,7 +20,7 @@ export interface CompletionItemData {
     };
 }
 export declare function create(ts: typeof import('typescript'), { isValidationEnabled, isSuggestionsEnabled, }?: {
-    isValidationEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-    isSuggestionsEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
+    isValidationEnabled?(document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
+    isSuggestionsEnabled?(document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
 }): LanguageServicePlugin;
 //# sourceMappingURL=semantic.d.ts.map

package/lib/plugins/semantic.js

@@ -12,6 +12,7 @@ const snippetForFunctionCall_1 = require("../utils/snippetForFunctionCall");
 const codeActions = require("../semanticFeatures/codeAction");
 const codeActionResolve = require("../semanticFeatures/codeActionResolve");
 const semanticTokens = require("../semanticFeatures/semanticTokens");
+const vscode_uri_1 = require("vscode-uri");
 const documentRegistries = [];
 function getDocumentRegistry(ts, useCaseSensitiveFileNames, currentDirectory) {
     let documentRegistry = documentRegistries.find(item => item[0] === useCaseSensitiveFileNames && item[1] === currentDirectory)?.[2];
@@ -28,15 +29,93 @@ function create(ts, { isValidationEnabled = async (document, context) => {
 }, } = {}) {
     return {
         name: 'typescript-semantic',
-        triggerCharacters: getBasicTriggerCharacters(ts.version),
-        signatureHelpTriggerCharacters: ['(', ',', '<'],
-        signatureHelpRetriggerCharacters: [')'],
+        capabilities: {
+            completionProvider: {
+                triggerCharacters: getBasicTriggerCharacters(ts.version),
+                resolveProvider: true,
+            },
+            renameProvider: {
+                prepareProvider: true,
+            },
+            codeActionProvider: {
+                codeActionKinds: [
+                    '',
+                    'quickfix',
+                    'refactor',
+                    'refactor.extract',
+                    'refactor.inline',
+                    'refactor.rewrite',
+                    'source',
+                    'source.fixAll',
+                    'source.organizeImports',
+                ],
+                resolveProvider: true,
+            },
+            inlayHintProvider: {},
+            callHierarchyProvider: true,
+            definitionProvider: true,
+            typeDefinitionProvider: true,
+            diagnosticProvider: true,
+            hoverProvider: true,
+            implementationProvider: true,
+            referencesProvider: true,
+            // fileReferencesProvider: true,
+            documentHighlightProvider: true,
+            semanticTokensProvider: {
+                // https://code.visualstudio.com/api/language-extensions/semantic-highlight-guide#standard-token-types-and-modifiers
+                legend: {
+                    tokenTypes: [
+                        'namespace',
+                        'class',
+                        'enum',
+                        'interface',
+                        'struct',
+                        'typeParameter',
+                        'type',
+                        'parameter',
+                        'variable',
+                        'property',
+                        'enumMember',
+                        'decorator',
+                        'event',
+                        'function',
+                        'method',
+                        'macro',
+                        'label',
+                        'comment',
+                        'string',
+                        'keyword',
+                        'number',
+                        'regexp',
+                        'operator',
+                    ],
+                    tokenModifiers: [
+                        'declaration',
+                        'definition',
+                        'readonly',
+                        'static',
+                        'deprecated',
+                        'abstract',
+                        'async',
+                        'modification',
+                        'documentation',
+                        'defaultLibrary',
+                    ],
+                },
+            },
+            workspaceSymbolProvider: true,
+            // fileRenameEdits: true,
+            selectionRangeProvider: true,
+            signatureHelpProvider: {
+                triggerCharacters: ['(', ',', '<'],
+                retriggerCharacters: [')'],
+            },
+        },
         create(context) {
             if (!context.language.typescript) {
                 return {};
             }
-            const { projectHost, languageServiceHost } = context.language.typescript;
-            const sys = projectHost;
+            const { sys, languageServiceHost, asFileName, asScriptId } = context.language.typescript;
             const created = tsWithImportCache.createLanguageService(ts, sys, languageServiceHost, proxiedHost => ts.createLanguageService(proxiedHost, getDocumentRegistry(ts, sys.useCaseSensitiveFileNames, languageServiceHost.getCurrentDirectory())));
             const { languageService } = created;
             if (created.setPreferences && context.env.getConfiguration) {
@@ -61,7 +140,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         updateSourceScriptFileNames();
                     }
                     for (const change of params.changes) {
-                        const fileName = context.env.typescript.uriToFileName(change.uri);
+                        const fileName = asFileName(vscode_uri_1.URI.parse(change.uri));
                         if (sourceScriptNames.has(normalizeFileName(fileName))) {
                             created.projectUpdated?.(languageServiceHost.getCurrentDirectory());
                         }
@@ -70,7 +149,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 function updateSourceScriptFileNames() {
                     sourceScriptNames.clear();
                     for (const fileName of languageServiceHost.getScriptFileNames()) {
-                        const uri = context.env.typescript.fileNameToUri(fileName);
+                        const uri = asScriptId(fileName);
                         const sourceScript = context.language.scripts.get(uri);
                         if (sourceScript?.generated) {
                             const tsCode = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
@@ -93,10 +172,10 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     if (virtualScript) {
                         return virtualScript.fileName;
                     }
-                    return context.env.typescript.uriToFileName(uri);
+                    return asFileName(uri);
                 },
                 fileNameToUri(fileName) {
-                    const uri = context.env.typescript.fileNameToUri(fileName);
+                    const uri = asScriptId(fileName);
                     const sourceScript = context.language.scripts.get(uri);
                     const extraServiceScript = context.language.typescript.getExtraServiceScript(fileName);
                     let virtualCode = extraServiceScript?.code;
@@ -153,7 +232,8 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     return undefined;
                 },
                 async provideCompletionItems(document, position, completeContext, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     if (!await isSuggestionsEnabled(document, context)) {
@@ -161,7 +241,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     }
                     return await worker(token, async () => {
                         const preferences = await (0, getUserPreferences_1.getUserPreferences)(ctx, document);
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const info = (0, shared_1.safeCall)(() => ctx.languageService.getCompletionsAtPosition(fileName, offset, {
                             ...preferences,
@@ -190,7 +270,8 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                             return item;
                         }
                         const { fileName, offset } = data;
-                        const document = ctx.getTextDocument(data.uri);
+                        const uri = vscode_uri_1.URI.parse(data.uri);
+                        const document = ctx.getTextDocument(uri);
                         const [formatOptions, preferences] = await Promise.all([
                             (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, formattingOptions),
                             (0, getUserPreferences_1.getUserPreferences)(ctx, document),
@@ -262,11 +343,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     }) ?? item;
                 },
                 provideRenameRange(document, position, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const renameInfo = (0, shared_1.safeCall)(() => ctx.languageService.getRenameInfo(fileName, offset, renameInfoOptions));
                         if (!renameInfo) {
@@ -279,11 +361,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideRenameEdits(document, position, newName, token) {
-                    if (!isSemanticDocument(document, true)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document, true)) {
                         return;
                     }
                     return worker(token, async () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const renameInfo = (0, shared_1.safeCall)(() => ctx.languageService.getRenameInfo(fileName, offset, renameInfoOptions));
                         if (!renameInfo?.canRename) {
@@ -319,19 +402,20 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                             }
                             edits.documentChanges.push({
                                 kind: 'rename',
-                                oldUri: ctx.fileNameToUri(fileToRename),
-                                newUri: ctx.fileNameToUri(newFilePath),
+                                oldUri: ctx.fileNameToUri(fileToRename).toString(),
+                                newUri: ctx.fileNameToUri(newFilePath).toString(),
                             });
                             return edits;
                         }
                     });
                 },
                 provideCodeActions(document, range, context, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        return getCodeActions(document, range, context, formattingOptions);
+                        return getCodeActions(uri, document, range, context, formattingOptions);
                     });
                 },
                 async resolveCodeAction(codeAction, token) {
@@ -340,12 +424,13 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     }) ?? codeAction;
                 },
                 provideInlayHints(document, range, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, async () => {
                         const preferences = await (0, getUserPreferences_1.getUserPreferences)(ctx, document);
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const start = document.offsetAt(range.start);
                         const end = document.offsetAt(range.end);
                         const inlayHints = (0, shared_1.safeCall)(() => 'provideInlayHints' in ctx.languageService
@@ -358,11 +443,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideCallHierarchyItems(document, position, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const calls = (0, shared_1.safeCall)(() => ctx.languageService.prepareCallHierarchy(fileName, offset));
                         if (!calls) {
@@ -374,8 +460,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 },
                 async provideCallHierarchyIncomingCalls(item, token) {
                     return await worker(token, () => {
-                        const document = ctx.getTextDocument(item.uri);
-                        const fileName = ctx.uriToFileName(item.uri);
+                        const uri = vscode_uri_1.URI.parse(item.uri);
+                        const document = ctx.getTextDocument(uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(item.selectionRange.start);
                         const calls = (0, shared_1.safeCall)(() => ctx.languageService.provideCallHierarchyIncomingCalls(fileName, offset));
                         if (!calls) {
@@ -387,8 +474,9 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 },
                 async provideCallHierarchyOutgoingCalls(item, token) {
                     return await worker(token, () => {
-                        const document = ctx.getTextDocument(item.uri);
-                        const fileName = ctx.uriToFileName(item.uri);
+                        const uri = vscode_uri_1.URI.parse(item.uri);
+                        const document = ctx.getTextDocument(uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(item.selectionRange.start);
                         const calls = (0, shared_1.safeCall)(() => ctx.languageService.provideCallHierarchyOutgoingCalls(fileName, offset));
                         if (!calls) {
@@ -399,11 +487,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     }) ?? [];
                 },
                 provideDefinition(document, position, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const info = (0, shared_1.safeCall)(() => ctx.languageService.getDefinitionAndBoundSpan(fileName, offset));
                         if (!info) {
@@ -413,11 +502,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideTypeDefinition(document, position, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const entries = (0, shared_1.safeCall)(() => ctx.languageService.getTypeDefinitionAtPosition(fileName, offset));
                         if (!entries) {
@@ -433,11 +523,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     return provideDiagnosticsWorker(document, token, 'semantic');
                 },
                 provideHover(document, position, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const info = (0, shared_1.safeCall)(() => ctx.languageService.getQuickInfoAtPosition(fileName, offset));
                         if (!info) {
@@ -447,11 +538,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideImplementation(document, position, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const entries = (0, shared_1.safeCall)(() => ctx.languageService.getImplementationAtPosition(fileName, offset));
                         if (!entries) {
@@ -461,11 +553,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideReferences(document, position, referenceContext, token) {
-                    if (!isSemanticDocument(document, true)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document, true)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const references = (0, shared_1.safeCall)(() => ctx.languageService.findReferences(fileName, offset));
                         if (!references) {
@@ -490,11 +583,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideFileReferences(document, token) {
-                    if (!isSemanticDocument(document, true)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document, true)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const entries = (0, shared_1.safeCall)(() => ctx.languageService.getFileReferences(fileName));
                         if (!entries) {
                             return [];
@@ -503,11 +597,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideDocumentHighlights(document, position, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const highlights = (0, shared_1.safeCall)(() => ctx.languageService.getDocumentHighlights(fileName, offset, [fileName]));
                         if (!highlights) {
@@ -523,11 +618,12 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideDocumentSemanticTokens(document, range, legend, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
-                        return getDocumentSemanticTokens(document, range, legend);
+                        return getDocumentSemanticTokens(uri, document, range, legend);
                     });
                 },
                 provideWorkspaceSymbols(query, token) {
@@ -559,13 +655,14 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideSelectionRanges(document, positions, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
                         return positions
                             .map(position => {
-                            const fileName = ctx.uriToFileName(document.uri);
+                            const fileName = ctx.uriToFileName(uri);
                             const offset = document.offsetAt(position);
                             const range = (0, shared_1.safeCall)(() => ctx.languageService.getSmartSelectionRange(fileName, offset));
                             if (!range) {
@@ -577,7 +674,8 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                     });
                 },
                 provideSignatureHelp(document, position, context, token) {
-                    if (!isSemanticDocument(document)) {
+                    const uri = vscode_uri_1.URI.parse(document.uri);
+                    if (!isSemanticDocument(uri, document)) {
                         return;
                     }
                     return worker(token, () => {
@@ -599,7 +697,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                                 triggerCharacter: context.triggerCharacter,
                             };
                         }
-                        const fileName = ctx.uriToFileName(document.uri);
+                        const fileName = ctx.uriToFileName(uri);
                         const offset = document.offsetAt(position);
                         const helpItems = (0, shared_1.safeCall)(() => ctx.languageService.getSignatureHelpItems(fileName, offset, options));
                         if (!helpItems) {
@@ -635,14 +733,15 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 },
             };
             async function provideDiagnosticsWorker(document, token, mode) {
-                if (!isSemanticDocument(document)) {
+                const uri = vscode_uri_1.URI.parse(document.uri);
+                if (!isSemanticDocument(uri, document)) {
                     return;
                 }
                 if (!await isValidationEnabled(document, context)) {
                     return;
                 }
                 return await worker(token, () => {
-                    const fileName = ctx.uriToFileName(document.uri);
+                    const fileName = ctx.uriToFileName(uri);
                     const program = ctx.languageService.getProgram();
                     const sourceFile = program?.getSourceFile(fileName);
                     if (!program || !sourceFile) {
@@ -675,8 +774,8 @@ function create(ts, { isValidationEnabled = async (document, context) => {
             function getEmitDeclarations(compilerOptions) {
                 return !!(compilerOptions.declaration || compilerOptions.composite);
             }
-            function isSemanticDocument(document, withJson = false) {
-                const virtualScript = getVirtualScriptByUri(document.uri);
+            function isSemanticDocument(uri, document, withJson = false) {
+                const virtualScript = getVirtualScriptByUri(uri);
                 if (virtualScript) {
                     return true;
                 }
@@ -688,7 +787,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
             async function worker(token, fn) {
                 let result;
                 let oldSysVersion;
-                let newSysVersion = await projectHost.syncSystem?.();
+                let newSysVersion = await sys.sync?.();
                 do {
                     oldSysVersion = newSysVersion;
                     try {
@@ -698,7 +797,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                         console.warn(err);
                         break;
                     }
-                    newSysVersion = await projectHost.syncSystem?.();
+                    newSysVersion = await sys.sync?.();
                 } while (newSysVersion !== oldSysVersion && !token.isCancellationRequested);
                 return result;
             }
@@ -708,7 +807,7 @@ function create(ts, { isValidationEnabled = async (document, context) => {
                 const virtualCode = decoded && sourceScript?.generated?.embeddedCodes.get(decoded[1]);
                 if (virtualCode && sourceScript?.generated?.languagePlugin.typescript) {
                     const { getServiceScript, getExtraServiceScripts } = sourceScript.generated?.languagePlugin.typescript;
-                    const sourceFileName = context.env.typescript.uriToFileName(sourceScript.id);
+                    const sourceFileName = asFileName(sourceScript.id);
                     if (getServiceScript(sourceScript.generated.root)?.code === virtualCode) {
                         return {
                             fileName: sourceFileName,

package/lib/plugins/syntactic.d.ts

@@ -1,12 +1,12 @@
-import type { ProviderResult, ServiceContext, LanguageServicePlugin } from '@volar/language-service';
+import type { ProviderResult, LanguageServiceContext, LanguageServicePlugin } from '@volar/language-service';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type * as ts from 'typescript';
 export declare function getLanguageServiceByDocument(ts: typeof import('typescript'), document: TextDocument): {
     languageService: ts.LanguageService;
     fileName: string;
 };
-export declare function create(ts: typeof import('typescript'), { isFormattingEnabled, isAutoClosingTagsEnabled, }?: {
-    isFormattingEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
-    isAutoClosingTagsEnabled?(document: TextDocument, context: ServiceContext): ProviderResult<boolean>;
+export declare function create(ts: typeof import('typescript'), { isFormattingEnabled, }?: {
+    isFormattingEnabled?(document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
+    isAutoClosingTagsEnabled?(document: TextDocument, context: LanguageServiceContext): ProviderResult<boolean>;
 }): LanguageServicePlugin;
 //# sourceMappingURL=syntactic.d.ts.map

package/lib/plugins/syntactic.js

@@ -32,23 +32,32 @@ function getLanguageServiceByDocument(ts, document) {
 exports.getLanguageServiceByDocument = getLanguageServiceByDocument;
 function create(ts, { isFormattingEnabled = async (document, context) => {
     return await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.format.enable') ?? true;
-}, isAutoClosingTagsEnabled = async (document, context) => {
-    return await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.autoClosingTags') ?? true;
 }, } = {}) {
     return {
         name: 'typescript-syntactic',
-        // https://github.com/microsoft/vscode/blob/ce119308e8fd4cd3f992d42b297588e7abe33a0c/extensions/typescript-language-features/src/languageFeatures/formatting.ts#L99
-        autoFormatTriggerCharacters: [';', '}', '\n'],
+        capabilities: {
+            autoInsertionProvider: {
+                triggerCharacters: ['>', '>'],
+                configurationSections: ['javascript.autoClosingTags', 'typescript.autoClosingTags'],
+            },
+            foldingRangeProvider: true,
+            documentSymbolProvider: true,
+            documentFormattingProvider: true,
+            documentOnTypeFormattingProvider: {
+                // https://github.com/microsoft/vscode/blob/ce119308e8fd4cd3f992d42b297588e7abe33a0c/extensions/typescript-language-features/src/languageFeatures/formatting.ts#L99
+                triggerCharacters: [';', '}', '\n'],
+            },
+        },
         create(context) {
             return {
-                async provideAutoInsertionEdit(document, selection, change) {
+                async provideAutoInsertSnippet(document, selection, change) {
                     // selection must at end of change
                     if (document.offsetAt(selection) !== change.rangeOffset + change.text.length) {
                         return;
                     }
                     if ((document.languageId === 'javascriptreact' || document.languageId === 'typescriptreact')
                         && change.text.endsWith('>')
-                        && await isAutoClosingTagsEnabled(document, context)) {
+                        && (await context.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.autoClosingTags') ?? true)) {
                         const { languageService, fileName } = getLanguageServiceByDocument(ts, document);
                         const close = languageService.getJsxClosingTagAtPosition(fileName, document.offsetAt(selection));
                         if (close) {

package/lib/semanticFeatures/codeAction.d.ts

@@ -1,6 +1,7 @@
 import type * as vscode from '@volar/language-service';
-import type { SharedContext } from './types';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { URI } from 'vscode-uri';
+import type { SharedContext } from './types';
 export interface FixAllData {
     type: 'fixAll';
     uri: string;
@@ -24,5 +25,5 @@ export interface OrganizeImportsData {
     fileName: string;
 }
 export type Data = FixAllData | RefactorData | OrganizeImportsData;
-export declare function register(ctx: SharedContext): (document: TextDocument, range: vscode.Range, context: vscode.CodeActionContext, formattingOptions: vscode.FormattingOptions | undefined) => Promise<vscode.CodeAction[]>;
+export declare function register(ctx: SharedContext): (uri: URI, document: TextDocument, range: vscode.Range, context: vscode.CodeActionContext, formattingOptions: vscode.FormattingOptions | undefined) => Promise<vscode.CodeAction[]>;
 //# sourceMappingURL=codeAction.d.ts.map

package/lib/semanticFeatures/codeAction.js

@@ -5,8 +5,8 @@ const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const getUserPreferences_1 = require("../configs/getUserPreferences");
 const shared_1 = require("../shared");
 const fixNames = require("../utils/fixNames");
-const codeActionResolve_1 = require("./codeActionResolve");
 const lspConverters_1 = require("../utils/lspConverters");
+const codeActionResolve_1 = require("./codeActionResolve");
 const renameCommandRefactors = new Set([
     'refactor.rewrite.property.generateAccessors',
     'refactor.extract.type',
@@ -30,12 +30,12 @@ function register(ctx) {
         resolveCommandSupport = true;
         resolveEditSupport = true;
     }
-    return async (document, range, context, formattingOptions) => {
+    return async (uri, document, range, context, formattingOptions) => {
         const [formatOptions, preferences] = await Promise.all([
             (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, formattingOptions),
             (0, getUserPreferences_1.getUserPreferences)(ctx, document),
         ]);
-        const fileName = ctx.uriToFileName(document.uri);
+        const fileName = ctx.uriToFileName(uri);
         const start = document.offsetAt(range.start);
         const end = document.offsetAt(range.end);
         let result = [];

package/lib/semanticFeatures/codeActionResolve.js

@@ -5,10 +5,11 @@ const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
 const getUserPreferences_1 = require("../configs/getUserPreferences");
 const shared_1 = require("../shared");
 const lspConverters_1 = require("../utils/lspConverters");
+const vscode_uri_1 = require("vscode-uri");
 function register(ctx) {
     return async (codeAction, formattingOptions) => {
         const data = codeAction.data;
-        const document = ctx.getTextDocument(data.uri);
+        const document = ctx.getTextDocument(vscode_uri_1.URI.parse(data.uri));
         const [formatOptions, preferences] = await Promise.all([
             (0, getFormatCodeSettings_1.getFormatCodeSettings)(ctx, document, formattingOptions),
             (0, getUserPreferences_1.getUserPreferences)(ctx, document),

package/lib/semanticFeatures/semanticTokens.d.ts

@@ -1,5 +1,6 @@
 import type * as vscode from '@volar/language-service';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
 import type { SharedContext } from './types';
-export declare function register(ts: typeof import('typescript'), ctx: SharedContext): (document: TextDocument, range: vscode.Range, legend: vscode.SemanticTokensLegend) => [number, number, number, number, number][] | undefined;
+import type { URI } from 'vscode-uri';
+export declare function register(ts: typeof import('typescript'), ctx: SharedContext): (uri: URI, document: TextDocument, range: vscode.Range, legend: vscode.SemanticTokensLegend) => [number, number, number, number, number][] | undefined;
 //# sourceMappingURL=semanticTokens.d.ts.map

package/lib/semanticFeatures/semanticTokens.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
 const shared_1 = require("../shared");
 function register(ts, ctx) {
-    return (document, range, legend) => {
-        const fileName = ctx.uriToFileName(document.uri);
+    return (uri, document, range, legend) => {
+        const fileName = ctx.uriToFileName(uri);
         const start = range ? document.offsetAt(range.start) : 0;
         const length = range ? (document.offsetAt(range.end) - start) : document.getText().length;
         if (ctx.language.typescript?.languageServiceHost.getCancellationToken?.().isCancellationRequested()) {

package/lib/semanticFeatures/types.d.ts

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

package/lib/utils/lspConverters.d.ts

@@ -1,18 +1,19 @@
 import type * as vscode from '@volar/language-service';
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
+import type { URI } from 'vscode-uri';
 import type { SharedContext } from '../semanticFeatures/types';
-export declare function convertDiagnostic(diag: ts.Diagnostic, document: TextDocument, fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): vscode.Diagnostic | undefined;
-export declare function applyCompletionEntryDetails(ts: typeof import('typescript'), item: vscode.CompletionItem, data: ts.CompletionEntryDetails, document: TextDocument, fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): void;
+export declare function convertDiagnostic(diag: ts.Diagnostic, document: TextDocument, fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): vscode.Diagnostic | undefined;
+export declare function applyCompletionEntryDetails(ts: typeof import('typescript'), item: vscode.CompletionItem, data: ts.CompletionEntryDetails, document: TextDocument, fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): void;
 export declare function convertCompletionInfo<T>(ts: typeof import('typescript'), completionContext: ts.CompletionInfo, document: TextDocument, position: vscode.Position, createData: (tsEntry: ts.CompletionEntry) => T): vscode.CompletionList;
 export declare function getLineText(document: TextDocument, line: number): string;
 export declare function convertNavigateToItem(item: ts.NavigateToItem, document: TextDocument): vscode.WorkspaceSymbol;
 export declare function convertInlayHint(hint: ts.InlayHint, document: TextDocument): vscode.InlayHint;
 export declare function convertHighlightSpan(span: ts.HighlightSpan, document: TextDocument): vscode.DocumentHighlight;
 export declare function convertSelectionRange(range: ts.SelectionRange, document: TextDocument): vscode.SelectionRange;
-export declare function convertFileTextChanges(changes: readonly ts.FileTextChanges[], fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): vscode.WorkspaceEdit;
-export declare function convertRenameLocations(newText: string, locations: readonly ts.RenameLocation[], fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): vscode.WorkspaceEdit;
-export declare function convertQuickInfo(ts: typeof import('typescript'), info: ts.QuickInfo, document: TextDocument, fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): vscode.Hover;
+export declare function convertFileTextChanges(changes: readonly ts.FileTextChanges[], fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): vscode.WorkspaceEdit;
+export declare function convertRenameLocations(newText: string, locations: readonly ts.RenameLocation[], fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): vscode.WorkspaceEdit;
+export declare function convertQuickInfo(ts: typeof import('typescript'), info: ts.QuickInfo, document: TextDocument, fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): vscode.Hover;
 export declare function convertNavTree(item: ts.NavigationTree, document: TextDocument): vscode.DocumentSymbol[];
 export declare function convertOutliningSpan(outliningSpan: ts.OutliningSpan, document: TextDocument): vscode.FoldingRange;
 export declare function convertOutliningSpanKind(kind: ts.OutliningSpanKind): vscode.FoldingRangeKind | undefined;

package/lib/utils/lspConverters.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertTextSpan = exports.convertDocumentSpantoLocationLink = exports.convertDefinitionInfoAndBoundSpan = exports.convertDocumentSpanToLocation = exports.convertCallHierarchyItem = exports.convertCallHierarchyOutgoingCall = exports.convertCallHierarchyIncomingCall = exports.convertTextChange = exports.convertOutliningSpanKind = exports.convertOutliningSpan = exports.convertNavTree = exports.convertQuickInfo = exports.convertRenameLocations = exports.convertFileTextChanges = exports.convertSelectionRange = exports.convertHighlightSpan = exports.convertInlayHint = exports.convertNavigateToItem = exports.getLineText = exports.convertCompletionInfo = exports.applyCompletionEntryDetails = exports.convertDiagnostic = void 0;
 const path = require("path-browserify");
+const semver = require("semver");
 const PConst = require("../protocol.const");
 const shared_1 = require("../shared");
 const modifiers_1 = require("../utils/modifiers");
 const previewer = require("../utils/previewer");
 const typeConverters = require("../utils/typeConverters");
-const semver = require("semver");
 // diagnostics
 function convertDiagnostic(diag, document, fileNameToUri, getTextDocument) {
     if (diag.start === undefined) {
@@ -510,10 +510,10 @@ function convertFileTextChanges(changes, fileNameToUri, getTextDocument) {
         }
         const uri = fileNameToUri(change.fileName);
         if (change.isNewFile) {
-            workspaceEdit.documentChanges.push({ kind: 'create', uri });
+            workspaceEdit.documentChanges.push({ kind: 'create', uri: uri.toString() });
             workspaceEdit.documentChanges.push({
                 textDocument: {
-                    uri,
+                    uri: uri.toString(),
                     version: null, // fix https://github.com/johnsoncodehk/volar/issues/2025
                 },
                 edits: change.textChanges.map(edit => ({
@@ -529,7 +529,7 @@ function convertFileTextChanges(changes, fileNameToUri, getTextDocument) {
             const doc = getTextDocument(uri);
             workspaceEdit.documentChanges.push({
                 textDocument: {
-                    uri,
+                    uri: uri.toString(),
                     version: null, // fix https://github.com/johnsoncodehk/volar/issues/2025
                 },
                 edits: change.textChanges.map(edit => convertTextChange(edit, doc)),
@@ -548,8 +548,8 @@ function convertRenameLocations(newText, locations, fileNameToUri, getTextDocume
         }
         const uri = fileNameToUri(location.fileName);
         const doc = getTextDocument(uri);
-        if (!workspaceEdit.changes[uri]) {
-            workspaceEdit.changes[uri] = [];
+        if (!workspaceEdit.changes[uri.toString()]) {
+            workspaceEdit.changes[uri.toString()] = [];
         }
         let _newText = newText;
         if (location.prefixText) {
@@ -558,7 +558,7 @@ function convertRenameLocations(newText, locations, fileNameToUri, getTextDocume
         if (location.suffixText) {
             _newText = _newText + location.suffixText;
         }
-        workspaceEdit.changes[uri].push({
+        workspaceEdit.changes[uri.toString()].push({
             newText: _newText,
             range: convertTextSpan(location.textSpan, doc),
         });
@@ -736,7 +736,7 @@ function convertCallHierarchyItem(item, ctx) {
         kind: typeConverters.SymbolKind.fromProtocolScriptElementKind(item.kind),
         name,
         detail,
-        uri,
+        uri: uri.toString(),
         range: convertTextSpan(item.span, document),
         selectionRange: convertTextSpan(item.selectionSpan, document),
     };
@@ -756,7 +756,7 @@ function convertDocumentSpanToLocation(documentSpan, ctx) {
     const document = ctx.getTextDocument(uri);
     const range = convertTextSpan(documentSpan.textSpan, document);
     return {
-        uri,
+        uri: uri.toString(),
         range,
     };
 }
@@ -788,7 +788,7 @@ function convertDocumentSpantoLocationLink(documentSpan, ctx) {
         ? convertTextSpan(documentSpan.originalTextSpan, document)
         : undefined;
     return {
-        targetUri,
+        targetUri: targetUri.toString(),
         targetRange,
         targetSelectionRange,
         originSelectionRange,

package/lib/utils/previewer.d.ts

@@ -1,7 +1,8 @@
 import type * as ts from 'typescript';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare function plainWithLinks(parts: readonly ts.server.protocol.SymbolDisplayPart[] | string, fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): string;
-export declare function tagsMarkdownPreview(tags: readonly ts.JSDocTagInfo[], fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): string;
-export declare function markdownDocumentation(documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined, tags: ts.JSDocTagInfo[] | undefined, fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): string;
-export declare function addMarkdownDocumentation(out: string, documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined, tags: ts.JSDocTagInfo[] | undefined, fileNameToUri: (fileName: string) => string, getTextDocument: (uri: string) => TextDocument | undefined): string;
+import type { URI } from 'vscode-uri';
+export declare function plainWithLinks(parts: readonly ts.server.protocol.SymbolDisplayPart[] | string, fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): string;
+export declare function tagsMarkdownPreview(tags: readonly ts.JSDocTagInfo[], fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): string;
+export declare function markdownDocumentation(documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined, tags: ts.JSDocTagInfo[] | undefined, fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): string;
+export declare function addMarkdownDocumentation(out: string, documentation: ts.server.protocol.SymbolDisplayPart[] | string | undefined, tags: ts.JSDocTagInfo[] | undefined, fileNameToUri: (fileName: string) => URI, getTextDocument: (uri: URI) => TextDocument | undefined): string;
 //# sourceMappingURL=previewer.d.ts.map

package/lib/utils/typeConverters.d.ts

@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
 export declare namespace SymbolKind {
-    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 6 | 7 | 9 | 10 | 11 | 12 | 13 | 15 | 22 | 26;
+    function fromProtocolScriptElementKind(kind: ts.ScriptElementKind): 2 | 5 | 10 | 22 | 11 | 6 | 7 | 13 | 12 | 9 | 26 | 15;
 }
 //# sourceMappingURL=typeConverters.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "volar-service-typescript",
-	"version": "0.0.46",
+	"version": "0.0.48",
 	"description": "Integrate TypeScript into Volar",
 	"homepage": "https://github.com/volarjs/services/tree/master/packages/typescript",
 	"bugs": "https://github.com/volarjs/services/issues",
@@ -32,15 +32,16 @@
 		"semver": "^7.5.4",
 		"typescript-auto-import-cache": "^0.3.1",
 		"vscode-languageserver-textdocument": "^1.0.11",
-		"vscode-nls": "^5.2.0"
+		"vscode-nls": "^5.2.0",
+		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
-		"@volar/language-service": "~2.2.3"
+		"@volar/language-service": "~2.3.0-alpha.0"
 	},
 	"peerDependenciesMeta": {
 		"@volar/language-service": {
 			"optional": true
 		}
 	},
-	"gitHead": "a5bc7172ea25a43dd403a1b7c926a297f70750ec"
+	"gitHead": "6a80c92133e154907a79eefa05603f63994214c3"
 }