volar-service-typescript 0.0.2 → 0.0.4

package/out/configs/getFormatCodeSettings.d.ts

@@ -1,5 +1,5 @@
 import { SharedContext } from '../types';
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import * as vscode from 'vscode-languageserver-protocol';
+import type { FormattingOptions } from '@volar/language-service';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare function getFormatCodeSettings(ctx: SharedContext, document: TextDocument, options?: vscode.FormattingOptions): Promise<ts.FormatCodeSettings>;
+export declare function getFormatCodeSettings(ctx: SharedContext, document: TextDocument, options?: FormattingOptions): Promise<ts.FormatCodeSettings>;

package/out/index.d.ts

@@ -1,12 +1,12 @@
-import { InjectionKey, Service } from '@volar/language-service';
+import type { Service } from '@volar/language-service';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import type { TextDocument } from 'vscode-languageserver-textdocument';
-export declare const injectionKeys: {
-    typescript: InjectionKey<[], typeof import('typescript/lib/tsserverlibrary')>;
-    sourceFile: InjectionKey<[TextDocument], ts.SourceFile>;
-    languageService: InjectionKey<[TextDocument], ts.LanguageService>;
-    languageServiceHost: InjectionKey<[TextDocument], ts.LanguageServiceHost>;
-    textDocument: InjectionKey<[uri: string], TextDocument>;
-};
-declare const _default: () => Service;
+export interface Provide {
+    'typescript/typescript': () => typeof import('typescript/lib/tsserverlibrary');
+    'typescript/sourceFile': (document: TextDocument) => ts.SourceFile | undefined;
+    'typescript/languageService': (document?: TextDocument) => ts.LanguageService | undefined;
+    'typescript/languageServiceHost': (document?: TextDocument) => ts.LanguageServiceHost | undefined;
+    'typescript/textDocument': (uri: string) => TextDocument | undefined;
+}
+declare const _default: () => Service<Provide>;
 export default _default;

package/out/index.js

@@ -23,10 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.injectionKeys = void 0;
-const language_service_1 = require("@volar/language-service");
 const semver = __importStar(require("semver"));
-const vscode = __importStar(require("vscode-languageserver-protocol"));
 const shared_1 = require("./shared");
 const _callHierarchy = __importStar(require("./services/callHierarchy"));
 const codeActions = __importStar(require("./services/codeAction"));
@@ -55,13 +52,7 @@ const signatureHelp = __importStar(require("./services/signatureHelp"));
 const typeDefinitions = __importStar(require("./services/typeDefinition"));
 const workspaceSymbols = __importStar(require("./services/workspaceSymbol"));
 const tsconfig = __importStar(require("./services/tsconfig"));
