npm - @volar/monaco - Versions diffs - 2.3.0-alpha.8 → 2.3.0 - Mend

@volar/monaco 2.3.0-alpha.8 → 2.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/editor.js CHANGED Viewed

@@ -60,7 +60,7 @@ export function activateMarkers(worker, languages, markersOwn, getSyncUris, edit
         }
         const version = model.getVersionId();
         const languageService = await worker.withSyncedResources(getSyncUris());
-        const diagnostics = await languageService.doValidation(model.uri);
+        const diagnostics = await languageService.getDiagnostics(model.uri);
         if (model.getVersionId() !== version) {
             return;
         }
@@ -127,7 +127,7 @@ export function activateAutoInsertion(worker, languages, getSyncUris, editor) {
                     return;
                 }
                 const languageService = await worker.withSyncedResources(getSyncUris());
-                const edit = await languageService.doAutoInsert(model.uri, fromPosition({
+                const edit = await languageService.getAutoInsertSnippet(model.uri, fromPosition({
                     lineNumber: lastChange.range.startLineNumber,
                     column: lastChange.range.startColumn + lastChange.text.length,
                 }), {

package/lib/provider.js CHANGED Viewed

@@ -1,4 +1,4 @@
-import { fromCompletionContext, fromFormattingOptions, fromPosition, fromRange, fromSignatureHelpContext, toCodeAction, toCodeLens, toColorInformation, toColorPresentation, toCompletionItem, toCompletionList, toDocumentHighlight, toDocumentSymbol, toFoldingRange, toHover, toInlayHint, toLink, toLinkedEditingRanges, toLocation, toLocationLink, toSelectionRange, toSemanticTokens, toSignatureHelp, toTextEdit, toWorkspaceEdit, } from 'monaco-languageserver-types';
+import { fromCompletionContext, fromFormattingOptions, fromPosition, fromRange, fromSignatureHelpContext, toCodeAction, toCodeLens, toColorInformation, toColorPresentation, toCompletionItem, toCompletionList, toDocumentHighlight, toDocumentSymbol, toFoldingRange, toHover, toInlayHint, toLink, toLinkedEditingRanges, toLocation, toLocationLink, toSelectionRanges, toSemanticTokens, toSignatureHelp, toTextEdit, toWorkspaceEdit, } from 'monaco-languageserver-types';
 import { markers } from './markers.js';
 export async function createLanguageFeaturesProvider(worker, getSyncUris) {
     const completionItems = new WeakMap();
@@ -34,49 +34,49 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         releaseDocumentSemanticTokens() { },
         async provideDocumentSymbols(model) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findDocumentSymbols(model.uri);
+            const codeResult = await languageService.getDocumentSymbols(model.uri);
             if (codeResult) {
                 return codeResult.map(toDocumentSymbol);
             }
         },
         async provideDocumentHighlights(model, position) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findDocumentHighlights(model.uri, fromPosition(position));
+            const codeResult = await languageService.getDocumentHighlights(model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toDocumentHighlight);
             }
         },
         async provideLinkedEditingRanges(model, position) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findLinkedEditingRanges(model.uri, fromPosition(position));
+            const codeResult = await languageService.getLinkedEditingRanges(model.uri, fromPosition(position));
             if (codeResult) {
                 return toLinkedEditingRanges(codeResult);
             }
         },
         async provideDefinition(model, position) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findDefinition(model.uri, fromPosition(position));
+            const codeResult = await languageService.getDefinition(model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toLocationLink);
             }
         },
         async provideImplementation(model, position) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findImplementations(model.uri, fromPosition(position));
+            const codeResult = await languageService.getImplementations(model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toLocationLink);
             }
         },
         async provideTypeDefinition(model, position) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findTypeDefinition(model.uri, fromPosition(position));
+            const codeResult = await languageService.getTypeDefinition(model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toLocationLink);
             }
         },
         async provideCodeLenses(model) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.doCodeLens(model.uri);
