@rohal12/spindle-lsp 0.15.48 → 0.15.50

package/dist/bin.js

@@ -55,7 +55,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = false ? pkg.version : "0.15.48";
+    VERSION = false ? pkg.version : "0.15.50";
   }
 });
 
@@ -35952,13 +35952,21 @@ function readText2(text3) {
   }
   return new DocumentMarkup(TEXT_URI, text3, passages, TEXT_CONTEXT);
 }
+function bracketLinksByTarget(passage) {
+  let index = bracketLinks.get(passage);
+  if (!index) {
+    index = new Map(passage.tokens.flatMap((token) => token.type === "link" ? [[token.targetStart, token]] : []));
+    bracketLinks.set(passage, index);
+  }
+  return index;
+}
 function findLinkRuntimeMismatches(text3) {
   if (!(typeof text3 === "string" ? text3 : text3.text).includes("[[")) return [];
   const found = [];
   for (const ref2 of documentPassageRefs(markupOfText(text3))) {
     if (ref2.form !== "bracket") continue;
-    const link = ref2.passage.tokens.find((token) => token.type === "link" && token.targetStart === ref2.start);
-    if (link?.type !== "link") continue;
+    const link = bracketLinksByTarget(ref2.passage).get(ref2.start);
+    if (!link) continue;
     const runtime = bracketLinkMismatch(link.display, link.target);
     if (!runtime) continue;
     found.push({ range: ref2.passage.range(link.start, link.end), display: link.display, target: link.target, runtime });
@@ -35984,7 +35992,7 @@ function findLiteralLinkInterpolations(text3) {
   }
   return found;
 }
-var TEXT_URI, TEXT_CONTEXT, lastMarkup;
+var TEXT_URI, TEXT_CONTEXT, lastMarkup, bracketLinks;
 var init_link_parser = __esm({
   "src/core/parsing/link-parser.ts"() {
     "use strict";
@@ -35995,6 +36003,7 @@ var init_link_parser = __esm({
     init_passage_refs();
     TEXT_URI = "memory:///text.tw";
     TEXT_CONTEXT = { macros: builtinMacros, isBlock: isBlockMacro };
+    bracketLinks = /* @__PURE__ */ new WeakMap();
   }
 });
 
@@ -36019,35 +36028,38 @@ function computeDiagnostics(uri, workspace, options) {
   const diagnostics = [...tweeDiagnostics(doc)];
   if (doc.passages.length === 0) return diagnostics;
   const attempt = (check2) => {
+    let batch;
     try {
-      check2();
+      batch = check2();
     } catch {
+      return;
     }
+    for (const diagnostic of batch) diagnostics.push(diagnostic);
   };
   const story = storyReport(workspace);
-  diagnostics.push(...story.metadata.get(doc) ?? []);
+  for (const diagnostic of story.metadata.get(doc) ?? []) diagnostics.push(diagnostic);
   const effective = new Set(workspace.passages.getEffectivePassages());
   let passageNames;
   const getPassageNames = () => passageNames ??= [...effective].filter(isRuntimePassage).map((passage) => passage.name);
   for (const passage of doc.passages) {
     if (!effective.has(passage.passage)) continue;
-    attempt(() => diagnostics.push(...markupDiagnostics(passage, story, workspace)));
-    attempt(() => diagnostics.push(...variableDiagnostics(passage, story)));
-    attempt(() => diagnostics.push(...structureDiagnostics(passage, workspace)));
-    attempt(() => diagnostics.push(...argumentDiagnostics(passage, workspace, getPassageNames)));
-    attempt(() => diagnostics.push(...widgetDiagnostics(passage, story, workspace)));
-  }
-  attempt(() => diagnostics.push(...versionDiagnostics(uri, doc, workspace)));
-  attempt(() => diagnostics.push(...storyVariablesDiagnostics(uri, doc, story, workspace)));
-  attempt(() => diagnostics.push(...arrayMemberDiagnostics(uri, workspace)));
-  attempt(() => diagnostics.push(...linkDiagnostics(doc).filter((diagnostic) => {
+    attempt(() => markupDiagnostics(passage, story, workspace));
+    attempt(() => variableDiagnostics(passage, story));
+    attempt(() => structureDiagnostics(passage, story, workspace));
+    attempt(() => argumentDiagnostics(passage, workspace, getPassageNames));
+    attempt(() => widgetDiagnostics(passage, story, workspace));
+  }
+  attempt(() => versionDiagnostics(uri, doc, workspace));
+  attempt(() => storyVariablesDiagnostics(uri, doc, story, workspace));
+  attempt(() => arrayMemberDiagnostics(uri, workspace));
+  attempt(() => linkDiagnostics(doc).filter((diagnostic) => {
     const passage = doc.passageAt(diagnostic.range.start);
     return passage !== void 0 && effective.has(passage.passage);
-  })));
-  attempt(() => diagnostics.push(...unusedWidgetDiagnostics(doc, story)));
+  }));
+  attempt(() => unusedWidgetDiagnostics(doc, story));
   if (options?.maxLineLength) {
     const maxLength = options.maxLineLength;
-    attempt(() => diagnostics.push(...lineLengthDiagnostics(doc, maxLength)));
+    attempt(() => lineLengthDiagnostics(doc, maxLength));
   }
   return diagnostics.sort((a, b) => a.range.start.line - b.range.start.line || a.range.start.character - b.range.start.character);
 }
@@ -36136,6 +36148,7 @@ function buildReport(documents, workspace) {
     metadata: storyDataDiagnostics(documents, workspace),
     passages,
     macros,
+    toolingChildren: new Set(workspace.macros.getAllMacros().filter((macro) => macro.source === "user").flatMap((macro) => macro.subMacros.map((name) => name.toLowerCase()))),
     markup,
     widgets,
     widgetList,
@@ -36308,15 +36321,15 @@ function versionDiagnostics(uri, doc, workspace) {
   const first = doc.passages[0].passage;
   return [makeDiag({ start: first.range.start, end: first.headerEnd.end }, DiagnosticCode.UnsupportedSpindleVersion, unsupportedVersionMessage(target))];
 }
-function structureDiagnostics(passage, workspace) {
+function structureDiagnostics(passage, story, workspace) {
   const diagnostics = [];
   if (!passage.isMarkup) return diagnostics;
   const visit2 = (nodes, ancestors) => {
     for (const node2 of nodes) {
       const token = node2.token;
       if (token.type === "macro" && !token.isClose) {
-        diagnostics.push(...parentDiagnostics(passage, token, ancestors, workspace));
-        diagnostics.push(...childDiagnostics(passage, node2, token, workspace));
+        diagnostics.push(...parentDiagnostics(passage, token, ancestors, story, workspace));
+        for (const diagnostic of childDiagnostics(passage, node2, token, workspace)) diagnostics.push(diagnostic);
         diagnostics.push(...loopDiagnostics(passage, token, ancestors, workspace));
       }
       if (!node2.body) continue;
@@ -36336,11 +36349,11 @@ function structureDiagnostics(passage, workspace) {
   }
   return diagnostics;
 }
-function parentDiagnostics(passage, token, ancestors, workspace) {
+function parentDiagnostics(passage, token, ancestors, story, workspace) {
   const name = token.name.toLowerCase();
   const parents = workspace.getEffectiveMacro(name)?.parents;
   if (!parents || parents.length === 0 || BRANCH_MACROS2.has(name)) return [];
-  if (workspace.macros.getAllMacros().some((macro) => macro.source === "user" && macro.subMacros.some((sub) => sub.toLowerCase() === name))) return [];
+  if (story.toolingChildren.has(name)) return [];
   const allowed = new Set(parents.map((parent) => parent.toLowerCase()));
   const parentList = parents.join(", ");
   const range2 = passage.range(token.start, token.end);
@@ -80468,10 +80481,11 @@ var require_connection = __commonJS({
           } finally {
             if (result2 instanceof Promise) {
               result2.then(() => {
-                inFlight--;
-                triggerMessageQueue();
               }).catch((error62) => {
                 logger.error(`Processing message queue failed: ${error62.toString()}`);
+              }).finally(() => {
+                inFlight--;
+                triggerMessageQueue();
               });
             } else {
               inFlight--;
@@ -81676,7 +81690,7 @@ var init_main = __esm({
       ColorPresentation2.create = create;
       function is2(value) {
         const candidate = value;
-        return Is2.objectLiteral(candidate) && Is2.string(candidate.label) && (Is2.undefined(candidate.textEdit) || TextEdit.is(candidate)) && (Is2.undefined(candidate.additionalTextEdits) || Is2.typedArray(candidate.additionalTextEdits, TextEdit.is));
+        return Is2.objectLiteral(candidate) && Is2.string(candidate.label) && (Is2.undefined(candidate.textEdit) || TextEdit.is(candidate.textEdit)) && (Is2.undefined(candidate.additionalTextEdits) || Is2.typedArray(candidate.additionalTextEdits, TextEdit.is));
       }
       ColorPresentation2.is = is2;
     })(ColorPresentation || (ColorPresentation = {}));
@@ -81708,7 +81722,7 @@ var init_main = __esm({
       FoldingRange2.create = create;
       function is2(value) {
         const candidate = value;
-        return Is2.objectLiteral(candidate) && Is2.uinteger(candidate.startLine) && Is2.uinteger(candidate.startLine) && (Is2.undefined(candidate.startCharacter) || Is2.uinteger(candidate.startCharacter)) && (Is2.undefined(candidate.endCharacter) || Is2.uinteger(candidate.endCharacter)) && (Is2.undefined(candidate.kind) || Is2.string(candidate.kind));
+        return Is2.objectLiteral(candidate) && Is2.uinteger(candidate.startLine) && Is2.uinteger(candidate.endLine) && (Is2.undefined(candidate.startCharacter) || Is2.uinteger(candidate.startCharacter)) && (Is2.undefined(candidate.endCharacter) || Is2.uinteger(candidate.endCharacter)) && (Is2.undefined(candidate.kind) || Is2.string(candidate.kind));
       }
       FoldingRange2.is = is2;
     })(FoldingRange || (FoldingRange = {}));
@@ -84767,98 +84781,6 @@ var require_api2 = __commonJS({
   }
 });
 
-// node_modules/vscode-languageserver/lib/common/utils/uuid.js
-var require_uuid = __commonJS({
-  "node_modules/vscode-languageserver/lib/common/utils/uuid.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", { value: true });
-    exports.empty = void 0;
-    exports.v4 = v4;
-    exports.isUUID = isUUID;
-    exports.parse = parse6;
-    exports.generateUuid = generateUuid;
-    var ValueUUID = class {
-      _value;
-      constructor(_value) {
-        this._value = _value;
-      }
-      asHex() {
-        return this._value;
-      }
-      equals(other) {
-        return this.asHex() === other.asHex();
-      }
-    };
-    var V4UUID = class _V4UUID extends ValueUUID {
-      static _chars = ["0", "1", "2", "3", "4", "5", "6", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f"];
-      static _timeHighBits = ["8", "9", "a", "b"];
-      static _oneOf(array2) {
-        return array2[Math.floor(array2.length * Math.random())];
-      }
-      static _randomHex() {
-        return _V4UUID._oneOf(_V4UUID._chars);
-      }
-      constructor() {
-        super([
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          "-",
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          "-",
-          "4",
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          "-",
-          _V4UUID._oneOf(_V4UUID._timeHighBits),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          "-",
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex(),
-          _V4UUID._randomHex()
-        ].join(""));
-      }
-    };
-    exports.empty = new ValueUUID("00000000-0000-0000-0000-000000000000");
-    function v4() {
-      return new V4UUID();
-    }
-    var _UUIDPattern = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-    function isUUID(value) {
-      return _UUIDPattern.test(value);
-    }
-    function parse6(value) {
-      if (!isUUID(value)) {
-        throw new Error("invalid uuid");
-      }
-      return new ValueUUID(value);
-    }
-    function generateUuid() {
-      return v4().asHex();
-    }
-  }
-});
-
 // node_modules/vscode-languageserver/lib/common/progress.js
 var require_progress = __commonJS({
   "node_modules/vscode-languageserver/lib/common/progress.js"(exports) {
@@ -84868,7 +84790,6 @@ var require_progress = __commonJS({
     exports.attachWorkDone = attachWorkDone;
     exports.attachPartialResult = attachPartialResult;
     var vscode_languageserver_protocol_1 = require_api2();
-    var uuid_1 = require_uuid();
     var WorkDoneProgressReporter;
     (function(WorkDoneProgressReporter2) {
       function isNullInstance(reporter) {
@@ -84995,7 +84916,7 @@ var require_progress = __commonJS({
         }
         createWorkDoneProgress() {
           if (this._progressSupported) {
-            const token = (0, uuid_1.generateUuid)();
+            const token = (0, vscode_languageserver_protocol_1.RAL)().crypto.randomUUID();
             return this.connection.sendRequest(vscode_languageserver_protocol_1.WorkDoneProgressCreateRequest.type, { token }).then(() => {
               const result2 = new WorkDoneProgressServerReporterImpl(this.connection, token);
               return result2;
@@ -86054,6 +85975,11 @@ var require_notebook = __commonJS({
               }
             }
           }
+          const removed = [];
+          for (const close of closed) {
+            removed.push(this.getNotebookCell(close));
+            this.notebookCellMap.delete(close);
+          }
           this.updateCellMap(notebookDocument);
           const changeEvent = { notebookDocument };
           if (metadataChanged) {
@@ -86063,10 +85989,6 @@ var require_notebook = __commonJS({
           for (const open2 of opened) {
             added.push(this.getNotebookCell(open2));
           }
-          const removed = [];
-          for (const close of closed) {
-            removed.push(this.getNotebookCell(close));
-          }
           const textContent = [];
           for (const change2 of text3) {
             textContent.push(this.getNotebookCell(change2));
@@ -86244,7 +86166,6 @@ var require_server = __commonJS({
     exports.createConnection = createConnection2;
     var vscode_languageserver_protocol_1 = require_api2();
     var Is3 = __importStar(require_is());
-    var UUID = __importStar(require_uuid());
     var progress_1 = require_progress();
     var configuration_1 = require_configuration();
     var workspaceFolder_1 = require_workspaceFolder();
@@ -86388,7 +86309,7 @@ var require_server = __commonJS({
         if (this._registered.has(method)) {
           throw new Error(`${method} is already added to this registration`);
         }
-        const id = UUID.generateUuid();
+        const id = (0, vscode_languageserver_protocol_1.RAL)().crypto.randomUUID();
         this._registrations.push({
           id,
           method,
@@ -86482,7 +86403,7 @@ var require_server = __commonJS({
       }
       registerSingle1(unregistration, type, registerOptions) {
         const method = Is3.string(type) ? type : type.method;
-        const id = UUID.generateUuid();
+        const id = (0, vscode_languageserver_protocol_1.RAL)().crypto.randomUUID();
         const params = {
           registrations: [{ id, method, registerOptions: registerOptions || {} }]
         };
@@ -86499,7 +86420,7 @@ var require_server = __commonJS({
       }
       registerSingle2(type, registerOptions) {
         const method = Is3.string(type) ? type : type.method;
-        const id = UUID.generateUuid();
+        const id = (0, vscode_languageserver_protocol_1.RAL)().crypto.randomUUID();
         const params = {
           registrations: [{ id, method, registerOptions: registerOptions || {} }]
         };
@@ -87129,7 +87050,6 @@ var require_files = __commonJS({
       });
     }
     function resolveGlobalNodePath(tracer) {
-      let npmCommand = "npm";
       const env = /* @__PURE__ */ Object.create(null);
       Object.keys(process.env).forEach((key) => env[key] = process.env[key]);
       env["NO_UPDATE_NOTIFIER"] = "true";
@@ -87138,14 +87058,13 @@ var require_files = __commonJS({
         env
       };
       if (isWindows()) {
-        npmCommand = "npm.cmd";
         options.shell = true;
       }
       const handler = () => {
       };
       try {
         process.on("SIGPIPE", handler);
-        const stdout = (0, child_process_1.spawnSync)(npmCommand, ["config", "get", "prefix"], options).stdout;
+        const stdout = (isWindows() ? (0, child_process_1.spawnSync)("npm.cmd config get prefix", options) : (0, child_process_1.spawnSync)("npm", ["config", "get", "prefix"], options)).stdout;
         if (!stdout) {
           if (tracer) {
             tracer(`'npm config get prefix' didn't return a value.`);
@@ -87171,19 +87090,17 @@ var require_files = __commonJS({
       }
     }
     function resolveGlobalYarnPath(tracer) {
-      let yarnCommand = "yarn";
       const options = {
         encoding: "utf8"
       };
       if (isWindows()) {
-        yarnCommand = "yarn.cmd";
         options.shell = true;
       }
       const handler = () => {
       };
       try {
         process.on("SIGPIPE", handler);
-        const results = (0, child_process_1.spawnSync)(yarnCommand, ["global", "dir", "--json"], options);
+        const results = isWindows() ? (0, child_process_1.spawnSync)("yarn.cmd global dir --json", options) : (0, child_process_1.spawnSync)("yarn", ["global", "dir", "--json"], options);
         const stdout = results.stdout;
         if (!stdout) {
           if (tracer) {
@@ -87262,6 +87179,7 @@ var require_ril = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     var util_1 = __require("util");
+    var crypto_1 = __require("crypto");
     var api_1 = require_api();
     var MessageBuffer = class _MessageBuffer extends api_1.AbstractMessageBuffer {
       static emptyBuffer = Buffer.allocUnsafe(0);
@@ -87285,7 +87203,7 @@ var require_ril = __commonJS({
         if (length === void 0) {
           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) {
@@ -87352,6 +87270,9 @@ var require_ril = __commonJS({
       }
     };
     var _ril = Object.freeze({
+      crypto: Object.freeze({
+        randomUUID: () => (0, crypto_1.randomUUID)()
+      }),
       messageBuffer: Object.freeze({
         create: (encoding) => new MessageBuffer(encoding)
       }),
@@ -87502,7 +87423,7 @@ var require_main = __commonJS({
         this.errorCount = 0;
         const eventEmitter = this.process;
         eventEmitter.on("error", (error62) => this.fireError(error62));
-        eventEmitter.on("close", () => this.fireClose);
+        eventEmitter.on("close", () => this.fireClose());
       }
       write(msg) {
         try {
@@ -87535,7 +87456,7 @@ var require_main = __commonJS({
       constructor(port) {
         super();
         this.onData = new api_1.Emitter();
-        port.on("close", () => this.fireClose);
+        port.on("close", () => this.fireClose());
         port.on("error", (error62) => this.fireError(error62));
         port.on("message", (message) => {
           this.onData.fire(message);
@@ -87644,6 +87565,9 @@ var require_main = __commonJS({
           resolve8({
             onConnected: () => {
               return connected;
+            },
+            close: () => {
+              server.close();
             }
           });
         });
@@ -87682,6 +87606,9 @@ var require_main = __commonJS({
             port: () => boundPort,
             onConnected: () => {
               return connected;
+            },
+            close: () => {
+              server.close();
             }
           });
         });
@@ -90171,9 +90098,12 @@ function addMacroToConfig(uri, macroName, workspace, options) {
       return null;
     }
   }
-  const edit = configPath.toLowerCase().endsWith(".json") ? addMacroToJsonConfig(text3, macroName) : addMacroToYamlConfig(text3, macroName);
-  if (!edit) return null;
-  return { ...action, edits: [{ uri: configUri, ...edit }] };
+  try {
+    const edit = configPath.toLowerCase().endsWith(".json") ? addMacroToJsonConfig(text3, macroName) : addMacroToYamlConfig(text3, macroName);
+    return edit ? { ...action, edits: [{ uri: configUri, ...edit }] } : null;
+  } catch {
+    return null;
+  }
 }
 function resolveConfigRoot(uri, workspaceRoot) {
   if (workspaceRoot) {