@rohal12/spindle-lsp 0.15.34 → 0.15.35

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.34";
+    VERSION = false ? pkg.version : "0.15.35";
   }
 });
 
@@ -14056,6 +14056,9 @@ function peg$parse(input2, options) {
   if (peg$success) return peg$result;
   else peg$throw();
 }
+function isOptionClause(name) {
+  return name.toLowerCase() === OPTION_CLAUSE;
+}
 function consumesOptionClauses(macro) {
   const name = macro.name.toLowerCase();
   return macro.source === "builtin" && !macro.widget && (name === "listbox" || name === "cycle");
@@ -21872,6 +21875,71 @@ function blockLookup(macros, includeRuntime = true) {
   for (const macro of effectiveToolingMacros(macros)) definitions.set(macro.name, macro.block);
   return (name) => includeRuntime && isRegisteredBlockMacro(name) || (definitions.get(name) ?? (includeRuntime ? isBlockMacro(name) : isBuiltinBlockMacro(name)));
 }
+function macroCalls(source, macros = []) {
+  const all = effectiveToolingMacros(macros);
+  const definitions = new NameMap(all.map((macro) => [macro.name, macro]));
+  const parametersOf2 = parameterLookup(all);
+  const options = tokenizationOptions({
+    macros: all,
+    hooks: { isBlock: blockLookup(all, false) }
+  });
+  const hooks = options.hooks;
+  const tokens2 = tokenizeMarkupTolerant$1(source, options).tokens;
+  const calls = [];
+  const classify2 = (tokens3) => {
+    const found = /* @__PURE__ */ new Map();
+    const pending = pairMarkup(tokens3, hooks).nodes.map((node2) => ({ node: node2 }));
+    while (pending.length) {
+      const { node: node2, parent } = pending.pop();
+      const token = node2.token;
+      if (token.type === "macro") {
+        const definition2 = parent && definitions.get(parent.name);
+        const value = definition2 && consumesOptionClauses(definition2) && isOptionClause(token.name);
+        found.set(token, {
+          token,
+          kind: value ? "value" : "invocation",
+          ...value && { owner: parent }
+        });
+      }
+      if (!node2.body) continue;
+      const owner = token.type === "macro" ? token : void 0;
+      for (const child of node2.body.children) pending.push({
+        node: child,
+        parent: owner
+      });
+      for (const branch of node2.body.branches) {
+        found.set(branch.tag, {
+          token: branch.tag,
+          kind: "branch",
+          owner
+        });
+        for (const child of branch.children) pending.push({
+          node: child,
+          parent: owner
+        });
+      }
+    }
+    for (const token of tokens3) {
+      if (token.type !== "macro" || token.isClose) continue;
+      const call = found.get(token) ?? {
+        token,
+        kind: "branch"
+      };
+      calls.push(call);
+    }
+  };
+  classify2(tokens2);
+  for (const piece of passagePiecesOf(source, tokens2, parametersOf2, { isBlock: hooks.isBlock })) {
+    if (piece.kind !== "text" || !piece.tokens.length) continue;
+    classify2(piece.tokens);
+  }
+  let literalEnd = -1;
+  return calls.sort((a, b) => a.token.start - b.token.start).filter((call) => {
+    if (call.token.start < literalEnd) return false;
+    if (call.kind === "value" || call.kind === "branch") literalEnd = call.token.argsEnd;
+    return true;
+  });
+}
 function passagePieces(source, macros = []) {
   const all = effectiveToolingMacros(macros);
   const parametersOf2 = parameterLookup(all);
@@ -33216,6 +33284,7 @@ var init_passage_markup = __esm({
       cachedTokens;
       cachedPairing;
       cachedPieces;
+      cachedInvocations;
       cachedDeclarations;
       /** The document offset of `contentOffset`. */
       docOffset(contentOffset) {
@@ -33268,6 +33337,16 @@ var init_passage_markup = __esm({
       get pieces() {
         return this.cachedPieces ??= this.isMarkup ? passagePieces(this.content, this.doc.context.macros) : [];
       }
+      /** Contextual calls, excluding parent-owned clauses and widget registration heads. */
+      get invocations() {
+        if (!this.cachedInvocations) {
+          const macros = this.doc.context.macros;
+          const definitions = widgetDefinitions([{ ...this.passage, content: this.content }], macros);
+          const registration = new Set(definitions.map((definition2) => definition2.start));
+          this.cachedInvocations = this.isMarkup ? macroCalls(this.content, macros).filter((call) => call.kind === "invocation" && !registration.has(call.token.start)).map((call) => call.token) : [];
+        }
+        return this.cachedInvocations;
+      }
       /** Whether the cursor is executable, with decoded code mapped back to `content`. */
       completionAt(offset2) {
         return this.isMarkup ? completionContext(this.content, offset2, this.doc.context.macros) : { kind: "literal" };
@@ -33607,24 +33686,6 @@ var init_variable_tracker = __esm({
   }
 });
 
-// src/core/markup/tokens.ts
-function* markupTokens(passage) {
-  yield* passage.tokens;
-  for (const piece of passage.pieces) {
-    if (piece.kind === "text") yield* piece.tokens;
-  }
-}
-function* macroTokens(passage) {
-  for (const token of markupTokens(passage)) {
-    if (token.type === "macro") yield token;
-  }
-}
-var init_tokens = __esm({
-  "src/core/markup/tokens.ts"() {
-    "use strict";
-  }
-});
-
 // src/core/markup/widgets.ts
 function widgetSources(passages, macros) {
   const sources = /* @__PURE__ */ new Map();
@@ -33650,7 +33711,6 @@ var init_widget_registry = __esm({
   "src/core/workspace/widget-registry.ts"() {
     "use strict";
     init_tooling();
-    init_tokens();
     init_widgets();
     WidgetRegistry = class {
       /** Widgets keyed by lower-cased name; Spindle resolves widgets case-insensitively. */
@@ -33729,8 +33789,8 @@ var init_widget_registry = __esm({
       recordInvocations(uri, passages) {
         const names = /* @__PURE__ */ new Set();
         for (const passage of passages) {
-          for (const macro of macroTokens(passage)) {
-            if (!macro.isClose) names.add(macro.name.toLowerCase());
+          for (const macro of passage.invocations) {
+            names.add(macro.name.toLowerCase());
           }
         }
         this.invokedByUri.set(uri, names);
@@ -34759,7 +34819,9 @@ var init_diagnostic_codes = __esm({
       UnsupportedSpindleVersion: "SP001",
       /** A fatal Twee source error reported by the public compiler parser. */
       TweeSyntaxError: "SP002",
-      /** StoryData explicitly selects an entry passage absent from the story. */
+      /** Compiler-owned errors decoding StoryData metadata. */
+      InvalidStoryData: "SP003",
+      /** The selected entry passage is absent or omitted from compiled story data. */
       MissingEntryPassage: "SP004",
       /** `unknown-macro`: a macro that is none of the built-in, configured or defined ones. */
       UndefinedMacro: "SP100",
@@ -34815,6 +34877,7 @@ var init_diagnostic_codes = __esm({
     severityMap = {
       [DiagnosticCode.UnsupportedSpindleVersion]: "warning",
       [DiagnosticCode.TweeSyntaxError]: "error",
+      [DiagnosticCode.InvalidStoryData]: "error",
       [DiagnosticCode.MissingEntryPassage]: "error",
       [DiagnosticCode.UndefinedMacro]: "warning",
       [DiagnosticCode.MalformedContainer]: "error",
@@ -34853,6 +34916,24 @@ var init_diagnostic_codes = __esm({
   }
 });
 
+// src/core/markup/tokens.ts
+function* markupTokens(passage) {
+  yield* passage.tokens;
+  for (const piece of passage.pieces) {
+    if (piece.kind === "text") yield* piece.tokens;
+  }
+}
+function* macroTokens(passage) {
+  for (const token of markupTokens(passage)) {
+    if (token.type === "macro") yield token;
+  }
+}
+var init_tokens = __esm({
+  "src/core/markup/tokens.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/markup/source-view.ts
 function viewIndex(view, offset2) {
   if (!view.sourceOffsets) return offset2 - view.offset;
@@ -35215,8 +35296,8 @@ function buildReport(documents, workspace) {
   const invoked = /* @__PURE__ */ new Set();
   for (const passage of passages) {
     if (!passage.isMarkup) continue;
-    for (const token of macroTokens(passage)) {
-      if (!token.isClose) invoked.add(token.name.toLowerCase());
+    for (const token of passage.invocations) {
+      invoked.add(token.name.toLowerCase());
     }
   }
   return {
@@ -35235,17 +35316,33 @@ function buildReport(documents, workspace) {
 }
 function storyDataDiagnostics(documents, workspace) {
   const found = /* @__PURE__ */ new Map();
-  const effective = workspace.passages.getEffectivePassage("StoryData");
-  for (const doc of documents) {
+  const data2 = workspace.passages.getEffectivePassage("StoryData");
+  const implicit = workspace.passages.getEffectivePassage("Start");
+  if (!data2 && (!implicit || isRuntimePassage(implicit))) return found;
+  const { parseTwee, StoryBuilder, startPassageDiagnostics } = createCompilerRequire3(import.meta.url)("@rohal12/twee-ts");
+  const builder = new StoryBuilder();
+  const sources = new Map(documents.flatMap((doc) => doc.passages.map((passage) => [passage.passage, passage])));
+  const parsed = new Map(documents.map((doc) => [doc, new Map(parseTwee(doc.text).passages.map((passage) => [passage.source?.line, passage]))]));
+  const effective = workspace.passages.getEffectivePassages();
+  for (const source of effective) {
+    const passage = sources.get(source);
+    if (!passage) continue;
+    const input2 = parsed.get(passage.doc)?.get(source.headerEnd.start.line + 1);
+    if (!input2) continue;
     const diagnostics = [];
-    for (const passage of doc.passages) {
-      if (passage.passage !== effective) continue;
-      const data2 = readStoryData(passage.content);
-      if (data2.start && !workspace.passages.getEffectivePassage(data2.start)) {
-        diagnostics.push(makeDiag(passage.passage.nameRange, DiagnosticCode.MissingEntryPassage, `Starting passage "${data2.start}" not found.`));
-      }
+    builder.add(input2, diagnostics);
+    if (source.name === "StoryData") {
+      found.set(passage.doc, diagnostics.filter((d) => d.level === "error").map((d) => makeDiag(passage.range(0, passage.content.trimEnd().length), DiagnosticCode.InvalidStoryData, d.message)));
     }
-    found.set(doc, diagnostics);
+  }
+  const story = builder.build();
+  const entry = workspace.passages.getEffectivePassage(story.twine2.start || "Start");
+  const owner = story.twine2.start ? workspace.passages.getEffectivePassage("StoryData") : entry;
+  const markup = owner && sources.get(owner);
+  if (markup) {
+    const diagnostics = found.get(markup.doc) ?? [];
+    diagnostics.push(...startPassageDiagnostics(story).map((d) => makeDiag(markup.passage.nameRange, DiagnosticCode.MissingEntryPassage, d.message)));
+    found.set(markup.doc, diagnostics);
   }
   return found;
 }
@@ -35597,8 +35694,7 @@ function widgetDiagnostics(passage, story, workspace) {
   if (!passage.isMarkup) return [];
   const diagnostics = [];
   const macros = [...macroTokens(passage)];
-  for (const token of macros) {
-    if (token.isClose) continue;
+  for (const token of passage.invocations) {
     if (workspace.getEffectiveMacro(token.name)) continue;
     const widget = story.widgets.get(token.name.toLowerCase());
     if (!widget) continue;
@@ -35732,7 +35828,6 @@ var init_diagnostics = __esm({
     init_link_parser();
     init_passage_parser();
     init_story_variables_owner();
-    init_story_data();
     init_macro_sources();
     init_spindle_version();
     tweeReports = /* @__PURE__ */ new WeakMap();
@@ -87432,7 +87527,7 @@ function linkable(name) {
   return tokens2.length === 1 && link.type === "link" && link.target === name && !bracketLinkMismatch("label", name);
 }
 function getPassageNameCompletions(workspace) {
-  return workspace.passages.getEffectivePassages().filter((p) => isRuntimePassage(p) && linkable(p.name)).map((p) => ({
+  return workspace.passages.getEffectivePassages().filter((p) => isRuntimePassage(p) && !isSpecialPassage(p.name) && linkable(p.name)).map((p) => ({
     label: p.name,
     kind: 18,
     // CompletionItemKind.Reference
@@ -87745,14 +87840,14 @@ var init_signature = __esm({
 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, start: node2.token.nameStart, end: node2.token.nameEnd };
+    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, start: branch.tag.nameStart, end: branch.tag.nameEnd };
+      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, start: close.nameStart, end: close.nameEnd };
+      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 });
     }
@@ -87762,8 +87857,9 @@ function* pairedHeads(paired, tokens2) {
     const token = byStart.get(error62.start);
     if (error62.code !== "stray-closer" || token?.type !== "macro" || !token.isClose) continue;
     const name = token.name.toLowerCase();
-    if (unclosed.some((open2) => open2.name === name && open2.start < error62.start)) {
-      yield { name: token.name, closing: true, start: token.nameStart, end: token.nameEnd };
+    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 };
     }
   }
 }
@@ -87776,7 +87872,8 @@ function passageMacroHeads(passage) {
     if (piece.kind !== "text") continue;
     found.push(...pairedHeads(pairMarkup(piece.tokens, { isBlock }), piece.tokens));
   }
-  heads = found.sort((a, b) => a.start - b.start).map((head) => ({ ...head, passage, range: passage.range(head.start, head.end) }));
+  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;
 }
@@ -87824,7 +87921,7 @@ function getPassageRefDefinition(uri, position, workspace) {
 function getWidgetDefinition(uri, position, workspace) {
   const doc = workspace.markup.get(uri);
   const head = doc && macroHeadAt(doc, position);
-  if (!head) return null;
+  if (!head?.invocation) return null;
   if (workspace.getEffectiveMacro(head.name)) return null;
   const widget = workspace.widgets.getWidget(head.name);
   return widget ? { uri: widget.uri, range: widget.range } : null;
@@ -87887,7 +87984,7 @@ function findReferences(uri, position, workspace, includeDeclaration) {
   if (declaration) return findWidgetReferences(declaration.name, workspace, includeDeclaration);
   const doc = workspace.markup.get(uri);
   const head = doc && macroHeadAt(doc, position);
-  if (head) {
+  if (head?.invocation) {
     const widget = workspace.widgets.getWidget(head.name);
     if (!workspace.getEffectiveMacro(head.name) && widget && (!head.closing || workspace.isContainer(head.name))) {
       return findWidgetReferences(head.name, workspace, includeDeclaration);
@@ -87957,17 +88054,11 @@ function findWidgetReferences(widgetName2, workspace, includeDeclaration, includ
   if (workspace.getEffectiveMacro(widgetName2)) return locations;
   const lowerName2 = widgetName2.toLowerCase();
   const isBlock = workspace.isContainer(widgetName2);
-  for (const docUri of workspace.documents.getUris()) {
-    const doc = workspace.markup.get(docUri);
-    if (!doc) continue;
-    for (const head of documentMacroHeads(doc)) {
-      if (head.closing && (!isBlock || !includeClosingTags)) continue;
-      if (head.name.toLowerCase() === lowerName2) {
-        locations.push({ uri: docUri, range: head.range });
-      }
-    }
-  }
-  return locations;
+  const calls = workspace.documents.getUris().flatMap((uri) => {
+    const doc = workspace.markup.get(uri);
+    return doc ? documentMacroHeads(doc).filter((head) => head.invocation && head.name.toLowerCase() === lowerName2 && (!head.closing || isBlock && includeClosingTags)).map((head) => ({ uri, range: head.range })) : [];
+  });
+  return locations.concat(calls);
 }
 function toLspRange3(r) {
   return {
@@ -88292,7 +88383,7 @@ function resolveSymbolAtCursor(uri, position, workspace) {
   if (declaration) return { kind: "widget", name: declaration.name, range: declaration.nameRange };
   const doc = workspace.markup.get(uri);
   const head = doc && macroHeadAt(doc, position);
-  if (head) {
+  if (head?.invocation) {
     const widget = workspace.widgets.getWidget(head.name);
     if (!workspace.getEffectiveMacro(head.name) && widget && (!head.closing || workspace.isContainer(head.name))) {
       return { kind: "widget", name: head.name, range: head.range };
@@ -88685,9 +88776,13 @@ var init_semantic_tokens = __esm({
 import { readFileSync as readFileSync7 } from "node:fs";
 import { basename as basename2, dirname as dirname5, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL6 } from "node:url";
+import { isDeepStrictEqual } from "node:util";
 function computeCodeActions(uri, diagnostics, workspace, options = {}) {
   const actions = [];
+  const current2 = computeDiagnostics(uri, workspace);
   for (const diag of diagnostics) {
+    const fresh = current2.find((candidate) => candidate.code === diag.code && isDeepStrictEqual(candidate.range, diag.range) && isDeepStrictEqual(candidate.data, diag.data));
+    if (!fresh && diag.code !== DiagnosticCode.NoStoryVariables) continue;
     switch (diag.code) {
       case DiagnosticCode.UndefinedMacro:
         actions.push(...fixUndefinedMacro(uri, diag, workspace, options));
@@ -89017,6 +89112,7 @@ var init_code_actions = __esm({
     "use strict";
     import_yaml3 = __toESM(require_dist(), 1);
     init_diagnostic_codes();
+    init_diagnostics();
     init_config_loader();
     init_story_variables_owner();
     init_macro_sources();