@adecore/lsp 0.21.1 → 0.22.0

package/dist/as-error.d.ts

@@ -0,0 +1 @@
+export declare function asError(error: unknown): Error;

package/dist/as-error.js

@@ -0,0 +1,3 @@
+export function asError(error) {
+    return error instanceof Error ? error : new Error(String(error));
+}

package/dist/connection.js

@@ -1,3 +1,4 @@
+import { asError } from './as-error.js';
 /* The JSON-RPC and LSP codes this package answers with. */
 export const ErrorCodes = {
     InvalidRequest: -32600,
@@ -26,8 +27,8 @@ export class StaleResultError extends LspError {
         this.uri = uri;
     }
 }
-function asError(error) {
-    return error instanceof Error ? error : new Error(String(error));
+function cancelledError() {
+    return new LspError('Request cancelled', ErrorCodes.RequestCancelled);
 }
 /* JSON-RPC 2.0 over an `LspTransport`: correlation, cancellation, and the requests a server sends back. */
 export class JsonRpcConnection {
@@ -62,7 +63,7 @@ export class JsonRpcConnection {
             return Promise.reject(new LspError('LSP connection is closed'));
         }
         if (options.signal?.aborted) {
-            return Promise.reject(new LspError('Request cancelled', ErrorCodes.RequestCancelled));
+            return Promise.reject(cancelledError());
         }
         const id = ++this.nextId;
         return new Promise((resolve, reject) => {
@@ -74,7 +75,7 @@ export class JsonRpcConnection {
                 this.settle(id, undefined, error);
                 void this.notify('$/cancelRequest', { id }).catch((failure) => this.reportError(failure));
             };
-            const abort = () => cancel(new LspError('Request cancelled', ErrorCodes.RequestCancelled));
+            const abort = () => cancel(cancelledError());
             this.pending.set(id, {
                 resolve: (value) => resolve(value),
                 reject,
@@ -108,17 +109,13 @@ export class JsonRpcConnection {
         };
     }
     onNotification(method, listener) {
-        let listeners = this.notifications.get(method);
-        if (!listeners) {
-            listeners = new Set();
-            this.notifications.set(method, listeners);
-        }
-        const registered = listeners;
-        registered.add(listener);
+        const listeners = this.notifications.get(method) ?? new Set();
+        this.notifications.set(method, listeners);
+        listeners.add(listener);
         return {
             dispose: () => {
-                registered.delete(listener);
-                if (registered.size === 0) {
+                listeners.delete(listener);
+                if (listeners.size === 0) {
                     this.notifications.delete(method);
                 }
             }
@@ -242,7 +239,7 @@ export class JsonRpcConnection {
             }
             const result = await handler(message.params, controller.signal);
             if (controller.signal.aborted) {
-                throw new LspError('Request cancelled', ErrorCodes.RequestCancelled);
+                throw cancelledError();
             }
             await this.send({ jsonrpc: '2.0', id: message.id, result: result ?? null });
         }

package/dist/edits.js

@@ -1,4 +1,6 @@
 import { ErrorCodes, LspError } from './connection.js';
+const CR = 13;
+const LF = 10;
 /* A line ends at `\n`, `\r\n` or a lone `\r`, which is how the protocol counts lines. */
 export function offsetAt(text, position) {
     if (!Number.isInteger(position.line) || !Number.isInteger(position.character) || position.line < 0 || position.character < 0) {
@@ -8,13 +10,13 @@ export function offsetAt(text, position) {
     let offset = 0;
     while (line < position.line && offset < text.length) {
         const char = text.charCodeAt(offset++);
-        if (char === 13) {
-            if (text.charCodeAt(offset) === 10) {
+        if (char === CR) {
+            if (text.charCodeAt(offset) === LF) {
                 offset++;
             }
             line++;
         }
-        else if (char === 10) {
+        else if (char === LF) {
             line++;
         }
     }
@@ -39,7 +41,7 @@ export function positionAt(text, offset) {
     let i = 0;
     while (i < offset) {
         const code = text.charCodeAt(i);
-        if (code === 13 && text.charCodeAt(i + 1) === 10) {
+        if (code === CR && text.charCodeAt(i + 1) === LF) {
             if (i + 2 > offset) {
                 break;
             }
@@ -47,7 +49,7 @@ export function positionAt(text, offset) {
             line++;
             lineStart = i;
         }
-        else if (code === 13 || code === 10) {
+        else if (code === CR || code === LF) {
             i++;
             line++;
             lineStart = i;

package/dist/session.d.ts

@@ -75,4 +75,5 @@ export declare class LspSession {
     private readConfiguration;
     private emitDiagnostics;
     private emitCapabilities;
+    private emit;
 }

package/dist/session.js

@@ -60,6 +60,25 @@ function matches(options, document) {
         (!filter.scheme || filter.scheme === url.protocol.slice(0, -1)) &&
         (!filter.pattern || globMatch(decodeURIComponent(url.pathname), filter.pattern)));
 }
+/* Whether provider options cover a method that a provider only offers on top of its feature. */
+function offersMethod(method, options) {
+    if (method.endsWith('/resolve')) {
+        return options.resolveProvider === true;
+    }
+    if (method === 'textDocument/prepareRename') {
+        return options.prepareProvider === true;
+    }
+    if (method === 'textDocument/semanticTokens/full/delta') {
+        return typeof options.full === 'object' && options.full.delta === true;
+    }
+    if (method === 'textDocument/semanticTokens/full') {
+        return !!options.full;
+    }
+    if (method === 'textDocument/semanticTokens/range') {
+        return !!options.range;
+    }
+    return true;
+}
 /* One conversation with one language server: the handshake, what it can do, and the documents open in it. */
 export class LspSession {
     connection;
@@ -203,24 +222,7 @@ export class LspSession {
         else if (provider && typeof provider === 'object' && matches(provider, document)) {
             candidates.push(provider);
         }
-        return candidates.find((options) => {
-            if (method.endsWith('/resolve')) {
-                return options.resolveProvider === true;
-            }
-            if (method === 'textDocument/prepareRename') {
-                return options.prepareProvider === true;
-            }
-            if (method === 'textDocument/semanticTokens/full/delta') {
-                return typeof options.full === 'object' && options.full.delta === true;
-            }
-            if (method === 'textDocument/semanticTokens/full') {
-                return !!options.full;
-            }
-            if (method === 'textDocument/semanticTokens/range') {
-                return !!options.range;
-            }
-            return true;
-        });
+        return candidates.find((options) => offersMethod(method, options));
     }
     supports(method, document) {
         return this.phase === 'ready' && this.providerOptions(method, document) !== undefined;
@@ -368,19 +370,16 @@ export class LspSession {
         return result ?? null;
     }
     emitDiagnostics(params) {
-        for (const listener of this.diagnosticListeners) {
-            try {
-                listener(params);
-            }
-            catch (error) {
-                this.connection.reportError(error);
-            }
-        }
+        this.emit(this.diagnosticListeners, params);
     }
     emitCapabilities() {
-        for (const listener of this.capabilityListeners) {
+        this.emit(this.capabilityListeners, undefined);
+    }
+    /* A listener that throws is reported and does not keep the others from hearing it. */
+    emit(listeners, value) {
+        for (const listener of listeners) {
             try {
-                listener();
+                listener(value);
             }
             catch (error) {
                 this.connection.reportError(error);

package/dist/transport.js

@@ -1,8 +1,6 @@
+import { asError } from './as-error.js';
 const DEFAULT_MAX_MESSAGE_BYTES = 32 * 1024 * 1024;
 const MAX_HEADER_BYTES = 8192;
-function asError(error) {
-    return error instanceof Error ? error : new Error(String(error));
-}
 /*
  * The listeners of a transport. A message that arrives before anyone listens is held and handed to
  * the first listener, since a server may speak the moment its pipe opens.
@@ -13,7 +11,7 @@ class TransportEvents {
     closes = new Set();
     backlog = [];
     error;
-    onMessage = (listener) => {
+    onMessage(listener) {
         this.messages.add(listener);
         for (const message of this.backlog.splice(0)) {
             listener(message);
@@ -23,8 +21,8 @@ class TransportEvents {
                 this.messages.delete(listener);
             }
         };
-    };
-    onClose = (listener) => {
+    }
+    onClose(listener) {
         this.closes.add(listener);
         if (this.closed) {
             listener(this.error);
@@ -34,7 +32,7 @@ class TransportEvents {
                 this.closes.delete(listener);
             }
         };
-    };
+    }
     receive(message) {
         if (this.closed) {
             return;
@@ -73,9 +71,11 @@ function concat(chunks, size) {
     }
     return joined;
 }
+const CR = 13;
+const LF = 10;
 function indexOfHeaderEnd(bytes) {
     for (let i = 0; i + 3 < bytes.length; i++) {
-        if (bytes[i] === 13 && bytes[i + 1] === 10 && bytes[i + 2] === 13 && bytes[i + 3] === 10) {
+        if (bytes[i] === CR && bytes[i + 1] === LF && bytes[i + 2] === CR && bytes[i + 3] === LF) {
             return i;
         }
     }
@@ -155,8 +155,8 @@ export function createStreamTransport(stream, options = {}) {
     });
     stream.onClose((error) => events.finish(error));
     return {
-        onMessage: events.onMessage,
-        onClose: events.onClose,
+        onMessage: (listener) => events.onMessage(listener),
+        onClose: (listener) => events.onClose(listener),
         async send(message) {
             if (events.closed) {
                 throw new Error('LSP stream is closed');
@@ -174,8 +174,8 @@ export function createMemoryTransportPair() {
     const left = new TransportEvents();
     const right = new TransportEvents();
     const end = (inbox, outbox) => ({
-        onMessage: inbox.onMessage,
-        onClose: inbox.onClose,
+        onMessage: (listener) => inbox.onMessage(listener),
+        onClose: (listener) => inbox.onClose(listener),
         send(message) {
             if (inbox.closed || outbox.closed) {
                 throw new Error('LSP transport is closed');
@@ -239,8 +239,8 @@ export async function connectWebSocket(url, options = {}) {
         options.signal?.addEventListener('abort', abort, { once: true });
     });
     return {
-        onMessage: events.onMessage,
-        onClose: events.onClose,
+        onMessage: (listener) => events.onMessage(listener),
+        onClose: (listener) => events.onClose(listener),
         send(message) {
             if (events.closed || socket.readyState !== 1) {
                 throw new Error('LSP WebSocket is closed');

package/dist/watched-files.js

@@ -1,12 +1,13 @@
 import { globMatch } from './glob.js';
 import { fileUriToPath } from './uris.js';
+const EVERY_CHANGE = 7;
 /* Folders whose files a server hears about only when a pattern of its own names the folder. */
 const SPARING_FOLDERS = ['node_modules', 'vendor', '.git'];
 function relativeTo(root, path) {
     const prefix = root.endsWith('/') ? root : `${root}/`;
     return path.startsWith(prefix) ? path.slice(prefix.length) : null;
 }
-/* A pattern with the folder it is relative to, or null for a relative pattern whose base is no folder of this machine. `base` is undefined for a string pattern. */
+/* A pattern with the folder it is relative to, or null for a relative pattern whose base is no folder of this machine. */
 function patternOf(watcher) {
     const { globPattern } = watcher;
     if (typeof globPattern === 'string') {
@@ -24,7 +25,7 @@ export function watchesFile(watchers, root, path, type) {
     const inProject = relativeTo(root, path);
     const segments = (inProject ?? path).split('/');
     return watchers.some((watcher) => {
-        if (((watcher.kind ?? 7) & (1 << (type - 1))) === 0) {
+        if (((watcher.kind ?? EVERY_CHANGE) & (1 << (type - 1))) === 0) {
             return false;
         }
         const parts = patternOf(watcher);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/lsp",
-  "version": "0.21.1",
+  "version": "0.22.0",
   "type": "module",
   "exports": {
     ".": {

package/src/as-error.ts

@@ -0,0 +1,3 @@
+export function asError(error: unknown): Error {
+    return error instanceof Error ? error : new Error(String(error));
+}

package/src/connection.ts

@@ -1,3 +1,4 @@
+import { asError } from './as-error.ts';
 import type { Disposable, LspTransport, RequestId, RequestOptions, RpcMessage, RpcRequest } from './protocol.ts';
 
 /* The JSON-RPC and LSP codes this package answers with. */
@@ -42,8 +43,8 @@ interface PendingRequest {
     cleanup(): void;
 }
 
-function asError(error: unknown): Error {
-    return error instanceof Error ? error : new Error(String(error));
+function cancelledError(): LspError {
+    return new LspError('Request cancelled', ErrorCodes.RequestCancelled);
 }
 
 /* JSON-RPC 2.0 over an `LspTransport`: correlation, cancellation, and the requests a server sends back. */
@@ -82,7 +83,7 @@ export class JsonRpcConnection {
             return Promise.reject(new LspError('LSP connection is closed'));
         }
         if (options.signal?.aborted) {
-            return Promise.reject(new LspError('Request cancelled', ErrorCodes.RequestCancelled));
+            return Promise.reject(cancelledError());
         }
         const id = ++this.nextId;
         return new Promise<T>((resolve, reject) => {
@@ -94,7 +95,7 @@ export class JsonRpcConnection {
                 this.settle(id, undefined, error);
                 void this.notify('$/cancelRequest', { id }).catch((failure) => this.reportError(failure));
             };
-            const abort = (): void => cancel(new LspError('Request cancelled', ErrorCodes.RequestCancelled));
+            const abort = (): void => cancel(cancelledError());
             this.pending.set(id, {
                 resolve: (value) => resolve(value as T),
                 reject,
@@ -131,17 +132,13 @@ export class JsonRpcConnection {
     }
 
     onNotification(method: string, listener: NotificationHandler): Disposable {
-        let listeners = this.notifications.get(method);
-        if (!listeners) {
-            listeners = new Set();
-            this.notifications.set(method, listeners);
-        }
-        const registered = listeners;
-        registered.add(listener);
+        const listeners = this.notifications.get(method) ?? new Set<NotificationHandler>();
+        this.notifications.set(method, listeners);
+        listeners.add(listener);
         return {
             dispose: () => {
-                registered.delete(listener);
-                if (registered.size === 0) {
+                listeners.delete(listener);
+                if (listeners.size === 0) {
                     this.notifications.delete(method);
                 }
             }
@@ -264,7 +261,7 @@ export class JsonRpcConnection {
             }
             const result = await handler(message.params, controller.signal);
             if (controller.signal.aborted) {
-                throw new LspError('Request cancelled', ErrorCodes.RequestCancelled);
+                throw cancelledError();
             }
             await this.send({ jsonrpc: '2.0', id: message.id, result: result ?? null });
         } catch (error) {

package/src/edits.ts

@@ -15,6 +15,9 @@ export interface PlannedDocumentEdit {
     created?: true;
 }
 
+const CR = 13;
+const LF = 10;
+
 /* A line ends at `\n`, `\r\n` or a lone `\r`, which is how the protocol counts lines. */
 export function offsetAt(text: string, position: Position): number {
     if (!Number.isInteger(position.line) || !Number.isInteger(position.character) || position.line < 0 || position.character < 0) {
@@ -24,12 +27,12 @@ export function offsetAt(text: string, position: Position): number {
     let offset = 0;
     while (line < position.line && offset < text.length) {
         const char = text.charCodeAt(offset++);
-        if (char === 13) {
-            if (text.charCodeAt(offset) === 10) {
+        if (char === CR) {
+            if (text.charCodeAt(offset) === LF) {
                 offset++;
             }
             line++;
-        } else if (char === 10) {
+        } else if (char === LF) {
             line++;
         }
     }
@@ -55,14 +58,14 @@ export function positionAt(text: string, offset: number): Position {
     let i = 0;
     while (i < offset) {
         const code = text.charCodeAt(i);
-        if (code === 13 && text.charCodeAt(i + 1) === 10) {
+        if (code === CR && text.charCodeAt(i + 1) === LF) {
             if (i + 2 > offset) {
                 break;
             }
             i += 2;
             line++;
             lineStart = i;
-        } else if (code === 13 || code === 10) {
+        } else if (code === CR || code === LF) {
             i++;
             line++;
             lineStart = i;

package/src/session.ts

@@ -11,7 +11,6 @@ import type {
     DocumentItem,
     FileEvent,
     FileOperationFilter,
-    FileRename,
     FileSystemWatcher,
     InitializeResult,
     LspTransport,
@@ -109,6 +108,26 @@ function matches(options: ProviderOptions, document?: Pick<DocumentItem, 'uri' |
     );
 }
 
+/* Whether provider options cover a method that a provider only offers on top of its feature. */
+function offersMethod(method: string, options: ProviderOptions): boolean {
+    if (method.endsWith('/resolve')) {
+        return options.resolveProvider === true;
+    }
+    if (method === 'textDocument/prepareRename') {
+        return options.prepareProvider === true;
+    }
+    if (method === 'textDocument/semanticTokens/full/delta') {
+        return typeof options.full === 'object' && options.full.delta === true;
+    }
+    if (method === 'textDocument/semanticTokens/full') {
+        return !!options.full;
+    }
+    if (method === 'textDocument/semanticTokens/range') {
+        return !!options.range;
+    }
+    return true;
+}
+
 /* One conversation with one language server: the handshake, what it can do, and the documents open in it. */
 export class LspSession {
     readonly connection: JsonRpcConnection;
@@ -265,24 +284,7 @@ export class LspSession {
         } else if (provider && typeof provider === 'object' && matches(provider as ProviderOptions, document)) {
             candidates.push(provider as ProviderOptions);
         }
-        return candidates.find((options) => {
-            if (method.endsWith('/resolve')) {
-                return options.resolveProvider === true;
-            }
-            if (method === 'textDocument/prepareRename') {
-                return options.prepareProvider === true;
-            }
-            if (method === 'textDocument/semanticTokens/full/delta') {
-                return typeof options.full === 'object' && options.full.delta === true;
-            }
-            if (method === 'textDocument/semanticTokens/full') {
-                return !!options.full;
-            }
-            if (method === 'textDocument/semanticTokens/range') {
-                return !!options.range;
-            }
-            return true;
-        });
+        return candidates.find((options) => offersMethod(method, options));
     }
 
     supports(method: string, document?: Pick<DocumentItem, 'uri' | 'languageId'>): boolean {
@@ -382,7 +384,7 @@ export class LspSession {
 
     /* Tells the server which of these files moved, those its filters take. */
     async didRenameFiles(files: readonly RenamedFile[]): Promise<void> {
-        const taken: FileRename[] = renamesTaken(this.fileOperationFilters('didRename'), files);
+        const taken = renamesTaken(this.fileOperationFilters('didRename'), files);
         if (taken.length > 0 && this.phase === 'ready') {
             await this.notify('workspace/didRenameFiles', { files: taken });
         }
@@ -453,19 +455,18 @@ export class LspSession {
     }
 
     private emitDiagnostics(params: PublishDiagnosticsParams): void {
-        for (const listener of this.diagnosticListeners) {
-            try {
-                listener(params);
-            } catch (error) {
-                this.connection.reportError(error);
-            }
-        }
+        this.emit(this.diagnosticListeners, params);
     }
 
     private emitCapabilities(): void {
-        for (const listener of this.capabilityListeners) {
+        this.emit(this.capabilityListeners, undefined);
+    }
+
+    /* A listener that throws is reported and does not keep the others from hearing it. */
+    private emit<T>(listeners: ReadonlySet<(value: T) => void>, value: T): void {
+        for (const listener of listeners) {
             try {
-                listener();
+                listener(value);
             } catch (error) {
                 this.connection.reportError(error);
             }

package/src/transport.ts

@@ -1,12 +1,9 @@
+import { asError } from './as-error.ts';
 import type { Disposable, LspTransport, RpcMessage } from './protocol.ts';
 
 const DEFAULT_MAX_MESSAGE_BYTES = 32 * 1024 * 1024;
 const MAX_HEADER_BYTES = 8192;
 
-function asError(error: unknown): Error {
-    return error instanceof Error ? error : new Error(String(error));
-}
-
 /*
  * The listeners of a transport. A message that arrives before anyone listens is held and handed to
  * the first listener, since a server may speak the moment its pipe opens.
@@ -18,7 +15,7 @@ class TransportEvents {
     private backlog: unknown[] = [];
     private error?: Error;
 
-    onMessage = (listener: (message: unknown) => void): Disposable => {
+    onMessage(listener: (message: unknown) => void): Disposable {
         this.messages.add(listener);
         for (const message of this.backlog.splice(0)) {
             listener(message);
@@ -28,9 +25,9 @@ class TransportEvents {
                 this.messages.delete(listener);
             }
         };
-    };
+    }
 
-    onClose = (listener: (error?: Error) => void): Disposable => {
+    onClose(listener: (error?: Error) => void): Disposable {
         this.closes.add(listener);
         if (this.closed) {
             listener(this.error);
@@ -40,7 +37,7 @@ class TransportEvents {
                 this.closes.delete(listener);
             }
         };
-    };
+    }
 
     receive(message: unknown): void {
         if (this.closed) {
@@ -83,9 +80,12 @@ function concat(chunks: readonly Uint8Array[], size: number): Uint8Array {
     return joined;
 }
 
+const CR = 13;
+const LF = 10;
+
 function indexOfHeaderEnd(bytes: Uint8Array): number {
     for (let i = 0; i + 3 < bytes.length; i++) {
-        if (bytes[i] === 13 && bytes[i + 1] === 10 && bytes[i + 2] === 13 && bytes[i + 3] === 10) {
+        if (bytes[i] === CR && bytes[i + 1] === LF && bytes[i + 2] === CR && bytes[i + 3] === LF) {
             return i;
         }
     }
@@ -178,8 +178,8 @@ export function createStreamTransport(stream: ByteStream, options: { maxMessageB
     });
     stream.onClose((error) => events.finish(error));
     return {
-        onMessage: events.onMessage,
-        onClose: events.onClose,
+        onMessage: (listener) => events.onMessage(listener),
+        onClose: (listener) => events.onClose(listener),
         async send(message) {
             if (events.closed) {
                 throw new Error('LSP stream is closed');
@@ -198,8 +198,8 @@ export function createMemoryTransportPair(): [LspTransport, LspTransport] {
     const left = new TransportEvents();
     const right = new TransportEvents();
     const end = (inbox: TransportEvents, outbox: TransportEvents): LspTransport => ({
-        onMessage: inbox.onMessage,
-        onClose: inbox.onClose,
+        onMessage: (listener) => inbox.onMessage(listener),
+        onClose: (listener) => inbox.onClose(listener),
         send(message) {
             if (inbox.closed || outbox.closed) {
                 throw new Error('LSP transport is closed');
@@ -271,8 +271,8 @@ export async function connectWebSocket(url: string, options: WebSocketTransportO
         options.signal?.addEventListener('abort', abort, { once: true });
     });
     return {
-        onMessage: events.onMessage,
-        onClose: events.onClose,
+        onMessage: (listener) => events.onMessage(listener),
+        onClose: (listener) => events.onClose(listener),
         send(message) {
             if (events.closed || socket.readyState !== 1) {
                 throw new Error('LSP WebSocket is closed');

package/src/watched-files.ts

@@ -5,6 +5,8 @@ import { fileUriToPath } from './uris.ts';
 /* A change of a file as the protocol numbers it: created, changed, deleted. */
 export type FileChangeType = 1 | 2 | 3;
 
+const EVERY_CHANGE = 7;
+
 /* Folders whose files a server hears about only when a pattern of its own names the folder. */
 const SPARING_FOLDERS = ['node_modules', 'vendor', '.git'];
 
@@ -13,7 +15,7 @@ function relativeTo(root: string, path: string): string | null {
     return path.startsWith(prefix) ? path.slice(prefix.length) : null;
 }
 
-/* A pattern with the folder it is relative to, or null for a relative pattern whose base is no folder of this machine. `base` is undefined for a string pattern. */
+/* A pattern with the folder it is relative to, or null for a relative pattern whose base is no folder of this machine. */
 function patternOf(watcher: FileSystemWatcher): { base: string | undefined; pattern: string } | null {
     const { globPattern } = watcher;
     if (typeof globPattern === 'string') {
@@ -32,7 +34,7 @@ export function watchesFile(watchers: readonly FileSystemWatcher[], root: string
     const inProject = relativeTo(root, path);
     const segments = (inProject ?? path).split('/');
     return watchers.some((watcher) => {
-        if (((watcher.kind ?? 7) & (1 << (type - 1))) === 0) {
+        if (((watcher.kind ?? EVERY_CHANGE) & (1 << (type - 1))) === 0) {
             return false;
         }
         const parts = patternOf(watcher);