@adecore/lsp 0.44.2 → 0.44.4

package/dist/session.js

@@ -317,7 +317,8 @@ export class LspSession {
         if (!this.supports('workspace/diagnostic')) {
             return Promise.reject(new LspError('Server does not support workspace diagnostics', ErrorCodes.MethodNotFound));
         }
-        return this.request('workspace/diagnostic', { identifier, previousResultIds: [...previousResultIds] }, options);
+        // The server may hold the request until something changes, so only the caller's own deadline ends it.
+        return this.request('workspace/diagnostic', { identifier, previousResultIds: [...previousResultIds] }, { timeoutMs: 0, ...options });
     }
     /* The text of a document of a scheme the server owns, such as a decompiled class, which is shown read-only. */
     textDocumentContent(uri, options) {
@@ -337,14 +338,26 @@ export class LspSession {
     }
     /* Adds and removes folders of the workspace, and tells a server that asked to hear about it. */
     async changeWorkspaceFolders(event) {
-        const removed = new Set(event.removed.map((folder) => fileUriKey(folder.uri)));
-        const kept = (this.folders ?? []).filter((folder) => !removed.has(fileUriKey(folder.uri)));
+        const asked = new Set(event.removed.map((folder) => fileUriKey(folder.uri)));
+        const current = this.folders ?? [];
+        const removed = current.filter((folder) => asked.has(fileUriKey(folder.uri)));
+        const kept = current.filter((folder) => !asked.has(fileUriKey(folder.uri)));
         const known = new Set(kept.map((folder) => fileUriKey(folder.uri)));
-        this.folders = [...kept, ...event.added.filter((folder) => !known.has(fileUriKey(folder.uri)))];
+        const added = [];
+        for (const folder of event.added) {
+            if (!known.has(fileUriKey(folder.uri))) {
+                known.add(fileUriKey(folder.uri));
+                added.push(folder);
+            }
+        }
+        this.folders = [...kept, ...added];
+        if (removed.length === 0 && added.length === 0) {
+            return;
+        }
         const notifications = this.serverCapabilities.workspace?.workspaceFolders?.changeNotifications;
         const registered = [...this.registrations.values()].some((registration) => registration.method === 'workspace/didChangeWorkspaceFolders');
         if (this.phase === 'ready' && (notifications === true || typeof notifications === 'string' || registered)) {
-            await this.notify('workspace/didChangeWorkspaceFolders', { event: { added: [...event.added], removed: [...event.removed] } });
+            await this.notify('workspace/didChangeWorkspaceFolders', { event: { added, removed } });
         }
     }
     /* Whether the server synchronizes notebooks of this type and scheme; the `notebook*` methods do nothing for one it does not. */

package/package.json

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

package/src/session.ts

@@ -484,7 +484,8 @@ export class LspSession {
         if (!this.supports('workspace/diagnostic')) {
             return Promise.reject(new LspError('Server does not support workspace diagnostics', ErrorCodes.MethodNotFound));
         }
-        return this.request('workspace/diagnostic', { identifier, previousResultIds: [...previousResultIds] }, options);
+        // The server may hold the request until something changes, so only the caller's own deadline ends it.
+        return this.request('workspace/diagnostic', { identifier, previousResultIds: [...previousResultIds] }, { timeoutMs: 0, ...options });
     }
 
     /* The text of a document of a scheme the server owns, such as a decompiled class, which is shown read-only. */
@@ -508,14 +509,26 @@ export class LspSession {
 
     /* Adds and removes folders of the workspace, and tells a server that asked to hear about it. */
     async changeWorkspaceFolders(event: WorkspaceFoldersChangeEvent): Promise<void> {
-        const removed = new Set(event.removed.map((folder) => fileUriKey(folder.uri)));
-        const kept = (this.folders ?? []).filter((folder) => !removed.has(fileUriKey(folder.uri)));
+        const asked = new Set(event.removed.map((folder) => fileUriKey(folder.uri)));
+        const current = this.folders ?? [];
+        const removed = current.filter((folder) => asked.has(fileUriKey(folder.uri)));
+        const kept = current.filter((folder) => !asked.has(fileUriKey(folder.uri)));
         const known = new Set(kept.map((folder) => fileUriKey(folder.uri)));
-        this.folders = [...kept, ...event.added.filter((folder) => !known.has(fileUriKey(folder.uri)))];
+        const added: WorkspaceFolder[] = [];
+        for (const folder of event.added) {
+            if (!known.has(fileUriKey(folder.uri))) {
+                known.add(fileUriKey(folder.uri));
+                added.push(folder);
+            }
+        }
+        this.folders = [...kept, ...added];
+        if (removed.length === 0 && added.length === 0) {
+            return;
+        }
         const notifications = this.serverCapabilities.workspace?.workspaceFolders?.changeNotifications;
         const registered = [...this.registrations.values()].some((registration) => registration.method === 'workspace/didChangeWorkspaceFolders');
         if (this.phase === 'ready' && (notifications === true || typeof notifications === 'string' || registered)) {
-            await this.notify('workspace/didChangeWorkspaceFolders', { event: { added: [...event.added], removed: [...event.removed] } });
+            await this.notify('workspace/didChangeWorkspaceFolders', { event: { added, removed } });
         }
     }