@rohal12/spindle-lsp 0.15.40 → 0.15.41

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.40";
+    VERSION = false ? pkg.version : "0.15.41";
   }
 });
 
@@ -16097,13 +16097,6 @@ function pairingError(position, error62) {
 function tokenizeMarkup$1(source, options = {}) {
   return run$1(source, "Tokens", options);
 }
-function parseSelectors(source, at3 = 0) {
-  const found = run$1(source.slice(at3), "SelectorsPrefix", {});
-  return {
-    ...found,
-    end: at3 + found.end
-  };
-}
 function tokenizeMarkupTolerant$1(source, options = {}) {
   const { tokens: tokens2, errors } = scanMarkupTolerant(source, options);
   return {
@@ -17090,8 +17083,11 @@ function locate(text3, part, from) {
   const anywhere = text3.indexOf(part);
   return anywhere >= 0 ? anywhere : from;
 }
-function completionContext(source, cursor, macros = []) {
-  return readCompletion(source.slice(0, cursor), cursor, macros, false, source.length);
+function completionTarget(source, cursor, macros = []) {
+  return readCompletion(source, cursor, macros, true);
+}
+function completionScopes(source, cursor, macros, visit2) {
+  readCompletion(source, cursor, macros, true, source.length, visit2);
 }
 function readCompletion(source, cursor, macros, full, sourceLength = source.length, visit2) {
   if (!Number.isInteger(cursor) || cursor < 0 || cursor > sourceLength) throw new RangeError("cursor must be a UTF-16 offset within source");
@@ -22676,6 +22672,21 @@ function macroClassifier(all) {
     return calls;
   };
 }
+function macroCallAt(source, cursor, macros = []) {
+  const all = effectiveToolingMacros(macros);
+  const classify2 = macroClassifier(all);
+  let selected;
+  completionScopes(source, cursor, all, (tokens2, map2) => {
+    const call = classify2(tokens2).find(({ token }) => map2(token.start) < cursor && cursor <= map2(token.end));
+    if (call) selected = {
+      ...call,
+      token: mapOffsets(call.token, map2),
+      ...call.owner && { owner: mapOffsets(call.owner, map2) }
+    };
+    return !call || call.kind === "invocation";
+  });
+  return selected;
+}
 function passagePieces(source, macros = []) {
   const all = effectiveToolingMacros(macros);
   const parametersOf2 = parameterLookup(all);
@@ -34149,7 +34160,11 @@ var init_passage_markup = __esm({
       }
       /** Whether the cursor is executable, with decoded code mapped back to `content`. */
       completionAt(offset2) {
-        return this.isMarkup ? completionContext(this.content, offset2, this.doc.context.macros) : { kind: "literal" };
+        return this.isMarkup ? completionTarget(this.content, offset2, this.doc.context.macros) : { kind: "literal" };
+      }
+      /** Contextual dispatch at a complete or unfinished macro head. */
+      macroCallAt(offset2) {
+        return this.isMarkup ? macroCallAt(this.content, offset2, this.doc.context.macros) : void 0;
       }
       /** The declarations of a StoryVariables / StoryTransients passage. */
       get declarations() {
@@ -34395,10 +34410,21 @@ var init_variable_tracker = __esm({
       getUsages(name) {
         return usagesOf(this.usagesByUri, name);
       }
+      /** Count every story binding's executable usages in one workspace pass. */
+      getUsageCounts() {
+        const counts = /* @__PURE__ */ new Map();
+        for (const usages of this.usagesByUri.values()) {
+          for (const usage of usages) counts.set(usage.baseName, (counts.get(usage.baseName) ?? 0) + 1);
+        }
+        return counts;
+      }
+      /** All declaration occurrences, including repeated defaults, in source order. */
+      getAllDeclarations(sigil) {
+        return (sigil === "$" ? this.variables : this.transients).occurrences;
+      }
       /** Every declaration location of a story or transient binding, in source order. */
       getDeclarations(name, sigil) {
-        const declarations = sigil === "$" ? this.variables : this.transients;
-        return declarations.occurrences.flatMap((d) => d.name === name && d.declarationUri !== void 0 && d.declarationRange ? [{ uri: d.declarationUri, range: d.declarationRange }] : []);
+        return this.getAllDeclarations(sigil).flatMap((d) => d.name === name && d.declarationUri !== void 0 && d.declarationRange ? [{ uri: d.declarationUri, range: d.declarationRange }] : []);
       }
       /** The executable usage or declaration containing the cursor, in source coordinates. */
       referenceAt(uri, position) {
@@ -88360,31 +88386,33 @@ var init_markup_cursor = __esm({
         }
         return this.cachedRegions = regions.reverse();
       }
-      /**
-       * The innermost macro whose arguments the cursor is in and that `known`
-       * accepts. A macro still being typed has no token: it is the macro of an
-       * `unclosed-macro` error, whose `offset` is its `{` and whose `end` the end
-       * of its name.
-       */
+      /** The runtime's contextual dispatch of the macro arguments being typed. */
       enclosingMacro(known) {
-        const { at: at3 } = this;
-        for (const region of this.regions) {
-          const found = [];
-          for (const token of region.tokens) {
-            if (token.type !== "macro" || token.isClose || token.nameEnd >= at3 || at3 >= token.end) continue;
-            found.push({ start: token.start, name: token.name, invocation: this.passage.invocations.some((call) => call.start === token.start), argsBefore: at3 >= token.argsStart ? region.view.text.slice(viewIndex(region.view, token.argsStart), viewIndex(region.view, at3)) : "" });
-          }
-          for (const error62 of region.errors) {
-            const source = region.view.text;
-            const end = viewIndex(region.view, error62.end);
-            if (error62.code !== "unclosed-macro" || error62.offset >= at3 || error62.end >= at3 || !/\s/.test(source[end] ?? "")) continue;
-            const name = source.slice(parseSelectors(source, viewIndex(region.view, error62.offset) + 1).end, end);
-            if (name && name[0] !== "/") found.push({ start: error62.offset, name, argsBefore: source.slice(end, viewIndex(region.view, at3)).trimStart() });
-          }
-          const innermost = found.filter((macro) => known(macro.name)).sort((a, b) => b.start - a.start)[0];
-          if (innermost) return innermost;
+        let call = this.passage.macroCallAt(this.at);
+        const active = (candidate) => !!candidate && candidate.token.nameEnd < this.at && known(candidate.token.name) && !(candidate.token.end === this.at && this.regions.some((region) => region.tokens.some((token2) => token2.type === "macro" && token2.start === candidate.token.start && token2.end === this.at)));
+        if (!active(call)) {
+          call = void 0;
+          const consider = (start, nameEnd) => {
+            if (nameEnd >= this.at) return;
+            const candidate = this.passage.macroCallAt(nameEnd + 1);
+            if (candidate?.token.start === start && active(candidate) && (!call || start > call.token.start)) call = candidate;
+          };
+          for (const region of this.regions) {
+            for (const token2 of region.tokens) {
+              if (token2.type === "macro" && !token2.isClose && token2.start < this.at && this.at < token2.end) {
+                consider(token2.start, token2.nameEnd);
+              }
+            }
+            for (const error62 of region.errors) {
+              if (error62.code === "unclosed-macro" && error62.offset < this.at && error62.end < this.at) consider(error62.offset, error62.end);
+            }
+          }
+          if (!call) return void 0;
         }
-        return void 0;
+        const { token } = call;
+        const view = sourceView(this.passage, token.argsStart, this.at);
+        const argsBefore = this.at >= token.argsEnd ? token.rawArgs + (token.argsEnd < this.at ? " " : "") : view.text.slice(viewIndex(view, token.argsStart), viewIndex(view, this.at));
+        return { name: call.token.name, invocation: call.kind === "invocation", argsBefore };
       }
       /**
        * The macro name or closer being typed at the cursor (`{`, `{na`, `{/`),
@@ -88495,8 +88523,8 @@ function getCompletions(uri, position, triggerChar, workspace) {
   const cursor = markupAt(workspace, uri, position);
   if (!cursor?.passage.isMarkup) return [];
   const { passage, content: content2, at: at3 } = cursor;
-  const editing = (items, start, end) => {
-    const range2 = passage.range(start, end);
+  const editing = (items, start, end2) => {
+    const range2 = passage.range(start, end2);
     return items.map((item) => ({ ...item, textEdit: { range: range2, newText: item.insertText ?? item.label } }));
   };
   const typedEdit = (items, typed, tailPattern = /^[\w$]*/) => editing(items, at3 - typed, at3 + tailPattern.exec(content2.slice(at3))[0].length);
@@ -88510,41 +88538,35 @@ function getCompletions(uri, position, triggerChar, workspace) {
   if (head && !head.typed.startsWith("_")) return typedEdit(getMacroCompletions(workspace), head.typed.length, /^[\w-]*/);
   const context = passage.completionAt(at3);
   if (context.kind !== "code") return [];
-  const before = context.code.slice(0, context.cursor);
+  const identifier = context.identifier;
+  if (!identifier) return [];
   const codeOffset = (index) => pieceOffset(context, index);
-  const variableEdit = (items, typed) => editing(items, codeOffset(context.cursor - typed), at3 + /^[\w$]*/.exec(content2.slice(at3))[0].length);
-  const dotPath = /([$%])([\w$]+)\.([A-Za-z_$][\w$]*)?$/.exec(before);
-  if (dotPath) {
-    const sigil = dotPath[1];
-    const typed = (dotPath[3] ?? "").length;
-    const end = at3 + /^[\w$]*/.exec(content2.slice(at3))[0].length;
-    return getDotPathCompletions(sigil, dotPath[2], workspace).map((item) => {
-      const identifier = /^[A-Za-z_$][\w$]*$/.test(item.label);
-      const start = codeOffset(context.cursor - typed - (identifier ? 0 : 1));
+  const end = codeOffset(identifier.end);
+  if (identifier.kind === "member" && identifier.dotStart !== void 0) {
+    let root;
+    lexJs(context.code.slice(0, identifier.dotStart), {
+      variable(sigil, name, _start, _nesting, end2) {
+        if ((sigil === "$" || sigil === "%") && end2 === identifier.dotStart) root = { sigil, name };
+      }
+    }, context.goal);
+    if (!root) return [];
+    return getDotPathCompletions(root.sigil, root.name, workspace).map((item) => {
+      const isIdentifier = /^[A-Za-z_$][\w$]*$/.test(item.label);
+      const start = codeOffset(isIdentifier ? identifier.start : identifier.dotStart);
+      const optional2 = context.code.slice(identifier.dotStart, identifier.start).startsWith("?.") ? "?." : "";
       return {
         ...item,
         textEdit: {
           range: passage.range(start, end),
-          newText: identifier ? item.label : encodeCompletion(`[${JSON.stringify(item.label)}]`, context.containers)
+          newText: encodeCompletion(isIdentifier ? item.label : `${optional2}[${JSON.stringify(item.label)}]`, context.containers)
         }
       };
     });
   }
-  const storyVar = /\$([A-Za-z_$]?[\w$]*)$/.exec(before);
-  if (storyVar) {
-    return variableEdit(getVariableCompletions("$", workspace), storyVar[1].length);
-  }
-  const tempVar = /_([A-Za-z_$]?[\w$]*)$/.exec(before);
-  if (tempVar) {
-    return variableEdit(getDocumentVariableCompletions("_", cursor, workspace), tempVar[1].length);
-  }
-  const localVar = /@([A-Za-z_$]?[\w$]*)$/.exec(before);
-  if (localVar) {
-    return variableEdit(getDocumentVariableCompletions("@", cursor, workspace), localVar[1].length);
-  }
-  const transientVar = /%([A-Za-z_$]?[\w$]*)$/.exec(before);
-  if (transientVar) {
-    return variableEdit(getVariableCompletions("%", workspace), transientVar[1].length);
+  if (identifier.kind === "root") {
+    const sigil = context.code[identifier.start];
+    const items = sigil === "$" || sigil === "%" ? getVariableCompletions(sigil, workspace) : sigil === "_" || sigil === "@" ? getDocumentVariableCompletions(sigil, cursor, workspace) : [];
+    return editing(items, codeOffset(identifier.start + 1), end);
   }
   return [];
 }
@@ -89602,7 +89624,13 @@ function computeCodeLenses(uri, workspace) {
       command: { title }
     });
   };
-  const variableLines = new Map([...workspace.variables.getDeclared().keys()].flatMap((name) => workspace.variables.getDeclarations(name, "$").filter((declaration) => declaration.uri === uri).map((declaration) => [declaration.range.start.line, name])));
+  const variableLines = /* @__PURE__ */ new Map();
+  for (const declaration of workspace.variables.getAllDeclarations("$")) {
+    if (declaration.declarationUri === uri && declaration.declarationRange) {
+      variableLines.set(declaration.declarationRange.start.line, declaration.name);
+    }
+  }
+  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]));
   for (let lineNum = 0; lineNum < lines.length; lineNum++) {
     const line = lines[lineNum];
@@ -89621,7 +89649,7 @@ function computeCodeLenses(uri, workspace) {
     }
     const varName = variableLines.get(lineNum);
     if (varName !== void 0) {
-      const usageCount = findVariableReferences(varName, workspace, false).length;
+      const usageCount = variableCounts.get(varName) ?? 0;
       addLens(lineNum, `${usageCount} usage${usageCount !== 1 ? "s" : ""}`);
     }
   }