@rohal12/spindle-lsp 0.15.10 → 0.15.11

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.11";
   }
 });
 
@@ -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,7 @@ var init_passage_parser = __esm({
 });
 
 // src/core/workspace/passage-index.ts
+import { createRequire as createSettingsRequire } from "node:module";
 var PassageIndex;
 var init_passage_index = __esm({
   "src/core/workspace/passage-index.ts"() {
@@ -31402,6 +31403,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);
@@ -32297,6 +32304,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 +33374,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 +33458,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 +33605,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 +33643,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 +33872,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");
@@ -33895,7 +33899,7 @@ var init_workspace_model = __esm({
         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;
+          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);
@@ -34384,7 +34388,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]));
@@ -34694,7 +34698,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);
@@ -81388,7 +81393,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 +81409,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 +81460,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 +81529,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, "$");