-exports.injectionKeys = {
-    typescript: 'typescript/typescript',
-    sourceFile: 'typescript/sourceFile',
-    languageService: 'typescript/languageService',
-    languageServiceHost: 'typescript/languageServiceHost',
-    textDocument: 'typescript/textDocument',
-};
+;
 exports.default = () => (contextOrNull, modules) => {
     const jsDocTriggerCharacter = '*';
     const directiveCommentTriggerCharacter = '@';
@@ -151,8 +142,8 @@ exports.default = () => (contextOrNull, modules) => {
     const getFoldingRanges = foldingRanges.register(syntacticCtx);
     return {
         provide: {
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.typescript, () => ts),
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.sourceFile, document => {
+            'typescript/typescript': () => ts,
+            'typescript/sourceFile': document => {
                 if ((0, shared_1.isTsDocument)(document)) {
                     const sourceFile = getSemanticServiceSourceFile(document.uri);
                     if (sourceFile) {
@@ -161,24 +152,22 @@ exports.default = () => (contextOrNull, modules) => {
                     prepareSyntacticService(document);
                     return syntacticCtx.typescript.languageService.getProgram()?.getSourceFile(syntacticHostCtx.fileName);
                 }
-            }),
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.languageService, document => {
-                const sourceFile = getSemanticServiceSourceFile(document.uri);
-                if (sourceFile) {
+            },
+            'typescript/languageService': document => {
+                if (!document || getSemanticServiceSourceFile(document.uri)) {
                     return semanticCtx.typescript.languageService;
                 }
                 prepareSyntacticService(document);
                 return syntacticCtx.typescript.languageService;
-            }),
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.languageServiceHost, document => {
-                const sourceFile = getSemanticServiceSourceFile(document.uri);
-                if (sourceFile) {
+            },
+            'typescript/languageServiceHost': document => {
+                if (!document || getSemanticServiceSourceFile(document.uri)) {
                     return semanticCtx.typescript.languageServiceHost;
                 }
                 prepareSyntacticService(document);
                 return syntacticCtx.typescript.languageServiceHost;
-            }),
-            ...(0, language_service_1.defineProvide)(exports.injectionKeys.textDocument, semanticCtx.getTextDocument),
+            },
+            'typescript/textDocument': semanticCtx.getTextDocument,
         },
         ...triggerCharacters,
         triggerCharacters: [
@@ -206,7 +195,7 @@ exports.default = () => (contextOrNull, modules) => {
                     isIncomplete: false,
                     items: [],
                 };
-                if (!context || context.triggerKind !== vscode.CompletionTriggerKind.TriggerCharacter || (context.triggerCharacter && basicTriggerCharacters.includes(context.triggerCharacter))) {
+                if (!context || context.triggerKind !== 2 || (context.triggerCharacter && basicTriggerCharacters.includes(context.triggerCharacter))) {
                     const completeOptions = {
                         triggerCharacter: context?.triggerCharacter,
                         triggerKind: context?.triggerKind,
@@ -216,13 +205,13 @@ exports.default = () => (contextOrNull, modules) => {
                         result = basicResult;
                     }
                 }
-                if (!context || context.triggerKind !== vscode.CompletionTriggerKind.TriggerCharacter || context.triggerCharacter === jsDocTriggerCharacter) {
+                if (!context || context.triggerKind !== 2 || context.triggerCharacter === jsDocTriggerCharacter) {
                     const jsdocResult = await doJsDocComplete(document.uri, position);
                     if (jsdocResult) {
                         result.items.push(jsdocResult);
                     }
                 }
-                if (!context || context.triggerKind !== vscode.CompletionTriggerKind.TriggerCharacter || context.triggerCharacter === directiveCommentTriggerCharacter) {
+                if (!context || context.triggerKind !== 2 || context.triggerCharacter === directiveCommentTriggerCharacter) {
                     const directiveCommentResult = await doDirectiveCommentComplete(document.uri, position);
                     if (directiveCommentResult) {
                         result.items = result.items.concat(directiveCommentResult);

package/out/services/callHierarchy.d.ts

@@ -1,4 +1,4 @@
-import * as vscode from 'vscode-languageserver-protocol';
+import type * as vscode from '@volar/language-service';
 import { SharedContext } from '../types';
 export declare function register(ctx: SharedContext): {
     doPrepare: (uri: string, position: vscode.Position) => vscode.CallHierarchyItem[];

package/out/services/callHierarchy.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
-const vscode = __importStar(require("vscode-languageserver-protocol"));
 const PConst = __importStar(require("../protocol.const"));
 const modifiers_1 = require("../utils/modifiers");
 const typeConverters = __importStar(require("../utils/typeConverters"));
@@ -97,7 +96,7 @@ function register(ctx) {
         };
         const kindModifiers = item.kindModifiers ? (0, modifiers_1.parseKindModifier)(item.kindModifiers) : undefined;
         if (kindModifiers?.has(PConst.KindModifiers.deprecated)) {
-            result.tags = [vscode.SymbolTag.Deprecated];
+            result.tags = [1];
         }
         return result;
     }

package/out/services/codeAction.d.ts

@@ -1,4 +1,4 @@
-import * as vscode from 'vscode-languageserver-protocol';
+import type * as vscode from '@volar/language-service';
 import { SharedContext } from '../types';
 export interface FixAllData {
     type: 'fixAll';

package/out/services/codeAction.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
-const vscode = __importStar(require("vscode-languageserver-protocol"));
 const rename_1 = require("./rename");
 const fixNames = __importStar(require("../utils/fixNames"));
 const getFormatCodeSettings_1 = require("../configs/getFormatCodeSettings");
@@ -50,18 +49,18 @@ function register(ctx) {
         const start = document.offsetAt(range.start);
         const end = document.offsetAt(range.end);
         let result = [];
-        const onlyQuickFix = matchOnlyKind(`${vscode.CodeActionKind.QuickFix}.ts`);
+        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)) ?? [];
                 for (const codeFix of codeFixes) {
-                    result = result.concat(transformCodeFix(codeFix, [error], onlyQuickFix ?? vscode.CodeActionKind.Empty));
+                    result = result.concat(transformCodeFix(codeFix, [error], onlyQuickFix ?? ''));
                 }
             }
         }
         if (context.only) {
             for (const only of context.only) {
-                if (only.split('.')[0] === vscode.CodeActionKind.Refactor) {
+                if (only.split('.')[0] === 'refactor') {
                     const refactors = (0, shared_1.safeCall)(() => ctx.typescript.languageService.getApplicableRefactors(fileName, { pos: start, end: end }, preferences, undefined, only)) ?? [];
                     for (const refactor of refactors) {
                         result = result.concat(transformRefactor(refactor));
@@ -75,9 +74,12 @@ function register(ctx) {
                 result = result.concat(transformRefactor(refactor));
             }
         }
-        const onlySourceOrganizeImports = matchOnlyKind(`${vscode.CodeActionKind.SourceOrganizeImports}.ts`);
+        const onlySourceOrganizeImports = matchOnlyKind(`${'source.organizeImports'}.ts`);
         if (onlySourceOrganizeImports) {
-            const action = vscode.CodeAction.create('Organize Imports', onlySourceOrganizeImports);
+            const action = {
+                title: 'Organize Imports',
+                kind: onlySourceOrganizeImports,
+            };
             const data = {
                 type: 'organizeImports',
                 uri,
@@ -91,9 +93,12 @@ function register(ctx) {
             }
             result.push(action);
         }
-        const onlySourceFixAll = matchOnlyKind(`${vscode.CodeActionKind.SourceFixAll}.ts`);
+        const onlySourceFixAll = matchOnlyKind(`${'source.fixAll'}.ts`);
         if (onlySourceFixAll) {
-            const action = vscode.CodeAction.create('Fix All', onlySourceFixAll);
+            const action = {
+                title: 'Fix All',
+                kind: onlySourceFixAll,
+            };
             const data = {
                 uri,
                 type: 'fixAll',
@@ -112,9 +117,12 @@ function register(ctx) {
             }
             result.push(action);
         }
-        const onlyRemoveUnused = matchOnlyKind(`${vscode.CodeActionKind.Source}.removeUnused.ts`);
+        const onlyRemoveUnused = matchOnlyKind(`${'source'}.removeUnused.ts`);
         if (onlyRemoveUnused) {
-            const action = vscode.CodeAction.create('Remove all unused code', onlyRemoveUnused);
+            const action = {
+                title: 'Remove all unused code',
+                kind: onlyRemoveUnused,
+            };
             const data = {
                 uri,
                 type: 'fixAll',
@@ -137,9 +145,12 @@ function register(ctx) {
             }
             result.push(action);
         }
-        const onlyAddMissingImports = matchOnlyKind(`${vscode.CodeActionKind.Source}.addMissingImports.ts`);
+        const onlyAddMissingImports = matchOnlyKind(`${'source'}.addMissingImports.ts`);
         if (onlyAddMissingImports) {
-            const action = vscode.CodeAction.create('Add all missing imports', onlyAddMissingImports);
+            const action = {
+                title: 'Add all missing imports',
+                kind: onlyAddMissingImports,
+            };
             const data = {
                 uri,
                 type: 'fixAll',
@@ -186,11 +197,18 @@ function register(ctx) {
         function transformCodeFix(codeFix, diagnostics, kind) {
             const edit = (0, rename_1.fileTextChangesToWorkspaceEdit)(codeFix.changes, ctx);
             const codeActions = [];
-            const fix = vscode.CodeAction.create(codeFix.description, edit, kind);
+            const fix = {
+                title: codeFix.description,
+                kind,
+                edit,
+            };
             fix.diagnostics = diagnostics;
             codeActions.push(fix);
             if (codeFix.fixAllDescription && codeFix.fixId) {
-                const fixAll = vscode.CodeAction.create(codeFix.fixAllDescription, kind);
+                const fixAll = {
+                    title: codeFix.fixAllDescription,
+                    kind,
+                };
                 const data = {
                     uri,
                     type: 'fixAll',
@@ -211,7 +229,10 @@ function register(ctx) {
         function transformRefactor(refactor) {
             const codeActions = [];
             for (const action of refactor.actions) {
-                const codeAction = vscode.CodeAction.create(action.description, action.kind);
+                const codeAction = {
+                    title: action.description,
+                    kind: action.kind,
+                };
                 if (action.notApplicableReason) {
                     codeAction.disabled = { reason: action.notApplicableReason };
                 }

package/out/services/codeActionResolve.d.ts

@@ -1,6 +1,6 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import * as vscode from 'vscode-languageserver-protocol';
-import { TextDocument } from 'vscode-languageserver-textdocument';
+import type * as vscode from '@volar/language-service';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 import { SharedContext } from '../types';
 import { Data, FixAllData, RefactorData } from './codeAction';
 export declare function register(ctx: SharedContext): (codeAction: vscode.CodeAction) => Promise<vscode.CodeAction>;

package/out/services/completions/basic.d.ts

@@ -1,6 +1,6 @@
 import { SharedContext } from '../../types';
 import type * as ts from 'typescript/lib/tsserverlibrary';
-import * as vscode from 'vscode-languageserver-protocol';
+import type * as vscode from '@volar/language-service';
 export interface Data {
     uri: string;
     fileName: string;

package/out/services/completions/basic.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleKindModifiers = exports.register = void 0;
 const semver = __importStar(require("semver"));
-const vscode = __importStar(require("vscode-languageserver-protocol"));
 const getUserPreferences_1 = require("../../configs/getUserPreferences");
 const PConst = __importStar(require("../../protocol.const"));
 const modifiers_1 = require("../../utils/modifiers");
@@ -47,7 +46,10 @@ function register(ctx) {
         }));
         if (completionContext === undefined)
             return;
-        const wordRange = completionContext.optionalReplacementSpan ? vscode.Range.create(document.positionAt(completionContext.optionalReplacementSpan.start), document.positionAt(completionContext.optionalReplacementSpan.start + completionContext.optionalReplacementSpan.length)) : undefined;
+        const wordRange = completionContext.optionalReplacementSpan ? {
+            start: document.positionAt(completionContext.optionalReplacementSpan.start),
+            end: document.positionAt(completionContext.optionalReplacementSpan.start + completionContext.optionalReplacementSpan.length),
+        } : undefined;
         let line = document.getText({
             start: { line: position.line, character: 0 },
             end: { line: position.line + 1, character: 0 },
@@ -63,7 +65,7 @@ function register(ctx) {
             items: entries,
         };
         function toVScodeItem(tsEntry, document) {
-            const item = vscode.CompletionItem.create(tsEntry.name);
+            const item = { label: tsEntry.name };
             item.kind = convertKind(tsEntry.kind);
             if (tsEntry.source && tsEntry.hasAction) {
                 // De-prioritize auto-imports
@@ -90,7 +92,7 @@ function register(ctx) {
                 enableCallCompletions: true, // TODO: suggest.completeFunctionCalls
             });
             item.insertText = tsEntry.insertText;
-            item.insertTextFormat = isSnippet ? vscode.InsertTextFormat.Snippet : vscode.InsertTextFormat.PlainText;
+            item.insertTextFormat = isSnippet ? 2 : 1;
             item.filterText = getFilterText(tsEntry, wordRange, line, tsEntry.insertText);
             if (completionContext?.isMemberCompletion && dotAccessorContext && !isSnippet) {
                 item.filterText = dotAccessorContext.text + (item.insertText || item.label);
@@ -111,16 +113,23 @@ function register(ctx) {
             handleKindModifiers(item, tsEntry);
             if (!range && wordRange) {
                 range = {
-                    inserting: vscode.Range.create(wordRange.start, position),
+                    inserting: { start: wordRange.start, end: position },
                     replacing: wordRange,
                 };
             }
             if (range) {
-                if (vscode.Range.is(range)) {
-                    item.textEdit = vscode.TextEdit.replace(range, item.insertText || item.label);
+                if ('start' in range) {
+                    item.textEdit = {
+                        range,
+                        newText: item.insertText || item.label,
+                    };
                 }
                 else {
-                    item.textEdit = vscode.InsertReplaceEdit.create(item.insertText || item.label, range.inserting, range.replacing);
+                    item.textEdit = {
+                        insert: range.inserting,
+                        replace: range.replacing,
+                        newText: item.insertText || item.label,
+                    };
                 }
             }
             return {
@@ -147,7 +156,10 @@ function register(ctx) {
                 if (isMemberCompletion) {
                     const dotMatch = line.slice(0, position.character).match(/\??\.\s*$/) || undefined;
                     if (dotMatch) {
-                        const range = vscode.Range.create({ line: position.line, character: position.character - dotMatch[0].length }, position);
+                        const range = {
+                            start: { line: position.line, character: position.character - dotMatch[0].length },
+                            end: position,
+                        };
                         const text = document.getText(range);
                         dotAccessorContext = { range, text };
                     }
@@ -160,10 +172,22 @@ function register(ctx) {
             if (!tsEntry.replacementSpan) {
                 return;
             }
-            let replaceRange = vscode.Range.create(document.positionAt(tsEntry.replacementSpan.start), document.positionAt(tsEntry.replacementSpan.start + tsEntry.replacementSpan.length));
+            let replaceRange = {
+                start: document.positionAt(tsEntry.replacementSpan.start),
+                end: document.positionAt(tsEntry.replacementSpan.start + tsEntry.replacementSpan.length),
+            };
             // Make sure we only replace a single line at most
             if (replaceRange.start.line !== replaceRange.end.line) {
-                replaceRange = vscode.Range.create(replaceRange.start.line, replaceRange.start.character, replaceRange.start.line, document.positionAt(document.offsetAt({ line: replaceRange.start.line + 1, character: 0 }) - 1).character);
+                replaceRange = {
+                    start: {
+                        line: replaceRange.start.line,
+                        character: replaceRange.start.character,
+                    },
+                    end: {
+                        line: replaceRange.start.line,
+                        character: document.positionAt(document.offsetAt({ line: replaceRange.start.line + 1, character: 0 }) - 1).character,
+                    },
+                };
             }
             // If TS returns an explicit replacement range, we should use it for both types of completion
             return {
@@ -208,48 +232,48 @@ function register(ctx) {
             switch (kind) {
                 case PConst.Kind.primitiveType:
                 case PConst.Kind.keyword:
-                    return vscode.CompletionItemKind.Keyword;
+                    return 14;
                 case PConst.Kind.const:
                 case PConst.Kind.let:
                 case PConst.Kind.variable:
                 case PConst.Kind.localVariable:
                 case PConst.Kind.alias:
                 case PConst.Kind.parameter:
-                    return vscode.CompletionItemKind.Variable;
+                    return 6;
                 case PConst.Kind.memberVariable:
                 case PConst.Kind.memberGetAccessor:
                 case PConst.Kind.memberSetAccessor:
-                    return vscode.CompletionItemKind.Field;
+                    return 5;
                 case PConst.Kind.function:
                 case PConst.Kind.localFunction:
-                    return vscode.CompletionItemKind.Function;
+                    return 3;
                 case PConst.Kind.method:
                 case PConst.Kind.constructSignature:
                 case PConst.Kind.callSignature:
                 case PConst.Kind.indexSignature:
-                    return vscode.CompletionItemKind.Method;
+                    return 2;
                 case PConst.Kind.enum:
-                    return vscode.CompletionItemKind.Enum;
+                    return 13;
                 case PConst.Kind.enumMember:
-                    return vscode.CompletionItemKind.EnumMember;
+                    return 20;
                 case PConst.Kind.module:
                 case PConst.Kind.externalModuleName:
-                    return vscode.CompletionItemKind.Module;
+                    return 9;
                 case PConst.Kind.class:
                 case PConst.Kind.type:
-                    return vscode.CompletionItemKind.Class;
+                    return 7;
                 case PConst.Kind.interface:
-                    return vscode.CompletionItemKind.Interface;
+                    return 8;
                 case PConst.Kind.warning:
-                    return vscode.CompletionItemKind.Text;
+                    return 1;
                 case PConst.Kind.script:
-                    return vscode.CompletionItemKind.File;
+                    return 17;
                 case PConst.Kind.directory:
-                    return vscode.CompletionItemKind.Folder;
+                    return 19;
                 case PConst.Kind.string:
-                    return vscode.CompletionItemKind.Constant;
+                    return 21;
                 default:
-                    return vscode.CompletionItemKind.Property;
+                    return 10;
             }
         }
         function getCommitCharacters(entry, context) {
@@ -271,7 +295,10 @@ function register(ctx) {
                 // Only enable dot completions when the previous character is not a dot preceded by whitespace.
                 // Prevents incorrectly completing while typing spread operators.
                 if (position.character > 1) {
-                    const preText = document.getText(vscode.Range.create(position.line, 0, position.line, position.character));
+                    const preText = document.getText({
+                        start: { line: position.line, character: 0 },
+                        end: position,
+                    });
                     return preText.match(/(\s|^)\.$/ig) === null;
                 }
             }
@@ -293,10 +320,10 @@ function handleKindModifiers(item, tsEntry) {
             item.label += '?';
         }
         if (kindModifiers.has(PConst.KindModifiers.deprecated)) {
-            item.tags = [vscode.CompletionItemTag.Deprecated];
+            item.tags = [1];
         }
         if (kindModifiers.has(PConst.KindModifiers.color)) {
-            item.kind = vscode.CompletionItemKind.Color;
+            item.kind = 16;
         }
         if (tsEntry.kind === PConst.Kind.script) {
             for (const extModifier of PConst.KindModifiers.fileExtensionKindModifiers) {

package/out/services/completions/directiveComment.d.ts

@@ -1,3 +1,3 @@
-import * as vscode from 'vscode-languageserver-protocol';
+import type * as vscode from '@volar/language-service';
 import { SharedContext } from '../../types';
 export declare function register(ctx: SharedContext): (uri: string, position: vscode.Position) => vscode.CompletionItem[] | undefined;

package/out/services/completions/directiveComment.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
-const vscode = __importStar(require("vscode-languageserver-protocol"));
 const nls = __importStar(require("vscode-nls"));
 const localize = nls.loadMessageBundle(); // TODO: not working
 const directives = [
@@ -54,11 +53,20 @@ function register(ctx) {
         const match = prefix.match(/^\s*\/\/+\s?(@[a-zA-Z\-]*)?$/);
         if (match) {
             return directives.map(directive => {
-                const item = vscode.CompletionItem.create(directive.value);
-                item.insertTextFormat = vscode.InsertTextFormat.Snippet;
+                const item = { label: directive.value };
+                item.insertTextFormat = 2;
                 item.detail = directive.description;
-                const range = vscode.Range.create(position.line, Math.max(0, position.character - (match[1] ? match[1].length : 0)), position.line, position.character);
-                item.textEdit = vscode.TextEdit.replace(range, directive.value);
+                const range = {
+                    start: {
+                        line: position.line,
+                        character: Math.max(0, position.character - (match[1] ? match[1].length : 0)),
+                    },
+                    end: position,
+                };
+                item.textEdit = {
+                    range,
+                    newText: directive.value,
+                };
                 return item;
             });
         }

package/out/services/completions/jsDoc.d.ts

@@ -1,3 +1,3 @@
 import { SharedContext } from '../../types';
-import * as vscode from 'vscode-languageserver-protocol';
+import type * as vscode from '@volar/language-service';
 export declare function register(ctx: SharedContext): (uri: string, position: vscode.Position) => vscode.CompletionItem | undefined;

package/out/services/completions/jsDoc.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
-const vscode = __importStar(require("vscode-languageserver-protocol"));
 const nls = __importStar(require("vscode-nls"));
 const resolve_1 = require("./resolve");
 const localize = nls.loadMessageBundle(); // TODO: not working
@@ -57,18 +56,18 @@ function register(ctx) {
 }
 exports.register = register;
 function createCompletionItem(document, position, insertText) {
-    const item = vscode.CompletionItem.create('/** */');
-    item.kind = vscode.CompletionItemKind.Text;
+    const item = { label: '/** */' };
+    item.kind = 1;
     item.detail = localize('typescript.jsDocCompletionItem.documentation', 'JSDoc comment');
     item.sortText = '\0';
-    item.insertTextFormat = vscode.InsertTextFormat.Snippet;
+    item.insertTextFormat = 2;
     const line = (0, resolve_1.getLineText)(document, position.line);
     const prefix = line.slice(0, position.character).match(/\/\**\s*$/);
     const suffix = line.slice(position.character).match(/^\s*\**\//);
-    const start = vscode.Position.create(position.line, position.character + (prefix ? -prefix[0].length : 0));
-    const end = vscode.Position.create(position.line, position.character + (suffix ? suffix[0].length : 0));
-    const range = vscode.Range.create(start, end);
-    item.textEdit = vscode.TextEdit.replace(range, insertText);
+    const start = { line: position.line, character: position.character + (prefix ? -prefix[0].length : 0) };
+    const end = { line: position.line, character: position.character + (suffix ? suffix[0].length : 0) };
+    const range = { start, end };
+    item.textEdit = { range, newText: insertText };
     return item;
 }
 function isPotentiallyValidDocCompletionPosition(document, position) {

package/out/services/completions/resolve.d.ts

@@ -1,5 +1,5 @@
 import { SharedContext } from '../../types';
-import * as vscode from 'vscode-languageserver-protocol';
-import { TextDocument } from 'vscode-languageserver-textdocument';
+import type * as vscode from '@volar/language-service';
+import type { TextDocument } from 'vscode-languageserver-textdocument';
 export declare function register(ctx: SharedContext): (item: vscode.CompletionItem, newPosition?: vscode.Position) => Promise<vscode.CompletionItem>;
 export declare function getLineText(document: TextDocument, line: number): string;

package/out/services/completions/resolve.js

@@ -24,7 +24,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLineText = exports.register = void 0;
-const vscode = __importStar(require("vscode-languageserver-protocol"));
 const getFormatCodeSettings_1 = require("../../configs/getFormatCodeSettings");
 const getUserPreferences_1 = require("../../configs/getUserPreferences");
 const shared_1 = require("../../shared");
@@ -78,7 +77,7 @@ function register(ctx) {
                     });
                     const locs = (0, transforms_1.entriesToLocations)(entries, ctx);
                     locs.forEach((loc, index) => {
-                        item.additionalTextEdits?.push(vscode.TextEdit.replace(loc.range, changes.textChanges[index].newText));
+                        item.additionalTextEdits?.push({ range: loc.range, newText: changes.textChanges[index].newText });
                     });
                 }
             }
@@ -98,7 +97,7 @@ function register(ctx) {
         }
         if (document) {
             const useCodeSnippetsOnMethodSuggest = await ctx.env.getConfiguration?.((0, shared_1.getConfigTitle)(document) + '.suggest.completeFunctionCalls') ?? false;
-            const useCodeSnippet = useCodeSnippetsOnMethodSuggest && (item.kind === vscode.CompletionItemKind.Function || item.kind === vscode.CompletionItemKind.Method);
+            const useCodeSnippet = useCodeSnippetsOnMethodSuggest && (item.kind === 3 || item.kind === 2);
             if (useCodeSnippet) {
                 const shouldCompleteFunction = isValidFunctionCompletionContext(ctx.typescript.languageService, fileName, offset, document);
                 if (shouldCompleteFunction) {
@@ -112,7 +111,7 @@ function register(ctx) {
                     if (item.insertText) {
                         item.insertText = snippet;
                     }
-                    item.insertTextFormat = vscode.InsertTextFormat.Snippet;
+                    item.insertTextFormat = 2;
                     if (parameterCount > 0) {
                         //Fix for https://github.com/microsoft/vscode/issues/104059
                         //Don't show parameter hints if "editor.parameterHints.enabled": false

package/out/services/definition.d.ts

@@ -1,3 +1,3 @@
-import * as vscode from 'vscode-languageserver-protocol';
+import type * as vscode from '@volar/language-service';
 import { SharedContext } from '../types';
 export declare function register(ctx: SharedContext): (uri: string, position: vscode.Position) => vscode.LocationLink[];

package/out/services/diagnostics.d.ts

@@ -1,4 +1,4 @@
-import * as vscode from 'vscode-languageserver-protocol';
+import type * as vscode from '@volar/language-service';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { SharedContext } from '../types';
 export declare function register(ctx: SharedContext): (uri: string, options: {