@volar/language-service - npm Package Compare versions

Comparing version 1.4.0-alpha.1 to 1.4.0-alpha.2

out/baseLanguageService.d.ts

@@ -13,34 +13,34 @@ import { LanguageServicePluginContext, LanguageServiceOptions } from './types';
         position: _.Position;
-    } | undefined, token: _.CancellationToken) => Promise<_.TextEdit[] | undefined>;
-    getFoldingRanges: (uri: string, token: _.CancellationToken) => Promise<_.FoldingRange[] | undefined>;
-    getSelectionRanges: (uri: string, positions: _.Position[], token: _.CancellationToken) => Promise<_.SelectionRange[] | undefined>;
-    findLinkedEditingRanges: (uri: string, position: _.Position, token: _.CancellationToken) => Promise<_.LinkedEditingRanges | undefined>;
-    findDocumentSymbols: (uri: string, token: _.CancellationToken) => Promise<_.DocumentSymbol[] | undefined>;
-    findDocumentColors: (uri: string, token: _.CancellationToken) => Promise<_.ColorInformation[] | undefined>;
-    getColorPresentations: (uri: string, color: _.Color, range: _.Range, token: _.CancellationToken) => Promise<_.ColorPresentation[] | undefined>;
-    doValidation: (uri: string, token: _.CancellationToken, mode: "semantic" | "all" | "syntactic", response?: ((result: _.Diagnostic[]) => void) | undefined) => Promise<_.Diagnostic[]>;
-    findReferences: (uri: string, position: _.Position, token: _.CancellationToken) => Promise<_.Location[] | undefined>;
-    findFileReferences: (uri: string, token: _.CancellationToken) => import("./types").NullableResult<_.Location[]>;
-    findDefinition: (uri: string, position: _.Position, token: _.CancellationToken) => Promise<_.LocationLink[] | undefined>;
-    findTypeDefinition: (uri: string, position: _.Position, token: _.CancellationToken) => Promise<_.LocationLink[] | undefined>;
-    findImplementations: (uri: string, position: _.Position, token: _.CancellationToken) => Promise<_.LocationLink[] | undefined>;
-    prepareRename: (uri: string, position: _.Position, token: _.CancellationToken) => Promise<NonNullable<_.Range | _.ResponseError<void> | null | undefined> | undefined>;
-    doRename: (uri: string, position: _.Position, newName: string, token: _.CancellationToken) => Promise<_.WorkspaceEdit | undefined>;
-    getEditsForFileRename: (oldUri: string, newUri: string, token: _.CancellationToken) => Promise<_.WorkspaceEdit | undefined>;
-    getSemanticTokens: (uri: string, range: _.Range | undefined, legend: _.SemanticTokensLegend, token: _.CancellationToken, reportProgress?: ((tokens: _.SemanticTokens) => void) | undefined) => Promise<_.SemanticTokens | undefined>;
-    doHover: (uri: string, position: _.Position, token: _.CancellationToken) => Promise<_.Hover | undefined>;
-    doComplete: (uri: string, position: _.Position, completionContext: _.CompletionContext | undefined, token: _.CancellationToken) => Promise<_.CompletionList>;
-    doCodeActions: (uri: string, range: _.Range, codeActionContext: _.CodeActionContext, token: _.CancellationToken) => Promise<_.CodeAction[] | undefined>;
-    doCodeActionResolve: (item: _.CodeAction, token: _.CancellationToken) => Promise<_.CodeAction>;
-    doCompletionResolve: (item: _.CompletionItem, token: _.CancellationToken) => Promise<_.CompletionItem>;
-    getSignatureHelp: (uri: string, position: _.Position, signatureHelpContext: _.SignatureHelpContext | undefined, token: _.CancellationToken) => Promise<_.SignatureHelp | undefined>;
-    doCodeLens: (uri: string, token: _.CancellationToken) => Promise<_.CodeLens[]>;
-    doCodeLensResolve: (item: _.CodeLens, token: _.CancellationToken) => Promise<_.CodeLens>;
-    findDocumentHighlights: (uri: string, position: _.Position, token: _.CancellationToken) => Promise<_.DocumentHighlight[] | undefined>;
-    findDocumentLinks: (uri: string, token: _.CancellationToken) => Promise<_.DocumentLink[]>;
-    findWorkspaceSymbols: (query: string, token: _.CancellationToken) => Promise<_.WorkspaceSymbol[]>;
-    doAutoInsert: (uri: string, position: _.Position, autoInsertContext: import("./types").AutoInsertionContext, token: _.CancellationToken) => Promise<NonNullable<string | _.TextEdit | null | undefined> | undefined>;
-    getInlayHints: (uri: string, range: _.Range, token: _.CancellationToken) => Promise<_.InlayHint[] | undefined>;
+    } | undefined, token?: _.CancellationToken) => Promise<_.TextEdit[] | undefined>;
+    getFoldingRanges: (uri: string, token?: _.CancellationToken) => Promise<_.FoldingRange[] | undefined>;
+    getSelectionRanges: (uri: string, positions: _.Position[], token?: _.CancellationToken) => Promise<_.SelectionRange[] | undefined>;
+    findLinkedEditingRanges: (uri: string, position: _.Position, token?: _.CancellationToken) => Promise<_.LinkedEditingRanges | undefined>;
+    findDocumentSymbols: (uri: string, token?: _.CancellationToken) => Promise<_.DocumentSymbol[] | undefined>;
+    findDocumentColors: (uri: string, token?: _.CancellationToken) => Promise<_.ColorInformation[] | undefined>;
+    getColorPresentations: (uri: string, color: _.Color, range: _.Range, token?: _.CancellationToken) => Promise<_.ColorPresentation[] | undefined>;
+    doValidation: (uri: string, mode: "all" | "semantic" | "syntactic", token?: _.CancellationToken, response?: ((result: _.Diagnostic[]) => void) | undefined) => Promise<_.Diagnostic[]>;
+    findReferences: (uri: string, position: _.Position, token?: _.CancellationToken) => Promise<_.Location[] | undefined>;
+    findFileReferences: (uri: string, token?: _.CancellationToken) => import("./types").NullableResult<_.Location[]>;
+    findDefinition: (uri: string, position: _.Position, token?: _.CancellationToken) => Promise<_.LocationLink[] | undefined>;
+    findTypeDefinition: (uri: string, position: _.Position, token?: _.CancellationToken) => Promise<_.LocationLink[] | undefined>;
+    findImplementations: (uri: string, position: _.Position, token?: _.CancellationToken) => Promise<_.LocationLink[] | undefined>;
+    prepareRename: (uri: string, position: _.Position, token?: _.CancellationToken) => Promise<NonNullable<_.Range | _.ResponseError<void> | null | undefined> | undefined>;
+    doRename: (uri: string, position: _.Position, newName: string, token?: _.CancellationToken) => Promise<_.WorkspaceEdit | undefined>;
+    getEditsForFileRename: (oldUri: string, newUri: string, token?: _.CancellationToken) => Promise<_.WorkspaceEdit | undefined>;
+    getSemanticTokens: (uri: string, range: _.Range | undefined, legend: _.SemanticTokensLegend, token?: _.CancellationToken, reportProgress?: ((tokens: _.SemanticTokens) => void) | undefined) => Promise<_.SemanticTokens | undefined>;
+    doHover: (uri: string, position: _.Position, token?: _.CancellationToken) => Promise<_.Hover | undefined>;
+    doComplete: (uri: string, position: _.Position, completionContext?: _.CompletionContext, token?: _.CancellationToken) => Promise<_.CompletionList>;
+    doCodeActions: (uri: string, range: _.Range, codeActionContext: _.CodeActionContext, token?: _.CancellationToken) => Promise<_.CodeAction[] | undefined>;
+    doCodeActionResolve: (item: _.CodeAction, token?: _.CancellationToken) => Promise<_.CodeAction>;
+    doCompletionResolve: (item: _.CompletionItem, token?: _.CancellationToken) => Promise<_.CompletionItem>;
+    getSignatureHelp: (uri: string, position: _.Position, signatureHelpContext?: _.SignatureHelpContext, token?: _.CancellationToken) => Promise<_.SignatureHelp | undefined>;
+    doCodeLens: (uri: string, token?: _.CancellationToken) => Promise<_.CodeLens[]>;
+    doCodeLensResolve: (item: _.CodeLens, token?: _.CancellationToken) => Promise<_.CodeLens>;
+    findDocumentHighlights: (uri: string, position: _.Position, token?: _.CancellationToken) => Promise<_.DocumentHighlight[] | undefined>;
+    findDocumentLinks: (uri: string, token?: _.CancellationToken) => Promise<_.DocumentLink[]>;
+    findWorkspaceSymbols: (query: string, token?: _.CancellationToken) => Promise<_.WorkspaceSymbol[]>;
+    doAutoInsert: (uri: string, position: _.Position, autoInsertContext: import("./types").AutoInsertionContext, token?: _.CancellationToken) => Promise<NonNullable<string | _.TextEdit | null | undefined> | undefined>;
+    getInlayHints: (uri: string, range: _.Range, token?: _.CancellationToken) => Promise<_.InlayHint[] | undefined>;
     callHierarchy: {
-        doPrepare(uri: string, position: _.Position, token: _.CancellationToken): Promise<_.CallHierarchyItem[] | undefined>;
+        doPrepare(uri: string, position: _.Position, token?: _.CancellationToken): Promise<_.CallHierarchyItem[] | undefined>;
         getIncomingCalls(item: _.CallHierarchyItem, token: _.CancellationToken): Promise<_.CallHierarchyIncomingCall[]>;
@@ -47,0 +47,0 @@ getOutgoingCalls(item: _.CallHierarchyItem, token: _.CancellationToken): Promise<_.CallHierarchyOutgoingCall[]>;

out/documentFeatures/colorPresentations.d.ts

 import type { LanguageServicePluginContext } from '../types';
 import * as vscode from 'vscode-languageserver-protocol';
-export declare function register(context: LanguageServicePluginContext): (uri: string, color: vscode.Color, range: vscode.Range, token: vscode.CancellationToken) => Promise<vscode.ColorPresentation[] | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, color: vscode.Color, range: vscode.Range, token?: vscode.CancellationToken) => Promise<vscode.ColorPresentation[] | undefined>;

