@rohal12/spindle-lsp 0.15.18 → 0.15.20

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.18";
+    VERSION = false ? pkg.version : "0.15.20";
   }
 });
 
@@ -33212,6 +33212,8 @@ var init_variable_tracker = __esm({
       usagesByUri = /* @__PURE__ */ new Map();
       /** Per-URI list of transient variable usages. */
       transientUsagesByUri = /* @__PURE__ */ new Map();
+      /** Executable assignments can replace a declaration's default shape anywhere in the story. */
+      rootWritesByUri = /* @__PURE__ */ new Map();
       /**
        * Parse the StoryVariables passage content for declarations.
        * Each line like `$name = value` becomes a declaration.
@@ -33244,7 +33246,17 @@ var init_variable_tracker = __esm({
         this.removeDocument(uri);
         const usages = [];
         const transientUsages = [];
+        const rootWrites = /* @__PURE__ */ new Set();
         for (const passage of markup.passages) {
+          for (const piece of passage.pieces) {
+            if (piece.kind !== "code") continue;
+            try {
+              for (const ref2 of parseCode(piece.code, piece.goal).refs) {
+                if (ref2.write && (ref2.sigil === "$" || ref2.sigil === "%")) rootWrites.add(ref2.sigil + ref2.name);
+              }
+            } catch {
+            }
+          }
           for (const ref2 of collectVariableReferences2(passage)) {
             const usage = {
               uri,
@@ -33257,11 +33269,13 @@ var init_variable_tracker = __esm({
         }
         if (usages.length > 0) this.usagesByUri.set(uri, usages);
         if (transientUsages.length > 0) this.transientUsagesByUri.set(uri, transientUsages);
+        if (rootWrites.size > 0) this.rootWritesByUri.set(uri, rootWrites);
       }
       /** Forget the usages recorded for a document, e.g. after it was deleted. */
       removeDocument(uri) {
         this.usagesByUri.delete(uri);
         this.transientUsagesByUri.delete(uri);
+        this.rootWritesByUri.delete(uri);
       }
       /** Get all declared variables. */
       getDeclared() {
@@ -33315,11 +33329,12 @@ var init_variable_tracker = __esm({
       }
       /**
        * Get `$var.member` / `%var.member` accesses in a document where `var` is
-       * declared with an array literal default and `member` is not a property
-       * that JavaScript arrays have (so the access always yields undefined).
+       * declared with an array literal default, with no known root assignment,
+       * and `member` is not a property that JavaScript arrays have.
        */
       getArrayMemberAccesses(uri) {
         const results = [];
+        const rootWrites = new Set([...this.rootWritesByUri.values()].flatMap((writes) => [...writes]));
         const sources = [
           ["$", this.usagesByUri.get(uri), this.variables.declared],
           ["%", this.transientUsagesByUri.get(uri), this.transients.declared]
@@ -33329,6 +33344,7 @@ var init_variable_tracker = __esm({
             const member = u.fullName.split(".")[1];
             if (member === void 0) continue;
             if (declared.get(u.baseName)?.type !== "array") continue;
+            if (rootWrites.has(sigil + u.baseName)) continue;
             if (ARRAY_MEMBERS.has(member) || /^(0|[1-9]\d*)$/.test(member) && Number(member) < 4294967295) continue;
             results.push({ sigil, name: u.baseName, member, range: u.range });
           }
@@ -35166,15 +35182,17 @@ function parentDiagnostics(passage, token, ancestors, workspace) {
   return [makeDiag(range2, DiagnosticCode.InvalidChildren, `Invalid: {${token.name}} can only be inside {${parentList}}`)];
 }
 function childDiagnostics(passage, node, token, workspace) {
-  const constraints = workspace.getEffectiveMacro(token.name)?.children;
+  const macro = workspace.getEffectiveMacro(token.name);
+  const constraints = macro?.children;
   if (!constraints || constraints.length === 0 || !node.body?.close) return [];
   const direct = [...node.body.children];
   for (const branch of node.body.branches) direct.push({ token: branch.tag, start: branch.tag.start, end: branch.tag.end }, ...branch.children);
+  const consumesOptions = macro?.source === "builtin" && ["listbox", "cycle"].includes(token.name.toLowerCase());
   const counts = /* @__PURE__ */ Object.create(null);
   for (const child of direct) {
     if (child.token.type !== "macro" || child.token.isClose) continue;
     const key = child.token.name.toLowerCase();
-    if (workspace.getEffectiveMacro(key)) counts[key] = (counts[key] ?? 0) + 1;
+    if (consumesOptions && key === "option" || workspace.getEffectiveMacro(key)) counts[key] = (counts[key] ?? 0) + 1;
   }
   const diagnostics = [];
   const range2 = passage.range(token.start, token.end);
@@ -37967,7 +37985,7 @@ async function formatLf2(text3, options) {
     if (passage.body === "") continue;
     const role = parsePassageHeader(passage.header, passage.startLine);
     const kind = classifyPassage(passage.header);
-    const body = kind === "normal" && role && !isMarkupPassage(role) ? passage.body : await formatPassage(passage.body, {
+    const body = role && (!isRuntimePassage({ name: role.name }) || kind === "normal" && !isMarkupPassage(role)) ? passage.body : await formatPassage(passage.body, {
       kind,
       prettier: prettier2?.prettier,
       prettierOptions: prettier2?.options,