@rohal12/spindle-lsp 0.15.11 → 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.11";
+    VERSION = false ? pkg.version : "0.15.12";
   }
 });
 
@@ -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"() {
@@ -31443,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);
@@ -31475,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() {
@@ -33898,7 +33911,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");
@@ -34205,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;
@@ -34228,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;
@@ -34521,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, {
@@ -34647,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;
@@ -34782,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,
@@ -79932,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
@@ -79947,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" };