npm - @volar/monaco - Versions diffs - 2.4.0-alpha.2 → 2.4.0-alpha.20 - Mend

@volar/monaco 2.4.0-alpha.2 → 2.4.0-alpha.20

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 (13) hide show

package/README.md CHANGED Viewed

@@ -35,7 +35,7 @@ self.onmessage = () => {
 			languagePlugins: [
 				// ...
 			],
-			servicePlugins: [
+			languageServicePlugins: [
 				// ...
 			],
 		});
@@ -49,36 +49,34 @@ self.onmessage = () => {
 import * as worker from 'monaco-editor-core/esm/vs/editor/editor.worker';
 import type * as monaco from 'monaco-editor-core';
 -import { createSimpleWorkerService, ServiceEnvironment } from '@volar/monaco/worker';
-+import {
-+	createTypeScriptWorkerService,
-+	ServiceEnvironment,
-+} from '@volar/monaco/worker';
++import { createTypeScriptWorkerService, ServiceEnvironment } from '@volar/monaco/worker';
 +import * as ts from 'typescript';
-+import { create as createTypeScriptService } from 'volar-service-typescript';
++import { create as createTypeScriptPlugins } from 'volar-service-typescript';
++import { URI } from 'vscode-uri';
 self.onmessage = () => {
 	worker.initialize((ctx: monaco.worker.IWorkerContext) => {
 		const env: ServiceEnvironment = {
 			workspaceFolder: 'file:///',
-+			typescript: {
-+				uriToFileName: uri => uri.substring('file://'.length),
-+				fileNameToUri: fileName => 'file://' + fileName,
-+			},
 		};
 -		return createSimpleWorkerService({
 +		return createTypeScriptWorkerService({
 +			typescript: ts,
 +			compilerOptions: {
 +				// ...
++			},
++			uriConverter: {
++				asFileName: uri => uri.fsPath,
++				asUri: fileName => URI.file(fileName),
 +			},
 			workerContext: ctx,
 			env,
 			languagePlugins: [
 				// ...
 			],
-			servicePlugins: [
+			languageServicePlugins: [
 				// ...
-+				createTypeScriptService(ts),
++				...createTypeScriptPlugins(ts),
 			],
 		});
 	});
@@ -90,11 +88,8 @@ self.onmessage = () => {
 ```diff
 import * as worker from 'monaco-editor-core/esm/vs/editor/editor.worker';
 import type * as monaco from 'monaco-editor-core';
-import {
-	createTypeScriptWorkerService,
-	ServiceEnvironment,
-+	activateAutomaticTypeAcquisition,
-} from '@volar/monaco/worker';
+import { createTypeScriptWorkerService, ServiceEnvironment } from '@volar/monaco/worker';
++import { createNpmFileSystem } from '@volar/jsdelivr';
 import * as ts from 'typescript';
 import { create as createTypeScriptService } from 'volar-service-typescript';
@@ -107,7 +102,7 @@ self.onmessage = () => {
 				fileNameToUri: fileName => 'file://' + fileName,
 			},
 		};
-+		activateAutomaticTypeAcquisition(env);
++		env.fs = createNpmFileSystem();
 		return createTypeScriptWorkerService({
 			typescript: ts,
 			compilerOptions: {
@@ -118,7 +113,7 @@ self.onmessage = () => {
 			languagePlugins: [
 				// ...
 			],
-			servicePlugins: [
+			languageServicePlugins: [
 				// ...
 				createTypeScriptService(ts),
 			],

package/lib/editor.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { LanguageService } from '@volar/language-service';
 import type { editor, IDisposable, MonacoEditor, Uri } from 'monaco-types';
-export declare function activateMarkers(worker: editor.MonacoWebWorker<LanguageService>, languages: string[], markersOwn: string, getSyncUris: () => Uri[], editor: MonacoEditor['editor']): IDisposable;
-export declare function activateAutoInsertion(worker: editor.MonacoWebWorker<LanguageService>, languages: string[], getSyncUris: () => Uri[], editor: MonacoEditor['editor']): IDisposable;
+import { WorkerLanguageService } from '../worker.js';
+export declare function activateMarkers(worker: editor.MonacoWebWorker<WorkerLanguageService>, languages: string[], markersOwn: string, getSyncUris: () => Uri[], editor: MonacoEditor['editor']): IDisposable;
+export declare function activateAutoInsertion(worker: editor.MonacoWebWorker<WorkerLanguageService>, languages: string[], getSyncUris: () => Uri[], editor: MonacoEditor['editor']): IDisposable;

package/lib/editor.js CHANGED Viewed

@@ -1,5 +1,6 @@
 import { fromPosition, toMarkerData, toTextEdit } from 'monaco-languageserver-types';
 import { markers } from './markers.js';
+import { getRequestId } from './requestId.js';
 export function activateMarkers(worker, languages, markersOwn, getSyncUris, editor) {
     const disposables = [];
     const listener = new Map();
@@ -58,10 +59,11 @@ export function activateMarkers(worker, languages, markersOwn, getSyncUris, edit
         if (!model.isAttachedToEditor()) {
             return;
         }
-        const version = model.getVersionId();
         const languageService = await worker.withSyncedResources(getSyncUris());
-        const diagnostics = await languageService.getDiagnostics(model.uri);
-        if (model.getVersionId() !== version) {
+        const token = createTokenForModelChange(model);
+        const diagnostics = await languageService.getDiagnostics(getRequestId(token.token, languageService), model.uri);
+        token.dispose();
+        if (token.token.isCancellationRequested) {
             return;
         }
         const result = diagnostics.map(error => {
@@ -127,7 +129,8 @@ export function activateAutoInsertion(worker, languages, getSyncUris, editor) {
                     return;
                 }
                 const languageService = await worker.withSyncedResources(getSyncUris());
-                const edit = await languageService.getAutoInsertSnippet(model.uri, fromPosition({
+                const token = createTokenForModelChange(model);
+                const edit = await languageService.getAutoInsertSnippet(getRequestId(token.token, languageService), model.uri, fromPosition({
                     lineNumber: lastChange.range.startLineNumber,
                     column: lastChange.range.startColumn + lastChange.text.length,
                 }), {
@@ -135,7 +138,8 @@ export function activateAutoInsertion(worker, languages, getSyncUris, editor) {
                     rangeOffset: lastChange.rangeOffset,
                     rangeLength: lastChange.rangeLength,
                 });
-                if (model.getVersionId() !== version) {
+                token.dispose();
+                if (token.token.isCancellationRequested) {
                     return;
                 }
                 const codeEditor = editor.getEditors().find(e => e.getModel() === model);
@@ -152,4 +156,39 @@ export function activateAutoInsertion(worker, languages, getSyncUris, editor) {
         }, 100);
     }
 }
+function createTokenForModelChange(model) {
+    const lastVersionId = model.getVersionId();
+    let callbacks;
+    const token = {
+        get isCancellationRequested() {
+            return model.getVersionId() !== lastVersionId;
+        },
+        onCancellationRequested(cb) {
+            const disposable = model.onDidChangeContent(() => {
+                cb(undefined);
+                disposable.dispose();
+                callbacks?.delete(disposable);
+            });
+            callbacks ??= new Set();
+            callbacks.add(disposable);
+            return {
+                dispose() {
+                    disposable.dispose();
+                    callbacks?.delete(disposable);
+                },
+            };
+        },
+    };
+    return {
+        token,
+        dispose() {
+            if (callbacks) {
+                for (const disposable of callbacks) {
+                    disposable.dispose();
+                }
+                callbacks.clear();
+            }
+        },
+    };
+}
 //# sourceMappingURL=editor.js.map

package/lib/languages.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import type { LanguageService } from '@volar/language-service';
 import type { IDisposable, MonacoEditor, Uri, editor, languages } from 'monaco-types';
-export declare function registerProviders(worker: editor.MonacoWebWorker<LanguageService>, language: languages.LanguageSelector, getSyncUris: () => Uri[], languages: MonacoEditor['languages']): Promise<IDisposable>;
+import { WorkerLanguageService } from '../worker.js';
+export declare function registerProviders(worker: editor.MonacoWebWorker<WorkerLanguageService>, language: languages.LanguageSelector, getSyncUris: () => Uri[], languages: MonacoEditor['languages']): Promise<IDisposable>;

package/lib/provider.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import type { LanguageService } from '@volar/language-service';
 import type { Uri, editor, languages } from 'monaco-types';
-export declare function createLanguageFeaturesProvider(worker: editor.MonacoWebWorker<LanguageService>, getSyncUris: () => Uri[]): Promise<languages.HoverProvider & languages.DocumentSymbolProvider & languages.DocumentHighlightProvider & languages.LinkedEditingRangeProvider & languages.DefinitionProvider & languages.TypeDefinitionProvider & languages.ImplementationProvider & languages.CodeLensProvider & languages.CodeActionProvider & languages.DocumentFormattingEditProvider & languages.DocumentRangeFormattingEditProvider & languages.OnTypeFormattingEditProvider & languages.LinkProvider & languages.CompletionItemProvider & languages.DocumentColorProvider & languages.FoldingRangeProvider & languages.DeclarationProvider & languages.SignatureHelpProvider & languages.RenameProvider & languages.ReferenceProvider & languages.SelectionRangeProvider & languages.InlayHintsProvider & languages.DocumentSemanticTokensProvider & languages.DocumentRangeSemanticTokensProvider>;
+import { WorkerLanguageService } from '../worker.js';
+export declare function createLanguageFeaturesProvider(worker: editor.MonacoWebWorker<WorkerLanguageService>, getSyncUris: () => Uri[]): Promise<languages.HoverProvider & languages.DocumentSymbolProvider & languages.DocumentHighlightProvider & languages.LinkedEditingRangeProvider & languages.DefinitionProvider & languages.TypeDefinitionProvider & languages.ImplementationProvider & languages.CodeLensProvider & languages.CodeActionProvider & languages.DocumentFormattingEditProvider & languages.DocumentRangeFormattingEditProvider & languages.OnTypeFormattingEditProvider & languages.LinkProvider & languages.CompletionItemProvider & languages.DocumentColorProvider & languages.FoldingRangeProvider & languages.DeclarationProvider & languages.SignatureHelpProvider & languages.RenameProvider & languages.ReferenceProvider & languages.SelectionRangeProvider & languages.InlayHintsProvider & languages.DocumentSemanticTokensProvider & languages.DocumentRangeSemanticTokensProvider>;

package/lib/provider.js CHANGED Viewed

@@ -1,5 +1,6 @@
 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';
+import { getRequestId } from './requestId.js';
 export async function createLanguageFeaturesProvider(worker, getSyncUris) {
     const completionItems = new WeakMap();
     const codeLens = new WeakMap();
@@ -17,66 +18,66 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
         getLegend() {
             return legend;
         },
-        async provideDocumentSemanticTokens(model, _lastResultId) {
+        async provideDocumentSemanticTokens(model, _lastResultId, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getSemanticTokens(model.uri, undefined, legend);
+            const codeResult = await languageService.getSemanticTokens(getRequestId(token, languageService), model.uri, undefined, legend);
             if (codeResult) {
                 return toSemanticTokens(codeResult);
             }
         },
-        async provideDocumentRangeSemanticTokens(model, range) {
+        async provideDocumentRangeSemanticTokens(model, range, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getSemanticTokens(model.uri, fromRange(range), legend);
+            const codeResult = await languageService.getSemanticTokens(getRequestId(token, languageService), model.uri, fromRange(range), legend);
             if (codeResult) {
                 return toSemanticTokens(codeResult);
             }
         },
         releaseDocumentSemanticTokens() { },
-        async provideDocumentSymbols(model) {
+        async provideDocumentSymbols(model, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDocumentSymbols(model.uri);
+            const codeResult = await languageService.getDocumentSymbols(getRequestId(token, languageService), model.uri);
             if (codeResult) {
                 return codeResult.map(toDocumentSymbol);
             }
         },
-        async provideDocumentHighlights(model, position) {
+        async provideDocumentHighlights(model, position, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDocumentHighlights(model.uri, fromPosition(position));
+            const codeResult = await languageService.getDocumentHighlights(getRequestId(token, languageService), model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toDocumentHighlight);
             }
         },
-        async provideLinkedEditingRanges(model, position) {
+        async provideLinkedEditingRanges(model, position, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getLinkedEditingRanges(model.uri, fromPosition(position));
+            const codeResult = await languageService.getLinkedEditingRanges(getRequestId(token, languageService), model.uri, fromPosition(position));
             if (codeResult) {
                 return toLinkedEditingRanges(codeResult);
             }
         },
-        async provideDefinition(model, position) {
+        async provideDefinition(model, position, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDefinition(model.uri, fromPosition(position));
+            const codeResult = await languageService.getDefinition(getRequestId(token, languageService), model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toLocationLink);
             }
         },
-        async provideImplementation(model, position) {
+        async provideImplementation(model, position, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getImplementations(model.uri, fromPosition(position));
+            const codeResult = await languageService.getImplementations(getRequestId(token, languageService), model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toLocationLink);
             }
         },
-        async provideTypeDefinition(model, position) {
+        async provideTypeDefinition(model, position, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getTypeDefinition(model.uri, fromPosition(position));
+            const codeResult = await languageService.getTypeDefinition(getRequestId(token, languageService), model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toLocationLink);
             }
         },
-        async provideCodeLenses(model) {
+        async provideCodeLenses(model, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getCodeLenses(model.uri);
+            const codeResult = await languageService.getCodeLenses(getRequestId(token, languageService), model.uri);
             if (codeResult) {
                 const monacoResult = codeResult.map(toCodeLens);
                 for (let i = 0; i < monacoResult.length; i++) {
@@ -88,11 +89,11 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 };
             }
         },
-        async resolveCodeLens(_, monacoResult) {
+        async resolveCodeLens(_, monacoResult, token) {
             let codeResult = codeLens.get(monacoResult);
             if (codeResult) {
                 const languageService = await worker.withSyncedResources(getSyncUris());
-                codeResult = await languageService.resolveCodeLens(codeResult);
+                codeResult = await languageService.resolveCodeLens(getRequestId(token, languageService), codeResult);
                 if (codeResult) {
                     monacoResult = toCodeLens(codeResult);
                     codeLens.set(monacoResult, codeResult);
@@ -100,7 +101,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
             }
             return monacoResult;
         },
-        async provideCodeActions(model, range, context) {
+        async provideCodeActions(model, range, context, token) {
             const diagnostics = [];
             for (const marker of context.markers) {
                 const diagnostic = markers.get(marker);
@@ -109,12 +110,12 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 }
             }
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getCodeActions(model.uri, fromRange(range), {
+            const codeResult = await languageService.getCodeActions(getRequestId(token, languageService), model.uri, fromRange(range), {
                 diagnostics: diagnostics,
                 only: context.only ? [context.only] : undefined,
             });
             if (codeResult) {
-                const monacoResult = codeResult.map(codeAction => toCodeAction(codeAction));
+                const monacoResult = codeResult.map(toCodeAction);
                 for (let i = 0; i < monacoResult.length; i++) {
                     codeActions.set(monacoResult[i], codeResult[i]);
                 }
@@ -124,11 +125,11 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 };
             }
         },
-        async resolveCodeAction(monacoResult) {
+        async resolveCodeAction(monacoResult, token) {
             let codeResult = codeActions.get(monacoResult);
             if (codeResult) {
                 const languageService = await worker.withSyncedResources(getSyncUris());
-                codeResult = await languageService.resolveCodeAction(codeResult);
+                codeResult = await languageService.resolveCodeAction(getRequestId(token, languageService), codeResult);
                 if (codeResult) {
                     monacoResult = toCodeAction(codeResult);
                     codeActions.set(monacoResult, codeResult);
@@ -136,23 +137,23 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
             }
             return monacoResult;
         },
-        async provideDocumentFormattingEdits(model, options) {
+        async provideDocumentFormattingEdits(model, options, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDocumentFormattingEdits(model.uri, fromFormattingOptions(options), undefined, undefined);
+            const codeResult = await languageService.getDocumentFormattingEdits(getRequestId(token, languageService), model.uri, fromFormattingOptions(options), undefined, undefined);
             if (codeResult) {
                 return codeResult.map(toTextEdit);
             }
         },
-        async provideDocumentRangeFormattingEdits(model, range, options) {
+        async provideDocumentRangeFormattingEdits(model, range, options, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDocumentFormattingEdits(model.uri, fromFormattingOptions(options), fromRange(range), undefined);
+            const codeResult = await languageService.getDocumentFormattingEdits(getRequestId(token, languageService), model.uri, fromFormattingOptions(options), fromRange(range), undefined);
             if (codeResult) {
                 return codeResult.map(toTextEdit);
             }
         },
-        async provideOnTypeFormattingEdits(model, position, ch, options) {
+        async provideOnTypeFormattingEdits(model, position, ch, options, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDocumentFormattingEdits(model.uri, fromFormattingOptions(options), undefined, {
+            const codeResult = await languageService.getDocumentFormattingEdits(getRequestId(token, languageService), model.uri, fromFormattingOptions(options), undefined, {
                 ch: ch,
                 position: fromPosition(position),
             });
@@ -160,9 +161,9 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 return codeResult.map(toTextEdit);
             }
         },
-        async provideLinks(model) {
+        async provideLinks(model, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDocumentLinks(model.uri);
+            const codeResult = await languageService.getDocumentLinks(getRequestId(token, languageService), model.uri);
             if (codeResult) {
                 return {
                     links: codeResult.map(link => {
@@ -173,17 +174,17 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 };
             }
         },
-        async resolveLink(link) {
+        async resolveLink(link, token) {
             let codeResult = documentLinks.get(link);
             if (codeResult) {
-                codeResult = await languageService.resolveDocumentLink(codeResult);
+                codeResult = await languageService.resolveDocumentLink(getRequestId(token, languageService), codeResult);
                 return toLink(codeResult);
             }
             return link;
         },
-        async provideCompletionItems(model, position, context) {
+        async provideCompletionItems(model, position, context, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getCompletionItems(model.uri, fromPosition(position), fromCompletionContext(context));
+            const codeResult = await languageService.getCompletionItems(getRequestId(token, languageService), model.uri, fromPosition(position), fromCompletionContext(context));
             const wordInfo = model.getWordUntilPosition(position);
             const monacoResult = toCompletionList(codeResult, {
                 range: {
@@ -198,11 +199,11 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
             }
             return monacoResult;
         },
-        async resolveCompletionItem(monacoItem) {
+        async resolveCompletionItem(monacoItem, token) {
             let codeItem = completionItems.get(monacoItem);
             if (codeItem) {
                 const languageService = await worker.withSyncedResources(getSyncUris());
-                codeItem = await languageService.resolveCompletionItem(codeItem);
+                codeItem = await languageService.resolveCompletionItem(getRequestId(token, languageService), codeItem);
                 monacoItem = toCompletionItem(codeItem, {
                     range: 'replace' in monacoItem.range ? monacoItem.range.replace : monacoItem.range
                 });
@@ -210,18 +211,18 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
             }
             return monacoItem;
         },
-        async provideDocumentColors(model) {
+        async provideDocumentColors(model, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDocumentColors(model.uri);
+            const codeResult = await languageService.getDocumentColors(getRequestId(token, languageService), model.uri);
             if (codeResult) {
                 return codeResult.map(toColorInformation);
             }
         },
-        async provideColorPresentations(model, monacoResult) {
+        async provideColorPresentations(model, monacoResult, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
             const codeResult = colorInfos.get(monacoResult);
             if (codeResult) {
-                const codeColors = await languageService.getColorPresentations(model.uri, codeResult.color, {
+                const codeColors = await languageService.getColorPresentations(getRequestId(token, languageService), model.uri, codeResult.color, {
                     start: fromPosition(model.getPositionAt(0)),
                     end: fromPosition(model.getPositionAt(model.getValueLength())),
                 });
@@ -230,28 +231,28 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 }
             }
         },
-        async provideFoldingRanges(model, _context) {
+        async provideFoldingRanges(model, _context, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getFoldingRanges(model.uri);
+            const codeResult = await languageService.getFoldingRanges(getRequestId(token, languageService), model.uri);
             if (codeResult) {
                 return codeResult.map(toFoldingRange);
             }
         },
-        async provideDeclaration(model, position) {
+        async provideDeclaration(model, position, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getDefinition(model.uri, fromPosition(position));
+            const codeResult = await languageService.getDefinition(getRequestId(token, languageService), model.uri, fromPosition(position));
             if (codeResult) {
                 return codeResult.map(toLocationLink);
             }
         },
-        async provideSelectionRanges(model, positions) {
+        async provideSelectionRanges(model, positions, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResults = await languageService.getSelectionRanges(model.uri, positions.map(fromPosition));
+            const codeResults = await languageService.getSelectionRanges(getRequestId(token, languageService), model.uri, positions.map(fromPosition));
             return codeResults?.map(toSelectionRanges);
         },
-        async provideSignatureHelp(model, position, _token, context) {
+        async provideSignatureHelp(model, position, token, context) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getSignatureHelp(model.uri, fromPosition(position), fromSignatureHelpContext(context));
+            const codeResult = await languageService.getSignatureHelp(getRequestId(token, languageService), model.uri, fromPosition(position), fromSignatureHelpContext(context));
             if (codeResult) {
                 return {
                     value: toSignatureHelp(codeResult),
@@ -259,23 +260,23 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 };
             }
         },
-        async provideRenameEdits(model, position, newName) {
+        async provideRenameEdits(model, position, newName, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getRenameEdits(model.uri, fromPosition(position), newName);
+            const codeResult = await languageService.getRenameEdits(getRequestId(token, languageService), model.uri, fromPosition(position), newName);
             if (codeResult) {
                 return toWorkspaceEdit(codeResult);
             }
         },
-        async provideReferences(model, position, _context) {
+        async provideReferences(model, position, context, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getReferences(model.uri, fromPosition(position), { includeDeclaration: true });
+            const codeResult = await languageService.getReferences(getRequestId(token, languageService), model.uri, fromPosition(position), context);
             if (codeResult) {
                 return codeResult.map(toLocation);
             }
         },
-        async provideInlayHints(model, range) {
+        async provideInlayHints(model, range, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getInlayHints(model.uri, fromRange(range));
+            const codeResult = await languageService.getInlayHints(getRequestId(token, languageService), model.uri, fromRange(range));
             if (codeResult) {
                 return {
                     hints: codeResult.map(hint => {
@@ -287,18 +288,18 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
                 };
             }
         },
-        async resolveInlayHint(hint) {
+        async resolveInlayHint(hint, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
             const codeHint = inlayHints.get(hint);
             if (codeHint) {
-                const resolvedCodeHint = await languageService.resolveInlayHint(codeHint);
+                const resolvedCodeHint = await languageService.resolveInlayHint(getRequestId(token, languageService), codeHint);
                 return toInlayHint(resolvedCodeHint);
             }
             return hint;
         },
-        async provideHover(model, position) {
+        async provideHover(model, position, token) {
             const languageService = await worker.withSyncedResources(getSyncUris());
-            const codeResult = await languageService.getHover(model.uri, fromPosition(position));
+            const codeResult = await languageService.getHover(getRequestId(token, languageService), model.uri, fromPosition(position));
             if (codeResult) {
                 return toHover(codeResult);
             }

package/lib/requestId.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import type { CancellationToken } from 'monaco-types';
+import type { WorkerLanguageService } from '../worker.js';
+export declare function getRequestId(token: CancellationToken, languageService: WorkerLanguageService): number;

package/lib/requestId.js ADDED Viewed

@@ -0,0 +1,8 @@
+const requestIdMap = new WeakMap();
+export function getRequestId(token, languageService) {
+    const nextRequestId = (requestIdMap.get(languageService) ?? 0) + 1;
+    requestIdMap.set(languageService, nextRequestId);
+    token.onCancellationRequested(() => languageService.cancelRequest(nextRequestId));
+    return nextRequestId;
+}
+//# sourceMappingURL=requestId.js.map

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/monaco",
-	"version": "2.4.0-alpha.2",
+	"version": "2.4.0-alpha.20",
 	"license": "MIT",
 	"type": "module",
 	"files": [
@@ -13,14 +13,14 @@
 		"directory": "packages/monaco"
 	},
 	"dependencies": {
-		"@volar/language-service": "2.4.0-alpha.2",
-		"@volar/typescript": "2.4.0-alpha.2",
-		"monaco-languageserver-types": "^0.3.4",
+		"@volar/language-service": "2.4.0-alpha.20",
+		"@volar/typescript": "2.4.0-alpha.20",
+		"monaco-languageserver-types": "^0.4.0",
 		"monaco-types": "^0.1.0",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"monaco-editor-core": "latest"
 	},
-	"gitHead": "62914047f925b79391fee6e4f697705b77641baf"
+	"gitHead": "63ec0dfd91333c91a7c6443cedc1ae074b317867"
 }