@rohal12/spindle-lsp 0.15.35 → 0.15.36

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.35";
+    VERSION = false ? pkg.version : "0.15.36";
   }
 });
 
@@ -35198,12 +35198,14 @@ function computeDiagnostics(uri, workspace, options) {
   const story = storyReport(workspace);
   diagnostics.push(...story.metadata.get(doc) ?? []);
   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)));
+    attempt(() => diagnostics.push(...argumentDiagnostics(passage, workspace, getPassageNames)));
     attempt(() => diagnostics.push(...widgetDiagnostics(passage, story, workspace)));
   }
   attempt(() => diagnostics.push(...versionDiagnostics(uri, doc, workspace)));
@@ -35656,9 +35658,8 @@ function isReadInBody(passage, bodyStart, bodyEnd, name, macroStart, macroEnd) {
   }
   return false;
 }
-function argumentDiagnostics(passage, workspace) {
+function argumentDiagnostics(passage, workspace, getPassageNames) {
   const diagnostics = [];
-  const passageNames = workspace.passages.getEffectivePassages().filter(isRuntimePassage).map((candidate) => candidate.name);
   for (const token of passage.isMarkup ? macroTokens(passage) : []) {
     if (token.type !== "macro" || token.isClose) continue;
     const info = workspace.getEffectiveMacro(token.name);
@@ -35678,7 +35679,7 @@ function argumentDiagnostics(passage, workspace) {
       }
       continue;
     }
-    const result2 = params.validate(args2, { passages: passageNames });
+    const result2 = params.validate(args2, { passages: getPassageNames() });
     if (result2.variantIndex === null) continue;
     for (const error62 of result2.errors) {
       const code = error62.message.startsWith("Too many arguments") ? DiagnosticCode.TooManyArguments : DiagnosticCode.ParameterTypeError;
@@ -87266,7 +87267,7 @@ var init_markup_cursor = __esm({
           const found = [];
           for (const token of region.tokens) {
             if (token.type !== "macro" || token.isClose || token.nameEnd >= at3 || at3 >= token.end) continue;
-            found.push({ start: token.start, name: token.name, argsBefore: at3 >= token.argsStart ? region.view.text.slice(viewIndex(region.view, token.argsStart), viewIndex(region.view, at3)) : "" });
+            found.push({ start: token.start, name: token.name, invocation: this.passage.invocations.some((call) => call.start === token.start), argsBefore: at3 >= token.argsStart ? region.view.text.slice(viewIndex(region.view, token.argsStart), viewIndex(region.view, at3)) : "" });
           }
           for (const error62 of region.errors) {
             const source = region.view.text;
@@ -87276,7 +87277,7 @@ var init_markup_cursor = __esm({
             if (name && name[0] !== "/") found.push({ start: error62.offset, name, argsBefore: source.slice(end, viewIndex(region.view, at3)).trimStart() });
           }
           const innermost = found.filter((macro) => known(macro.name)).sort((a, b) => b.start - a.start)[0];
-          if (innermost) return { name: innermost.name, argsBefore: innermost.argsBefore };
+          if (innermost) return innermost;
         }
         return void 0;
       }
@@ -87568,6 +87569,65 @@ var init_completions = __esm({
   }
 });
 
+// src/core/markup/macro-heads.ts
+function* pairedHeads(paired, tokens2) {
+  const unclosed = [];
+  for (const node2 of walkNodes(paired.nodes)) {
+    if (node2.token.type === "macro") yield { name: node2.token.name, closing: false, opener: node2.token.start, start: node2.token.nameStart, end: node2.token.nameEnd };
+    for (const branch of node2.body?.branches ?? []) {
+      yield { name: branch.tag.name, closing: false, opener: branch.tag.start, start: branch.tag.nameStart, end: branch.tag.nameEnd };
+    }
+    const close = node2.body?.close;
+    if (node2.token.type !== "macro") continue;
+    if (close?.type === "macro" && close.name.toLowerCase() === node2.token.name.toLowerCase()) {
+      yield { name: close.name, closing: true, opener: node2.token.start, start: close.nameStart, end: close.nameEnd };
+    } else if (node2.body && !close) {
+      unclosed.push({ name: node2.token.name.toLowerCase(), start: node2.token.start });
+    }
+  }
+  const byStart = new Map(tokens2.map((token) => [token.start, token]));
+  for (const error62 of paired.errors) {
+    const token = byStart.get(error62.start);
+    if (error62.code !== "stray-closer" || token?.type !== "macro" || !token.isClose) continue;
+    const name = token.name.toLowerCase();
+    const open2 = unclosed.find((open3) => open3.name === name && open3.start < error62.start);
+    if (open2) {
+      yield { name: token.name, closing: true, opener: open2.start, start: token.nameStart, end: token.nameEnd };
+    }
+  }
+}
+function passageMacroHeads(passage) {
+  let heads = kept2.get(passage);
+  if (heads) return heads;
+  const isBlock = (name) => passage.doc.context.isBlock(name);
+  const found = [...pairedHeads(passage.pairing, passage.tokens)];
+  for (const piece of passage.pieces) {
+    if (piece.kind !== "text") continue;
+    found.push(...pairedHeads(pairMarkup(piece.tokens, { isBlock }), piece.tokens));
+  }
+  const invocations = new Set(passage.invocations.map((token) => token.start));
+  heads = found.sort((a, b) => a.start - b.start).map(({ opener, ...head }) => ({ ...head, invocation: invocations.has(opener), passage, range: passage.range(head.start, head.end) }));
+  kept2.set(passage, heads);
+  return heads;
+}
+function documentMacroHeads(doc) {
+  return doc.passages.flatMap((passage) => passage.isMarkup ? [...passageMacroHeads(passage)] : []);
+}
+function macroHeadAt(doc, position) {
+  const passage = doc.passageAt(position);
+  if (!passage?.isMarkup) return void 0;
+  return passageMacroHeads(passage).find(({ range: { start, end } }) => start.line === position.line && position.character >= start.character && position.character <= end.character);
+}
+var kept2;
+var init_macro_heads = __esm({
+  "src/core/markup/macro-heads.ts"() {
+    "use strict";
+    init_tooling();
+    init_tree();
+    kept2 = /* @__PURE__ */ new WeakMap();
+  }
+});
+
 // src/plugins/hover.ts
 function getHoverInfo(uri, position, workspace) {
   const doc = workspace.markup.get(uri);
@@ -87596,7 +87656,7 @@ function getMacroHover(passage, at3, workspace) {
       return { contents: parts.join("\n"), range: range2 };
     }
     const widget = workspace.widgets.getWidget(macro.name);
-    if (widget) return buildWidgetHover(widget, range2);
+    if (widget && macroHeadAt(passage.doc, passage.position(at3))?.invocation) return buildWidgetHover(widget, range2);
   }
   return null;
 }
@@ -87636,6 +87696,7 @@ var init_hover = __esm({
     "use strict";
     init_text();
     init_tokens();
+    init_macro_heads();
     init_markup_symbols();
     VARIABLE_KINDS = {
       $: "Story variable",
@@ -87773,6 +87834,7 @@ ${p.documentation}`) : []
       activeParameter: positional ? argument : 0
     };
   }
+  if (enclosing.invocation === false) return null;
   const widget = workspace.widgets.getWidget(macroName);
   if (widget && widget.params.length > 0) {
     const paramLabels = widget.params;
@@ -87836,65 +87898,6 @@ var init_signature = __esm({
   }
 });
 
-// src/core/markup/macro-heads.ts
-function* pairedHeads(paired, tokens2) {
-  const unclosed = [];
-  for (const node2 of walkNodes(paired.nodes)) {
-    if (node2.token.type === "macro") yield { name: node2.token.name, closing: false, opener: node2.token.start, start: node2.token.nameStart, end: node2.token.nameEnd };
-    for (const branch of node2.body?.branches ?? []) {
-      yield { name: branch.tag.name, closing: false, opener: branch.tag.start, start: branch.tag.nameStart, end: branch.tag.nameEnd };
-    }
-    const close = node2.body?.close;
-    if (node2.token.type !== "macro") continue;
-    if (close?.type === "macro" && close.name.toLowerCase() === node2.token.name.toLowerCase()) {
-      yield { name: close.name, closing: true, opener: node2.token.start, start: close.nameStart, end: close.nameEnd };
-    } else if (node2.body && !close) {
-      unclosed.push({ name: node2.token.name.toLowerCase(), start: node2.token.start });
-    }
-  }
-  const byStart = new Map(tokens2.map((token) => [token.start, token]));
-  for (const error62 of paired.errors) {
-    const token = byStart.get(error62.start);
-    if (error62.code !== "stray-closer" || token?.type !== "macro" || !token.isClose) continue;
-    const name = token.name.toLowerCase();
-    const open2 = unclosed.find((open3) => open3.name === name && open3.start < error62.start);
-    if (open2) {
-      yield { name: token.name, closing: true, opener: open2.start, start: token.nameStart, end: token.nameEnd };
-    }
-  }
-}
-function passageMacroHeads(passage) {
-  let heads = kept2.get(passage);
-  if (heads) return heads;
-  const isBlock = (name) => passage.doc.context.isBlock(name);
-  const found = [...pairedHeads(passage.pairing, passage.tokens)];
-  for (const piece of passage.pieces) {
-    if (piece.kind !== "text") continue;
-    found.push(...pairedHeads(pairMarkup(piece.tokens, { isBlock }), piece.tokens));
-  }
-  const invocations = new Set(passage.invocations.map((token) => token.start));
-  heads = found.sort((a, b) => a.start - b.start).map(({ opener, ...head }) => ({ ...head, invocation: invocations.has(opener), passage, range: passage.range(head.start, head.end) }));
-  kept2.set(passage, heads);
-  return heads;
-}
-function documentMacroHeads(doc) {
-  return doc.passages.flatMap((passage) => passage.isMarkup ? [...passageMacroHeads(passage)] : []);
-}
-function macroHeadAt(doc, position) {
-  const passage = doc.passageAt(position);
-  if (!passage?.isMarkup) return void 0;
-  return passageMacroHeads(passage).find(({ range: { start, end } }) => start.line === position.line && position.character >= start.character && position.character <= end.character);
-}
-var kept2;
-var init_macro_heads = __esm({
-  "src/core/markup/macro-heads.ts"() {
-    "use strict";
-    init_tooling();
-    init_tree();
-    kept2 = /* @__PURE__ */ new WeakMap();
-  }
-});
-
 // src/plugins/definition.ts
 function getDefinition(uri, position, workspace) {
   const text3 = workspace.documents.getText(uri);
@@ -88570,7 +88573,7 @@ function computeInlayHints(uri, range2, workspace) {
 function addWidgetParamHints(passages, inRange, workspace, hints) {
   if (workspace.widgets.getAllWidgets().length === 0) return;
   for (const passage of passages) {
-    for (const token of macroTokens(passage)) {
+    for (const token of passage.invocations) {
       if (token.isClose || token.rawArgs === "") continue;
       if (!inRange(passage.position(token.start).line)) continue;
       if (workspace.getEffectiveMacro(token.name)) continue;
@@ -88609,7 +88612,6 @@ var init_inlay_hints = __esm({
     "use strict";
     init_tooling();
     init_source_view();
-    init_tokens();
     inlayHintsPlugin = {
       id: "inlay-hints",
       capabilities: {