@rohal12/spindle-lsp 0.15.43 → 0.15.44

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.44";
   }
 });
 
@@ -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;
@@ -36348,12 +36348,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);
@@ -90041,7 +90042,11 @@ function addMacroToYamlConfig(text3, macroName) {
   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;
-  const macros = doc.getIn(path2, true);
+  let macros = doc.getIn(path2, true);
+  if ((0, import_yaml3.isAlias)(macros)) {
+    macros = doc.createNode(macros.toJS(doc));
+    doc.setIn(path2, macros);
+  }
   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;