@adecore/lsp 0.29.1 → 0.29.2

package/dist/edits.js

@@ -1,4 +1,5 @@
 import { ErrorCodes, LspError } from './connection.js';
+import { fileUriKey } from './uris.js';
 const CR = 13;
 const LF = 10;
 function checkPosition(position) {
@@ -171,20 +172,21 @@ export function minimalChange(before, after) {
     };
 }
 function snapshotEdit(uri, snapshots) {
-    const snapshot = snapshots.get(uri);
-    if (!snapshot) {
+    const found = snapshots.get(fileUriKey(uri));
+    if (!found) {
         throw new LspError(`Missing workspace snapshot: ${uri}`);
     }
-    return { uri, version: snapshot.version, before: snapshot.text, text: snapshot.text };
+    return { uri: found.uri, version: found.snapshot.version, before: found.snapshot.text, text: found.snapshot.text };
 }
 /* A file that is there already is refused, unless the create says to empty it or to leave it as it is. */
 function planCreate(change, snapshots, planned) {
-    const existing = planned.get(change.uri) ?? (snapshots.has(change.uri) ? snapshotEdit(change.uri, snapshots) : null);
+    const key = fileUriKey(change.uri);
+    const existing = planned.get(key) ?? (snapshots.has(key) ? snapshotEdit(change.uri, snapshots) : null);
     if (existing === null) {
-        planned.set(change.uri, { uri: change.uri, version: null, before: '', text: '', created: true });
+        planned.set(key, { uri: change.uri, version: null, before: '', text: '', created: true });
     }
     else if (change.options?.overwrite) {
-        planned.set(change.uri, { ...existing, text: '' });
+        planned.set(key, { ...existing, text: '' });
     }
     else if (!change.options?.ignoreIfExists) {
         throw new LspError(`${change.uri} already exists`);
@@ -195,6 +197,7 @@ function planCreate(change, snapshots, planned) {
  * files that are there; a file the edit creates is absent from it. A rename or delete needs the host's own handling and is refused.
  */
 export function planWorkspaceEdit(edit, snapshots) {
+    const keyed = new Map([...snapshots].map(([uri, snapshot]) => [fileUriKey(uri), { uri, snapshot }]));
     const planned = new Map();
     const changes = edit.documentChanges ?? Object.entries(edit.changes ?? {}).map(([uri, edits]) => ({ textDocument: { uri, version: null }, edits }));
     for (const change of changes) {
@@ -202,15 +205,16 @@ export function planWorkspaceEdit(edit, snapshots) {
             if (change.kind !== 'create') {
                 throw new LspError(`A host file-operation handler is required for ${change.kind}`);
             }
-            planCreate(change, snapshots, planned);
+            planCreate(change, keyed, planned);
             continue;
         }
         const { uri, version } = change.textDocument;
-        const current = planned.get(uri) ?? snapshotEdit(uri, snapshots);
+        const key = fileUriKey(uri);
+        const current = planned.get(key) ?? snapshotEdit(uri, keyed);
         if (version !== null && current.version !== version) {
             throw new LspError(`Workspace edit version mismatch: ${uri}`, ErrorCodes.ContentModified);
         }
-        planned.set(uri, { ...current, text: applyTextEdits(current.text, change.edits) });
+        planned.set(key, { ...current, text: applyTextEdits(current.text, change.edits) });
     }
     return [...planned.values()];
 }

package/dist/session.js

@@ -2,6 +2,7 @@ import { ErrorCodes, JsonRpcConnection, LspError } from './connection.js';
 import { LspDocument } from './document.js';
 import { createsTaken, deletesTaken, renamesTaken } from './file-operations.js';
 import { globMatch } from './glob.js';
+import { fileUriKey } from './uris.js';
 /* The capability that advertises each method statically. */
 const PROVIDERS = {
     'textDocument/completion': 'completionProvider',
@@ -111,11 +112,11 @@ export class LspSession {
         });
         this.connection.onNotification('textDocument/publishDiagnostics', (params) => {
             const diagnostics = params;
-            const document = this.documents.get(diagnostics.uri);
+            const document = this.documents.get(fileUriKey(diagnostics.uri));
             if (!document || document.isClosed || (diagnostics.version !== undefined && diagnostics.version !== document.version)) {
                 return;
             }
-            this.emitDiagnostics(diagnostics);
+            this.emitDiagnostics({ ...diagnostics, uri: document.uri });
         });
         this.connection.onRequest('workspace/configuration', async (params) => {
             const { items } = params;
@@ -202,15 +203,15 @@ export class LspSession {
     }
     openDocument(item) {
         this.assertReady();
-        if (this.documents.has(item.uri)) {
+        if (this.documents.has(fileUriKey(item.uri))) {
             throw new LspError(`Document already open: ${item.uri}`);
         }
         const document = new LspDocument(this, item);
-        this.documents.set(item.uri, document);
+        this.documents.set(fileUriKey(item.uri), document);
         return document;
     }
     getDocument(uri) {
-        return this.documents.get(uri);
+        return this.documents.get(fileUriKey(uri));
     }
     /* The options the server gave a method, from its capabilities or a registration whose selector takes `document`. */
     providerOptions(method, document) {
@@ -355,10 +356,10 @@ export class LspSession {
     }
     /* Called by a document that closed, so its diagnostics go with it. */
     forgetDocument(document) {
-        if (this.documents.get(document.uri) !== document) {
+        if (this.documents.get(fileUriKey(document.uri)) !== document) {
             return;
         }
-        this.documents.delete(document.uri);
+        this.documents.delete(fileUriKey(document.uri));
         this.emitDiagnostics({ uri: document.uri, diagnostics: [] });
     }
     assertReady() {

package/dist/uris.d.ts

@@ -1,2 +1,3 @@
 export declare function pathToFileUri(path: string): string;
 export declare function fileUriToPath(uri: string): string | null;
+export declare function fileUriKey(uri: string): string;

package/dist/uris.js

@@ -37,3 +37,14 @@ export function fileUriToPath(uri) {
     }
     return path;
 }
+/*
+ * One key for every way a URI can name the same Windows file: servers write the drive in either
+ * case, and some escape its colon (`file:///c%3A/...`). Any other URI is its own key.
+ */
+export function fileUriKey(uri) {
+    const path = fileUriToPath(uri);
+    if (path === null || !/^[A-Za-z]:\\/.test(path)) {
+        return uri;
+    }
+    return pathToFileUri(`${path[0].toUpperCase()}${path.slice(1)}`);
+}

package/dist/watched-files.d.ts

@@ -1,3 +1,3 @@
 import type { FileSystemWatcher } from './protocol.ts';
 export type FileChangeType = 1 | 2 | 3;
-export declare function watchesFile(watchers: readonly FileSystemWatcher[], root: string, path: string, type: FileChangeType): boolean;
+export declare function watchesFile(watchers: readonly FileSystemWatcher[], root: string, changed: string, type: FileChangeType): boolean;

package/dist/watched-files.js

@@ -3,6 +3,14 @@ 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'];
+/* A Windows path with forward slashes and its drive in capitals, so it compares with a pattern and a root however it was written. A POSIX path is left alone, a backslash being part of a name there. */
+function slashed(path) {
+    if (!/^[A-Za-z]:[\\/]/.test(path) && !path.startsWith('\\\\')) {
+        return path;
+    }
+    const forward = path.replaceAll('\\', '/');
+    return /^[a-z]:/.test(forward) ? `${forward[0].toUpperCase()}${forward.slice(1)}` : forward;
+}
 function relativeTo(root, path) {
     const prefix = root.endsWith('/') ? root : `${root}/`;
     return path.startsWith(prefix) ? path.slice(prefix.length) : null;
@@ -14,15 +22,16 @@ function patternOf(watcher) {
         return { base: undefined, pattern: globPattern };
     }
     const base = fileUriToPath(typeof globPattern.baseUri === 'string' ? globPattern.baseUri : globPattern.baseUri.uri);
-    return base === null ? null : { base, pattern: globPattern.pattern };
+    return base === null ? null : { base: slashed(base), pattern: globPattern.pattern };
 }
 /*
  * Whether a server asked to hear about this change. A string pattern is relative to the project folder
  * (or absolute), a relative pattern to its own base. A path inside `node_modules`, `vendor` or `.git` only
  * matches a pattern that names that folder, since `**` over a dependency tree is what a server never means.
  */
-export function watchesFile(watchers, root, path, type) {
-    const inProject = relativeTo(root, path);
+export function watchesFile(watchers, root, changed, type) {
+    const path = slashed(changed);
+    const inProject = relativeTo(slashed(root), path);
     const segments = (inProject ?? path).split('/');
     return watchers.some((watcher) => {
         if (((watcher.kind ?? EVERY_CHANGE) & (1 << (type - 1))) === 0) {
@@ -33,7 +42,7 @@ export function watchesFile(watchers, root, path, type) {
             return false;
         }
         const { base, pattern } = parts;
-        const subject = pattern.startsWith('/') ? path : base === undefined ? inProject : relativeTo(base, path);
+        const subject = pattern.startsWith('/') || /^[A-Za-z]:\//.test(pattern) ? path : base === undefined ? inProject : relativeTo(base, path);
         if (subject === null || !globMatch(subject, pattern)) {
             return false;
         }

package/package.json

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

package/src/edits.ts

@@ -1,5 +1,6 @@
 import { ErrorCodes, LspError } from './connection.ts';
 import type { ContentChange, CreateFile, Position, TextEdit, WorkspaceEdit } from './protocol.ts';
+import { fileUriKey } from './uris.ts';
 
 export interface DocumentSnapshot {
     text: string;
@@ -195,21 +196,25 @@ export function minimalChange(before: string, after: string): ContentChange {
     };
 }
 
-function snapshotEdit(uri: string, snapshots: ReadonlyMap<string, DocumentSnapshot>): PlannedDocumentEdit {
-    const snapshot = snapshots.get(uri);
-    if (!snapshot) {
+// The snapshots by `fileUriKey`, each with the URI it was given under, which the plan keeps.
+type KeyedSnapshots = ReadonlyMap<string, { uri: string; snapshot: DocumentSnapshot }>;
+
+function snapshotEdit(uri: string, snapshots: KeyedSnapshots): PlannedDocumentEdit {
+    const found = snapshots.get(fileUriKey(uri));
+    if (!found) {
         throw new LspError(`Missing workspace snapshot: ${uri}`);
     }
-    return { uri, version: snapshot.version, before: snapshot.text, text: snapshot.text };
+    return { uri: found.uri, version: found.snapshot.version, before: found.snapshot.text, text: found.snapshot.text };
 }
 
 /* A file that is there already is refused, unless the create says to empty it or to leave it as it is. */
-function planCreate(change: CreateFile, snapshots: ReadonlyMap<string, DocumentSnapshot>, planned: Map<string, PlannedDocumentEdit>): void {
-    const existing = planned.get(change.uri) ?? (snapshots.has(change.uri) ? snapshotEdit(change.uri, snapshots) : null);
+function planCreate(change: CreateFile, snapshots: KeyedSnapshots, planned: Map<string, PlannedDocumentEdit>): void {
+    const key = fileUriKey(change.uri);
+    const existing = planned.get(key) ?? (snapshots.has(key) ? snapshotEdit(change.uri, snapshots) : null);
     if (existing === null) {
-        planned.set(change.uri, { uri: change.uri, version: null, before: '', text: '', created: true });
+        planned.set(key, { uri: change.uri, version: null, before: '', text: '', created: true });
     } else if (change.options?.overwrite) {
-        planned.set(change.uri, { ...existing, text: '' });
+        planned.set(key, { ...existing, text: '' });
     } else if (!change.options?.ignoreIfExists) {
         throw new LspError(`${change.uri} already exists`);
     }
@@ -220,6 +225,7 @@ function planCreate(change: CreateFile, snapshots: ReadonlyMap<string, DocumentS
  * files that are there; a file the edit creates is absent from it. A rename or delete needs the host's own handling and is refused.
  */
 export function planWorkspaceEdit(edit: WorkspaceEdit, snapshots: ReadonlyMap<string, DocumentSnapshot>): PlannedDocumentEdit[] {
+    const keyed: KeyedSnapshots = new Map([...snapshots].map(([uri, snapshot]) => [fileUriKey(uri), { uri, snapshot }]));
     const planned = new Map<string, PlannedDocumentEdit>();
     const changes = edit.documentChanges ?? Object.entries(edit.changes ?? {}).map(([uri, edits]) => ({ textDocument: { uri, version: null }, edits }));
     for (const change of changes) {
@@ -227,15 +233,16 @@ export function planWorkspaceEdit(edit: WorkspaceEdit, snapshots: ReadonlyMap<st
             if (change.kind !== 'create') {
                 throw new LspError(`A host file-operation handler is required for ${change.kind}`);
             }
-            planCreate(change, snapshots, planned);
+            planCreate(change, keyed, planned);
             continue;
         }
         const { uri, version } = change.textDocument;
-        const current = planned.get(uri) ?? snapshotEdit(uri, snapshots);
+        const key = fileUriKey(uri);
+        const current = planned.get(key) ?? snapshotEdit(uri, keyed);
         if (version !== null && current.version !== version) {
             throw new LspError(`Workspace edit version mismatch: ${uri}`, ErrorCodes.ContentModified);
         }
-        planned.set(uri, { ...current, text: applyTextEdits(current.text, change.edits) });
+        planned.set(key, { ...current, text: applyTextEdits(current.text, change.edits) });
     }
     return [...planned.values()];
 }

package/src/session.ts

@@ -2,6 +2,7 @@ import { ErrorCodes, JsonRpcConnection, LspError, type RequestHandler } from './
 import { LspDocument } from './document.ts';
 import { createsTaken, deletesTaken, renamesTaken, type CreatedFile, type DeletedFile, type RenamedFile } from './file-operations.ts';
 import { globMatch } from './glob.ts';
+import { fileUriKey } from './uris.ts';
 import type { ResourceOperationKind } from './workspace-operations.ts';
 import type {
     ApplyWorkspaceEditParams,
@@ -173,11 +174,11 @@ export class LspSession {
         });
         this.connection.onNotification('textDocument/publishDiagnostics', (params) => {
             const diagnostics = params as PublishDiagnosticsParams;
-            const document = this.documents.get(diagnostics.uri);
+            const document = this.documents.get(fileUriKey(diagnostics.uri));
             if (!document || document.isClosed || (diagnostics.version !== undefined && diagnostics.version !== document.version)) {
                 return;
             }
-            this.emitDiagnostics(diagnostics);
+            this.emitDiagnostics({ ...diagnostics, uri: document.uri });
         });
         this.connection.onRequest('workspace/configuration', async (params) => {
             const { items } = params as { items: ConfigurationItem[] };
@@ -275,16 +276,16 @@ export class LspSession {
 
     openDocument(item: DocumentItem): LspDocument {
         this.assertReady();
-        if (this.documents.has(item.uri)) {
+        if (this.documents.has(fileUriKey(item.uri))) {
             throw new LspError(`Document already open: ${item.uri}`);
         }
         const document = new LspDocument(this, item);
-        this.documents.set(item.uri, document);
+        this.documents.set(fileUriKey(item.uri), document);
         return document;
     }
 
     getDocument(uri: string): LspDocument | undefined {
-        return this.documents.get(uri);
+        return this.documents.get(fileUriKey(uri));
     }
 
     /* The options the server gave a method, from its capabilities or a registration whose selector takes `document`. */
@@ -453,10 +454,10 @@ export class LspSession {
 
     /* Called by a document that closed, so its diagnostics go with it. */
     forgetDocument(document: LspDocument): void {
-        if (this.documents.get(document.uri) !== document) {
+        if (this.documents.get(fileUriKey(document.uri)) !== document) {
             return;
         }
-        this.documents.delete(document.uri);
+        this.documents.delete(fileUriKey(document.uri));
         this.emitDiagnostics({ uri: document.uri, diagnostics: [] });
     }
 

package/src/uris.ts

@@ -38,3 +38,15 @@ export function fileUriToPath(uri: string): string | null {
     }
     return path;
 }
+
+/*
+ * One key for every way a URI can name the same Windows file: servers write the drive in either
+ * case, and some escape its colon (`file:///c%3A/...`). Any other URI is its own key.
+ */
+export function fileUriKey(uri: string): string {
+    const path = fileUriToPath(uri);
+    if (path === null || !/^[A-Za-z]:\\/.test(path)) {
+        return uri;
+    }
+    return pathToFileUri(`${path[0]!.toUpperCase()}${path.slice(1)}`);
+}

package/src/watched-files.ts

@@ -10,6 +10,15 @@ 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'];
 
+/* A Windows path with forward slashes and its drive in capitals, so it compares with a pattern and a root however it was written. A POSIX path is left alone, a backslash being part of a name there. */
+function slashed(path: string): string {
+    if (!/^[A-Za-z]:[\\/]/.test(path) && !path.startsWith('\\\\')) {
+        return path;
+    }
+    const forward = path.replaceAll('\\', '/');
+    return /^[a-z]:/.test(forward) ? `${forward[0]!.toUpperCase()}${forward.slice(1)}` : forward;
+}
+
 function relativeTo(root: string, path: string): string | null {
     const prefix = root.endsWith('/') ? root : `${root}/`;
     return path.startsWith(prefix) ? path.slice(prefix.length) : null;
@@ -22,7 +31,7 @@ function patternOf(watcher: FileSystemWatcher): { base: string | undefined; patt
         return { base: undefined, pattern: globPattern };
     }
     const base = fileUriToPath(typeof globPattern.baseUri === 'string' ? globPattern.baseUri : globPattern.baseUri.uri);
-    return base === null ? null : { base, pattern: globPattern.pattern };
+    return base === null ? null : { base: slashed(base), pattern: globPattern.pattern };
 }
 
 /*
@@ -30,8 +39,9 @@ function patternOf(watcher: FileSystemWatcher): { base: string | undefined; patt
  * (or absolute), a relative pattern to its own base. A path inside `node_modules`, `vendor` or `.git` only
  * matches a pattern that names that folder, since `**` over a dependency tree is what a server never means.
  */
-export function watchesFile(watchers: readonly FileSystemWatcher[], root: string, path: string, type: FileChangeType): boolean {
-    const inProject = relativeTo(root, path);
+export function watchesFile(watchers: readonly FileSystemWatcher[], root: string, changed: string, type: FileChangeType): boolean {
+    const path = slashed(changed);
+    const inProject = relativeTo(slashed(root), path);
     const segments = (inProject ?? path).split('/');
     return watchers.some((watcher) => {
         if (((watcher.kind ?? EVERY_CHANGE) & (1 << (type - 1))) === 0) {
@@ -42,7 +52,7 @@ export function watchesFile(watchers: readonly FileSystemWatcher[], root: string
             return false;
         }
         const { base, pattern } = parts;
-        const subject = pattern.startsWith('/') ? path : base === undefined ? inProject : relativeTo(base, path);
+        const subject = pattern.startsWith('/') || /^[A-Za-z]:\//.test(pattern) ? path : base === undefined ? inProject : relativeTo(base, path);
         if (subject === null || !globMatch(subject, pattern)) {
             return false;
         }