+            const codeResult = await languageService.getCodeLenses(model.uri);
             if (codeResult) {
                 const monacoResult = codeResult.map(toCodeLens);
                 for (let i = 0; i < monacoResult.length; i++) {
@@ -92,7 +92,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
             let codeResult = codeLens.get(monacoResult);
             if (codeResult) {
                 const languageService = await worker.withSyncedResources(getSyncUris());
-                codeResult = await languageService.doCodeLensResolve(codeResult);
+                codeResult = await languageService.resolveCodeLens(codeResult);
                 if (codeResult) {
                     monacoResult = toCodeLens(codeResult);
                     codeLens.set(monacoResult, codeResult);
@@ -109,7 +109,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 }
             }
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.doCodeActions(model.uri, fromRange(range), {
+            const codeResult = await languageService.getCodeActions(model.uri, fromRange(range), {
                 diagnostics: diagnostics,
                 only: context.only ? [context.only] : undefined,
             });
@@ -128,7 +128,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
             let codeResult = codeActions.get(monacoResult);
             if (codeResult) {
                 const languageService = await worker.withSyncedResources(getSyncUris());
-                codeResult = await languageService.doCodeActionResolve(codeResult);
+                codeResult = await languageService.resolveCodeAction(codeResult);
                 if (codeResult) {
                     monacoResult = toCodeAction(codeResult);
                     codeActions.set(monacoResult, codeResult);
@@ -138,21 +138,21 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         },
         async provideDocumentFormattingEdits(model, options) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.format(model.uri, fromFormattingOptions(options), undefined, undefined);
+            const codeResult = await languageService.getDocumentFormattingEdits(model.uri, fromFormattingOptions(options), undefined, undefined);
             if (codeResult) {
                 return codeResult.map(toTextEdit);
             }
         },
         async provideDocumentRangeFormattingEdits(model, range, options) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.format(model.uri, fromFormattingOptions(options), fromRange(range), undefined);
+            const codeResult = await languageService.getDocumentFormattingEdits(model.uri, fromFormattingOptions(options), fromRange(range), undefined);
             if (codeResult) {
                 return codeResult.map(toTextEdit);
             }
         },
         async provideOnTypeFormattingEdits(model, position, ch, options) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.format(model.uri, fromFormattingOptions(options), undefined, {
+            const codeResult = await languageService.getDocumentFormattingEdits(model.uri, fromFormattingOptions(options), undefined, {
                 ch: ch,
                 position: fromPosition(position),
             });
@@ -162,7 +162,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         },
         async provideLinks(model) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findDocumentLinks(model.uri);
+            const codeResult = await languageService.getDocumentLinks(model.uri);
             if (codeResult) {
                 return {
                     links: codeResult.map(link => {
@@ -176,14 +176,14 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         async resolveLink(link) {
             let codeResult = documentLinks.get(link);
             if (codeResult) {
-                codeResult = await languageService.doDocumentLinkResolve(codeResult);
+                codeResult = await languageService.resolveDocumentLink(codeResult);
                 return toLink(codeResult);
             }
             return link;
         },
         async provideCompletionItems(model, position, context) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.doComplete(model.uri, fromPosition(position), fromCompletionContext(context));
+            const codeResult = await languageService.getCompletionItems(model.uri, fromPosition(position), fromCompletionContext(context));
             const wordInfo = model.getWordUntilPosition(position);
             const monacoResult = toCompletionList(codeResult, {
                 range: {
@@ -202,7 +202,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
             let codeItem = completionItems.get(monacoItem);
             if (codeItem) {
                 const languageService = await worker.withSyncedResources(getSyncUris());
-                codeItem = await languageService.doCompletionResolve(codeItem);
+                codeItem = await languageService.resolveCompletionItem(codeItem);
                 monacoItem = toCompletionItem(codeItem, {
                     range: 'replace' in monacoItem.range ? monacoItem.range.replace : monacoItem.range
                 });
@@ -212,7 +212,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         },
         async provideDocumentColors(model) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findDocumentColors(model.uri);
+            const codeResult = await languageService.getDocumentColors(model.uri);
             if (codeResult) {
                 return codeResult.map(toColorInformation);
             }
@@ -239,15 +239,15 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         },
         async provideDeclaration(model, position) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findDefinition(model.uri, fromPosition(position));
+            const codeResult = await languageService.getDefinition(model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toLocationLink);
             }
         },
         async provideSelectionRanges(model, positions) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResults = await Promise.all(positions.map(position => languageService.getSelectionRanges(model.uri, [fromPosition(position)])));
-            return codeResults.map(codeResult => codeResult?.map(toSelectionRange) ?? []);
+            const codeResults = await languageService.getSelectionRanges(model.uri, positions.map(fromPosition));
+            return codeResults?.map(toSelectionRanges);
         },
         async provideSignatureHelp(model, position, _token, context) {
             const languageService = await worker.withSyncedResources(getSyncUris());
@@ -261,14 +261,14 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         },
         async provideRenameEdits(model, position, newName) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.doRename(model.uri, fromPosition(position), newName);
+            const codeResult = await languageService.getRenameEdits(model.uri, fromPosition(position), newName);
             if (codeResult) {
                 return toWorkspaceEdit(codeResult);
             }
         },
         async provideReferences(model, position, _context) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.findReferences(model.uri, fromPosition(position), { includeDeclaration: true });
+            const codeResult = await languageService.getReferences(model.uri, fromPosition(position), { includeDeclaration: true });
             if (codeResult) {
                 return codeResult.map(toLocation);
             }
@@ -291,14 +291,14 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
             const languageService = await worker.withSyncedResources(getSyncUris());
             const codeHint = inlayHints.get(hint);
             if (codeHint) {
-                const resolvedCodeHint = await languageService.doInlayHintResolve(codeHint);
+                const resolvedCodeHint = await languageService.resolveInlayHint(codeHint);
                 return toInlayHint(resolvedCodeHint);
             }
             return hint;
         },
         async provideHover(model, position) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.doHover(model.uri, fromPosition(position));
+            const codeResult = await languageService.getHover(model.uri, fromPosition(position));
             if (codeResult) {
                 return toHover(codeResult);
             }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "2.3.0-alpha.8",
+	"version": "2.3.0",
 	"license": "MIT",
 	"type": "module",
 	"files": [
@@ -13,14 +13,14 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.3.0-alpha.8",
-		"@volar/typescript": "2.3.0-alpha.8",
-		"monaco-languageserver-types": "^0.3.3",
+		"@volar/language-service": "2.3.0",
+		"@volar/typescript": "2.3.0",
+		"monaco-languageserver-types": "^0.3.4",
 		"monaco-types": "^0.1.0",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"monaco-editor-core": "latest"
 	},
-	"gitHead": "377a0083ac697a476509805a6777a2339391dcaf"
+	"gitHead": "4f6488605e22e0f76ea877460848a443fd3e8762"
 }

package/worker.d.ts CHANGED Viewed

@@ -11,6 +11,11 @@ export declare function createSimpleWorkerService<T = {}>({ env, workerContext,
     servicePlugins?: LanguageServicePlugin[];
     extraApis?: T;
 }): {
+    dispose: () => void;
+    context: import("@volar/language-service").LanguageServiceContext;
+    getCallHierarchyItems(uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined): Promise<import("@volar/language-service").CallHierarchyItem[] | undefined>;
+    getCallHierarchyIncomingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyIncomingCall[]>;
+    getCallHierarchyOutgoingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyOutgoingCall[]>;
     getSemanticTokenLegend: () => {
         tokenModifiers: string[];
         tokenTypes: string[];
@@ -19,58 +24,52 @@ export declare function createSimpleWorkerService<T = {}>({ env, workerContext,
     getAutoFormatTriggerCharacters: () => string[];
     getSignatureHelpTriggerCharacters: () => string[];
     getSignatureHelpRetriggerCharacters: () => string[];
-    format: (uri: URI, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
+    getDocumentFormattingEdits: (uri: URI, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
         ch: string;
         position: import("@volar/language-service").Position;
     } | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").TextEdit[] | undefined>;
     getFoldingRanges: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").FoldingRange[] | undefined>;
     getSelectionRanges: (uri: URI, positions: import("@volar/language-service").Position[], token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").SelectionRange[] | undefined>;
-    findLinkedEditingRanges: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
-    findDocumentSymbols: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
-    findDocumentColors: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
+    getLinkedEditingRanges: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
+    getDocumentSymbols: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
+    getDocumentColors: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
     getColorPresentations: (uri: URI, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
-    doValidation: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
-    findReferences: (uri: URI, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
-    findFileReferences: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => import("@volar/language-service").NullableProviderResult<import("@volar/language-service").Location[]>;
-    findDefinition: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    findTypeDefinition: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    findImplementations: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    prepareRename: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Range | {
+    getDiagnostics: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
+    getWorkspaceDiagnostics: (token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceDocumentDiagnosticReport[]>;
+    getReferences: (uri: URI, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
+    getFileReferences: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => import("@volar/language-service").NullableProviderResult<import("@volar/language-service").Location[]>;
+    getDefinition: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getTypeDefinition: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getImplementations: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getRenameRange: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Range | {
         range: import("@volar/language-service").Range;
         placeholder: string;
     } | {
         message: string;
     } | undefined>;
-    doRename: (uri: URI, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
-    getEditsForFileRename: (oldUri: URI, newUri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
+    getRenameEdits: (uri: URI, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
+    getFileRenameEdits: (oldUri: URI, newUri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
     getSemanticTokens: (uri: URI, range: import("@volar/language-service").Range | undefined, legend: import("@volar/language-service").SemanticTokensLegend, token?: import("@volar/language-service").CancellationToken | undefined, _reportProgress?: ((tokens: import("@volar/language-service").SemanticTokens) => void) | undefined) => Promise<import("@volar/language-service").SemanticTokens | undefined>;
-    doHover: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Hover | undefined>;
-    doComplete: (uri: URI, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionList>;
-    doCodeActions: (uri: URI, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
-    doCodeActionResolve: (item: import("@volar/language-service").CodeAction, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction>;
-    doCompletionResolve: (item: import("@volar/language-service").CompletionItem, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionItem>;
+    getHover: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Hover | undefined>;
+    getCompletionItems: (uri: URI, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionList>;
+    getCodeActions: (uri: URI, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
     getSignatureHelp: (uri: URI, position: import("@volar/language-service").Position, signatureHelpContext?: import("@volar/language-service").SignatureHelpContext | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").SignatureHelp | undefined>;
-    doCodeLens: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens[]>;
-    doCodeLensResolve: (item: import("@volar/language-service").CodeLens, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens>;
-    findDocumentHighlights: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
-    findDocumentLinks: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink[]>;
-    doDocumentLinkResolve: (item: import("@volar/language-service").DocumentLink, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink>;
-    findWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
-    doAutoInsert: (uri: URI, selection: import("@volar/language-service").Position, change: {
+    getCodeLenses: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens[]>;
+    getDocumentHighlights: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
+    getDocumentLinks: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink[]>;
+    getWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
+    getAutoInsertSnippet: (uri: URI, selection: import("@volar/language-service").Position, change: {
         rangeOffset: number;
         rangeLength: number;
         text: string;
     }, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<string | undefined>;
-    doDocumentDrop: (uri: URI, position: import("@volar/language-service").Position, dataTransfer: Map<string, import("@volar/language-service").DataTransferItem>, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentDropEdit | undefined>;
+    getDocumentDropEdits: (uri: URI, position: import("@volar/language-service").Position, dataTransfer: Map<string, import("@volar/language-service").DataTransferItem>, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentDropEdit | undefined>;
     getInlayHints: (uri: URI, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").InlayHint[] | undefined>;
-    doInlayHintResolve: (item: import("@volar/language-service").InlayHint, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").InlayHint>;
-    callHierarchy: {
-        doPrepare(uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined): Promise<import("@volar/language-service").CallHierarchyItem[] | undefined>;
-        getIncomingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyIncomingCall[]>;
-        getOutgoingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyOutgoingCall[]>;
-    };
-    dispose: () => void;
-    context: import("@volar/language-service").LanguageServiceContext;
+    resolveCodeAction: (item: import("@volar/language-service").CodeAction, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction>;
+    resolveCompletionItem: (item: import("@volar/language-service").CompletionItem, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionItem>;
+    resolveCodeLens: (item: import("@volar/language-service").CodeLens, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens>;
+    resolveDocumentLink: (item: import("@volar/language-service").DocumentLink, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink>;
+    resolveInlayHint: (item: import("@volar/language-service").InlayHint, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").InlayHint>;
 } & T;
 export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts, compilerOptions, env, uriConverter, workerContext, languagePlugins, servicePlugins, extraApis, }: {
     typescript: typeof import('typescript');
@@ -85,6 +84,11 @@ export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts,
     servicePlugins?: LanguageServicePlugin[];
     extraApis?: T;
 }): {
+    dispose: () => void;
+    context: import("@volar/language-service").LanguageServiceContext;
+    getCallHierarchyItems(uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined): Promise<import("@volar/language-service").CallHierarchyItem[] | undefined>;
+    getCallHierarchyIncomingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyIncomingCall[]>;
+    getCallHierarchyOutgoingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyOutgoingCall[]>;
     getSemanticTokenLegend: () => {
         tokenModifiers: string[];
         tokenTypes: string[];
@@ -93,56 +97,50 @@ export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts,
     getAutoFormatTriggerCharacters: () => string[];
     getSignatureHelpTriggerCharacters: () => string[];
     getSignatureHelpRetriggerCharacters: () => string[];
-    format: (uri: URI, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
+    getDocumentFormattingEdits: (uri: URI, options: import("@volar/language-service").FormattingOptions, range: import("@volar/language-service").Range | undefined, onTypeParams: {
         ch: string;
         position: import("@volar/language-service").Position;
     } | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").TextEdit[] | undefined>;
     getFoldingRanges: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").FoldingRange[] | undefined>;
     getSelectionRanges: (uri: URI, positions: import("@volar/language-service").Position[], token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").SelectionRange[] | undefined>;
-    findLinkedEditingRanges: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
-    findDocumentSymbols: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
-    findDocumentColors: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
+    getLinkedEditingRanges: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LinkedEditingRanges | undefined>;
+    getDocumentSymbols: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
+    getDocumentColors: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
     getColorPresentations: (uri: URI, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
-    doValidation: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
-    findReferences: (uri: URI, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
-    findFileReferences: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => import("@volar/language-service").NullableProviderResult<import("@volar/language-service").Location[]>;
-    findDefinition: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    findTypeDefinition: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    findImplementations: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
-    prepareRename: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Range | {
+    getDiagnostics: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
+    getWorkspaceDiagnostics: (token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceDocumentDiagnosticReport[]>;
+    getReferences: (uri: URI, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
+    getFileReferences: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => import("@volar/language-service").NullableProviderResult<import("@volar/language-service").Location[]>;
+    getDefinition: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getTypeDefinition: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getImplementations: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
+    getRenameRange: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Range | {
         range: import("@volar/language-service").Range;
         placeholder: string;
     } | {
         message: string;
     } | undefined>;
-    doRename: (uri: URI, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
-    getEditsForFileRename: (oldUri: URI, newUri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
+    getRenameEdits: (uri: URI, position: import("@volar/language-service").Position, newName: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
+    getFileRenameEdits: (oldUri: URI, newUri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceEdit | undefined>;
     getSemanticTokens: (uri: URI, range: import("@volar/language-service").Range | undefined, legend: import("@volar/language-service").SemanticTokensLegend, token?: import("@volar/language-service").CancellationToken | undefined, _reportProgress?: ((tokens: import("@volar/language-service").SemanticTokens) => void) | undefined) => Promise<import("@volar/language-service").SemanticTokens | undefined>;
-    doHover: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Hover | undefined>;
-    doComplete: (uri: URI, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionList>;
-    doCodeActions: (uri: URI, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
-    doCodeActionResolve: (item: import("@volar/language-service").CodeAction, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction>;
-    doCompletionResolve: (item: import("@volar/language-service").CompletionItem, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionItem>;
+    getHover: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Hover | undefined>;
+    getCompletionItems: (uri: URI, position: import("@volar/language-service").Position, completionContext?: import("@volar/language-service").CompletionContext | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionList>;
+    getCodeActions: (uri: URI, range: import("@volar/language-service").Range, codeActionContext: import("@volar/language-service").CodeActionContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction[] | undefined>;
     getSignatureHelp: (uri: URI, position: import("@volar/language-service").Position, signatureHelpContext?: import("@volar/language-service").SignatureHelpContext | undefined, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").SignatureHelp | undefined>;
-    doCodeLens: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens[]>;
-    doCodeLensResolve: (item: import("@volar/language-service").CodeLens, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens>;
-    findDocumentHighlights: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
-    findDocumentLinks: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink[]>;
-    doDocumentLinkResolve: (item: import("@volar/language-service").DocumentLink, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink>;
-    findWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
-    doAutoInsert: (uri: URI, selection: import("@volar/language-service").Position, change: {
+    getCodeLenses: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens[]>;
+    getDocumentHighlights: (uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentHighlight[] | undefined>;
+    getDocumentLinks: (uri: URI, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink[]>;
+    getWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
+    getAutoInsertSnippet: (uri: URI, selection: import("@volar/language-service").Position, change: {
         rangeOffset: number;
         rangeLength: number;
         text: string;
     }, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<string | undefined>;
-    doDocumentDrop: (uri: URI, position: import("@volar/language-service").Position, dataTransfer: Map<string, import("@volar/language-service").DataTransferItem>, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentDropEdit | undefined>;
+    getDocumentDropEdits: (uri: URI, position: import("@volar/language-service").Position, dataTransfer: Map<string, import("@volar/language-service").DataTransferItem>, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentDropEdit | undefined>;
     getInlayHints: (uri: URI, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").InlayHint[] | undefined>;
-    doInlayHintResolve: (item: import("@volar/language-service").InlayHint, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").InlayHint>;
-    callHierarchy: {
-        doPrepare(uri: URI, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined): Promise<import("@volar/language-service").CallHierarchyItem[] | undefined>;
-        getIncomingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyIncomingCall[]>;
-        getOutgoingCalls(item: import("@volar/language-service").CallHierarchyItem, token: import("@volar/language-service").CancellationToken): Promise<import("@volar/language-service").CallHierarchyOutgoingCall[]>;
-    };
-    dispose: () => void;
-    context: import("@volar/language-service").LanguageServiceContext;
+    resolveCodeAction: (item: import("@volar/language-service").CodeAction, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeAction>;
+    resolveCompletionItem: (item: import("@volar/language-service").CompletionItem, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CompletionItem>;
+    resolveCodeLens: (item: import("@volar/language-service").CodeLens, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").CodeLens>;
+    resolveDocumentLink: (item: import("@volar/language-service").DocumentLink, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink>;
+    resolveInlayHint: (item: import("@volar/language-service").InlayHint, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").InlayHint>;
 } & T;