@rohal12/spindle-lsp 0.14.1 → 0.14.2

package/dist/bin.js

@@ -16694,12 +16694,13 @@ function parsePassageHeader(line, lineNumber) {
   if (!name) return null;
   const escapedName = name.replace(/\\./g, "ec");
   if (/[\[\]\{\}]/.test(escapedName)) return null;
-  const tagsStr = rawTags.trim();
+  const tagsStr = line.slice(nameEnd, nameEnd + rawTags.length).trim();
   let tags = [];
   if (tagsStr) {
-    const inner = tagsStr.substring(1, tagsStr.length - 1).trim();
+    const inner = tagsStr.substring(1, tagsStr.length - 1);
     if (/[\[\]\{\}]/.test(inner.replace(/\\./g, "ec"))) return null;
-    tags = inner ? inner.split(/\s+/) : [];
+    const decoded = inner.replace(/\\(.)/g, "$1").trim();
+    tags = decoded ? decoded.split(/\s+/) : [];
   }
   let meta3;
   const metaStr = rawMeta.trim();
@@ -16742,7 +16743,7 @@ var passageHeaderRegex, SPECIAL_PASSAGES, CODE_PASSAGE_TAGS, RESERVED_PASSAGE_NA
 var init_passage_parser = __esm({
   "src/core/parsing/passage-parser.ts"() {
     "use strict";
-    passageHeaderRegex = /^(::\s+)(.*?)(\[.*?\]\s*)?(\{.*?\}\s*)?\r?$/;
+    passageHeaderRegex = /^(::\s*)(.*?)(\[.*?\]\s*)?(\{.*?\}\s*)?\r?$/;
     SPECIAL_PASSAGES = /* @__PURE__ */ new Set([
       "StoryVariables",
       "StoryInit",
@@ -24365,6 +24366,12 @@ var init_config_loader = __esm({
 });
 
 // src/core/workspace/macro-registry.ts
+function applySupplement(info, entry) {
+  for (const field of ["description", "parameters", "parameterDocs", "children", "parents", "skipArgs"]) {
+    if (entry[field] !== void 0) Object.assign(info, { [field]: entry[field] });
+  }
+  if (entry.container !== void 0) info.block = entry.container;
+}
 var MacroRegistry;
 var init_macro_registry2 = __esm({
   "src/core/workspace/macro-registry.ts"() {
@@ -24537,30 +24544,20 @@ var init_macro_registry2 = __esm({
         const found = this.discovered.get(key);
         if (!found) return base;
         const info = {
-          ...base,
-          name: base?.name ?? found.name,
-          block: found.block ?? base?.block ?? false,
-          subMacros: found.subMacros?.length ? found.subMacros : base?.subMacros ?? [],
+          name: found.name,
+          block: found.block ?? false,
+          subMacros: found.subMacros ?? [],
           source: "user",
-          storeVar: found.storeVar ?? base?.storeVar,
-          interpolate: found.interpolate ?? base?.interpolate,
-          merged: found.merged ?? base?.merged,
-          description: found.description ?? base?.description,
+          storeVar: found.storeVar,
+          interpolate: found.interpolate,
+          merged: found.merged,
+          description: found.description,
           // A definition replaces the macro it names, parameters included
           parameterDefs: found.parameterDefs,
-          // A discovered sub-macro may also belong to other (e.g. built-in) parents
-          parents: found.parents ? [.../* @__PURE__ */ new Set([...base?.parents ?? [], ...found.parents])] : base?.parents
+          parents: found.parents
         };
         const config2 = this.configEntries.get(key);
-        if (config2) {
-          if (config2.description !== void 0) info.description = config2.description;
-          if (config2.parameters !== void 0) info.parameters = config2.parameters;
-          if (config2.parameterDocs !== void 0) info.parameterDocs = config2.parameterDocs;
-          if (config2.children !== void 0) info.children = config2.children;
-          if (config2.parents !== void 0) info.parents = config2.parents;
-          if (config2.skipArgs !== void 0) info.skipArgs = config2.skipArgs;
-          if (config2.container !== void 0) info.block = config2.container;
-        }
+        if (config2) applySupplement(info, config2);
         return info;
       }
       /** Merge a set of supplement/config entries into the registry. */
@@ -24569,13 +24566,7 @@ var init_macro_registry2 = __esm({
           const key = rawKey.toLowerCase();
           const existing = this.macros.get(key);
           if (existing) {
-            if (entry.description !== void 0) existing.description = entry.description;
-            if (entry.parameters !== void 0) existing.parameters = entry.parameters;
-            if (entry.parameterDocs !== void 0) existing.parameterDocs = entry.parameterDocs;
-            if (entry.children !== void 0) existing.children = entry.children;
-            if (entry.parents !== void 0) existing.parents = entry.parents;
-            if (entry.skipArgs !== void 0) existing.skipArgs = entry.skipArgs;
-            if (entry.container !== void 0) existing.block = entry.container;
+            applySupplement(existing, entry);
           } else {
             this.macros.set(key, {
               name: entry.name ?? rawKey,
@@ -24970,6 +24961,27 @@ var init_variable_tracker = __esm({
       getUsages(name) {
         return usagesOf(this.usagesByUri, name);
       }
+      /** The executable usage or declaration containing the cursor, in source coordinates. */
+      referenceAt(uri, position) {
+        const contains = (range) => (position.line > range.start.line || position.line === range.start.line && position.character >= range.start.character) && (position.line < range.end.line || position.line === range.end.line && position.character <= range.end.character);
+        let atEnd = null;
+        for (const [sigil, usages, declarations] of [
+          ["$", this.usagesByUri.get(uri), this.variables.declared],
+          ["%", this.transientUsagesByUri.get(uri), this.transients.declared]
+        ]) {
+          const candidates = (usages ?? []).map((u) => ({ name: u.baseName, range: u.range }));
+          for (const [name, declaration] of declarations) {
+            if (declaration.declarationUri === uri && declaration.declarationRange) candidates.push({ name, range: declaration.declarationRange });
+          }
+          for (const candidate of candidates) {
+            if (!contains(candidate.range)) continue;
+            const symbol2 = { sigil, ...candidate };
+            if (position.line !== candidate.range.end.line || position.character < candidate.range.end.character) return symbol2;
+            atEnd ??= symbol2;
+          }
+        }
+        return atEnd;
+      }
       /** Whether a StoryVariables passage has been parsed. */
       hasStoryVariables() {
         return this.variables.present;
@@ -26205,6 +26217,36 @@ var init_diagnostic_codes = __esm({
   }
 });
 
+// src/core/markup/source-view.ts
+function viewIndex(view, offset2) {
+  if (!view.sourceOffsets) return offset2 - view.offset;
+  let low = 0;
+  let high = view.sourceOffsets.length - 1;
+  while (low < high) {
+    const mid = Math.ceil((low + high) / 2);
+    if (view.sourceOffsets[mid] <= offset2) low = mid;
+    else high = mid - 1;
+  }
+  return low;
+}
+function textAt(passage, start, end) {
+  return passage.pieces.filter((piece) => piece.kind === "text" && piece.offset <= start && pieceOffset(piece, piece.text.length) >= end).at(-1);
+}
+function sourceView(passage, start, end) {
+  const owner = passage.pieces.filter((piece) => {
+    const value = piece.kind === "text" ? piece.text : piece.kind === "code" ? piece.code : void 0;
+    return value !== void 0 && piece.offset <= start && pieceOffset(piece, value.length) >= end;
+  }).at(-1);
+  if (owner?.kind === "code") return { ...owner, text: owner.code };
+  return owner?.kind === "text" ? owner : { offset: 0, text: passage.content };
+}
+var init_source_view = __esm({
+  "src/core/markup/source-view.ts"() {
+    "use strict";
+    init_tooling();
+  }
+});
+
 // src/core/parsing/argument-lexer.ts
 function lexArguments(source) {
   let from = 0;
@@ -26553,6 +26595,7 @@ var TypeError2, TypeWarning, parameterTypes, LEX_LIMIT, wsRe, identStartRe, iden
 var init_parameter_validator = __esm({
   "src/core/parsing/parameter-validator.ts"() {
     "use strict";
+    init_tooling();
     init_argument_lexer();
     TypeError2 = class {
       constructor(message) {
@@ -26666,7 +26709,8 @@ var init_parameter_validator = __esm({
         validate(arg, _args, _index, state) {
           let passageName;
           if (arg.type === 0 /* String */) {
-            passageName = arg.text.slice(1, -1);
+            const target = passageTarget(arg.text);
+            if (target.kind === "name") passageName = target.name;
           } else if (arg.type === 8 /* Bareword */) {
             passageName = arg.text;
           } else if (arg.type === 1 /* Number */) {
@@ -26675,7 +26719,6 @@ var init_parameter_validator = __esm({
             passageName = "NaN";
           }
           if (passageName !== void 0) {
-            passageName = passageName.replace(/\\/g, "");
             if (state && state.passages.length > 0) {
               if (!state.passages.includes(passageName)) {
                 return new TypeWarning(`Nonexistent passage: "${passageName}"`);
@@ -27167,7 +27210,9 @@ function fromMarkup(passage, found, workspace) {
       if (element) code = DiagnosticCode.MalformedElement;
       else if (found.code === "stray-closer" && !workspace.isContainer(name)) code = DiagnosticCode.IllegalClosingTag;
       if (found.code === "unclosed-block") {
-        data2 = { kind: "unclosed-block", closer: element ? `</${name}>` : `{/${name}}`, at: passage.position(passage.content.trimEnd().length) };
+        const owner = textAt(passage, found.start, found.end);
+        const end = owner ? pieceOffset(owner, owner.text.trimEnd().length) : passage.content.trimEnd().length;
+        data2 = { kind: "unclosed-block", closer: element ? `</${name}>` : `{/${name}}`, at: passage.position(end) };
       }
       break;
     }
@@ -27399,10 +27444,9 @@ function loopDiagnostics(passage, token, ancestors) {
   if (!loop || !close) return [];
   const targets = macro === "computed" ? computedTemporaryTarget(token.rawArgs) : setTemporaryTargets(token.rawArgs);
   const bodyStart = loop.node.token.end;
-  const body = passage.content.slice(bodyStart, close.start);
   const diagnostics = [];
   for (const target of targets) {
-    if (!isReadInBody(body, bodyStart, target.name, token.start, token.end)) continue;
+    if (!isReadInBody(passage, bodyStart, close.start, target.name, token.start, token.end)) continue;
     const start = token.argsStart + target.offset;
     diagnostics.push(makeDiag(
       passage.range(start, start + 1 + target.name.length),
@@ -27412,22 +27456,28 @@ function loopDiagnostics(passage, token, ancestors) {
   }
   return diagnostics;
 }
-function isReadInBody(body, bodyOffset, name, macroStart, macroEnd) {
-  const re2 = temporaryRefRegex(name);
-  let m;
-  while ((m = re2.exec(body)) !== null) {
-    const offset2 = bodyOffset + m.index;
-    if (offset2 >= macroStart && offset2 < macroEnd) continue;
-    const after = body.slice(m.index + m[0].length);
-    if (/^\s*=(?![=>])/.test(after)) continue;
-    return true;
+function isReadInBody(passage, bodyStart, bodyEnd, name, macroStart, macroEnd) {
+  const eligible = (offset2) => offset2 >= bodyStart && offset2 < bodyEnd && !(offset2 >= macroStart && offset2 < macroEnd);
+  for (const token of markupTokens(passage)) {
+    if (token.type === "variable" && token.scope === "temporary" && token.name.split(".")[0] === name && eligible(token.start)) return true;
+  }
+  for (const piece of passage.pieces) {
+    if (piece.kind !== "code") continue;
+    let read = false;
+    lexJs(piece.code, {
+      variable(sigil, found, index, _nesting, end) {
+        if (sigil !== "_" || found !== name || !eligible(pieceOffset(piece, index))) return;
+        if (!/^\s*=(?![=>])/.test(maskLiterals(piece.code.slice(end)))) read = true;
+      }
+    }, piece.goal);
+    if (read) return true;
   }
   return false;
 }
 function argumentDiagnostics(passage, workspace) {
   const diagnostics = [];
   const passageNames = Array.from(workspace.passages.getAllPassages(), (candidate) => candidate.name);
-  for (const token of passage.isMarkup ? passage.tokens : []) {
+  for (const token of passage.isMarkup ? macroTokens(passage) : []) {
     if (token.type !== "macro" || token.isClose) continue;
     const info = workspace.macros.getMacro(token.name);
     if (!info?.parameters || info.skipArgs || SPINDLE_MACROS.has(token.name.toLowerCase())) continue;
@@ -27588,6 +27638,7 @@ var init_diagnostics = __esm({
     init_tooling();
     init_diagnostic_codes();
     init_tokens();
+    init_source_view();
     init_argument_lexer();
     init_parameter_validator();
     init_link_parser();
@@ -28043,7 +28094,7 @@ function splitPassages(text2) {
     }
   }
   for (let i2 = 0; i2 < lines.length; i2++) {
-    if (PASSAGE_HEADER_REGEX.test(lines[i2])) {
+    if (parsePassageHeader(lines[i2], i2)) {
       pushPassage();
       currentHeader = lines[i2];
       bodyLines = [];
@@ -28056,7 +28107,7 @@ function splitPassages(text2) {
   return passages;
 }
 function classifyPassage(header) {
-  const tags = headerTags(header).map((t) => t.toLowerCase());
+  const tags = headerTags(header);
   if (tags.includes("script")) return "script";
   if (tags.includes("stylesheet")) return "stylesheet";
   return "normal";
@@ -28067,22 +28118,23 @@ function headerTags(header) {
   const unescaped = header.replace(/\\./g, "ec");
   return (unescaped.match(/\[[^\]]*\]/g) ?? []).flatMap((t) => t.slice(1, -1).split(/\s+/));
 }
-var PASSAGE_HEADER_REGEX;
 var init_segment = __esm({
   "src/plugins/format/segment.ts"() {
     "use strict";
     init_passage_parser();
-    PASSAGE_HEADER_REGEX = /^::\s+/;
   }
 });
 
 // src/plugins/format/prettier-bridge.ts
-async function loadPrettier() {
+import { resolve as resolve4 } from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+async function loadPrettier(filePath) {
   prettier ??= import("prettier").catch(() => null);
   const p = await prettier;
   if (!p) return void 0;
   try {
-    const resolved = await p.resolveConfig(process.cwd());
+    const path = filePath?.startsWith("file:") ? fileURLToPath2(filePath) : filePath;
+    const resolved = await p.resolveConfig(path ?? resolve4(process.cwd(), "story.tw"));
     return { prettier: p, options: { tabWidth: 2, ...resolved ?? {} } };
   } catch {
     return { prettier: p, options: { tabWidth: 2 } };
@@ -28122,7 +28174,7 @@ function dominantEol2(text2) {
 async function formatLf2(text2, options) {
   const isBlock = options?.isBlock ?? buildDefaultIsBlock(text2);
   const isDedentingSubMacro = options?.isDedentingSubMacro ?? ((name) => DEFAULT_DEDENTING2.has(name.toLowerCase()));
-  const prettier2 = await loadPrettier();
+  const prettier2 = await loadPrettier(options?.filePath);
   const passages = splitPassages(text2);
   const resultLines = [];
   for (let pi2 = 0; pi2 < passages.length; pi2++) {
@@ -28136,7 +28188,7 @@ async function formatLf2(text2, options) {
       }
     }
     if (passage.header) {
-      const header = PASSAGE_HEADER_REGEX2.test(passage.header) ? normalizePassageHeader(passage.header) : passage.header;
+      const header = PASSAGE_HEADER_REGEX.test(passage.header) ? normalizePassageHeader(passage.header) : passage.header;
       resultLines.push(header.replace(/\s+$/, ""));
     }
     if (passage.body === "") continue;
@@ -28156,7 +28208,7 @@ async function formatRange(text2, _range, options) {
   return formatDocument(text2, options);
 }
 function normalizePassageHeader(line) {
-  const headerMatch = line.match(/^::\s+(.*)/);
+  const headerMatch = line.match(/^::\s*(.*)/);
   if (!headerMatch) return line;
   const rest = headerMatch[1];
   const unescaped = rest.replace(/\\./g, "ec");
@@ -28175,14 +28227,14 @@ function normalizePassageHeader(line) {
   }
   return `:: ${name}${suffix}`;
 }
-var PASSAGE_HEADER_REGEX2, DEFAULT_DEDENTING2, BUILTIN_CONTAINERS, formatPlugin;
+var PASSAGE_HEADER_REGEX, DEFAULT_DEDENTING2, BUILTIN_CONTAINERS, formatPlugin;
 var init_format = __esm({
   "src/plugins/format.ts"() {
     "use strict";
     init_tooling();
     init_segment();
     init_prettier_bridge();
-    PASSAGE_HEADER_REGEX2 = /^(::)\s+/;
+    PASSAGE_HEADER_REGEX = /^(::)\s*/;
     DEFAULT_DEDENTING2 = /* @__PURE__ */ new Set(["else", "elseif", "next", "case", "default"]);
     BUILTIN_CONTAINERS = new Set(builtinMacros.filter((m) => m.block).map((m) => m.name.toLowerCase()));
     formatPlugin = {
@@ -28200,7 +28252,7 @@ var init_format = __esm({
         ctx.connection.onDocumentFormatting(async (params) => {
           const text2 = ctx.workspace.documents.getText(params.textDocument.uri);
           if (text2 === void 0) return [];
-          const formatted = await formatDocument(text2, formatOpts);
+          const formatted = await formatDocument(text2, { ...formatOpts, filePath: params.textDocument.uri });
           if (formatted === text2) return [];
           const lines = text2.split("\n");
           return [{
@@ -28218,7 +28270,7 @@ var init_format = __esm({
             start: { line: params.range.start.line, character: params.range.start.character },
             end: { line: params.range.end.line, character: params.range.end.character }
           };
-          const formatted = await formatRange(text2, range, formatOpts);
+          const formatted = await formatRange(text2, range, { ...formatOpts, filePath: params.textDocument.uri });
           if (formatted === text2) return [];
           const lines = text2.split("\n");
           return [{
@@ -28310,7 +28362,7 @@ async function runFormat(args2) {
   const unformatted = [];
   for (const [filePath, text2] of texts) {
     try {
-      const formatted = await formatDocument(text2, formatOpts);
+      const formatted = await formatDocument(text2, { ...formatOpts, filePath });
       if (formatted !== text2) {
         if (options.check) {
           const relative2 = filePath.startsWith(cwd) ? filePath.slice(cwd.length + 1) : filePath;
@@ -50599,7 +50651,7 @@ var init_protocol = __esm({
               return;
             }
             const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-            await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
+            await new Promise((resolve6) => setTimeout(resolve6, pollInterval));
             options?.signal?.throwIfAborted();
           }
         } catch (error48) {
@@ -50616,7 +50668,7 @@ var init_protocol = __esm({
        */
       request(request, resultSchema, options) {
         const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           const earlyReject = (error48) => {
             reject(error48);
           };
@@ -50694,7 +50746,7 @@ var init_protocol = __esm({
               if (!parseResult.success) {
                 reject(parseResult.error);
               } else {
-                resolve5(parseResult.data);
+                resolve6(parseResult.data);
               }
             } catch (error48) {
               reject(error48);
@@ -50956,12 +51008,12 @@ var init_protocol = __esm({
           }
         } catch {
         }
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           if (signal.aborted) {
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
             return;
           }
-          const timeoutId = setTimeout(resolve5, interval);
+          const timeoutId = setTimeout(resolve6, interval);
           signal.addEventListener("abort", () => {
             clearTimeout(timeoutId);
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -53988,7 +54040,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref2];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve5.call(this, root, ref2);
+      let _sch = resolve6.call(this, root, ref2);
       if (_sch === void 0) {
         const schema = (_a2 = root.localRefs) === null || _a2 === void 0 ? void 0 : _a2[ref2];
         const { schemaId } = this.opts;
@@ -54015,7 +54067,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve5(root, ref2) {
+    function resolve6(root, ref2) {
       let sch;
       while (typeof (sch = this.refs[ref2]) == "string")
         ref2 = sch;
@@ -54590,7 +54642,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve5(baseURI, relativeURI, options) {
+    function resolve6(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse6(baseURI, schemelessOptions), parse6(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -54817,7 +54869,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize,
-      resolve: resolve5,
+      resolve: resolve6,
       resolveComponent,
       equal,
       serialize,
@@ -58975,7 +59027,7 @@ var init_mcp = __esm({
         let task = createTaskResult.task;
         const pollInterval = task.pollInterval ?? 5e3;
         while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") {
-          await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
+          await new Promise((resolve6) => setTimeout(resolve6, pollInterval));
           const updatedTask = await extra.taskStore.getTask(taskId);
           if (!updatedTask) {
             throw new McpError(ErrorCode.InternalError, `Task ${taskId} not found during polling`);
@@ -59584,12 +59636,12 @@ var init_stdio2 = __esm({
         this.onclose?.();
       }
       send(message) {
-        return new Promise((resolve5) => {
+        return new Promise((resolve6) => {
           const json2 = serializeMessage(message);
           if (this._stdout.write(json2)) {
-            resolve5();
+            resolve6();
           } else {
-            this._stdout.once("drain", resolve5);
+            this._stdout.once("drain", resolve6);
           }
         });
       }
@@ -59607,7 +59659,7 @@ __export(server_exports, {
   startMcpServer: () => startMcpServer
 });
 import { readFileSync as readFileSync8, writeFileSync as writeFileSync2, statSync } from "node:fs";
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve5 } from "node:path";
 import { pathToFileURL as pathToFileURL4 } from "node:url";
 function filterBySeverity2(diagnostics, minSeverity) {
   const minIdx = SEVERITY_ORDER2.indexOf(minSeverity);
@@ -59620,7 +59672,7 @@ async function resolveFiles(pattern, cwd) {
   let input = pattern;
   let directory = cwd;
   try {
-    const literal3 = resolve4(cwd, pattern);
+    const literal3 = resolve5(cwd, pattern);
     const stat = statSync(literal3);
     if (stat.isFile()) return [literal3];
     if (stat.isDirectory()) {
@@ -59721,7 +59773,7 @@ async function formatFiles(pattern, cwd = process.cwd()) {
     const text2 = contents.get(pathToFileURL4(filePath).toString());
     if (text2 === void 0) continue;
     try {
-      const result = await formatDocument(text2);
+      const result = await formatDocument(text2, { filePath });
       if (result !== text2) {
         writeFileSync2(filePath, result, "utf-8");
         formatted++;
@@ -59746,7 +59798,7 @@ async function checkFormatting(pattern, cwd = process.cwd()) {
     const text2 = contents.get(pathToFileURL4(filePath).toString());
     if (text2 === void 0) continue;
     try {
-      const result = await formatDocument(text2);
+      const result = await formatDocument(text2, { filePath });
       (result !== text2 ? needsFormatting : alreadyFormatted).push(relativeTo(cwd, filePath));
     } catch {
     }
@@ -61083,8 +61135,8 @@ var require_semaphore = __commonJS({
         this._waiting = [];
       }
       lock(thunk) {
-        return new Promise((resolve5, reject) => {
-          this._waiting.push({ thunk, resolve: resolve5, reject });
+        return new Promise((resolve6, reject) => {
+          this._waiting.push({ thunk, resolve: resolve6, reject });
           this.runNext();
         });
       }
@@ -62710,9 +62762,9 @@ ${JSON.stringify(message, null, 4)}`);
           if (typeof cancellationStrategy.sender.enableCancellation === "function") {
             cancellationStrategy.sender.enableCancellation(requestMessage);
           }
-          return new Promise(async (resolve5, reject) => {
+          return new Promise(async (resolve6, reject) => {
             const resolveWithCleanup = (r) => {
-              resolve5(r);
+              resolve6(r);
               cancellationStrategy.sender.cleanup(id);
               disposable?.dispose();
             };
@@ -68354,8 +68406,8 @@ var require_server = __commonJS({
         if (value instanceof Promise) {
           return value;
         } else if (Is3.thenable(value)) {
-          return new Promise((resolve5, reject) => {
-            value.then((resolved) => resolve5(resolved), (error48) => reject(error48));
+          return new Promise((resolve6, reject) => {
+            value.then((resolved) => resolve6(resolved), (error48) => reject(error48));
           });
         } else {
           return Promise.resolve(value);
@@ -68639,7 +68691,7 @@ var require_files = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.FileSystem = void 0;
     exports.uriToFilePath = uriToFilePath;
-    exports.resolve = resolve5;
+    exports.resolve = resolve6;
     exports.resolveGlobalNodePath = resolveGlobalNodePath;
     exports.resolveGlobalYarnPath = resolveGlobalYarnPath;
     exports.resolveModulePath = resolveModulePath;
@@ -68668,7 +68720,7 @@ var require_files = __commonJS({
     function isWindows() {
       return process.platform === "win32";
     }
-    function resolve5(moduleName, nodePath, cwd, tracer) {
+    function resolve6(moduleName, nodePath, cwd, tracer) {
       const nodePathKey = "NODE_PATH";
       const app = [
         "var p = process;",
@@ -68687,7 +68739,7 @@ var require_files = __commonJS({
         "}",
         "});"
       ].join("");
-      return new Promise((resolve6, reject) => {
+      return new Promise((resolve7, reject) => {
         const env = process.env;
         const newEnv = /* @__PURE__ */ Object.create(null);
         Object.keys(env).forEach((key) => newEnv[key] = env[key]);
@@ -68719,7 +68771,7 @@ var require_files = __commonJS({
             if (message2.c === "r") {
               cp.send({ c: "e" });
               if (message2.s) {
-                resolve6(message2.r);
+                resolve7(message2.r);
               } else {
                 reject(new Error(`Failed to resolve module: ${moduleName}`));
               }
@@ -68847,17 +68899,17 @@ var require_files = __commonJS({
         if (!path.isAbsolute(nodePath)) {
           nodePath = path.join(workspaceRoot, nodePath);
         }
-        return resolve5(moduleName, nodePath, nodePath, tracer).then((value) => {
+        return resolve6(moduleName, nodePath, nodePath, tracer).then((value) => {
           if (FileSystem.isParent(nodePath, value)) {
             return value;
           } else {
             return Promise.reject(new Error(`Failed to load ${moduleName} from node path location.`));
           }
         }).then(void 0, (_error) => {
-          return resolve5(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
+          return resolve6(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
         });
       } else {
-        return resolve5(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
+        return resolve6(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
       }
     }
   }
@@ -68939,10 +68991,10 @@ var require_ril = __commonJS({
         return api_1.Disposable.create(() => this.stream.off("end", listener));
       }
       write(data2, encoding) {
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           const callback = (error48) => {
             if (error48 === void 0 || error48 === null) {
-              resolve5();
+              resolve6();
             } else {
               reject(error48);
             }
@@ -69234,10 +69286,10 @@ var require_main = __commonJS({
     }
     function createClientPipeTransport(pipeName, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve5, _reject) => {
-        connectResolve = resolve5;
+      const connected = new Promise((resolve6, _reject) => {
+        connectResolve = resolve6;
       });
-      return new Promise((resolve5, reject) => {
+      return new Promise((resolve6, reject) => {
         const server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -69248,7 +69300,7 @@ var require_main = __commonJS({
         server.on("error", reject);
         server.listen(pipeName, () => {
           server.removeListener("error", reject);
-          resolve5({
+          resolve6({
             onConnected: () => {
               return connected;
             }
@@ -69265,10 +69317,10 @@ var require_main = __commonJS({
     }
     function createClientSocketTransport(port, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve5, _reject) => {
-        connectResolve = resolve5;
+      const connected = new Promise((resolve6, _reject) => {
+        connectResolve = resolve6;
       });
-      return new Promise((resolve5, reject) => {
+      return new Promise((resolve6, reject) => {
         const server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -69285,7 +69337,7 @@ var require_main = __commonJS({
             return;
           }
           const boundPort = address.port;
-          resolve5({
+          resolve6({
             port: () => boundPort,
             onConnected: () => {
               return connected;
@@ -70079,6 +70131,7 @@ var init_markup_cursor = __esm({
     init_tooling();
     init_passage_markup();
     init_tree();
+    init_source_view();
     init_text();
     MarkupCursor = class {
       constructor(passage, at3, workspace) {
@@ -70104,6 +70157,7 @@ var init_markup_cursor = __esm({
           start: 0,
           end: content.length,
           text: false,
+          view: { offset: 0, text: content },
           tokens: passage.tokens,
           errors: passage.tokenization.errors,
           nodes: () => passage.pairing.nodes
@@ -70116,6 +70170,7 @@ var init_markup_cursor = __esm({
             start: piece.offset,
             end,
             text: true,
+            view: piece,
             tokens: piece.tokens,
             errors: piece.errors,
             nodes: () => pairMarkup(piece.tokens, { isBlock: (name) => this.workspace.isContainer(name), source: content }).nodes
@@ -70130,17 +70185,19 @@ var init_markup_cursor = __esm({
        * of its name.
        */
       enclosingMacro(known) {
-        const { content, at: at3 } = this;
+        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, argsBefore: at3 >= token.argsStart ? content.slice(token.argsStart, at3) : "" });
+            found.push({ start: token.start, name: token.name, argsBefore: at3 >= token.argsStart ? region.view.text.slice(viewIndex(region.view, token.argsStart), viewIndex(region.view, at3)) : "" });
           }
           for (const error48 of region.errors) {
-            if (error48.code !== "unclosed-macro" || error48.offset >= at3 || error48.end >= at3 || !/\s/.test(content[error48.end] ?? "")) continue;
-            const name = content.slice(parseSelectors(content, error48.offset + 1).end, error48.end);
-            if (name && name[0] !== "/") found.push({ start: error48.offset, name, argsBefore: content.slice(error48.end, at3).trimStart() });
+            const source = region.view.text;
+            const end = viewIndex(region.view, error48.end);
+            if (error48.code !== "unclosed-macro" || error48.offset >= at3 || error48.end >= at3 || !/\s/.test(source[end] ?? "")) continue;
+            const name = source.slice(parseSelectors(source, viewIndex(region.view, error48.offset) + 1).end, end);
+            if (name && name[0] !== "/") found.push({ start: error48.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 { name: innermost.name, argsBefore: innermost.argsBefore };
@@ -70229,10 +70286,9 @@ function variableUses(passage) {
   for (const piece of passage.pieces) {
     if (piece.kind !== "code") continue;
     lexJs(piece.code, {
-      variable(sigil, name, index) {
-        const nameEnd = index + 1 + name.length;
+      variable(sigil, name, index, _nesting, nameEnd) {
         const pathEnd = nameEnd + pathLength(piece.code, nameEnd);
-        uses.push({ sigil, name, start: pieceOffset(piece, index), end: pieceOffset(piece, pathEnd - 1) + 1 });
+        uses.push({ sigil, name, start: pieceOffset(piece, index), end: pieceOffset(piece, pathEnd) });
       }
     }, piece.goal);
   }
@@ -70824,27 +70880,7 @@ function findReferences(uri, position, workspace, includeDeclaration) {
   return [];
 }
 function variableAt(uri, position, workspace) {
-  const line = workspace.documents.getText(uri)?.split("\n")[position.line];
-  if (line === void 0) return null;
-  let atEnd = null;
-  VARIABLE_CANDIDATE.lastIndex = 0;
-  let found;
-  while ((found = VARIABLE_CANDIDATE.exec(line)) !== null) {
-    const match = VARIABLE_PATH.exec(line.slice(found.index));
-    const start = found.index;
-    const end = start + match[0].length;
-    VARIABLE_CANDIDATE.lastIndex = start + 1;
-    if (position.character < start || position.character > end) continue;
-    const sigil = match[1];
-    const name = match[2].split(".")[0];
-    const refs = sigil === "%" ? findTransientReferences(name, workspace, true) : findVariableReferences(name, workspace, true);
-    const hit = refs.find((r) => r.uri === uri && r.range.start.line === position.line && r.range.start.character === start);
-    if (!hit) continue;
-    const symbol2 = { sigil, name, range: hit.range };
-    if (position.character < end) return symbol2;
-    atEnd ??= symbol2;
-  }
-  return atEnd;
+  return workspace.variables.referenceAt(uri, position);
 }
 function findPassageReferences(passageName, workspace, includeDeclaration) {
   const locations = [];
@@ -70927,15 +70963,13 @@ function toLspRange3(r) {
     end: { line: r.end.line, character: r.end.character }
   };
 }
-var VARIABLE_CANDIDATE, VARIABLE_PATH, referencesPlugin;
+var referencesPlugin;
 var init_references = __esm({
   "src/plugins/references.ts"() {
     "use strict";
     init_macro_heads();
     init_passage_refs();
     init_passage_parser();
-    VARIABLE_CANDIDATE = /(?:\$|(?<!\w)%)(?=\w)/g;
-    VARIABLE_PATH = /^([$%])(\w+(?:\.[A-Za-z_$][\w$]*)*)/;
     referencesPlugin = {
       id: "references",
       capabilities: {
@@ -71039,17 +71073,32 @@ function computeRename(uri, position, newName, workspace) {
           `Cannot rename to ${JSON.stringify(newName)}: a transient name cannot start with a digit, \`%5\` is the modulo operator in code.`
         ).at(uri, symbol2.range);
       }
+      const declaration = parseDeclarations(`${symbol2.sigil}${bareName} = 0`, symbol2.sigil);
+      if (declaration.errors.length || declaration.declarations[0]?.name !== bareName) {
+        throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: ${declaration.errors[0]?.message ?? "invalid variable name"}.`).at(uri, symbol2.range);
+      }
       if (bareName === symbol2.name) return /* @__PURE__ */ new Map();
       if (workspace.variables.getDeclared().has(bareName) || workspace.variables.getDeclaredTransient().has(bareName)) {
         throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: a variable with that name already exists.`).at(uri, symbol2.range);
       }
       const refs = symbol2.sigil === "%" ? findTransientReferences(symbol2.name, workspace, true) : findVariableReferences(symbol2.name, workspace, true);
       for (const ref2 of refs) {
-        const start = ref2.range.start.character + 1;
-        addEdit(ref2.uri, {
-          start: { line: ref2.range.start.line, character: start },
-          end: { line: ref2.range.start.line, character: start + symbol2.name.length }
-        }, bareName);
+        const doc = workspace.markup.get(ref2.uri);
+        const passage = doc.passageAt(ref2.range.start);
+        const start = passage.contentOffset(positionToOffset(ref2.range.start, doc.lineStarts));
+        const end = passage.contentOffset(positionToOffset(ref2.range.end, doc.lineStarts));
+        const view = sourceView(passage, start, end);
+        const index = viewIndex(view, start);
+        let base;
+        lexJs(view.text.slice(index, viewIndex(view, end)), {
+          variable(sigil, name, at3, _nesting, nameEnd) {
+            if (at3 === 0 && sigil === symbol2.sigil && name === symbol2.name) {
+              base = [pieceOffset(view, index + 1), pieceOffset(view, index + nameEnd)];
+            }
+          }
+        });
+        if (!base) throw new RenameError("Cannot locate the variable name safely.").at(ref2.uri, ref2.range);
+        addEdit(ref2.uri, passage.range(...base), bareName);
       }
       break;
     }
@@ -71204,6 +71253,8 @@ var init_rename = __esm({
     "use strict";
     import_vscode_languageserver2 = __toESM(require_api3(), 1);
     init_tooling();
+    init_source_view();
+    init_text();
     init_link_runtime();
     init_passage_refs();
     init_js_string_literal();
@@ -71358,7 +71409,8 @@ var init_code_lens = __esm({
             range: toLspRange5(l.range),
             command: {
               title: l.command.title,
-              command: "spindle.findReferences"
+              // Informational counts: no editor-specific navigation command is registered.
+              command: ""
             }
           }));
         });
@@ -71387,13 +71439,15 @@ function addWidgetParamHints(passages, inRange, workspace, hints) {
       const widget = workspace.widgets.getWidget(token.name);
       if (!widget || widget.params.length === 0) continue;
       const args2 = splitArgs(token.rawArgs);
+      const view = textAt(passage, token.start, token.end) ?? { offset: 0 };
+      const argsStart = viewIndex(view, token.argsStart);
       let from = 0;
       for (let i2 = 0; i2 < Math.min(args2.length, widget.params.length); i2++) {
         const at3 = token.rawArgs.indexOf(args2[i2], from);
         if (at3 === -1) break;
         from = at3 + args2[i2].length;
         hints.push({
-          position: passage.position(token.argsStart + at3),
+          position: passage.position(pieceOffset(view, argsStart + at3)),
           label: `${widget.params[i2]}:`,
           kind: "parameter"
         });
@@ -71416,6 +71470,7 @@ var init_inlay_hints = __esm({
   "src/plugins/inlay-hints.ts"() {
     "use strict";
     init_tooling();
+    init_source_view();
     init_tokens();
     inlayHintsPlugin = {
       id: "inlay-hints",
@@ -71582,7 +71637,7 @@ var init_semantic_tokens = __esm({
 // src/plugins/code-actions.ts
 import { readFileSync as readFileSync9 } from "node:fs";
 import { basename, dirname as dirname3, join as join4 } from "node:path";
-import { fileURLToPath as fileURLToPath2, pathToFileURL as pathToFileURL5 } from "node:url";
+import { fileURLToPath as fileURLToPath3, pathToFileURL as pathToFileURL5 } from "node:url";
 function computeCodeActions(uri, diagnostics, workspace, options = {}) {
   const actions = [];
   for (const diag of diagnostics) {
@@ -71665,10 +71720,10 @@ function addMacroToConfig(uri, macroName, workspace, options) {
 }
 function resolveConfigRoot(uri, workspaceRoot) {
   if (workspaceRoot) {
-    return workspaceRoot.startsWith("file:") ? fileURLToPath2(workspaceRoot) : workspaceRoot;
+    return workspaceRoot.startsWith("file:") ? fileURLToPath3(workspaceRoot) : workspaceRoot;
   }
   if (!uri.startsWith("file:")) return null;
-  const docDir = dirname3(fileURLToPath2(uri));
+  const docDir = dirname3(fileURLToPath3(uri));
   let search = docDir;
   for (let i2 = 0; i2 < 10; i2++) {
     if (findConfigFile(search)) return search;
@@ -72298,12 +72353,12 @@ var server_exports2 = {};
 __export(server_exports2, {
   startServer: () => startServer
 });
-import { fileURLToPath as fileURLToPath3, pathToFileURL as pathToFileURL6 } from "node:url";
+import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL6 } from "node:url";
 import { readFileSync as readFileSync10 } from "node:fs";
 import { basename as basename2 } from "node:path";
 function uriToFsPath(uri) {
   try {
-    return fileURLToPath3(uri);
+    return fileURLToPath4(uri);
   } catch {
     return uri;
   }
@@ -72539,7 +72594,7 @@ var init_server4 = __esm({
 
 // src/bin.ts
 var args = process.argv.slice(2);
-var VERSION = "0.14.1";
+var VERSION = "0.14.2";
 var HELP = `spindle-lsp v${VERSION}
 Language Server Protocol server for Spindle story format