@rohal12/spindle-lsp 0.15.48 → 0.15.49

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.49";
   }
 });
 
@@ -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);
@@ -90171,9 +90184,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) {