@rohal12/spindle-lsp 0.15.42 → 0.15.43

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.43";
   }
 });
 
@@ -88740,6 +88740,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 +89255,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 +89635,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 +89659,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 +89682,7 @@ var init_code_lens = __esm({
     "use strict";
     init_text();
     init_passage_parser();
+    init_macro_heads();
     init_references();
     codeLensPlugin = {
       id: "code-lens",