@rohal12/spindle-lsp 0.15.10 → 0.15.12

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.10";
+    VERSION = false ? pkg.version : "0.15.12";
   }
 });
 
@@ -31258,7 +31258,7 @@ function parsePassageHeader(rawLine, lineNumber) {
   const first = delimiter.exec(escaped);
   const boundary = first?.index ?? line.length;
   const nameEnd = escaped.slice(0, boundary).trimEnd().length;
-  const name = line.slice(nameStart, nameEnd).replace(/\\(.)/g, "$1").trim();
+  const name = line.slice(nameStart, nameEnd).replace(/\\(.|$)/g, "$1").trim();
   if (!name) return null;
   let rest = boundary;
   let tags = [];
@@ -31306,7 +31306,7 @@ function isScriptOrStylesheetPassage(passage) {
   return passage.tags?.some((t) => CODE_PASSAGE_TAGS.has(t)) ?? false;
 }
 function isRuntimePassage(passage) {
-  return passage.name !== "StoryTitle" && passage.name !== "StoryData" && !isScriptOrStylesheetPassage(passage) && !passage.tags?.includes("Twine.private");
+  return !passage.runtimeOmitted && passage.name !== "StoryTitle" && passage.name !== "StoryData" && !isScriptOrStylesheetPassage(passage) && !passage.tags?.includes("Twine.private");
 }
 function isMarkupPassage(passage) {
   return isRuntimePassage(passage) && !(passage.name !== void 0 && NON_MARKUP_PASSAGES.has(passage.name));
@@ -31355,6 +31355,16 @@ var init_passage_parser = __esm({
 });
 
 // src/core/workspace/passage-index.ts
+import { createRequire as createSettingsRequire } from "node:module";
+function compareSourceUris(left, right) {
+  const a = left.split("/").map(decodeURIComponent);
+  const b = right.split("/").map(decodeURIComponent);
+  for (let i2 = 0; i2 < Math.min(a.length, b.length); i2++) {
+    const order = Buffer.compare(Buffer.from(a[i2], "utf8"), Buffer.from(b[i2], "utf8"));
+    if (order !== 0) return order;
+  }
+  return a.length - b.length;
+}
 var PassageIndex;
 var init_passage_index = __esm({
   "src/core/workspace/passage-index.ts"() {
@@ -31402,6 +31412,12 @@ var init_passage_index = __esm({
             start: passages[i2].range.start,
             end: { line: nextStart, character: lines[nextStart]?.length ?? 0 }
           };
+          if (passages[i2].name === "StorySettings") {
+            const { StoryBuilder } = createSettingsRequire(import.meta.url)("@rohal12/twee-ts");
+            const builder = new StoryBuilder();
+            builder.add({ name: "StorySettings", tags: [], text: lines.slice(passages[i2].headerEnd.end.line + 1, nextStart + 1).join("\n") }, []);
+            passages[i2].runtimeOmitted = builder.build().twine1.settings.size === 0;
+          }
         }
         if (passages.length > 0) {
           this.byUri.set(uri, passages);
@@ -31436,6 +31452,10 @@ var init_passage_index = __esm({
         }
         return found;
       }
+      /** The compiler replaces duplicate passages with the later source declaration. */
+      getEffectivePassage(name) {
+        return this.getPassages(name).sort((a, b) => compareSourceUris(a.uri, b.uri)).at(-1);
+      }
       /** Get the passage containing a specific line in a document. */
       getPassageAt(uri, line) {
         const passages = this.byUri.get(uri);
@@ -31468,11 +31488,11 @@ var init_passage_index = __esm({
       }
       /** Get the StoryVariables passage, if any. */
       getStoryVariables() {
-        return this.getPassage("StoryVariables");
+        return this.getEffectivePassage("StoryVariables");
       }
       /** Get the StoryTransients passage, if any. */
       getStoryTransients() {
-        return this.getPassage("StoryTransients");
+        return this.getEffectivePassage("StoryTransients");
       }
       /** Get the StoryInit passage, if any. */
       getStoryInit() {
@@ -32297,6 +32317,10 @@ var init_macro_registry2 = __esm({
       hasConfiguredParameters(name) {
         return this.configEntries.get(name.toLowerCase())?.parameters !== void 0;
       }
+      /** Whether a project definition replaces the original runtime macro. */
+      hasDiscoveredMacro(name) {
+        return this.discovered.has(name.toLowerCase());
+      }
       /** Check if a macro is a block (container) macro. */
       isBlock(name) {
         return this.getMacro(name)?.block ?? false;
@@ -33363,11 +33387,10 @@ var init_macro_supplements = __esm({
       button: {
         name: "button",
         container: true,
-        description: 'Creates a button that executes its contents when clicked.\n\nUsage:\n\n```\n{button "text" "passage"}\n  ...\n{/button}\n```',
-        parameters: ["text |+ text", ""],
+        description: 'Creates a button that executes its contents when clicked. Navigate by placing {goto} in its body.\n\nUsage:\n\n```\n{button "Go"}\n  {goto "Hall"}\n{/button}\n```',
+        parameters: ["text"],
         parameterDocs: [
-          { name: "label", documentation: "Text of the button." },
-          { name: "passage", documentation: "Passage to go to when clicked; omit to run the contents." }
+          { name: "label", documentation: "Text of the button; its body runs when clicked." }
         ]
       },
       timed: {
@@ -33448,7 +33471,7 @@ var init_macro_supplements = __esm({
       },
       meter: {
         name: "meter",
-        description: "Displays a progress meter.\n\nUsage: `{meter $var min max}`",
+        description: 'Displays the current value relative to a maximum, with an optional quoted label.\n\nUsage: `{meter 5 10 "%"}`',
         parameters: ["...text"],
         parameterDocs: [
           { name: "current", documentation: 'Current value expression; a maximum expression and an optional label mode (`"%"`, `"none"` or a unit) follow.' }
@@ -33595,27 +33618,19 @@ var init_macro_supplements = __esm({
       },
       watch: {
         name: "watch",
-        description: "Watches a variable for changes and triggers a re-render.\n\nUsage: `{watch $var}`",
+        description: 'Watches a quoted condition and runs an action when it changes from false to true. Use name to allow removal with {unwatch}.\n\nUsage: `{watch "$x >= 2" run "$x = 0" name "reset-x"}`',
         parameters: ["...text"],
         parameterDocs: [
-          { name: "variable", documentation: "Variable to watch for changes." }
+          { name: "condition", documentation: "Quoted expression checked when variables change or the story navigates." },
+          { name: "options", documentation: "Action (goto, dialog or run), optional name, priority and once flag." }
         ]
       },
       unwatch: {
         name: "unwatch",
-        description: "Stops watching a variable.\n\nUsage: `{unwatch $var}`",
+        description: 'Removes a watcher by its registered name.\n\nUsage: `{unwatch "reset-x"}`',
         parameters: ["...text"],
         parameterDocs: [
-          { name: "variable", documentation: "Variable to stop watching." }
-        ]
-      },
-      unless: {
-        name: "unless",
-        container: true,
-        description: "Conditionally displays its contents when the expression is falsy. The inverse of `{if}`.\n\nUsage:\n\n```\n{unless condition}\n  ...\n{/unless}\n```",
-        parameters: ["...text"],
-        parameterDocs: [
-          { name: "condition", documentation: "Expression; the contents show when it is falsy." }
+          { name: "name", documentation: "Name supplied to the watch macro." }
         ]
       }
     };
@@ -33641,6 +33656,7 @@ var init_workspace_model = __esm({
     init_macro_sources();
     init_story_format();
     init_spindle_version();
+    init_passage_parser();
     init_macro_supplements();
     WorkspaceModel = class extends EventEmitter2 {
       documents;
@@ -33869,7 +33885,8 @@ var init_workspace_model = __esm({
           }
           let lines;
           for (const passage of this.passages.getPassagesInDocument(uri)) {
-            const isStoryInit = passage.name === "StoryInit";
+            if (passage.tags?.includes("Twine.private")) continue;
+            const isStoryInit = passage.name === "StoryInit" && isRuntimePassage(passage);
             const isScript = passage.tags?.includes("script") ?? false;
             if (!isStoryInit && !isScript) continue;
             lines ??= text3.split("\n");
@@ -33894,8 +33911,8 @@ var init_workspace_model = __esm({
         this.declaredVersion = storyDataFormatVersion(this.passages.getAllPassages(), (uri) => this.documents.getText(uri));
         this._target = resolveSpindleTarget(this.installedVersion, this.declaredVersion);
         const declarations = (name) => {
-          const passage = this.passages.getPassage(name);
-          return passage ? this.markup.get(passage.uri)?.passages.find((p) => p.passage === passage) : void 0;
+          const passage = this.passages.getEffectivePassage(name);
+          return passage && isRuntimePassage(passage) ? this.markup.get(passage.uri)?.passages.find((p) => p.passage === passage) : void 0;
         };
         const variables = declarations("StoryVariables");
         if (variables) this.variables.parseStoryVariables(variables.content, variables.passage.headerEnd.end.line + 1, variables.doc.uri);
@@ -34201,6 +34218,7 @@ var init_passage_refs = __esm({
 
 // src/core/parsing/link-parser.ts
 function markupOfText(text3) {
+  if (typeof text3 !== "string") return text3;
   if (lastMarkup?.text === text3) return lastMarkup;
   const markup = readText2(text3);
   lastMarkup = markup;
@@ -34224,7 +34242,7 @@ function readText2(text3) {
   return new DocumentMarkup(TEXT_URI, text3, passages, TEXT_CONTEXT);
 }
 function findLinkRuntimeMismatches(text3) {
-  if (!text3.includes("[[")) return [];
+  if (!(typeof text3 === "string" ? text3 : text3.text).includes("[[")) return [];
   const found = [];
   for (const ref2 of documentPassageRefs(markupOfText(text3))) {
     if (ref2.form !== "bracket") continue;
@@ -34384,7 +34402,7 @@ function buildReport(documents, workspace) {
 }
 function declarationsOf(workspace, name) {
   const passage = name === "StoryVariables" ? workspace.passages.getStoryVariables() : workspace.passages.getStoryTransients();
-  if (!passage) return void 0;
+  if (!passage || !isRuntimePassage(passage)) return void 0;
   const markup = workspace.markup.get(passage.uri)?.passages.find((candidate) => candidate.passage === passage);
   if (!markup) return void 0;
   return new Map(markup.declarations.declarations.map((declaration) => [declaration.name, declaration.schema]));
@@ -34517,7 +34535,7 @@ function structureDiagnostics(passage, workspace) {
       if (token.type === "macro" && !token.isClose) {
         diagnostics.push(...parentDiagnostics(passage, token, ancestors, workspace));
         diagnostics.push(...childDiagnostics(passage, node, token, workspace));
-        diagnostics.push(...loopDiagnostics(passage, token, ancestors));
+        diagnostics.push(...loopDiagnostics(passage, token, ancestors, workspace));
       }
       if (!node.body) continue;
       const inside = [...ancestors, {
@@ -34643,13 +34661,13 @@ function statementEnd(code, from) {
   }
   return code.length;
 }
-function loopDiagnostics(passage, token, ancestors) {
+function loopDiagnostics(passage, token, ancestors, workspace) {
   const macro = token.name.toLowerCase();
-  if (macro !== "computed" && macro !== "set" || !token.rawArgs) return [];
+  if (macro !== "computed" && macro !== "set" || !token.rawArgs || workspace.macros.getMacro(macro)?.source !== "builtin") return [];
   let loop;
   for (let i2 = ancestors.length - 1; i2 >= 0; i2--) {
     const ancestor = ancestors[i2];
-    if (ancestor.element) continue;
+    if (ancestor.element || workspace.macros.getMacro(ancestor.name)?.source !== "builtin") continue;
     if (DEFERRED_CONTAINERS.has(ancestor.name)) return [];
     if (ancestor.name === "for") {
       loop = ancestor;
@@ -34694,7 +34712,8 @@ function argumentDiagnostics(passage, workspace) {
   for (const token of passage.isMarkup ? macroTokens(passage) : []) {
     if (token.type !== "macro" || token.isClose) continue;
     const info = workspace.macros.getMacro(token.name);
-    if (!info?.parameters || info.skipArgs || SPINDLE_MACROS.has(token.name.toLowerCase())) continue;
+    if (!info?.parameters || info.skipArgs || info.parameterDefs?.length) continue;
+    if (SPINDLE_MACROS.has(token.name.toLowerCase()) && !workspace.macros.hasDiscoveredMacro(token.name)) continue;
     let params;
     try {
       params = new Parameters(info.parameters);
@@ -34777,14 +34796,14 @@ function describeNavigation(passage) {
 }
 function linkDiagnostics(doc) {
   const diagnostics = [];
-  for (const link of findLinkRuntimeMismatches(doc.text)) {
+  for (const link of findLinkRuntimeMismatches(doc)) {
     diagnostics.push(makeDiag(
       link.range,
       DiagnosticCode.LinkRuntimeMismatch,
       `Spindle reads this link differently from how it is written: the link macro reads the label as ${JSON.stringify(link.runtime.display)} and a click ${describeNavigation(link.runtime.passage)}, not to ${JSON.stringify(link.target)}.`
     ));
   }
-  for (const found of findLiteralLinkInterpolations(doc.text)) {
+  for (const found of findLiteralLinkInterpolations(doc)) {
     diagnostics.push(makeDiag(
       found.range,
       DiagnosticCode.LiteralLinkInterpolation,
@@ -79927,7 +79946,7 @@ function linkable(name) {
   return tokens2.length === 1 && link.type === "link" && link.target === name && !bracketLinkMismatch("label", name);
 }
 function getPassageNameCompletions(workspace) {
-  return workspace.passages.getAllPassages().filter((p) => linkable(p.name)).map((p) => ({
+  return workspace.passages.getAllPassages().filter((p) => isRuntimePassage(p) && linkable(p.name)).map((p) => ({
     label: p.name,
     kind: 18,
     // CompletionItemKind.Reference
@@ -79942,6 +79961,7 @@ var init_completions = __esm({
     init_widgets();
     init_passage_refs();
     init_link_runtime();
+    init_passage_parser();
     init_markup_cursor();
     init_markup_symbols();
     VARIABLE_DETAIL = { $: "story variable", "%": "transient variable", _: "temporary variable", "@": "local/parameter variable" };
@@ -81388,7 +81408,7 @@ function declareVariable(diag, workspace, sigil) {
   if (diag.data?.kind !== "undeclared-variable" || diag.data.sigil !== sigil) return [];
   const { name } = diag.data;
   const passage = sigil === "$" ? workspace.passages.getStoryVariables() : workspace.passages.getStoryTransients();
-  if (!passage) return [];
+  if (!passage || !isRuntimePassage(passage)) return [];
   const text3 = workspace.documents.getText(passage.uri);
   if (text3 === void 0) return [];
   const markup = workspace.markup.get(passage.uri)?.passages.find((p) => p.passage === passage);
@@ -81404,6 +81424,7 @@ function declareVariable(diag, workspace, sigil) {
   }];
 }
 function fixNoStoryVariables(workspace) {
+  if (workspace.passages.getStoryVariables()) return null;
   const targetUri = missingStoryVariablesOwner(workspace);
   if (targetUri === void 0) return null;
   const text3 = workspace.documents.getText(targetUri);
@@ -81454,7 +81475,7 @@ function fixBrokenLink(uri, diag, workspace) {
     });
   }
   const header = `:: ${name.replace(/[\\[\]{}]/g, "\\$&")}`;
-  if (name.trim() === name && name !== "" && !/[\r\n]/.test(name)) {
+  if (!workspace.passages.getPassage(name) && name.trim() === name && name !== "" && !/[\r\n]/.test(name)) {
     const edit = insertLinesAt(text3, text3.split("\n").length, `
 ${header}
 `, lineEndingFor(workspace, uri));
@@ -81523,6 +81544,7 @@ var init_code_actions = __esm({
     init_rename();
     init_js_string_literal();
     init_text();
+    init_passage_parser();
     DEFAULT_CONFIG_FILENAME = "spindle.config.yaml";
     NEW_MACRO_ENTRY = { description: "" };
     fixUndeclaredVariable = (diag, workspace) => declareVariable(diag, workspace, "$");