@rohal12/spindle-lsp 0.15.44 → 0.15.46

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.44";
+    VERSION = false ? pkg.version : "0.15.46";
   }
 });
 
@@ -32868,6 +32868,10 @@ function encodePassageName(name) {
   const parsed = parseTwee(`:: ${encoded}`);
   return parsed.passages.length === 1 && parsed.passages[0].name === name && !parsed.diagnostics.some((d) => d.level === "error") ? encoded : void 0;
 }
+function trimmedEnd(text3, end = text3.length) {
+  while (end > 0 && new RegExp("\\p{White_Space}", "u").test(text3[end - 1])) end--;
+  return end;
+}
 function parsePassageHeader(rawLine, lineNumber) {
   const line = withoutCr(rawLine);
   const bomLength = /^\uFEFF*/.exec(line)[0].length;
@@ -32879,8 +32883,9 @@ function parsePassageHeader(rawLine, lineNumber) {
   delimiter.lastIndex = nameStart;
   const first = delimiter.exec(escaped);
   const boundary = first?.index ?? line.length;
-  const nameEnd = escaped.slice(0, boundary).replace(new RegExp("\\p{White_Space}+$", "u"), "").length;
-  const name = line.slice(nameStart, nameEnd).replace(/\\(.|$)/g, "$1").replace(new RegExp("^\\p{White_Space}+|\\p{White_Space}+$", "gu"), "");
+  const nameEnd = trimmedEnd(escaped, boundary);
+  const decodedName = line.slice(nameStart, nameEnd).replace(/\\(.|$)/g, "$1").replace(new RegExp("^\\p{White_Space}+", "u"), "");
+  const name = decodedName.slice(0, trimmedEnd(decodedName));
   if (!name) return null;
   let rest = boundary;
   let tags = [];
@@ -32894,7 +32899,7 @@ function parsePassageHeader(rawLine, lineNumber) {
   }
   let meta3;
   if (rest < line.length) {
-    const raw = line.slice(rest).replace(new RegExp("\\p{White_Space}+$", "u"), "");
+    const raw = line.slice(rest, trimmedEnd(line));
     if (escaped[rest] !== "{" || !raw.endsWith("}")) return null;
     try {
       meta3 = JSON.parse(raw);
@@ -33086,7 +33091,7 @@ var init_passage_index = __esm({
       getAllPassages() {
         const result2 = [];
         for (const uri of this.uris()) {
-          result2.push(...this.byUri.get(uri));
+          for (const passage of this.byUri.get(uri)) result2.push(passage);
         }
         return result2;
       }
@@ -36179,16 +36184,21 @@ function declarationsOf(workspace, name) {
   return new Map(markup.declarations.declarations.map((declaration) => [declaration.name, declaration.schema]));
 }
 function markupDiagnostics(passage, story, workspace) {
-  return (story.markup.get(passage) ?? []).map((found) => fromMarkup(passage, found, workspace));
+  const found = story.markup.get(passage) ?? [];
+  const tokens2 = /* @__PURE__ */ new Map();
+  if (found.some((diagnostic) => diagnostic.code === "unknown-macro")) {
+    for (const token of macroTokens(passage)) tokens2.set(token.start, token);
+  }
+  return found.map((diagnostic) => fromMarkup(passage, diagnostic, workspace, tokens2));
 }
-function fromMarkup(passage, found, workspace) {
+function fromMarkup(passage, found, workspace, tokens2) {
   const range2 = passage.range(...visibleSpan(passage.content, found.start, found.end));
   const name = text2(found.data?.name);
   let code = MARKUP_CODES[found.code];
   let data2;
   switch (found.code) {
     case "unknown-macro": {
-      const token = [...macroTokens(passage)].find((candidate) => candidate.start === found.start);
+      const token = tokens2.get(found.start);
       data2 = {
         kind: "unknown-macro",
         name,
@@ -90041,12 +90051,23 @@ function addMacroToYamlConfig(text3, macroName) {
   if (doc.errors.length > 0) return null;
   if (doc.contents !== null && !(0, import_yaml3.isMap)(doc.contents)) return null;
   const path2 = macrosPath(doc.toJS());
-  const parent = path2.length > 1 ? doc.getIn(path2.slice(0, -1), true) : doc.contents;
-  let macros = doc.getIn(path2, true);
-  if ((0, import_yaml3.isAlias)(macros)) {
-    macros = doc.createNode(macros.toJS(doc));
-    doc.setIn(path2, macros);
+  for (let depth = 1; depth <= path2.length; depth++) {
+    const prefix = path2.slice(0, depth);
+    const node2 = doc.getIn(prefix, true);
+    if ((0, import_yaml3.isAlias)(node2)) {
+      let value = node2.toJS(doc);
+      if (depth < path2.length && (0, import_yaml3.isMap)(node2.resolve(doc))) {
+        const key = path2[depth];
+        const child = value[key];
+        if (child !== null && typeof child === "object" && !Array.isArray(child)) {
+          value = { ...value, [key]: { ...child } };
+        }
+      }
+      doc.setIn(prefix, doc.createNode(value));
+    }
   }
+  const parent = path2.length > 1 ? doc.getIn(path2.slice(0, -1), true) : doc.contents;
+  const macros = doc.getIn(path2, true);
   if ((0, import_yaml3.isMap)(macros) && definesMacro(macros.toJS(doc), macroName)) return null;
   if ((0, import_yaml3.isMap)(parent) && (0, import_yaml3.isMap)(macros) && !macros.flow && macros.items.length > 0 && macros.range) {
     const macrosKey = parent.items.find((p) => (0, import_yaml3.isScalar)(p.key) && p.key.value === "macros")?.key;
@@ -90556,9 +90577,10 @@ function computeDocumentLinks(uri, workspace) {
   const doc = workspace.markup.get(uri);
   if (!doc) return [];
   const links = [];
+  const targets = new Map(workspace.passages.getEffectivePassages().map((passage) => [passage.name, passage]));
   for (const ref2 of documentPassageRefs(doc)) {
     if (ref2.form !== "bracket") continue;
-    const targetPassage = workspace.passages.getEffectivePassage(ref2.name);
+    const targetPassage = targets.get(ref2.name);
     links.push({
       range: ref2.range,
       target: targetPassage ? `${targetPassage.uri}#L${targetPassage.range.start.line + 1}` : void 0