@rohal12/spindle-lsp 0.15.43 → 0.15.45

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.43";
+    VERSION = false ? pkg.version : "0.15.45";
   }
 });
 
@@ -3546,7 +3546,7 @@ var require_identity = __commonJS({
     var SCALAR = /* @__PURE__ */ Symbol.for("yaml.scalar");
     var SEQ = /* @__PURE__ */ Symbol.for("yaml.seq");
     var NODE_TYPE = /* @__PURE__ */ Symbol.for("yaml.node.type");
-    var isAlias = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === ALIAS;
+    var isAlias2 = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === ALIAS;
     var isDocument = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === DOC;
     var isMap2 = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === MAP;
     var isPair = (node2) => !!node2 && typeof node2 === "object" && node2[NODE_TYPE] === PAIR;
@@ -3581,7 +3581,7 @@ var require_identity = __commonJS({
     exports.SCALAR = SCALAR;
     exports.SEQ = SEQ;
     exports.hasAnchor = hasAnchor;
-    exports.isAlias = isAlias;
+    exports.isAlias = isAlias2;
     exports.isCollection = isCollection;
     exports.isDocument = isDocument;
     exports.isMap = isMap2;
@@ -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);
@@ -36348,12 +36353,13 @@ function childDiagnostics(passage, node2, token, workspace) {
   if (!constraints || constraints.length === 0 || !node2.body?.close) return [];
   const direct = [...node2.body.children];
   for (const branch of node2.body.branches) direct.push({ token: branch.tag, start: branch.tag.start, end: branch.tag.end }, ...branch.children);
+  const branchTags = new Set(node2.body.branches.map((branch) => branch.tag));
   const consumesOptions = macro?.source === "builtin" && ["listbox", "cycle"].includes(token.name.toLowerCase());
   const counts = /* @__PURE__ */ Object.create(null);
   for (const child of direct) {
     if (child.token.type !== "macro" || child.token.isClose) continue;
     const key = child.token.name.toLowerCase();
-    if (consumesOptions && key === "option" || workspace.getEffectiveMacro(key)) counts[key] = (counts[key] ?? 0) + 1;
+    if (branchTags.has(child.token) || consumesOptions && key === "option" || workspace.getEffectiveMacro(key)) counts[key] = (counts[key] ?? 0) + 1;
   }
   const diagnostics = [];
   const range2 = passage.range(token.start, token.end);
@@ -90040,6 +90046,21 @@ 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());
+  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;