out/documentFeatures/colorPresentations.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
 const featureWorkers_1 = require("../utils/featureWorkers");
+const vscode = require("vscode-languageserver-protocol");
 const common_1 = require("../utils/common");
 function register(context) {
-    return (uri, color, range, token) => {
+    return (uri, color, range, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, range, (range, map, file) => {
@@ -8,0 +9,0 @@ if (file.capabilities.documentSymbol) // TODO: add color capability setting

out/documentFeatures/documentColors.d.ts

 import type { LanguageServicePluginContext } from '../types';
 import * as vscode from 'vscode-languageserver-protocol';
-export declare function register(context: LanguageServicePluginContext): (uri: string, token: vscode.CancellationToken) => Promise<vscode.ColorInformation[] | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, token?: vscode.CancellationToken) => Promise<vscode.ColorInformation[] | undefined>;

out/documentFeatures/documentColors.js

@@ -7,3 +7,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return (uri, token) => {
+    return (uri, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.documentFeatureWorker)(context, uri, file => !!file.capabilities.documentSymbol, // TODO: add color capability setting
@@ -10,0 +10,0 @@ (plugin, document) => {

out/documentFeatures/documentSymbols.d.ts

 import type { LanguageServicePluginContext } from '../types';
 import * as vscode from 'vscode-languageserver-protocol';
-export declare function register(context: LanguageServicePluginContext): (uri: string, token: vscode.CancellationToken) => Promise<vscode.DocumentSymbol[] | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, token?: vscode.CancellationToken) => Promise<vscode.DocumentSymbol[] | undefined>;

out/documentFeatures/documentSymbols.js

@@ -5,5 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const transformer = require("../transformer");
+const vscode = require("vscode-languageserver-protocol");
 const common_1 = require("../utils/common");
 function register(context) {
-    return (uri, token) => {
+    return (uri, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.documentFeatureWorker)(context, uri, file => !!file.capabilities.documentSymbol, async (plugin, document) => {
@@ -10,0 +11,0 @@ if (token.isCancellationRequested)

out/documentFeatures/foldingRanges.d.ts

 import type { LanguageServicePluginContext } from '../types';
-import type * as vscode from 'vscode-languageserver-protocol';
-export declare function register(context: LanguageServicePluginContext): (uri: string, token: vscode.CancellationToken) => Promise<vscode.FoldingRange[] | undefined>;
+import * as vscode from 'vscode-languageserver-protocol';
+export declare function register(context: LanguageServicePluginContext): (uri: string, token?: vscode.CancellationToken) => Promise<vscode.FoldingRange[] | undefined>;

out/documentFeatures/foldingRanges.js

@@ -5,4 +5,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const transformer = require("../transformer");
+const vscode = require("vscode-languageserver-protocol");
 function register(context) {
-    return (uri, token) => {
+    return (uri, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.documentFeatureWorker)(context, uri, file => !!file.capabilities.foldingRange, (plugin, document) => {
@@ -9,0 +10,0 @@ if (token.isCancellationRequested)

out/documentFeatures/format.d.ts

@@ -6,2 +6,2 @@ import * as vscode from 'vscode-languageserver-protocol';
     position: vscode.Position;
-} | undefined, token: vscode.CancellationToken) => Promise<vscode.TextEdit[] | undefined>;
+} | undefined, token?: vscode.CancellationToken) => Promise<vscode.TextEdit[] | undefined>;

out/documentFeatures/format.js

@@ -7,3 +7,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return async (uri, options, range, onTypeParams, token) => {
+    return async (uri, options, range, onTypeParams, token = vscode.CancellationToken.None) => {
         let document = context.getTextDocument(uri);
@@ -10,0 +10,0 @@ if (!document)

out/documentFeatures/linkedEditingRanges.d.ts

 import type { LanguageServicePluginContext } from '../types';
 import * as vscode from 'vscode-languageserver-protocol';
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token: vscode.CancellationToken) => Promise<vscode.LinkedEditingRanges | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token?: vscode.CancellationToken) => Promise<vscode.LinkedEditingRanges | undefined>;

out/documentFeatures/linkedEditingRanges.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
 const featureWorkers_1 = require("../utils/featureWorkers");
+const vscode = require("vscode-languageserver-protocol");
 const common_1 = require("../utils/common");
 function register(context) {
-    return (uri, position, token) => {
+    return (uri, position, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, position, (position, map) => map.toGeneratedPositions(position, data => !!data.completion), (plugin, document, position) => {
@@ -8,0 +9,0 @@ if (token.isCancellationRequested)

out/documentFeatures/selectionRanges.d.ts

 import type { LanguageServicePluginContext } from '../types';
 import * as vscode from 'vscode-languageserver-protocol';
-export declare function register(context: LanguageServicePluginContext): (uri: string, positions: vscode.Position[], token: vscode.CancellationToken) => Promise<vscode.SelectionRange[] | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, positions: vscode.Position[], token?: vscode.CancellationToken) => Promise<vscode.SelectionRange[] | undefined>;

out/documentFeatures/selectionRanges.js

@@ -5,5 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const transformer = require("../transformer");
+const vscode = require("vscode-languageserver-protocol");
 const common_1 = require("../utils/common");
 function register(context) {
-    return (uri, positions, token) => {
+    return (uri, positions, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, positions, (positions, map, file) => {
@@ -10,0 +11,0 @@ if (file.capabilities.documentFormatting) {

out/documents.js

@@ -51,3 +51,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
     // Position APIs
-    toSourcePosition(position, filter = () => true, baseOffset = 'left') {
+    toSourcePosition(position, filter = () => true, baseOffset) {
         for (const mapped of this.toSourcePositions(position, filter, baseOffset)) {
@@ -57,3 +57,3 @@ return mapped;
     }
-    toGeneratedPosition(position, filter = () => true, baseOffset = 'left') {
+    toGeneratedPosition(position, filter = () => true, baseOffset) {
         for (const mapped of this.toGeneratedPositions(position, filter, baseOffset)) {
@@ -63,3 +63,3 @@ return mapped;
     }
-    *toSourcePositions(position, filter = () => true, baseOffset = 'left') {
+    *toSourcePositions(position, filter = () => true, baseOffset) {
         for (const mapped of this.toSourcePositionsBase(position, filter, baseOffset)) {
@@ -69,3 +69,3 @@ yield mapped[0];
     }
-    *toGeneratedPositions(position, filter = () => true, baseOffset = 'left') {
+    *toGeneratedPositions(position, filter = () => true, baseOffset) {
         for (const mapped of this.toGeneratedPositionsBase(position, filter, baseOffset)) {
@@ -75,7 +75,25 @@ yield mapped[0];
     }
-    toSourcePositionsBase(position, filter = () => true, baseOffset = 'left') {
-        return this.toPositions(position, filter, this.virtualFileDocument, this.sourceFileDocument, 'generatedRange', 'sourceRange', baseOffset);
+    *toSourcePositionsBase(position, filter = () => true, baseOffset) {
+        let hasResult = false;
+        for (const mapped of this.toPositions(position, filter, this.virtualFileDocument, this.sourceFileDocument, 'generatedRange', 'sourceRange', baseOffset ?? 'left')) {
+            hasResult = true;
+            yield mapped;
+        }
+        if (!hasResult && baseOffset === undefined) {
+            for (const mapped of this.toPositions(position, filter, this.virtualFileDocument, this.sourceFileDocument, 'generatedRange', 'sourceRange', 'right')) {
+                yield mapped;
+            }
+        }
     }
-    toGeneratedPositionsBase(position, filter = () => true, baseOffset = 'left') {
-        return this.toPositions(position, filter, this.sourceFileDocument, this.virtualFileDocument, 'sourceRange', 'generatedRange', baseOffset);
+    *toGeneratedPositionsBase(position, filter = () => true, baseOffset) {
+        let hasResult = false;
+        for (const mapped of this.toPositions(position, filter, this.sourceFileDocument, this.virtualFileDocument, 'sourceRange', 'generatedRange', baseOffset ?? 'left')) {
+            hasResult = true;
+            yield mapped;
+        }
+        if (!hasResult && baseOffset === undefined) {
+            for (const mapped of this.toPositions(position, filter, this.sourceFileDocument, this.virtualFileDocument, 'sourceRange', 'generatedRange', 'right')) {
+                yield mapped;
+            }
+        }
     }
@@ -87,8 +105,3 @@ *toPositions(position, filter, fromDoc, toDoc, from, to, baseOffset) {
             }
-            let offset = mapped[0];
-            const mapping = mapped[1];
-            if (baseOffset === 'right') {
-                offset += (mapping.sourceRange[1] - mapping.sourceRange[0]) - (mapping.generatedRange[1] - mapping.generatedRange[0]);
-            }
-            yield [toDoc.positionAt(offset), mapping];
+            yield [toDoc.positionAt(mapped[0]), mapped[1]];
         }
@@ -95,0 +108,0 @@ }

out/languageFeatures/autoInsert.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext, AutoInsertionContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, autoInsertContext: AutoInsertionContext, token: vscode.CancellationToken) => Promise<NonNullable<string | vscode.TextEdit | null | undefined> | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, autoInsertContext: AutoInsertionContext, token?: vscode.CancellationToken) => Promise<NonNullable<string | vscode.TextEdit | null | undefined> | undefined>;

out/languageFeatures/autoInsert.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
+const vscode = require("vscode-languageserver-protocol");
 const featureWorkers_1 = require("../utils/featureWorkers");
 function register(context) {
-    return (uri, position, autoInsertContext, token) => {
+    return (uri, position, autoInsertContext, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, { position, autoInsertContext }, function* (arg, map) {
@@ -7,0 +8,0 @@ for (const position of map.toGeneratedPositions(arg.position, data => !!data.completion)) {

out/languageFeatures/callHierarchy.d.ts

@@ -1,2 +0,2 @@
-import type * as vscode from 'vscode-languageserver-protocol';
+import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
@@ -12,5 +12,5 @@ export interface PluginCallHierarchyData {
 export declare function register(context: LanguageServicePluginContext): {
-    doPrepare(uri: string, position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.CallHierarchyItem[] | undefined>;
+    doPrepare(uri: string, position: vscode.Position, token?: vscode.CancellationToken): Promise<vscode.CallHierarchyItem[] | undefined>;
     getIncomingCalls(item: vscode.CallHierarchyItem, token: vscode.CancellationToken): Promise<vscode.CallHierarchyIncomingCall[]>;
     getOutgoingCalls(item: vscode.CallHierarchyItem, token: vscode.CancellationToken): Promise<vscode.CallHierarchyOutgoingCall[]>;
 };

out/languageFeatures/callHierarchy.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
 const path_1 = require("path");
+const vscode = require("vscode-languageserver-protocol");
 const common_1 = require("../utils/common");
@@ -9,3 +10,3 @@ const dedupe = require("../utils/dedupe");
     return {
-        doPrepare(uri, position, token) {
+        doPrepare(uri, position, token = vscode.CancellationToken.None) {
             return (0, featureWorkers_1.languageFeatureWorker)(context, uri, position, (position, map) => map.toGeneratedPositions(position, data => !!data.references), async (plugin, document, position, map) => {
@@ -12,0 +13,0 @@ if (token.isCancellationRequested)

out/languageFeatures/codeActionResolve.d.ts

@@ -1,3 +0,3 @@
-import type * as vscode from 'vscode-languageserver-protocol';
+import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (item: vscode.CodeAction, token: vscode.CancellationToken) => Promise<vscode.CodeAction>;
+export declare function register(context: LanguageServicePluginContext): (item: vscode.CodeAction, token?: vscode.CancellationToken) => Promise<vscode.CodeAction>;

out/languageFeatures/codeActionResolve.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
+const vscode = require("vscode-languageserver-protocol");
 const rename_1 = require("./rename");
 function register(context) {
-    return async (item, token) => {
+    return async (item, token = vscode.CancellationToken.None) => {
         const data = item.data;
@@ -7,0 +8,0 @@ if (data?.type === 'plugin') {

out/languageFeatures/codeActions.d.ts

@@ -20,2 +20,2 @@ import * as vscode from 'vscode-languageserver-protocol';
 }
-export declare function register(context: LanguageServicePluginContext): (uri: string, range: vscode.Range, codeActionContext: vscode.CodeActionContext, token: vscode.CancellationToken) => Promise<vscode.CodeAction[] | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, range: vscode.Range, codeActionContext: vscode.CodeActionContext, token?: vscode.CancellationToken) => Promise<vscode.CodeAction[] | undefined>;

out/languageFeatures/codeActions.js

@@ -10,3 +10,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return async (uri, range, codeActionContext, token) => {
+    return async (uri, range, codeActionContext, token = vscode.CancellationToken.None) => {
         const sourceDocument = context.getTextDocument(uri);
@@ -13,0 +13,0 @@ if (!sourceDocument)

out/languageFeatures/codeLens.d.ts

@@ -15,2 +15,2 @@ import type { LanguageServicePluginContext } from '../types';
 }
-export declare function register(context: LanguageServicePluginContext): (uri: string, token: vscode.CancellationToken) => Promise<vscode.CodeLens[]>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, token?: vscode.CancellationToken) => Promise<vscode.CodeLens[]>;

out/languageFeatures/codeLens.js

@@ -7,3 +7,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return async (uri, token) => {
+    return async (uri, token = vscode.CancellationToken.None) => {
         const referencesCodeLendsEnabled = await context.configurationHost?.getConfiguration('volar.codeLens.references') ?? true;
@@ -10,0 +10,0 @@ return await (0, featureWorkers_1.languageFeatureWorker)(context, uri, undefined, (arg) => [arg], async (plugin, document) => {

out/languageFeatures/codeLensResolve.d.ts

@@ -5,2 +5,2 @@ import * as vscode from 'vscode-languageserver-protocol';
 export type ShowReferencesCommandData = [string, vscode.Position, vscode.Location[]];
-export declare function register(context: LanguageServicePluginContext): (item: vscode.CodeLens, token: vscode.CancellationToken) => Promise<vscode.CodeLens>;
+export declare function register(context: LanguageServicePluginContext): (item: vscode.CodeLens, token?: vscode.CancellationToken) => Promise<vscode.CodeLens>;

out/languageFeatures/codeLensResolve.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = exports.showReferencesCommand = void 0;
+const vscode = require("vscode-languageserver-protocol");
 const references = require("./references");
@@ -7,3 +8,3 @@ exports.showReferencesCommand = `volar.${Math.random().toString(36).slice(2)}.show-references`;
     const findReferences = references.register(context);
-    return async (item, token) => {
+    return async (item, token = vscode.CancellationToken.None) => {
         const data = item.data;
@@ -10,0 +11,0 @@ if (data?.kind === 'normal') {

out/languageFeatures/complete.d.ts

@@ -11,2 +11,2 @@ import * as vscode from 'vscode-languageserver-protocol';
 }
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, completionContext: vscode.CompletionContext | undefined, token: vscode.CancellationToken) => Promise<vscode.CompletionList>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, completionContext?: vscode.CompletionContext, token?: vscode.CancellationToken) => Promise<vscode.CompletionList>;

out/languageFeatures/complete.js

@@ -8,6 +8,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
     let cache;
-    return async (uri, position, completionContext, token) => {
-        completionContext ??= {
-            triggerKind: vscode.CompletionTriggerKind.Invoked,
-        };
+    return async (uri, position, completionContext = { triggerKind: vscode.CompletionTriggerKind.Invoked, }, token = vscode.CancellationToken.None) => {
         let document;
@@ -14,0 +11,0 @@ if (completionContext?.triggerKind === vscode.CompletionTriggerKind.TriggerForIncompleteCompletions

out/languageFeatures/completeResolve.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (item: vscode.CompletionItem, token: vscode.CancellationToken) => Promise<vscode.CompletionItem>;
+export declare function register(context: LanguageServicePluginContext): (item: vscode.CompletionItem, token?: vscode.CancellationToken) => Promise<vscode.CompletionItem>;

out/languageFeatures/completeResolve.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
 const transformer = require("../transformer");
+const vscode = require("vscode-languageserver-protocol");
 function register(context) {
-    return async (item, token) => {
+    return async (item, token = vscode.CancellationToken.None) => {
         const data = item.data;
@@ -7,0 +8,0 @@ if (data) {

out/languageFeatures/definition.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
 import { FileRangeCapabilities, MirrorBehaviorCapabilities } from '@volar/language-core';
-export declare function register(context: LanguageServicePluginContext, apiName: 'provideDefinition' | 'provideTypeDefinition' | 'provideImplementation', isValidMapping: (data: FileRangeCapabilities) => boolean, isValidMirrorPosition: (mirrorData: MirrorBehaviorCapabilities) => boolean): (uri: string, position: vscode.Position, token: vscode.CancellationToken) => Promise<vscode.LocationLink[] | undefined>;
+export declare function register(context: LanguageServicePluginContext, apiName: 'provideDefinition' | 'provideTypeDefinition' | 'provideImplementation', isValidMapping: (data: FileRangeCapabilities) => boolean, isValidMirrorPosition: (mirrorData: MirrorBehaviorCapabilities) => boolean): (uri: string, position: vscode.Position, token?: vscode.CancellationToken) => Promise<vscode.LocationLink[] | undefined>;

out/languageFeatures/definition.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
+const vscode = require("vscode-languageserver-protocol");
 const featureWorkers_1 = require("../utils/featureWorkers");
@@ -7,3 +8,3 @@ const dedupe = require("../utils/dedupe");
 function register(context, apiName, isValidMapping, isValidMirrorPosition) {
-    return (uri, position, token) => {
+    return (uri, position, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, position, (position, map) => map.toGeneratedPositions(position, isValidMapping), async (plugin, document, position) => {
@@ -10,0 +11,0 @@ if (token.isCancellationRequested)

out/languageFeatures/documentHighlights.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token: vscode.CancellationToken) => Promise<vscode.DocumentHighlight[] | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token?: vscode.CancellationToken) => Promise<vscode.DocumentHighlight[] | undefined>;

out/languageFeatures/documentHighlights.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
+const vscode = require("vscode-languageserver-protocol");
 const featureWorkers_1 = require("../utils/featureWorkers");
@@ -7,3 +8,3 @@ const dedupe = require("../utils/dedupe");
 function register(context) {
-    return (uri, position, token) => {
+    return (uri, position, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, position, (position, map) => map.toGeneratedPositions(position, 
@@ -10,0 +11,0 @@ // note https://github.com/johnsoncodehk/volar/issues/2009

out/languageFeatures/documentLinks.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, token: vscode.CancellationToken) => Promise<vscode.DocumentLink[]>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, token?: vscode.CancellationToken) => Promise<vscode.DocumentLink[]>;

out/languageFeatures/documentLinks.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
+const vscode = require("vscode-languageserver-protocol");
 const featureWorkers_1 = require("../utils/featureWorkers");
 const common_1 = require("../utils/common");
 function register(context) {
-    return async (uri, token) => {
+    return async (uri, token = vscode.CancellationToken.None) => {
         const pluginLinks = await (0, featureWorkers_1.documentFeatureWorker)(context, uri, file => !!file.capabilities.documentSymbol, (plugin, document) => {
@@ -8,0 +9,0 @@ if (token.isCancellationRequested)

out/languageFeatures/documentSemanticTokens.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, range: vscode.Range | undefined, legend: vscode.SemanticTokensLegend, token: vscode.CancellationToken, reportProgress?: ((tokens: vscode.SemanticTokens) => void) | undefined) => Promise<vscode.SemanticTokens | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, range: vscode.Range | undefined, legend: vscode.SemanticTokensLegend, token?: vscode.CancellationToken, reportProgress?: ((tokens: vscode.SemanticTokens) => void) | undefined) => Promise<vscode.SemanticTokens | undefined>;

out/languageFeatures/documentSemanticTokens.js

@@ -8,3 +8,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return async (uri, range, legend, token, reportProgress) => {
+    return async (uri, range, legend, token = vscode.CancellationToken.None, reportProgress) => {
         const document = context.getTextDocument(uri);
@@ -11,0 +11,0 @@ if (!document)

out/languageFeatures/fileReferences.d.ts

 import type { LanguageServicePluginContext } from '../types';
 import * as vscode from 'vscode-languageserver-protocol';
 import { NullableResult } from '@volar/language-service';
-export declare function register(context: LanguageServicePluginContext): (uri: string, token: vscode.CancellationToken) => NullableResult<vscode.Location[]>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, token?: vscode.CancellationToken) => NullableResult<vscode.Location[]>;

out/languageFeatures/fileReferences.js

@@ -5,5 +5,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const dedupe = require("../utils/dedupe");
+const vscode = require("vscode-languageserver-protocol");
 const common_1 = require("../utils/common");
 function register(context) {
-    return (uri, token) => {
+    return (uri, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, undefined, function* (_) {
@@ -10,0 +11,0 @@ yield _;

out/languageFeatures/fileRename.d.ts

 import type { LanguageServicePluginContext } from '../types';
 import type * as _ from 'vscode-languageserver-protocol';
-import type * as vscode from 'vscode-languageserver-protocol';
-export declare function register(context: LanguageServicePluginContext): (oldUri: string, newUri: string, token: vscode.CancellationToken) => Promise<_.WorkspaceEdit | undefined>;
+export declare function register(context: LanguageServicePluginContext): (oldUri: string, newUri: string, token?: _.CancellationToken) => Promise<_.WorkspaceEdit | undefined>;

out/languageFeatures/fileRename.js

@@ -6,4 +6,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const language_core_1 = require("@volar/language-core");
+const vscode = require("vscode-languageserver-protocol");
 function register(context) {
-    return async (oldUri, newUri, token) => {
+    return async (oldUri, newUri, token = vscode.CancellationToken.None) => {
         const rootFile = context.documents.getSourceByUri(oldUri)?.root;
@@ -10,0 +11,0 @@ if (rootFile) {

out/languageFeatures/hover.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token: vscode.CancellationToken) => Promise<vscode.Hover | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token?: vscode.CancellationToken) => Promise<vscode.Hover | undefined>;

out/languageFeatures/hover.js

@@ -7,3 +7,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return (uri, position, token) => {
+    return (uri, position, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, position, (position, map) => map.toGeneratedPositions(position, data => !!data.hover), (plugin, document, position) => {
@@ -10,0 +10,0 @@ if (token.isCancellationRequested)

out/languageFeatures/inlayHints.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, range: vscode.Range, token: vscode.CancellationToken) => Promise<vscode.InlayHint[] | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, range: vscode.Range, token?: vscode.CancellationToken) => Promise<vscode.InlayHint[] | undefined>;

out/languageFeatures/inlayHints.js

@@ -8,3 +8,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return async (uri, range, token) => {
+    return async (uri, range, token = vscode.CancellationToken.None) => {
         const document = context.getTextDocument(uri);
@@ -11,0 +11,0 @@ if (!document)

out/languageFeatures/references.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token: vscode.CancellationToken) => Promise<vscode.Location[] | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token?: vscode.CancellationToken) => Promise<vscode.Location[] | undefined>;

out/languageFeatures/references.js

 Object.defineProperty(exports, "__esModule", { value: true });
 exports.register = void 0;
+const vscode = require("vscode-languageserver-protocol");
 const featureWorkers_1 = require("../utils/featureWorkers");
 const dedupe = require("../utils/dedupe");
 function register(context) {
-    return (uri, position, token) => {
+    return (uri, position, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, position, (position, map) => map.toGeneratedPositions(position, data => !!data.references), async (plugin, document, position) => {
@@ -8,0 +9,0 @@ if (token.isCancellationRequested)

out/languageFeatures/rename.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
 import { DocumentsAndSourceMaps } from '../documents';
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, newName: string, token: vscode.CancellationToken) => Promise<vscode.WorkspaceEdit | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, newName: string, token?: vscode.CancellationToken) => Promise<vscode.WorkspaceEdit | undefined>;
 export declare function mergeWorkspaceEdits(original: vscode.WorkspaceEdit, ...others: vscode.WorkspaceEdit[]): void;
 export declare function embeddedEditToSourceEdit(tsResult: vscode.WorkspaceEdit, documents: DocumentsAndSourceMaps, mode: 'fileName' | 'rename' | 'codeAction' | 'format', versions?: Record<string, number>): vscode.WorkspaceEdit | undefined;

out/languageFeatures/rename.js

@@ -7,3 +7,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return (uri, position, newName, token) => {
+    return (uri, position, newName, token = vscode.CancellationToken.None) => {
         let _data;
@@ -10,0 +10,0 @@ return (0, featureWorkers_1.languageFeatureWorker)(context, uri, { position, newName }, function* (arg, map) {

out/languageFeatures/renamePrepare.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token: vscode.CancellationToken) => Promise<NonNullable<vscode.Range | vscode.ResponseError<void> | null | undefined> | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, token?: vscode.CancellationToken) => Promise<NonNullable<vscode.Range | vscode.ResponseError<void> | null | undefined> | undefined>;

out/languageFeatures/renamePrepare.js

@@ -6,3 +6,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return (uri, position, token) => {
+    return (uri, position, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, position, (position, map) => map.toGeneratedPositions(position, data => typeof data.rename === 'object' ? !!data.rename.normalize : !!data.rename), (plugin, document, position) => {
@@ -9,0 +9,0 @@ if (token.isCancellationRequested)

out/languageFeatures/signatureHelp.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, signatureHelpContext: vscode.SignatureHelpContext | undefined, token: vscode.CancellationToken) => Promise<vscode.SignatureHelp | undefined>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, position: vscode.Position, signatureHelpContext?: vscode.SignatureHelpContext, token?: vscode.CancellationToken) => Promise<vscode.SignatureHelp | undefined>;

out/languageFeatures/signatureHelp.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return (uri, position, signatureHelpContext, token) => {
-        signatureHelpContext ??= {
-            triggerKind: vscode.SignatureHelpTriggerKind.Invoked,
-            isRetrigger: false,
-        };
+    return (uri, position, signatureHelpContext = {
+        triggerKind: vscode.SignatureHelpTriggerKind.Invoked,
+        isRetrigger: false,
+    }, token = vscode.CancellationToken.None) => {
         return (0, featureWorkers_1.languageFeatureWorker)(context, uri, position, (position, map) => map.toGeneratedPositions(position, data => !!data.completion), (plugin, document, position) => {
@@ -13,0 +12,0 @@ if (token.isCancellationRequested)

out/languageFeatures/validation.d.ts

@@ -17,2 +17,2 @@ import * as vscode from 'vscode-languageserver-protocol';
 }
-export declare function register(context: LanguageServicePluginContext): (uri: string, token: vscode.CancellationToken, mode: 'all' | 'semantic' | 'syntactic', response?: ((result: vscode.Diagnostic[]) => void) | undefined) => Promise<vscode.Diagnostic[]>;
+export declare function register(context: LanguageServicePluginContext): (uri: string, mode: 'all' | 'semantic' | 'syntactic', token?: vscode.CancellationToken, response?: ((result: vscode.Diagnostic[]) => void) | undefined) => Promise<vscode.Diagnostic[]>;

out/languageFeatures/validation.js

@@ -88,3 +88,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
     };
-    return async (uri, token, mode, response) => {
+    return async (uri, mode, token = vscode.CancellationToken.None, response) => {
         const newDocument = context.getTextDocument(uri);
@@ -91,0 +91,0 @@ if (!newDocument) {

out/languageFeatures/workspaceSymbols.d.ts

 import * as vscode from 'vscode-languageserver-protocol';
 import type { LanguageServicePluginContext } from '../types';
-export declare function register(context: LanguageServicePluginContext): (query: string, token: vscode.CancellationToken) => Promise<vscode.WorkspaceSymbol[]>;
+export declare function register(context: LanguageServicePluginContext): (query: string, token?: vscode.CancellationToken) => Promise<vscode.WorkspaceSymbol[]>;

out/languageFeatures/workspaceSymbols.js

@@ -7,3 +7,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 function register(context) {
-    return async (query, token) => {
+    return async (query, token = vscode.CancellationToken.None) => {
         const symbolsList = [];
@@ -10,0 +10,0 @@ for (const plugin of Object.values(context.plugins)) {

package.json

 {
 	"name": "@volar/language-service",
-	"version": "1.4.0-alpha.1",
+	"version": "1.4.0-alpha.2",
 	"main": "out/index.js",
@@ -16,4 +16,4 @@ "license": "MIT",
 	"dependencies": {
-		"@volar/language-core": "1.4.0-alpha.1",
-		"@volar/source-map": "1.4.0-alpha.1",
+		"@volar/language-core": "1.4.0-alpha.2",
+		"@volar/source-map": "1.4.0-alpha.2",
 		"typescript-auto-import-cache": "^0.0.1",
@@ -26,3 +26,3 @@ "vscode-html-languageservice": "^5.0.4",
 	},
-	"gitHead": "41ea915b137aea284e2bf5edd98a788ce21b779c"
+	"gitHead": "034b230da17794a6fcf5a0b07668710f98ff84e3"
 }

No alert changes

Improved metrics

Total package byte prevSize

200142

increased by1.1%

Lines of code

3948

increased by0.61%

Dependency changes

• + Added@volar/language-core@1.4.0-alpha.2(transitive)

• + Added@volar/source-map@1.4.0-alpha.2(transitive)

• - Removed@volar/language-core@1.4.0-alpha.1(transitive)

• - Removed@volar/source-map@1.4.0-alpha.1(transitive)

• Updated@volar/language-core@1.4.0-alpha.2

• Updated@volar/source-map@1.4.0-alpha.2