@mrclrchtr/supi-lsp 11.0.0 → 11.1.0

package/node_modules/vscode-jsonrpc/lib/node/main.js

@@ -84,7 +84,7 @@ class IPCMessageWriter extends api_1.AbstractMessageWriter {
         this.errorCount = 0;
         const eventEmitter = this.process;
         eventEmitter.on('error', (error) => this.fireError(error));
-        eventEmitter.on('close', () => this.fireClose);
+        eventEmitter.on('close', () => this.fireClose());
     }
     write(msg) {
         try {
@@ -119,7 +119,7 @@ class PortMessageReader extends api_1.AbstractMessageReader {
     constructor(port) {
         super();
         this.onData = new api_1.Emitter;
-        port.on('close', () => this.fireClose);
+        port.on('close', () => this.fireClose());
         port.on('error', (error) => this.fireError(error));
         port.on('message', (message) => {
             this.onData.fire(message);
@@ -227,7 +227,8 @@ function createClientPipeTransport(pipeName, encoding = 'utf-8') {
         server.listen(pipeName, () => {
             server.removeListener('error', reject);
             resolve({
-                onConnected: () => { return connected; }
+                onConnected: () => { return connected; },
+                close: () => { server.close(); }
             });
         });
     });
@@ -263,7 +264,8 @@ function createClientSocketTransport(port, encoding = 'utf-8') {
             const boundPort = address.port;
             resolve({
                 port: () => boundPort,
-                onConnected: () => { return connected; }
+                onConnected: () => { return connected; },
+                close: () => { server.close(); }
             });
         });
     });

package/node_modules/vscode-jsonrpc/lib/node/ril.js

@@ -5,6 +5,7 @@
  * ------------------------------------------------------------------------------------------ */
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("util");
+const crypto_1 = require("crypto");
 const api_1 = require("../common/api");
 class MessageBuffer extends api_1.AbstractMessageBuffer {
     static emptyBuffer = Buffer.allocUnsafe(0);
@@ -30,7 +31,7 @@ class MessageBuffer extends api_1.AbstractMessageBuffer {
             return buffer instanceof Buffer ? buffer : Buffer.from(buffer);
         }
         else {
-            return buffer instanceof Buffer ? buffer.slice(0, length) : Buffer.from(buffer, 0, length);
+            return buffer instanceof Buffer ? buffer.slice(0, length) : Buffer.from(buffer.subarray(0, length));
         }
     }
     allocNative(length) {
@@ -99,6 +100,9 @@ class WritableStreamWrapper {
     }
 }
 const _ril = Object.freeze({
+    crypto: Object.freeze({
+        randomUUID: () => (0, crypto_1.randomUUID)()
+    }),
     messageBuffer: Object.freeze({
         create: (encoding) => new MessageBuffer(encoding)
     }),

package/node_modules/vscode-jsonrpc/package.json

@@ -1,9 +1,10 @@
 {
 	"name": "vscode-jsonrpc",
 	"description": "A json rpc implementation over streams",
-	"version": "9.0.3",
+	"version": "10.0.0",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
+	"homepage": "https://github.com/microsoft/vscode-languageserver-node/tree/main/jsonrpc",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/Microsoft/vscode-languageserver-node.git",
@@ -13,7 +14,7 @@
 		"url": "https://github.com/Microsoft/vscode-languageserver-node/issues"
 	},
 	"engines": {
-		"node": ">=14.0.0"
+		"node": ">=14.17.0"
 	},
 	"exports": {
 		".": {
@@ -31,6 +32,7 @@
 	},
 	"devDependencies": {
 		"@types/msgpack-lite": "^0.1.12",
+		"@types/node": "22.13.14",
 		"msgpack-lite": "^0.1.26"
 	},
 	"scripts": {

package/node_modules/vscode-languageserver-protocol/package.json

@@ -1,9 +1,10 @@
 {
 	"name": "vscode-languageserver-protocol",
 	"description": "VSCode Language Server Protocol implementation",
-	"version": "3.18.4",
+	"version": "3.18.5",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
+	"homepage": "https://github.com/microsoft/vscode-languageserver-node/tree/main/protocol",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/Microsoft/vscode-languageserver-node.git",
@@ -27,8 +28,8 @@
 		}
 	},
 	"dependencies": {
-		"vscode-jsonrpc": "9.0.3",
-		"vscode-languageserver-types": "3.18.4"
+		"vscode-jsonrpc": "10.0.0",
+		"vscode-languageserver-types": "3.18.5"
 	},
 	"scripts": {
 		"prepublishOnly": "npm run all:publish",

package/node_modules/vscode-languageserver-types/lib/esm/main.js

@@ -222,7 +222,7 @@ export var ColorPresentation;
     function is(value) {
         const candidate = value;
         return Is.objectLiteral(candidate) && Is.string(candidate.label)
-            && (Is.undefined(candidate.textEdit) || TextEdit.is(candidate))
+            && (Is.undefined(candidate.textEdit) || TextEdit.is(candidate.textEdit))
             && (Is.undefined(candidate.additionalTextEdits) || Is.typedArray(candidate.additionalTextEdits, TextEdit.is));
     }
     ColorPresentation.is = is;
@@ -279,7 +279,7 @@ export var FoldingRange;
      */
     function is(value) {
         const candidate = value;
-        return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.startLine)
+        return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.endLine)
             && (Is.undefined(candidate.startCharacter) || Is.uinteger(candidate.startCharacter))
             && (Is.undefined(candidate.endCharacter) || Is.uinteger(candidate.endCharacter))
             && (Is.undefined(candidate.kind) || Is.string(candidate.kind));

package/node_modules/vscode-languageserver-types/lib/umd/main.js

@@ -233,7 +233,7 @@
         function is(value) {
             var candidate = value;
             return Is.objectLiteral(candidate) && Is.string(candidate.label)
-                && (Is.undefined(candidate.textEdit) || TextEdit.is(candidate))
+                && (Is.undefined(candidate.textEdit) || TextEdit.is(candidate.textEdit))
                 && (Is.undefined(candidate.additionalTextEdits) || Is.typedArray(candidate.additionalTextEdits, TextEdit.is));
         }
         ColorPresentation.is = is;
@@ -290,7 +290,7 @@
          */
         function is(value) {
             var candidate = value;
-            return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.startLine)
+            return Is.objectLiteral(candidate) && Is.uinteger(candidate.startLine) && Is.uinteger(candidate.endLine)
                 && (Is.undefined(candidate.startCharacter) || Is.uinteger(candidate.startCharacter))
                 && (Is.undefined(candidate.endCharacter) || Is.uinteger(candidate.endCharacter))
                 && (Is.undefined(candidate.kind) || Is.string(candidate.kind));

package/node_modules/vscode-languageserver-types/package.json

@@ -1,9 +1,10 @@
 {
 	"name": "vscode-languageserver-types",
 	"description": "Types used by the Language server for node",
-	"version": "3.18.4",
+	"version": "3.18.5",
 	"author": "Microsoft Corporation",
 	"license": "MIT",
+	"homepage": "https://github.com/microsoft/vscode-languageserver-node/tree/main/types",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/Microsoft/vscode-languageserver-node.git",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrclrchtr/supi-lsp",
-  "version": "11.0.0",
+  "version": "11.1.0",
   "description": "Language Server Protocol runtime for SuPi code intelligence",
   "license": "MIT",
   "repository": {
@@ -34,11 +34,11 @@
   "dependencies": {
     "ignore": "^7.0.5",
     "typescript": "6.0.3",
-    "vscode-jsonrpc": "^9.0.0",
-    "vscode-languageserver-protocol": "^3.18.0",
-    "vscode-languageserver-types": "^3.18.0",
-    "@mrclrchtr/supi-code-runtime": "11.0.0",
-    "@mrclrchtr/supi-core": "11.0.0"
+    "vscode-jsonrpc": "^10.0.0",
+    "vscode-languageserver-protocol": "^3.18.5",
+    "vscode-languageserver-types": "^3.18.5",
+    "@mrclrchtr/supi-code-runtime": "11.1.0",
+    "@mrclrchtr/supi-core": "11.1.0"
   },
   "bundledDependencies": [
     "@mrclrchtr/supi-code-runtime",

package/src/client/client.ts

@@ -82,6 +82,9 @@ import { SemanticInputSynchronizationError } from "./client-semantic-input-error
 import { JsonRpcClient, JsonRpcRequestError } from "./transport.ts";
 
 const SHUTDOWN_TIMEOUT_MS = 5_000;
+// ContentModified can outlive the server's progress notifications. Yield before
+// spending the single retry instead of immediately racing the same analysis.
+const CONTENT_MODIFIED_RETRY_DELAY_MS = 100;
 
 /** Bounded stderr tail kept for startup-failure error messages. */
 const STDERR_TAIL_MAX_CHARS = 4_000;
@@ -1498,6 +1501,9 @@ export class LspClient {
     for (;;) {
       const attempt: SemanticRequestAttemptState = { inputRevision: undefined };
       try {
+        if (retryGuard.retryReason === "content-modified") {
+          await this.waitForContentModifiedRetry(control);
+        }
         const data = await this.runSemanticRequestAttempt<T>({
           method,
           params,
@@ -1515,6 +1521,21 @@ export class LspClient {
     }
   }
 
+  /** Pause only the protocol retry, without extending the caller's deadline. */
+  private async waitForContentModifiedRetry(control?: CodeRequestControl): Promise<void> {
+    let timer: ReturnType<typeof setTimeout> | undefined;
+    try {
+      await raceRequestControl(
+        new Promise<void>((resolve) => {
+          timer = setTimeout(resolve, CONTENT_MODIFIED_RETRY_DELAY_MS);
+        }),
+        control,
+      );
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
+  }
+
   /** Return only when another attempt is permitted; retain the cause when retry stops. */
   private prepareSemanticRetry(options: {
     method: string;

package/src/manager/manager.ts

@@ -2975,7 +2975,7 @@ export class LspManager {
     control?: CodeRequestControl,
   ): Promise<{ kind: "enrolled" } | { kind: "unavailable"; reason: string }> {
     throwIfCodeRequestInterrupted(control);
-    const files = [...new Set(filePaths)].sort();
+    const files = [...new Set(filePaths)].sort((a, b) => (a < b ? -1 : a > b ? 1 : 0));
     const routeKey = clientKey(client.name, client.root);
     if (this.clients.get(routeKey) !== client) {
       return { kind: "unavailable", reason: "The semantic route changed during rename planning." };