@rohal12/spindle-lsp 0.15.11 → 0.15.13

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.11";
+    VERSION = false ? pkg.version : "0.15.13";
   }
 });
 
@@ -31356,6 +31356,15 @@ 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"() {
@@ -31368,7 +31377,7 @@ var init_passage_index = __esm({
       /** The documents' URIs in a fixed (sorted) order, so lookups never depend on the order documents were opened. */
       sortedUris = null;
       uris() {
-        return this.sortedUris ??= [...this.byUri.keys()].sort();
+        return this.sortedUris ??= [...this.byUri.keys()].sort(compareSourceUris);
       }
       /**
        * Parse all passage headers in the given document text and
@@ -31443,6 +31452,14 @@ var init_passage_index = __esm({
         }
         return found;
       }
+      /** The compiler replaces duplicate passages with the later source declaration. */
+      getEffectivePassage(name) {
+        return this.getPassages(name).at(-1);
+      }
+      /** Later duplicates replace the original slot, before any runtime role exclusions. */
+      getEffectivePassages() {
+        return [...new Map(this.getAllPassages().map((passage) => [passage.name, passage])).values()];
+      }
       /** Get the passage containing a specific line in a document. */
       getPassageAt(uri, line) {
         const passages = this.byUri.get(uri);
@@ -31475,11 +31492,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() {
@@ -32902,28 +32919,44 @@ var init_widget_registry = __esm({
       /** Per-URI set of lower-cased macro names opened in that document. */
       invokedByUri = /* @__PURE__ */ new Map();
       /**
-       * Read the widget definitions of `passages` (all of them, in workspace
-       * order). Public tooling selects the closed definitions in runtime phase
-       * order, preserving their identities so the original source is retained.
+       * Read effective story passages in compiler order. Superseded passages may
+       * supply editor navigation while a replacement is incomplete; they cannot
+       * register runtime widgets. Tooling selects definitions in runtime phase order.
        */
-      scan(passages, macros) {
+      scan(passages, macros, superseded = []) {
         this.widgets.clear();
         this.incomplete.clear();
-        const sources = widgetSources(passages, [...macros]);
+        const metadata2 = [...macros];
+        const sources = widgetSources(passages, metadata2);
         const effective = new Set(effectiveWidgetDefinitions([...sources.keys()]));
+        const incompletePassages = /* @__PURE__ */ new Map();
+        const located = (definition2, markup) => ({
+          tooling: definition2,
+          name: definition2.name,
+          params: definition2.params,
+          uri: markup.passage.uri,
+          range: markup.range(definition2.start, definition2.end),
+          nameRange: markup.range(definition2.nameStart, definition2.nameEnd),
+          block: definition2.block
+        });
         for (const [definition2, markup] of sources) {
-          const widget = {
-            tooling: definition2,
-            name: definition2.name,
-            params: definition2.params,
-            uri: markup.passage.uri,
-            range: markup.range(definition2.start, definition2.end),
-            nameRange: markup.range(definition2.nameStart, definition2.nameEnd),
-            block: definition2.block
-          };
+          const widget = located(definition2, markup);
           const key = definition2.name.toLowerCase();
           if (effective.has(definition2)) this.widgets.set(key, widget);
-          else if (definition2.closeStart === void 0) this.incomplete.set(key, widget);
+          else if (definition2.closeStart === void 0) {
+            this.incomplete.set(key, widget);
+            incompletePassages.set(key, markup.passage.name);
+          }
+        }
+        if (incompletePassages.size > 0) {
+          const previous2 = widgetSources(superseded, metadata2);
+          const candidates = [...previous2.keys()].filter((definition2) => {
+            const name = definition2.name.toLowerCase();
+            return !this.widgets.has(name) && incompletePassages.get(name) === previous2.get(definition2).passage.name;
+          });
+          for (const definition2 of effectiveWidgetDefinitions(candidates)) {
+            this.incomplete.set(definition2.name.toLowerCase(), located(definition2, previous2.get(definition2)));
+          }
         }
       }
       /** The effective definition, or an incomplete declaration while its first definition is being typed. */
@@ -33863,21 +33896,24 @@ var init_workspace_model = __esm({
       refreshDiscoveredMacros() {
         const found = [];
         const init = [];
-        for (const uri of this.documents.getUris().sort()) {
+        const seen = /* @__PURE__ */ new Set();
+        const effective = new Map(this.passages.getEffectivePassages().map((passage) => [passage.name, passage]));
+        for (const uri of this.documents.getUris().sort(compareSourceUris)) {
           const text3 = this.documents.getText(uri);
           if (!text3) continue;
           if (isMacroSource(uri)) {
             found.push(...discoverMacros(text3));
             continue;
           }
-          let lines;
-          for (const passage of this.passages.getPassagesInDocument(uri)) {
+          for (const source of this.passages.getPassagesInDocument(uri)) {
+            if (seen.has(source.name)) continue;
+            seen.add(source.name);
+            const passage = effective.get(source.name);
             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");
-            const content2 = lines.slice(passage.headerEnd.end.line + 1, passage.range.end.line + 1).join("\n");
+            const content2 = this.markup.get(passage.uri)?.passages.find((p) => p.passage === passage)?.content ?? "";
             if (isScript) found.push(...discoverMacros(content2));
             else init.push(...storyInitMacros(content2));
           }
@@ -33898,7 +33934,7 @@ 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);
+          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");
@@ -33913,15 +33949,18 @@ var init_workspace_model = __esm({
         });
         const markups = /* @__PURE__ */ new Map();
         for (const doc of readDocuments()) for (const passage of doc.passages) markups.set(passage.passage, passage);
+        const effective = new Set(this.passages.getEffectivePassages());
         this.widgets.scan(
-          this.passages.getAllPassages().flatMap((passage) => markups.get(passage) ?? []),
-          this.macros.toolingMacros()
+          [...effective].flatMap((passage) => markups.get(passage) ?? []),
+          this.macros.toolingMacros(),
+          [...markups].filter(([passage]) => !effective.has(passage)).map(([, markup]) => markup)
         );
         this.markup.invalidate();
         this.widgets.clearInvocations();
         for (const doc of readDocuments()) {
-          this.variables.scanDocument(doc.uri, doc.text, doc);
-          this.widgets.recordInvocations(doc.uri, doc.passages);
+          const passages = doc.passages.filter((p) => effective.has(p.passage));
+          this.variables.scanDocument(doc.uri, doc.text, { passages });
+          this.widgets.recordInvocations(doc.uri, passages);
         }
       }
       /** All runtime metadata, with real macros taking precedence over widgets. */
@@ -34205,6 +34244,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;
@@ -34228,7 +34268,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;
@@ -34298,7 +34338,9 @@ function computeDiagnostics(uri, workspace, options) {
     }
   };
   const story = storyReport(workspace);
+  const effective = new Set(workspace.passages.getEffectivePassages());
   for (const passage of doc.passages) {
+    if (!effective.has(passage.passage)) continue;
     attempt(() => diagnostics.push(...markupDiagnostics(passage, story, workspace)));
     attempt(() => diagnostics.push(...variableDiagnostics(passage, story)));
     attempt(() => diagnostics.push(...structureDiagnostics(passage, workspace)));
@@ -34308,7 +34350,10 @@ function computeDiagnostics(uri, workspace, options) {
   attempt(() => diagnostics.push(...versionDiagnostics(uri, doc, workspace)));
   attempt(() => diagnostics.push(...storyVariablesDiagnostics(uri, doc, story, workspace)));
   attempt(() => diagnostics.push(...arrayMemberDiagnostics(uri, workspace)));
-  attempt(() => diagnostics.push(...linkDiagnostics(doc)));
+  attempt(() => diagnostics.push(...linkDiagnostics(doc).filter((diagnostic) => {
+    const passage = doc.passageAt(diagnostic.range.start);
+    return passage !== void 0 && effective.has(passage.passage);
+  })));
   attempt(() => diagnostics.push(...unusedWidgetDiagnostics(doc, story)));
   if (options?.maxLineLength) {
     const maxLength = options.maxLineLength;
@@ -34335,12 +34380,13 @@ function buildReport(documents, workspace) {
     const storeVar = workspace.macros.getMacro(macro.name)?.storeVar;
     return storeVar ? { ...macro, storeVar } : macro;
   });
-  const passages = [];
+  const markups = /* @__PURE__ */ new Map();
   for (const doc of documents) {
     for (const passage of doc.passages) {
-      if (isRuntimePassage(passage.passage)) passages.push(passage);
+      markups.set(passage.passage, passage);
     }
   }
+  const passages = workspace.passages.getEffectivePassages().filter(isRuntimePassage).flatMap((passage) => markups.get(passage) ?? []);
   const markup = /* @__PURE__ */ new Map();
   const validationMacros = toolingMacros.map((macro) => workspace.macros.hasConfiguredParameters(macro.name) ? { ...macro, widget: void 0 } : macro);
   const found = validateStoryMarkup(
@@ -34376,6 +34422,7 @@ function buildReport(documents, workspace) {
   }
   return {
     documents,
+    passages,
     macros,
     markup,
     widgets,
@@ -34489,11 +34536,11 @@ function storyVariablesDiagnostics(uri, doc, story, workspace) {
 }
 function storyUsesVariables(story) {
   const excluded = /* @__PURE__ */ new Set(["StoryVariables", "StoryInit", "StoryData", "StoryScript", "StoryInterface"]);
-  return story.documents.some((doc) => doc.passages.some((passage) => passage.isMarkup && !excluded.has(passage.passage.name) && validateVariableReferences(
+  return story.passages.some((passage) => passage.isMarkup && !excluded.has(passage.passage.name) && validateVariableReferences(
     [{ name: passage.passage.name, content: passage.content }],
     { variables: /* @__PURE__ */ new Map() },
     story.macros
-  ).some((diagnostic) => diagnostic.code === "undeclared-variable")));
+  ).some((diagnostic) => diagnostic.code === "undeclared-variable"));
 }
 function arrayMemberDiagnostics(uri, workspace) {
   return workspace.variables.getArrayMemberAccesses(uri).map((access) => {
@@ -34521,7 +34568,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, {
@@ -34647,13 +34694,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 +34741,7 @@ function isReadInBody(passage, bodyStart, bodyEnd, name, macroStart, macroEnd) {
 }
 function argumentDiagnostics(passage, workspace) {
   const diagnostics = [];
-  const passageNames = workspace.passages.getAllPassages().filter(isRuntimePassage).map((candidate) => candidate.name);
+  const passageNames = workspace.passages.getEffectivePassages().filter(isRuntimePassage).map((candidate) => candidate.name);
   for (const token of passage.isMarkup ? macroTokens(passage) : []) {
     if (token.type !== "macro" || token.isClose) continue;
     const info = workspace.macros.getMacro(token.name);
@@ -34747,7 +34794,7 @@ function widgetDiagnostics(passage, story, workspace) {
   }
   for (const piece of passage.pieces) {
     if (piece.kind !== "passage" || piece.macro !== "include") continue;
-    const target = workspace.passages.getPassage(piece.name);
+    const target = workspace.passages.getEffectivePassage(piece.name);
     if (!target?.tags?.includes("widget")) continue;
     const defined = story.widgetList.filter((widget) => widget.passage.passage === target).map((widget) => widget.definition.name);
     if (defined.length === 0) continue;
@@ -34782,14 +34829,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,
@@ -79932,7 +79979,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.getEffectivePassages().filter((p) => isRuntimePassage(p) && linkable(p.name)).map((p) => ({
     label: p.name,
     kind: 18,
     // CompletionItemKind.Reference
@@ -79947,6 +79994,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" };
@@ -81898,7 +81946,7 @@ __export(server_exports2, {
 });
 import { fileURLToPath as fileURLToPath5, pathToFileURL as pathToFileURL6 } from "node:url";
 import { readFileSync as readFileSync8 } from "node:fs";
-import { basename as basename3 } from "node:path";
+import { basename as basename3, dirname as dirname6 } from "node:path";
 function uriToFsPath(uri) {
   try {
     return fileURLToPath5(uri);
@@ -82035,7 +82083,7 @@ function startServer(args2) {
     if (workspace) {
       try {
         const fsPath = uriToFsPath(textDocument.uri);
-        if (isExcludedProjectFile(fsPath, workspaceRoot)) {
+        if (isExcludedProjectFile(fsPath, workspaceRoot) || !canDiscoverProjectPath(fsPath, workspaceRoot ?? dirname6(fsPath))) {
           workspace.documents.close(textDocument.uri);
         } else {
           const text3 = readFileSync8(fsPath, "utf-8");
@@ -82066,15 +82114,16 @@ function startServer(args2) {
         configChanged = true;
         continue;
       }
-      if (isExcludedProjectFile(uriToFsPath(change.uri), workspaceRoot)) {
+      if (documents.has(change.uri)) continue;
+      const fsPath = uriToFsPath(change.uri);
+      if (isExcludedProjectFile(fsPath, workspaceRoot) || !canDiscoverProjectPath(fsPath, workspaceRoot ?? dirname6(fsPath))) {
+        workspace.documents.close(change.uri);
         continue;
       }
-      if (documents.has(change.uri)) continue;
       if (change.type === import_node.FileChangeType.Deleted) {
         workspace.documents.close(change.uri);
       } else {
         try {
-          const fsPath = uriToFsPath(change.uri);
           const text3 = readFileSync8(fsPath, "utf-8");
           if (workspace.documents.has(change.uri)) {
             workspace.documents.update(change.uri, text3);