@rohal12/spindle-lsp 0.15.17 → 0.15.19

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.17";
+    VERSION = false ? pkg.version : "0.15.19";
   }
 });
 
@@ -34510,6 +34510,8 @@ 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. */
+      MissingEntryPassage: "SP004",
       /** `unknown-macro`: a macro that is none of the built-in, configured or defined ones. */
       UndefinedMacro: "SP100",
       /** `unclosed-block`, `mismatched-closer`, `stray-closer` of a macro. */
@@ -34560,6 +34562,7 @@ var init_diagnostic_codes = __esm({
     severityMap = {
       [DiagnosticCode.UnsupportedSpindleVersion]: "warning",
       [DiagnosticCode.TweeSyntaxError]: "error",
+      [DiagnosticCode.MissingEntryPassage]: "error",
       [DiagnosticCode.UndefinedMacro]: "warning",
       [DiagnosticCode.MalformedContainer]: "error",
       [DiagnosticCode.MalformedElement]: "error",
@@ -34857,6 +34860,7 @@ function computeDiagnostics(uri, workspace, options) {
     }
   };
   const story = storyReport(workspace);
+  diagnostics.push(...story.metadata.get(doc) ?? []);
   const effective = new Set(workspace.passages.getEffectivePassages());
   for (const passage of doc.passages) {
     if (!effective.has(passage.passage)) continue;
@@ -34962,6 +34966,7 @@ function buildReport(documents, workspace) {
   }
   return {
     documents,
+    metadata: storyDataDiagnostics(documents, workspace),
     passages,
     macros,
     markup,
@@ -34973,6 +34978,22 @@ function buildReport(documents, workspace) {
     variableDiagnostics: /* @__PURE__ */ new Map()
   };
 }
+function storyDataDiagnostics(documents, workspace) {
+  const found = /* @__PURE__ */ new Map();
+  const effective = workspace.passages.getEffectivePassage("StoryData");
+  for (const doc of documents) {
+    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.`));
+      }
+    }
+    found.set(doc, diagnostics);
+  }
+  return found;
+}
 function declarationsOf(workspace, name) {
   const passage = name === "StoryVariables" ? workspace.passages.getStoryVariables() : workspace.passages.getStoryTransients();
   if (!passage || !isRuntimePassage(passage)) return void 0;
@@ -35145,15 +35166,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);
@@ -35180,7 +35203,7 @@ function temporaryRefRegex(name) {
   return new RegExp(`(?<![.\\w$@%])_(${name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")})(?![\\w$])`, "g");
 }
 function maskLiterals(code) {
-  const chars = Array.from(code, (ch) => ch === "\n" ? "\n" : " ");
+  const chars = code.split("").map((ch) => ch === "\n" ? "\n" : " ");
   const copy = (text3, index) => {
     for (let i2 = 0; i2 < text3.length; i2++) chars[index + i2] = text3[i2];
   };
@@ -35250,13 +35273,15 @@ function loopDiagnostics(passage, token, ancestors, workspace) {
   const close = loop?.node.body?.close;
   if (!loop || !close) return [];
   const targets = macro === "computed" ? computedTemporaryTarget(token.rawArgs) : setTemporaryTargets(token.rawArgs);
+  const view = sourceView(passage, token.argsStart, token.argsEnd);
+  const argsIndex = viewIndex(view, token.argsStart);
   const bodyStart = loop.node.token.end;
   const diagnostics = [];
   for (const target of targets) {
     if (!isReadInBody(passage, bodyStart, close.start, target.name, token.start, token.end)) continue;
-    const start = token.argsStart + target.offset;
+    const start = argsIndex + target.offset;
     diagnostics.push(makeDiag(
-      passage.range(start, start + 1 + target.name.length),
+      passage.range(pieceOffset(view, start), pieceOffset(view, start + 1 + target.name.length)),
       DiagnosticCode.TemporaryAssignedInLoop,
       `Temporary '_${target.name}' is assigned inside {${loop.name}} and read in the loop body. Temporaries are shared by every iteration, so all iterations end up seeing the value assigned by the last one. Use the iteration-local '@${target.name}' instead, or assign it once before the loop if the value does not depend on the iteration.`
     ));
@@ -35452,6 +35477,7 @@ 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();