@rohal12/spindle-lsp 0.15.42 → 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.42";
+    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);
@@ -88740,6 +88741,13 @@ function passageMacroHeads(passage) {
 function documentMacroHeads(doc) {
   return doc.passages.flatMap((passage) => passage.isMarkup ? [...passageMacroHeads(passage)] : []);
 }
+function* workspaceMacroHeads(workspace) {
+  for (const uri of workspace.documents.getUris()) {
+    const doc = workspace.markup.get(uri);
+    if (!doc) continue;
+    for (const head of documentMacroHeads(doc)) yield { uri, head };
+  }
+}
 function macroHeadAt(doc, position) {
   const passage = doc.passageAt(position);
   if (!passage?.isMarkup) return void 0;
@@ -89248,13 +89256,9 @@ function computeRename(uri, position, newName, workspace) {
       if (workspace.passages.getPassage(newName)) {
         throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: a passage with that name already exists.`).at(uri, symbol2.range);
       }
-      for (const documentUri of workspace.documents.getUris()) {
-        const doc = workspace.markup.get(documentUri);
-        if (!doc) continue;
-        for (const head of documentMacroHeads(doc)) {
-          if (!head.closing && workspace.getEffectiveMacro(head.name) && workspace.macros.hasUnsafeConfiguredPassages(head.name)) {
-            throw new RenameError(`Cannot rename: {${head.name}} has configured passage parameters whose positions are ambiguous, repeated or conflict with its runtime signature.`).at(documentUri, head.range);
-          }
+      for (const { uri: documentUri, head } of workspaceMacroHeads(workspace)) {
+        if (!head.closing && workspace.getEffectiveMacro(head.name) && workspace.macros.hasUnsafeConfiguredPassages(head.name)) {
+          throw new RenameError(`Cannot rename: {${head.name}} has configured passage parameters whose positions are ambiguous, repeated or conflict with its runtime signature.`).at(documentUri, head.range);
         }
       }
       const refEdits = [];
@@ -89632,6 +89636,18 @@ function computeCodeLenses(uri, workspace) {
   }
   const variableCounts = variableLines.size > 0 ? workspace.variables.getUsageCounts() : /* @__PURE__ */ new Map();
   const widgetLines = new Map(workspace.widgets.getAllWidgets().filter((w) => w.uri === uri).map((w) => [w.range.start.line, w.name]));
+  const widgetCounts = /* @__PURE__ */ new Map();
+  for (const name of widgetLines.values()) {
+    if (!workspace.getEffectiveMacro(name)) widgetCounts.set(name.toLowerCase(), 0);
+  }
+  if (widgetCounts.size > 0) {
+    for (const { head } of workspaceMacroHeads(workspace)) {
+      if (!head.invocation || head.closing) continue;
+      const name = head.name.toLowerCase();
+      const count = widgetCounts.get(name);
+      if (count !== void 0) widgetCounts.set(name, count + 1);
+    }
+  }
   for (let lineNum = 0; lineNum < lines.length; lineNum++) {
     const line = lines[lineNum];
     const header = parsePassageHeader(line, lineNum);
@@ -89644,7 +89660,7 @@ function computeCodeLenses(uri, workspace) {
     }
     const widgetName2 = widgetLines.get(lineNum);
     if (widgetName2 !== void 0) {
-      const usageCount = findWidgetReferences(widgetName2, workspace, false, false).length;
+      const usageCount = widgetCounts.get(widgetName2.toLowerCase()) ?? 0;
       addLens(lineNum, `${usageCount} usage${usageCount !== 1 ? "s" : ""}`);
     }
     const varName = variableLines.get(lineNum);
@@ -89667,6 +89683,7 @@ var init_code_lens = __esm({
     "use strict";
     init_text();
     init_passage_parser();
+    init_macro_heads();
     init_references();
     codeLensPlugin = {
       id: "code-lens",
@@ -90025,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;