@rohal12/spindle-lsp 0.13.3 → 0.14.0

package/dist/bin.js

@@ -6855,8 +6855,8 @@ function walk(node, src, out, binding, shorthand) {
       }
   }
 }
-function findCodeEnd(src, start, { goal = "expression", stop } = {}) {
-  const end = scanCodeEnd(src, start, goal, stop);
+function findCodeEnd(src, start, { goal = "expression", stop, onRunOut } = {}) {
+  const end = scanCodeEnd(src, start, goal, stop, onRunOut);
   return end < 0 && !stop ? parsedCodeEnd(src, start, goal) : end;
 }
 function parsedCodeEnd(src, start, goal) {
@@ -6874,7 +6874,11 @@ function parsedCodeEnd(src, start, goal) {
   }
   return -1;
 }
-function scanCodeEnd(src, start, goal, stop) {
+function scanCodeEnd(src, start, goal, stop, onRunOut) {
+  const ranOut = () => {
+    onRunOut?.();
+    return -1;
+  };
   const stack = [];
   let prevEnd = -1;
   let prevWord = false;
@@ -6890,11 +6894,12 @@ function scanCodeEnd(src, start, goal, stop) {
         if (!/^Unterminated/.test(message) && !inTemplate) {
           resumeAt = Math.max(tok.pos, from) + 1;
           afterOperand = false;
-          if (resumeAt >= src.length) return -1;
+          if (resumeAt >= src.length) return ranOut();
           break;
         }
         const k2 = stack.lastIndexOf("${");
-        if (!/^Unterminated template/.test(message) || k2 < 0 || templateSlip || stop) return -1;
+        if (!/^Unterminated template/.test(message) || k2 < 0 || templateSlip || stop) return /^Unterminated/.test(message) && !/^Unterminated regular/.test(message) && !(/^Unterminated string/.test(message) && prevWord && tok.pos === prevEnd) ? ranOut() : -1;
+        onRunOut?.();
         templateSlip = true;
         stack.length = k2;
         resumeAt = tok.pos;
@@ -6903,7 +6908,7 @@ function scanCodeEnd(src, start, goal, stop) {
       }
       if (tok.restarted && stack.includes("${")) return -1;
       const t = tok.type;
-      if (t === types$1.eof) return -1;
+      if (t === types$1.eof) return ranOut();
       if (t === types$1.string && prevWord && tok.start === prevEnd) return -1;
       prevWord = t === types$1.name && !WORDS_BEFORE_STRING.has(tok.value) || t === types$1.num;
       prevEnd = tok.end;
@@ -7131,48 +7136,107 @@ function scanStringLiteral(src, start) {
 function skipLiteral(input, i2) {
   const quote = input[i2];
   const template = quote === "`";
+  let ranOut = false;
   for (let j2 = i2 + 1; j2 < input.length; ) {
     const c = input[j2];
     if (c === "\\") j2 += 2;
-    else if (c === quote) return j2 + 1;
-    else if (!template && c === "\n") return -1;
+    else if (c === quote) return {
+      end: j2 + 1,
+      ranOut
+    };
+    else if (!template && c === "\n") return {
+      end: -1,
+      ranOut
+    };
     else if (template && c === "$" && input[j2 + 1] === "{") {
-      const close = lenientClose(input, j2 + 2);
-      if (close === -1) return -1;
-      j2 = close + 1;
+      const close = lenientRead(input, j2 + 2);
+      ranOut || (ranOut = close.ranOut);
+      if (close.end === -1) return {
+        end: -1,
+        ranOut
+      };
+      j2 = close.end + 1;
     } else j2++;
   }
-  return -1;
+  return {
+    end: -1,
+    ranOut: ranOut || template
+  };
+}
+function lenientClose(input, i2, onRunOut) {
+  const { end, ranOut } = lenientRead(input, i2);
+  if (ranOut) onRunOut?.();
+  return end;
 }
-function lenientClose(input, i2) {
+function lenientRead(input, i2) {
   if (memoInput !== input) {
     memoInput = input;
     memo.clear();
   }
-  let end = memo.get(i2);
-  if (end === void 0) {
-    end = scanLenient(input, i2);
-    memo.set(i2, end);
+  let read = memo.get(i2);
+  if (read === void 0) {
+    read = scanLenient(input, i2);
+    memo.set(i2, read);
   }
-  return end;
+  return read;
 }
 function scanLenient(input, i2) {
   let depth = 0;
+  let ranOut = false;
   while (i2 < input.length) {
     const c = input[i2];
     if (c === "{") {
       depth++;
       i2++;
     } else if (c === "}") {
-      if (depth === 0) return i2;
+      if (depth === 0) return {
+        end: i2,
+        ranOut
+      };
       depth--;
       i2++;
     } else if (c === "`" || (c === '"' || c === "'") && !(i2 > 0 && NON_STRING_QUOTE_PREFIX.test(input[i2 - 1]))) {
       const close = skipLiteral(input, i2);
-      i2 = close === -1 ? i2 + 1 : close;
+      ranOut || (ranOut = close.ranOut);
+      i2 = close.end === -1 ? i2 + 1 : close.end;
     } else i2++;
   }
-  return -1;
+  return {
+    end: -1,
+    ranOut: true
+  };
+}
+function jsCodeEnd(onOpenEnd) {
+  return {
+    closeBrace(input, codeStart, lenientStart) {
+      let ranOut = false;
+      const onRunOut = () => ranOut = true;
+      const strict = findCodeEnd(input, codeStart, { onRunOut });
+      const end = strict !== -1 ? strict : lenientClose(input, lenientStart, onRunOut);
+      if (ranOut) onOpenEnd?.(input, codeStart);
+      return end;
+    },
+    rawBodyEnd(input, bodyStart, name) {
+      const closer = `\\{/${name}\\s*\\}`;
+      const first = new RegExp(closer, "gi");
+      first.lastIndex = bodyStart;
+      const firstAt = first.exec(input)?.index ?? -1;
+      if (firstAt === -1) return -1;
+      const at3 = new RegExp(closer, "iy");
+      let ranOut = false;
+      const end = findCodeEnd(input, bodyStart, {
+        goal: "statements",
+        stop: (k2) => {
+          at3.lastIndex = k2;
+          return at3.test(input);
+        },
+        onRunOut: () => ranOut = true
+      });
+      if (end !== -1) return end;
+      if (onOpenEnd && (ranOut || new RegExp(`\\{/${name}\\s*$`, "i").test(input))) onOpenEnd(input, bodyStart);
+      return firstAt;
+    }
+  };
 }
 function isCodeAttribute(name) {
   const lower = name.toLowerCase();
@@ -7204,7 +7268,7 @@ function splitSigilTemplate(template) {
   if (text2) parts.push({ text: text2 });
   return parts;
 }
-function run(source, startRule, options) {
+function run$1(source, startRule, options) {
   const hooks = options.hooks ? {
     ...defaultHooks,
     ...options.hooks
@@ -7226,7 +7290,7 @@ function run(source, startRule, options) {
   }
 }
 function analyzeMarkup(source, options = {}) {
-  const { tokens: tokens2, errors, damage } = scan(source, options);
+  const { tokens: tokens2, errors, damage } = scanMarkupTolerant(source, options);
   const hooks = {
     ...defaultHooks,
     ...options.hooks
@@ -7261,23 +7325,23 @@ function pairingError(source, error48) {
   return new MarkupError(error48.message, error48.start, line, column, error48.code, error48.end, error48.data);
 }
 function tokenizeMarkup(source, options = {}) {
-  return run(source, "Tokens", options);
+  return run$1(source, "Tokens", options);
 }
 function parseSelectors(source, at3 = 0) {
-  const found = run(source.slice(at3), "SelectorsPrefix", {});
+  const found = run$1(source.slice(at3), "SelectorsPrefix", {});
   return {
     ...found,
     end: at3 + found.end
   };
 }
 function tokenizeMarkupTolerant(source, options = {}) {
-  const { tokens: tokens2, errors } = scan(source, options);
+  const { tokens: tokens2, errors } = scanMarkupTolerant(source, options);
   return {
     tokens: tokens2,
     errors
   };
 }
-function scan(source, options) {
+function scanMarkupTolerant(source, options = {}) {
   const tokens2 = [];
   const errors = [];
   const damage = [];
@@ -8810,6 +8874,554 @@ function discoverMacros(source) {
   }
   return found;
 }
+function segmentRegions(body) {
+  const lines = body.split("\n");
+  if (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
+  if (lines.length === 0) return [];
+  const regions = [];
+  let i2 = 0;
+  while (i2 < lines.length) {
+    const line = lines[i2];
+    const trimmed2 = line.trim();
+    if (/^<script(\s|>)/i.test(trimmed2)) {
+      const block = blockLines(lines, i2, /<\/script\s*>/i);
+      regions.push({
+        type: "script",
+        lines: block
+      });
+      i2 += block.length;
+      continue;
+    }
+    if (/^<svg(\s|>)/i.test(trimmed2)) {
+      const block = blockLines(lines, i2, /<\/svg\s*>/i);
+      regions.push({
+        type: "svg",
+        lines: block
+      });
+      i2 += block.length;
+      continue;
+    }
+    if (/^<([a-zA-Z][\w-]*)/.test(trimmed2)) {
+      const tagName = trimmed2.match(/^<([a-zA-Z][\w-]*)/)[1].toLowerCase();
+      if (VOID_ELEMENTS.has(tagName) && !lines[i2 + 1]?.trim().startsWith("<")) {
+        pushSpindleLine(regions, line);
+        i2++;
+        continue;
+      }
+      if (new RegExp(`</${tagName}\\s*>`, "i").test(trimmed2)) {
+        pushSpindleLine(regions, line);
+        i2++;
+        continue;
+      }
+      const htmlLines = [line];
+      let depth = 1;
+      i2++;
+      while (i2 < lines.length && depth > 0) {
+        htmlLines.push(lines[i2]);
+        const opens = (lines[i2].match(new RegExp(`<${tagName}(?:[\\s>]|$)`, "gi")) ?? []).length;
+        const closes2 = (lines[i2].match(new RegExp(`</${tagName}\\s*>`, "gi")) ?? []).length;
+        depth += opens - closes2;
+        i2++;
+      }
+      regions.push({
+        type: "html",
+        lines: htmlLines
+      });
+      continue;
+    }
+    pushSpindleLine(regions, line);
+    i2++;
+  }
+  return regions;
+}
+function blockLines(lines, start, close) {
+  let end = start;
+  while (end < lines.length - 1 && !close.test(lines[end])) end++;
+  return lines.slice(start, end + 1);
+}
+function pushSpindleLine(regions, line) {
+  const last2 = regions[regions.length - 1];
+  if (last2?.type === "spindle") last2.lines.push(line);
+  else regions.push({
+    type: "spindle",
+    lines: [line]
+  });
+}
+async function run(code, prettier2, options, overrides) {
+  if (!prettier2) return void 0;
+  try {
+    return await prettier2.format(code, {
+      ...options ?? DEFAULT_PRETTIER_OPTIONS,
+      ...overrides
+    });
+  } catch {
+    return;
+  }
+}
+function formatJS(code, prettier2, options) {
+  return run(code, prettier2, options, { parser: "babel" });
+}
+function formatCSS(code, prettier2, options) {
+  return run(code, prettier2, options, { parser: "css" });
+}
+function formatHTML(code, prettier2, options) {
+  return run(code, prettier2, options, {
+    parser: "html",
+    htmlWhitespaceSensitivity: "css"
+  });
+}
+function scanSpindleMarkup(text2) {
+  const tokens2 = [];
+  const tags = [];
+  const doBlocks = [];
+  let open;
+  const push = (t, inAttribute) => {
+    const match = {
+      start: t.start,
+      end: t.end,
+      token: text2.slice(t.start, t.end)
+    };
+    if (inAttribute) match.inAttribute = true;
+    tokens2.push(match);
+  };
+  for (const t of tokenizeMarkupTolerant(text2).tokens) if (t.type === "html") {
+    tags.push({
+      start: t.start,
+      end: t.end
+    });
+    for (const attribute of t.attributeSpans) {
+      if (attribute.valueStart === void 0 || attribute.valueEnd === void 0) continue;
+      const value = text2.slice(attribute.valueStart, attribute.valueEnd);
+      if (!value.includes("{")) continue;
+      for (const inner of tokenizeMarkupTolerant(value, { text: true }).tokens) if (inner.type === "macro" || inner.type === "variable" || inner.type === "expression") push({
+        start: attribute.valueStart + inner.start,
+        end: attribute.valueStart + inner.end
+      }, true);
+    }
+  } else if (t.type !== "text") {
+    if (t.type === "macro" && t.name === "do") {
+      if (!t.isClose) open = t;
+      else if (open) {
+        doBlocks.push({
+          start: open.start,
+          end: t.end,
+          bodyStart: open.end,
+          bodyEnd: t.start
+        });
+        open = void 0;
+      }
+    }
+    push(t);
+  }
+  return {
+    tokens: tokens2,
+    tags,
+    doBlocks
+  };
+}
+function multilineJsLiterals(code) {
+  const spans = [];
+  let skipUntil = 0;
+  lexJs(code, { literal(text2, index, nesting) {
+    if (nesting > 0 || index < skipUntil) return;
+    const quote = text2[0];
+    if (quote === "`") {
+      skipUntil = lexTemplate(code, index);
+      if (code.slice(index, skipUntil).includes("\n")) spans.push([index, skipUntil]);
+    } else if ((quote === '"' || quote === "'") && text2.includes("\n")) spans.push([index, index + text2.length]);
+  } }, "statements");
+  return spans;
+}
+function lineHasTag(tags, start, end) {
+  return tags.some((tag) => tag.start < end && tag.end > start);
+}
+function replaceSvgBlocks(html) {
+  const tokens2 = [];
+  return {
+    text: html.replace(/<svg[\s>][\s\S]*?<\/svg>/gi, (match) => {
+      const idx = tokens2.length;
+      tokens2.push(match);
+      return `<!--SVG:${idx}-->`;
+    }),
+    tokens: tokens2
+  };
+}
+function placeholdersIntact(text2, tokens2, placeholdersOf) {
+  return tokens2.every((_2, index) => placeholdersOf(index).reduce((count, placeholder) => count + text2.split(placeholder).length - 1, 0) === 1);
+}
+function sameSpindleTokens(before, after) {
+  const tokensOf2 = (text2) => scanSpindleMarkup(text2).tokens.map((m) => m.token);
+  const expected = tokensOf2(before);
+  const found = tokensOf2(after);
+  return expected.length === found.length && expected.every((t, i2) => t === found[i2]);
+}
+function restorePlaceholders(text2, tokens2, placeholdersOf) {
+  let result = text2;
+  tokens2.forEach((token, index) => {
+    for (const placeholder of placeholdersOf(index)) result = result.replace(placeholder, () => token);
+  });
+  return result;
+}
+function restoreSvgBlocks(text2, tokens2) {
+  return restorePlaceholders(text2, tokens2, SVG_PLACEHOLDERS);
+}
+function replaceSpindleTokens(html) {
+  const { tokens: found, tags, doBlocks } = scanSpindleMarkup(html);
+  const units = [];
+  const pushDoBlock = (block) => units.push({
+    start: block.start,
+    end: block.end,
+    token: html.slice(block.start, block.end)
+  });
+  let doIndex = 0;
+  for (const m of found) {
+    for (let block = doBlocks[doIndex]; block && block.end <= m.start; ) {
+      pushDoBlock(block);
+      block = doBlocks[++doIndex];
+    }
+    const open = doBlocks[doIndex];
+    if (open && m.start >= open.start) continue;
+    units.push(m);
+  }
+  for (; doIndex < doBlocks.length; doIndex++) pushDoBlock(doBlocks[doIndex]);
+  units.sort((a, b) => a.start - b.start);
+  const tokens2 = [];
+  const resultLines = [];
+  let unit = 0;
+  let lineStart = 0;
+  while (lineStart <= html.length) {
+    let lineEnd = lineStart;
+    const lineUnits = [];
+    for (; ; ) {
+      while (unit < units.length && units[unit].end <= lineEnd) unit++;
+      const next = units[unit];
+      const inside = next && next.start <= lineEnd ? next : void 0;
+      if (inside) {
+        lineUnits.push(inside);
+        lineEnd = inside.end;
+        unit++;
+        continue;
+      }
+      if (lineEnd >= html.length || html[lineEnd] === "\n") break;
+      lineEnd++;
+    }
+    const line = html.slice(lineStart, lineEnd);
+    const indent = line.match(/^(\s*)/)?.[1] ?? "";
+    if (lineUnits.length === 0) resultLines.push(line);
+    else if (!lineHasTag(tags, lineStart, lineEnd)) {
+      const idx = tokens2.length;
+      tokens2.push(line.trim());
+      resultLines.push(`${indent}<!--SP:${idx}-->`);
+    } else {
+      let replaced = "";
+      let last2 = lineStart;
+      for (const u of lineUnits) {
+        const idx = tokens2.length;
+        tokens2.push(u.token);
+        replaced += html.slice(last2, u.start) + (u.inAttribute ? `__SP${idx}__` : `<!--SP:${idx}-->`);
+        last2 = u.end;
+      }
+      resultLines.push(replaced + html.slice(last2, lineEnd));
+    }
+    lineStart = lineEnd + 1;
+  }
+  return {
+    text: resultLines.join("\n"),
+    tokens: tokens2
+  };
+}
+function restoreSpindleTokens(text2, tokens2) {
+  return restorePlaceholders(text2, tokens2, SPINDLE_PLACEHOLDERS);
+}
+function closedMacroNames(text2) {
+  const found = /* @__PURE__ */ new Set();
+  for (const t of tokenizeMarkupTolerant(text2).tokens) if (t.type === "macro" && t.isClose) found.add(t.name.toLowerCase());
+  return found;
+}
+function defaultIsBlock(text2, extra = []) {
+  const closed = closedMacroNames(text2);
+  for (const name of extra) closed.add(name.toLowerCase());
+  return (name) => isBlockMacro(name) || closed.has(name.toLowerCase());
+}
+async function formatPassage(body, options = {}) {
+  if (body.charCodeAt(0) === 65279) return "\uFEFF" + await formatPassage(body.slice(1), options);
+  const eol = dominantEol(body);
+  const output = await formatLf(body.replace(/\r\n/g, "\n"), options);
+  return eol === "\r\n" ? output.replace(/\n/g, "\r\n") : output;
+}
+function dominantEol(text2) {
+  const crlf = (text2.match(/\r\n/g) ?? []).length;
+  const lf = (text2.match(/\n/g) ?? []).length - crlf;
+  if (crlf !== lf) return crlf > lf ? "\r\n" : "\n";
+  return text2.indexOf("\r\n") !== -1 && text2.indexOf("\r\n") < text2.indexOf("\n") ? "\r\n" : "\n";
+}
+function replaceAll(text2, from, to) {
+  return text2.split(from).join(to);
+}
+function newlineSentinel(text2) {
+  for (let code = 57344; code <= 63743; code++) {
+    const ch = String.fromCharCode(code);
+    if (!text2.includes(ch)) return ch;
+  }
+  throw new Error("no free private-use character for the newline stand-in");
+}
+function protectMultilineTokens(body, sentinel) {
+  const { tokens: tokens2, doBlocks } = scanSpindleMarkup(body);
+  const spans = [];
+  for (const m of tokens2) if (m.token.includes("\n")) spans.push([m.start, m.end]);
+  for (const block of doBlocks) for (const [a, b] of multilineJsLiterals(body.slice(block.bodyStart, block.bodyEnd))) spans.push([block.bodyStart + a, block.bodyStart + b]);
+  return joinSpans(body, spans, sentinel);
+}
+function joinJsLiterals(code, sentinel) {
+  return joinSpans(code, multilineJsLiterals(code), sentinel);
+}
+function joinSpans(text2, spans, sentinel) {
+  let out = "";
+  let last2 = 0;
+  for (const [a, b] of [...spans].sort((x2, y) => x2[0] - y[0])) {
+    out += text2.slice(last2, a) + replaceAll(text2.slice(a, b), "\n", sentinel);
+    last2 = b;
+  }
+  return out + text2.slice(last2);
+}
+async function formatLf(text2, options) {
+  const { prettier: prettier2, prettierOptions } = options;
+  const body = text2.replace(/(?:[ \t]*\n)+[ \t]*$/, "\n");
+  if (options.kind === "script" || options.kind === "stylesheet") {
+    const format = options.kind === "script" ? formatJS : formatCSS;
+    const code = body.trim();
+    return (await format(code, prettier2, prettierOptions) ?? code).trim().replace(/\n*$/, "\n");
+  }
+  const isBlock = options.isBlock ?? defaultIsBlock(body, options.blockMacros);
+  const isDedenting = options.isDedentingSubMacro ?? ((name) => DEFAULT_DEDENTING.has(name.toLowerCase()));
+  const sentinel = newlineSentinel(body);
+  const lines = [];
+  const hardBreakLines = /* @__PURE__ */ new Set();
+  const regions = segmentRegions(protectMultilineTokens(body, sentinel));
+  for (const region of regions) {
+    if (region.type !== "spindle") region.lines = region.lines.map((l) => replaceAll(l, sentinel, "\n"));
+    if (region.type === "script") {
+      if (region.lines.length === 1) {
+        lines.push(...region.lines);
+        continue;
+      }
+      const innerCode = region.lines.slice(1, -1).join("\n");
+      const formatted = await formatJS(innerCode.trim(), prettier2, prettierOptions);
+      if (formatted === void 0 || !sameSpindleTokens(innerCode, formatted)) {
+        lines.push(...region.lines);
+        continue;
+      }
+      lines.push(region.lines[0]);
+      if (formatted.trim()) for (const fLine of joinJsLiterals(formatted.trim(), sentinel).split("\n")) lines.push("  " + fLine);
+      lines.push(region.lines[region.lines.length - 1]);
+      continue;
+    }
+    if (region.type === "svg") {
+      lines.push(...region.lines);
+      continue;
+    }
+    if (region.type === "html") {
+      const htmlText = region.lines.join("\n");
+      if (WHITESPACE_AS_WRITTEN.test(htmlText)) {
+        lines.push(...region.lines);
+        continue;
+      }
+      const { text: svgPlaceholdered, tokens: svgTokens } = replaceSvgBlocks(htmlText);
+      const { text: placeholdered, tokens: tokens2 } = replaceSpindleTokens(svgPlaceholdered);
+      const formatted = await formatHTML(placeholdered, prettier2, prettierOptions);
+      if (formatted === void 0 || !placeholdersIntact(formatted, tokens2, SPINDLE_PLACEHOLDERS) || !placeholdersIntact(formatted, svgTokens, SVG_PLACEHOLDERS)) {
+        lines.push(...region.lines);
+        continue;
+      }
+      const restored = restoreSvgBlocks(restoreSpindleTokens(formatted.trim(), tokens2.map((t) => replaceAll(t, "\n", sentinel))), svgTokens);
+      for (const fLine of restored.split("\n")) lines.push(fLine);
+      continue;
+    }
+    let indented = indentMacros(region.lines, isBlock, isDedenting);
+    if (options.maxLineLength) indented = wrapLines(indented, options.maxLineLength);
+    for (const line of indented) {
+      if (line.endsWith("  ")) hardBreakLines.add(lines.length);
+      lines.push(line);
+    }
+  }
+  let output = lines.map((l, i2) => hardBreakLines.has(i2) ? l : l.replace(/\s+$/, "")).join("\n");
+  output = output.replace(/\n*$/, "\n");
+  return replaceAll(output, sentinel, "\n");
+}
+function indentMacros(lines, isBlock, isDedenting) {
+  const macrosOnLine = macroTokensByLine(lines);
+  const bodies = [{
+    openLine: -1,
+    minCol: Infinity,
+    keepRelative: false
+  }];
+  const stack = [0];
+  const info = [];
+  const openBody = (line) => {
+    bodies.push({
+      openLine: line,
+      minCol: Infinity,
+      keepRelative: false
+    });
+    stack.push(bodies.length - 1);
+  };
+  const currentBody = () => stack[stack.length - 1];
+  const closeBody = () => stack.length > 1 ? stack.pop() : void 0;
+  const addLine = (col, text2) => {
+    const body = bodies[currentBody()];
+    body.minCol = Math.min(body.minCol, col);
+    if (LIST_ITEM_REGEX.test(text2) || CODE_FENCE_REGEX.test(text2)) body.keepRelative = true;
+    info.push({
+      body: currentBody(),
+      col,
+      text: text2
+    });
+  };
+  for (let i2 = 0; i2 < lines.length; i2++) {
+    const lineText = lines[i2];
+    const trimmed2 = lineText.trim();
+    if (trimmed2 === "") {
+      info.push(null);
+      continue;
+    }
+    const col = indentColumn(lineText);
+    const lead = lineText.length - lineText.trimStart().length;
+    const macros = macrosOnLine[i2];
+    const [first, ...rest] = macros;
+    const startsWithMacro = first !== void 0 && first.start === lead;
+    if (startsWithMacro && !first.isClose && isDedenting(first.name)) {
+      const closed2 = closeBody();
+      if (closed2 === void 0) addLine(col, trimmed2);
+      else info.push({
+        body: currentBody(),
+        closes: closed2,
+        col,
+        text: trimmed2
+      });
+      openBody(i2);
+      continue;
+    }
+    const closed = startsWithMacro && first.isClose ? closeBody() : void 0;
+    if (closed === void 0) addLine(col, trimmed2);
+    else info.push({
+      body: currentBody(),
+      closes: closed,
+      col,
+      text: trimmed2
+    });
+    if (startsWithMacro && !first.isClose && isBlock(first.name)) openBody(i2);
+    for (const macro of startsWithMacro ? rest : macros) if (macro.isClose && macro.start > lead) closeBody();
+  }
+  const outCol = [];
+  const result = [];
+  for (let i2 = 0; i2 < info.length; i2++) {
+    const line = info[i2];
+    if (!line) {
+      outCol.push(0);
+      result.push("");
+      continue;
+    }
+    let col;
+    if (line.closes !== void 0) col = outCol[bodies[line.closes].openLine];
+    else {
+      const body = bodies[line.body];
+      const isRoot = body.openLine === -1;
+      col = (isRoot ? 0 : outCol[body.openLine] + 2) + (body.keepRelative ? line.col - (isRoot ? 0 : body.minCol) : 0);
+    }
+    outCol.push(col);
+    const hardBreak = / {2,}$/.test(lines[i2]) && info[i2 + 1] ? "  " : "";
+    result.push(" ".repeat(col) + line.text + hardBreak);
+  }
+  return result;
+}
+function macroTokensByLine(lines) {
+  const byLine = lines.map(() => []);
+  const starts = [];
+  let offset2 = 0;
+  for (const line2 of lines) {
+    starts.push(offset2);
+    offset2 += line2.length + 1;
+  }
+  let line = 0;
+  for (const token of tokenizeMarkupTolerant(lines.join("\n")).tokens) {
+    if (token.type !== "macro") continue;
+    while (line + 1 < lines.length && starts[line + 1] <= token.start) line++;
+    const lineStart = starts[line];
+    byLine[line].push({
+      ...token,
+      start: token.start - lineStart,
+      end: token.end - lineStart
+    });
+  }
+  return byLine;
+}
+function indentColumn(line) {
+  let col = 0;
+  for (const ch of line) if (ch === " ") col++;
+  else if (ch === "	") col += 4 - col % 4;
+  else break;
+  return col;
+}
+function wrapLines(lines, maxLen) {
+  const result = [];
+  const javaScript = doBodyLines(lines);
+  for (const [index, line] of lines.entries()) {
+    if (line.length <= maxLen || javaScript.has(index)) {
+      result.push(line);
+      continue;
+    }
+    const trimmed2 = line.trim();
+    if (trimmed2 === "" || /^\{[\/#.]/.test(trimmed2) || /^\[\[/.test(trimmed2) || /^\{choice\b/.test(trimmed2) || /^\{choices\b/.test(trimmed2)) {
+      result.push(line);
+      continue;
+    }
+    const wrapped = wordWrap(trimmed2, maxLen, line.match(/^(\s*)/)?.[1] ?? "");
+    if (line.endsWith("  ")) wrapped[wrapped.length - 1] += "  ";
+    result.push(...wrapped);
+  }
+  return result;
+}
+function doBodyLines(lines) {
+  const found = /* @__PURE__ */ new Set();
+  const text2 = lines.join("\n");
+  for (const block of scanSpindleMarkup(text2).doBlocks) {
+    const first = text2.slice(0, block.bodyStart).split("\n").length - 1;
+    const last2 = text2.slice(0, block.bodyEnd).split("\n").length - 1;
+    for (let i2 = first; i2 <= last2; i2++) found.add(i2);
+  }
+  return found;
+}
+function wordWrap(text2, maxLen, indent) {
+  const lines = [];
+  const inToken = new Array(text2.length).fill(false);
+  for (const token of tokenizeMarkupTolerant(text2).tokens) {
+    if (token.type === "text" || token.type === "html") continue;
+    inToken.fill(true, token.start, token.end);
+  }
+  const room = maxLen - indent.length;
+  let pos = 0;
+  while (pos < text2.length) {
+    if (text2.length - pos <= room) {
+      lines.push(indent + text2.slice(pos));
+      break;
+    }
+    let breakIdx = -1;
+    for (let i2 = pos + 1; i2 < text2.length && i2 - pos <= room; i2++) if (text2[i2] === " " && !inToken[i2]) breakIdx = i2;
+    if (breakIdx === -1) {
+      for (let i2 = pos + room + 1; i2 < text2.length; i2++) if (text2[i2] === " " && !inToken[i2]) {
+        breakIdx = i2;
+        break;
+      }
+    }
+    if (breakIdx === -1) {
+      lines.push(indent + text2.slice(pos));
+      break;
+    }
+    lines.push(indent + text2.slice(pos, breakIdx));
+    pos = breakIdx + 1;
+  }
+  return lines;
+}
 function validateStoryMarkup(passages, macros, options = {}) {
   const list3 = [...passages];
   const all = [...macros];
@@ -8843,8 +9455,10 @@ function blockLookup(macros) {
   return (name) => blocks.has(name.toLowerCase()) || isBlockMacro(name);
 }
 function passagePieces(source, macros = []) {
+  return passagePiecesOfTokens(source, macros, tokenizeMarkupTolerant(source).tokens);
+}
+function passagePiecesOfTokens(source, macros, tokens2) {
   const all = [...macros];
-  const { tokens: tokens2 } = tokenizeMarkupTolerant(source);
   return [...passagePiecesOf(source, tokens2, parameterLookup(all), { isBlock: blockLookup(all) })];
 }
 function widgetDefinitions(passages, macros = []) {
@@ -8867,7 +9481,7 @@ function validateVariableReferences(passages, declarations, macros = []) {
   const list3 = [...passages];
   return checkVariableReferences(list3.filter((p) => !p.tags?.some((t) => NOT_MARKUP_TAGS.includes(t))), declarations, referenceOptions(macros, false, list3));
 }
-var SIGIL_SCOPES, SIGIL_CHARS, grammar_shared_default, LB, RB, SIGIL_SCOPES$1, withSelectors, VOID_TAGS, BRANCH_PARENT$1, LINK_SEPARATORS, NO_SELECTORS, EMAIL_AUTOLINK, peg$SyntaxError, NameMap, NameSet, BLOCK_MACROS, BLOCK_WIDGETS, RAW_BODY_MACROS, BRANCHING, quoteArg, last$1, BRANCH_PARENT, isBranchTag, lowerName, nameOf, closerOf, closes, astralIdentifierCodes, astralIdentifierStartCodes, nonASCIIidentifierChars, nonASCIIidentifierStartChars, reservedWords, ecma5AndLessKeywords, keywords$1, keywordRelationalOperator, nonASCIIidentifierStart, nonASCIIidentifier, TokenType, beforeExpr, startsExpr, keywords, types$1, lineBreak, lineBreakG, nonASCIIwhitespace, skipWhiteSpace, ref, hasOwnProperty, toString, hasOwn$1, isArray, regexpCache, loneSurrogate, Position, SourceLocation, defaultOptions, warnedAboutEcmaVersion, SCOPE_TOP, SCOPE_FUNCTION, SCOPE_ASYNC, SCOPE_GENERATOR, SCOPE_ARROW, SCOPE_SIMPLE_CATCH, SCOPE_SUPER, SCOPE_DIRECT_SUPER, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH, SCOPE_VAR, BIND_NONE, BIND_VAR, BIND_LEXICAL, BIND_FUNCTION, BIND_SIMPLE_CATCH, BIND_OUTSIDE, Parser, prototypeAccessors, pp$9, literal, DestructuringErrors, pp$8, loopLabel, switchLabel, empty$1, FUNC_STATEMENT, FUNC_HANGING_STATEMENT, FUNC_NULLABLE_ID, pp$7, TokContext, types, pp$6, pp$5, empty, pp$4, pp$3, Scope, Node, pp$2, scriptValuesAddedInUnicode, ecma9BinaryProperties, ecma10BinaryProperties, ecma11BinaryProperties, ecma12BinaryProperties, ecma13BinaryProperties, unicodeBinaryProperties, unicodeBinaryPropertiesOfStrings, unicodeGeneralCategoryValues, ecma9ScriptValues, ecma10ScriptValues, ecma11ScriptValues, ecma12ScriptValues, ecma13ScriptValues, unicodeScriptValues, data, ecmaVersion, i, list, pp$1, BranchID, RegExpValidationState, CharSetNone, CharSetOk, CharSetString, Token, pp, INVALID_TEMPLATE_ESCAPE_ERROR, OPTIONS, AT_NAME_RE, TRANS_NAME_RE, SIGIL_IDENT_RE, LINE_BREAK_RE, NOT_A_BODY_RE, OPERAND_ENDS, SigilParser, OPENERS, CLOSERS$1, CodeSyntaxError, last, CLOSER, isNode, NAMESPACE_NAME, WORD_RE$2, FLAGS_RE, WORDS_BEFORE_STRING, NON_STRING_QUOTE_PREFIX, memoInput, memo, defaultCodeEnd, defaultHooks, MarkupError, OFFSET_FIELD, listeners, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, SUB_MACRO_PARAMETERS, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, parses, CONDITION_MACROS, PASSAGE_BODIES, holdsByDefault, JS_ESCAPE_RE, textPiece, registeredParameters, WIDGET_PARAMETERS, NOT_MARKUP, NOT_MARKUP_TAGS$1, BRANCH_MACROS, didYouMean, PASSAGE_ARGUMENT_HINT, BARE_WORD_RE, NUMBER_RE, IDENT_RE, KEY_RE, ARROW_RE, LINE_END_RE, ARRAY_INDEX_RE, UNSUPPORTED_UNDEFINED, Reader, VAR_PATH_RE, QUOTED_VAR_ARG_RE, VALID_VAR_TYPES, PRIMITIVE_SAMPLES, UNSUPPORTED_TYPE, NO_STORE_VAR_MACROS, FIELD_PATH_RE, CLOSERS, BLOCK_WORDS, NOT_PARAMETERS, DECLARATIONS, WRITE_RE, MUTATORS, MUTATING_CALL_RE, BEFORE_BINDING, isWordChar, Bindings, CALL_RE, IDENTIFIER_ARGUMENT_RE, WORD_RE, MODIFIER_RE, KEY_START_RE, CONFIG_KEYS, ConfigReader, stringOf, booleanOf, textOf, stringsOf, NOT_MARKUP_TAGS;
+var SIGIL_SCOPES, SIGIL_CHARS, grammar_shared_default, LB, RB, SIGIL_SCOPES$1, withSelectors, VOID_TAGS, BRANCH_PARENT$1, LINK_SEPARATORS, NO_SELECTORS, EMAIL_AUTOLINK, peg$SyntaxError, NameMap, NameSet, BLOCK_MACROS, BLOCK_WIDGETS, RAW_BODY_MACROS, BRANCHING, quoteArg, last$1, BRANCH_PARENT, isBranchTag, lowerName, nameOf, closerOf, closes, astralIdentifierCodes, astralIdentifierStartCodes, nonASCIIidentifierChars, nonASCIIidentifierStartChars, reservedWords, ecma5AndLessKeywords, keywords$1, keywordRelationalOperator, nonASCIIidentifierStart, nonASCIIidentifier, TokenType, beforeExpr, startsExpr, keywords, types$1, lineBreak, lineBreakG, nonASCIIwhitespace, skipWhiteSpace, ref, hasOwnProperty, toString, hasOwn$1, isArray, regexpCache, loneSurrogate, Position, SourceLocation, defaultOptions, warnedAboutEcmaVersion, SCOPE_TOP, SCOPE_FUNCTION, SCOPE_ASYNC, SCOPE_GENERATOR, SCOPE_ARROW, SCOPE_SIMPLE_CATCH, SCOPE_SUPER, SCOPE_DIRECT_SUPER, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH, SCOPE_VAR, BIND_NONE, BIND_VAR, BIND_LEXICAL, BIND_FUNCTION, BIND_SIMPLE_CATCH, BIND_OUTSIDE, Parser, prototypeAccessors, pp$9, literal, DestructuringErrors, pp$8, loopLabel, switchLabel, empty$1, FUNC_STATEMENT, FUNC_HANGING_STATEMENT, FUNC_NULLABLE_ID, pp$7, TokContext, types, pp$6, pp$5, empty, pp$4, pp$3, Scope, Node, pp$2, scriptValuesAddedInUnicode, ecma9BinaryProperties, ecma10BinaryProperties, ecma11BinaryProperties, ecma12BinaryProperties, ecma13BinaryProperties, unicodeBinaryProperties, unicodeBinaryPropertiesOfStrings, unicodeGeneralCategoryValues, ecma9ScriptValues, ecma10ScriptValues, ecma11ScriptValues, ecma12ScriptValues, ecma13ScriptValues, unicodeScriptValues, data, ecmaVersion, i, list, pp$1, BranchID, RegExpValidationState, CharSetNone, CharSetOk, CharSetString, Token, pp, INVALID_TEMPLATE_ESCAPE_ERROR, OPTIONS, AT_NAME_RE, TRANS_NAME_RE, SIGIL_IDENT_RE, LINE_BREAK_RE, NOT_A_BODY_RE, OPERAND_ENDS, SigilParser, OPENERS, CLOSERS$1, CodeSyntaxError, last, CLOSER, isNode, NAMESPACE_NAME, WORD_RE$2, FLAGS_RE, WORDS_BEFORE_STRING, NON_STRING_QUOTE_PREFIX, memoInput, memo, defaultCodeEnd, defaultHooks, MarkupError, OFFSET_FIELD, listeners, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, SUB_MACRO_PARAMETERS, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, parses, CONDITION_MACROS, PASSAGE_BODIES, holdsByDefault, JS_ESCAPE_RE, textPiece, registeredParameters, WIDGET_PARAMETERS, NOT_MARKUP, NOT_MARKUP_TAGS$1, BRANCH_MACROS, didYouMean, PASSAGE_ARGUMENT_HINT, BARE_WORD_RE, NUMBER_RE, IDENT_RE, KEY_RE, ARROW_RE, LINE_END_RE, ARRAY_INDEX_RE, UNSUPPORTED_UNDEFINED, Reader, VAR_PATH_RE, QUOTED_VAR_ARG_RE, VALID_VAR_TYPES, PRIMITIVE_SAMPLES, UNSUPPORTED_TYPE, NO_STORE_VAR_MACROS, FIELD_PATH_RE, CLOSERS, BLOCK_WORDS, NOT_PARAMETERS, DECLARATIONS, WRITE_RE, MUTATORS, MUTATING_CALL_RE, BEFORE_BINDING, isWordChar, Bindings, CALL_RE, IDENTIFIER_ARGUMENT_RE, WORD_RE, MODIFIER_RE, KEY_START_RE, CONFIG_KEYS, ConfigReader, stringOf, booleanOf, textOf, stringsOf, VOID_ELEMENTS, DEFAULT_PRETTIER_OPTIONS, SVG_PLACEHOLDERS, SPINDLE_PLACEHOLDERS, DEFAULT_DEDENTING, WHITESPACE_AS_WRITTEN, LIST_ITEM_REGEX, CODE_FENCE_REGEX, NOT_MARKUP_TAGS;
 var init_story_variables = __esm({
   "node_modules/@rohal12/spindle/dist/pkg/story-variables.js"() {
     SIGIL_SCOPES = {
@@ -14251,28 +14865,7 @@ var init_story_variables = __esm({
     NON_STRING_QUOTE_PREFIX = /[\p{L}\p{N}_\\]/u;
     memoInput = "";
     memo = /* @__PURE__ */ new Map();
-    defaultCodeEnd = {
-      closeBrace(input, codeStart, lenientStart) {
-        const end = findCodeEnd(input, codeStart);
-        return end !== -1 ? end : lenientClose(input, lenientStart);
-      },
-      rawBodyEnd(input, bodyStart, name) {
-        const closer = `\\{/${name}\\s*\\}`;
-        const first = new RegExp(closer, "gi");
-        first.lastIndex = bodyStart;
-        const firstAt = first.exec(input)?.index ?? -1;
-        if (firstAt === -1) return -1;
-        const at3 = new RegExp(closer, "iy");
-        const end = findCodeEnd(input, bodyStart, {
-          goal: "statements",
-          stop: (k2) => {
-            at3.lastIndex = k2;
-            return at3.test(input);
-          }
-        });
-        return end === -1 ? firstAt : end;
-      }
-    };
+    defaultCodeEnd = jsCodeEnd();
     defaultHooks = {
       ...defaultCodeEnd,
       isBlock: isBlockMacro,
@@ -15374,6 +15967,35 @@ var init_story_variables = __esm({
     booleanOf = (d) => d?.type === "boolean" ? d.value : void 0;
     textOf = (d) => stringOf(d)?.value;
     stringsOf = (d) => d?.type === "array" ? d.items.flatMap((item) => stringOf(item)?.value ?? []) : [];
+    VOID_ELEMENTS = /* @__PURE__ */ new Set([
+      "area",
+      "base",
+      "br",
+      "col",
+      "embed",
+      "hr",
+      "img",
+      "input",
+      "link",
+      "meta",
+      "param",
+      "source",
+      "track",
+      "wbr"
+    ]);
+    DEFAULT_PRETTIER_OPTIONS = { tabWidth: 2 };
+    SVG_PLACEHOLDERS = (i2) => [`<!--SVG:${i2}-->`];
+    SPINDLE_PLACEHOLDERS = (i2) => [`<!--SP:${i2}-->`, `__SP${i2}__`];
+    DEFAULT_DEDENTING = /* @__PURE__ */ new Set([
+      "else",
+      "elseif",
+      "next",
+      "case",
+      "default"
+    ]);
+    WHITESPACE_AS_WRITTEN = /<(?:pre|textarea)[\s>]|white-space\s*:/i;
+    LIST_ITEM_REGEX = /^(?:[-+*]|\d{1,9}[.)])(?:[ \t]|$)/;
+    CODE_FENCE_REGEX = /^(?:`{3,}|~{3,})/;
     NOT_MARKUP_TAGS = ["script", "stylesheet"];
   }
 });
@@ -24615,7 +25237,7 @@ var MINIMUM_SPINDLE_VERSION, DEFAULT_TARGET;
 var init_spindle_version = __esm({
   "src/core/workspace/spindle-version.ts"() {
     "use strict";
-    MINIMUM_SPINDLE_VERSION = "0.59.20";
+    MINIMUM_SPINDLE_VERSION = "0.60.0";
     DEFAULT_TARGET = { version: void 0, source: "default", supported: true };
   }
 });
@@ -27641,322 +28263,31 @@ function headerTags(header) {
   const unescaped = header.replace(/\\./g, "ec");
   return (unescaped.match(/\[[^\]]*\]/g) ?? []).flatMap((t) => t.slice(1, -1).split(/\s+/));
 }
-function segmentRegions(body) {
-  const lines = body.split("\n");
-  if (lines.length > 0 && lines[lines.length - 1] === "") {
-    lines.pop();
-  }
-  if (lines.length === 0) return [];
-  const regions = [];
-  let i2 = 0;
-  while (i2 < lines.length) {
-    const line = lines[i2];
-    const trimmed2 = line.trim();
-    if (/^<script(\s|>)/i.test(trimmed2)) {
-      const scriptLines = [line];
-      i2++;
-      if (/<\/script\s*>/i.test(line)) {
-        regions.push({ type: "script", lines: scriptLines });
-        continue;
-      }
-      while (i2 < lines.length && !/<\/script>/i.test(lines[i2])) {
-        scriptLines.push(lines[i2]);
-        i2++;
-      }
-      if (i2 < lines.length) {
-        scriptLines.push(lines[i2]);
-        i2++;
-      }
-      regions.push({ type: "script", lines: scriptLines });
-      continue;
-    }
-    if (/^<svg(\s|>)/i.test(trimmed2)) {
-      const svgLines = [line];
-      i2++;
-      while (i2 < lines.length && !/<\/svg>/i.test(lines[i2])) {
-        svgLines.push(lines[i2]);
-        i2++;
-      }
-      if (i2 < lines.length) {
-        svgLines.push(lines[i2]);
-        i2++;
-      }
-      regions.push({ type: "svg", lines: svgLines });
-      continue;
-    }
-    if (/^<([a-zA-Z][\w-]*)/.test(trimmed2)) {
-      const tagMatch = trimmed2.match(/^<([a-zA-Z][\w-]*)/);
-      const tagName = tagMatch[1].toLowerCase();
-      if (VOID_ELEMENTS.has(tagName) && !lines[i2 + 1]?.trim().startsWith("<")) {
-        pushSpindleLine(regions, line);
-        i2++;
-        continue;
-      }
-      const selfClosing = new RegExp(`</${tagName}\\s*>`, "i");
-      if (selfClosing.test(trimmed2)) {
-        pushSpindleLine(regions, line);
-        i2++;
-        continue;
-      }
-      const htmlLines = [line];
-      let depth = 1;
-      i2++;
-      while (i2 < lines.length && depth > 0) {
-        htmlLines.push(lines[i2]);
-        const opens = (lines[i2].match(new RegExp(`<${tagName}(?:[\\s>]|$)`, "gi")) ?? []).length;
-        const closes2 = (lines[i2].match(new RegExp(`</${tagName}\\s*>`, "gi")) ?? []).length;
-        depth += opens - closes2;
-        i2++;
-      }
-      regions.push({ type: "html", lines: htmlLines });
-      continue;
-    }
-    pushSpindleLine(regions, line);
-    i2++;
-  }
-  return regions;
-}
-function pushSpindleLine(regions, line) {
-  const last2 = regions[regions.length - 1];
-  if (last2?.type === "spindle") {
-    last2.lines.push(line);
-  } else {
-    regions.push({ type: "spindle", lines: [line] });
-  }
-}
-var PASSAGE_HEADER_REGEX, VOID_ELEMENTS;
+var PASSAGE_HEADER_REGEX;
 var init_segment = __esm({
   "src/plugins/format/segment.ts"() {
     "use strict";
     init_passage_parser();
     PASSAGE_HEADER_REGEX = /^::\s+/;
-    VOID_ELEMENTS = /* @__PURE__ */ new Set([
-      "area",
-      "base",
-      "br",
-      "col",
-      "embed",
-      "hr",
-      "img",
-      "input",
-      "link",
-      "meta",
-      "param",
-      "source",
-      "track",
-      "wbr"
-    ]);
   }
 });
 
 // src/plugins/format/prettier-bridge.ts
 async function loadPrettier() {
-  if (prettierLoaded) return prettier;
-  prettierLoaded = true;
-  try {
-    prettier = await import("prettier");
-  } catch {
-    prettier = null;
-  }
-  return prettier;
-}
-async function getBaseConfig() {
-  const p = await loadPrettier();
-  if (!p) return {};
+  prettier ??= import("prettier").catch(() => null);
+  const p = await prettier;
+  if (!p) return void 0;
   try {
     const resolved = await p.resolveConfig(process.cwd());
-    return { tabWidth: 2, ...resolved ?? {} };
-  } catch {
-    return { tabWidth: 2 };
-  }
-}
-async function formatJS(code) {
-  const p = await loadPrettier();
-  if (!p) return code;
-  try {
-    const config2 = await getBaseConfig();
-    return await p.format(code, { ...config2, parser: "babel" });
-  } catch {
-    return code;
-  }
-}
-async function formatCSS(code) {
-  const p = await loadPrettier();
-  if (!p) return code;
-  try {
-    const config2 = await getBaseConfig();
-    return await p.format(code, { ...config2, parser: "css" });
-  } catch {
-    return code;
-  }
-}
-async function formatHTML(code) {
-  const p = await loadPrettier();
-  if (!p) return code;
-  try {
-    const config2 = await getBaseConfig();
-    return await p.format(code, {
-      ...config2,
-      parser: "html",
-      htmlWhitespaceSensitivity: "ignore"
-    });
+    return { prettier: p, options: { tabWidth: 2, ...resolved ?? {} } };
   } catch {
-    return code;
+    return { prettier: p, options: { tabWidth: 2 } };
   }
 }
-var prettier, prettierLoaded;
+var prettier;
 var init_prettier_bridge = __esm({
   "src/plugins/format/prettier-bridge.ts"() {
     "use strict";
-    prettier = null;
-    prettierLoaded = false;
-  }
-});
-
-// src/plugins/format/placeholders.ts
-function scanSpindleMarkup(text2) {
-  const tokens2 = [];
-  const tags = [];
-  const doBlocks = [];
-  let open;
-  const push = (t, inAttribute) => {
-    const match = { start: t.start, end: t.end, token: text2.slice(t.start, t.end) };
-    if (inAttribute) match.inAttribute = true;
-    tokens2.push(match);
-  };
-  for (const t of tokenizeMarkupTolerant(text2).tokens) {
-    if (t.type === "html") {
-      tags.push({ start: t.start, end: t.end });
-      for (const attribute of t.attributeSpans) {
-        if (attribute.valueStart === void 0 || attribute.valueEnd === void 0) continue;
-        const value = text2.slice(attribute.valueStart, attribute.valueEnd);
-        if (!value.includes("{")) continue;
-        for (const inner of tokenizeMarkupTolerant(value, { text: true }).tokens) {
-          if (inner.type === "macro" || inner.type === "variable" || inner.type === "expression") {
-            push({ start: attribute.valueStart + inner.start, end: attribute.valueStart + inner.end }, true);
-          }
-        }
-      }
-    } else if (t.type !== "text") {
-      if (t.type === "macro" && t.name === "do") {
-        if (!t.isClose) open = t;
-        else if (open) {
-          doBlocks.push({ start: open.start, end: t.end, bodyStart: open.end, bodyEnd: t.start });
-          open = void 0;
-        }
-      }
-      push(t);
-    }
-  }
-  return { tokens: tokens2, tags, doBlocks };
-}
-function multilineJsLiterals(code) {
-  const spans = [];
-  let skipUntil = 0;
-  lexJs(code, {
-    literal(text2, index, nesting) {
-      if (nesting > 0 || index < skipUntil) return;
-      const quote = text2[0];
-      if (quote === "`") {
-        skipUntil = lexTemplate(code, index);
-        if (code.slice(index, skipUntil).includes("\n")) spans.push([index, skipUntil]);
-      } else if ((quote === '"' || quote === "'") && text2.includes("\n")) {
-        spans.push([index, index + text2.length]);
-      }
-    }
-  }, "statements");
-  return spans;
-}
-function lineHasTag(tags, start, end) {
-  return tags.some((tag) => tag.start < end && tag.end > start);
-}
-function replaceSvgBlocks(html) {
-  const tokens2 = [];
-  const result = html.replace(/<svg[\s>][\s\S]*?<\/svg>/gi, (match) => {
-    const idx = tokens2.length;
-    tokens2.push(match);
-    return `<!--SVG:${idx}-->`;
-  });
-  return { text: result, tokens: tokens2 };
-}
-function restoreSvgBlocks(text2, tokens2) {
-  let result = text2;
-  for (let i2 = 0; i2 < tokens2.length; i2++) {
-    result = result.replace(`<!--SVG:${i2}-->`, () => tokens2[i2]);
-  }
-  return result;
-}
-function replaceSpindleTokens(html) {
-  const { tokens: found, tags, doBlocks } = scanSpindleMarkup(html);
-  const units = [];
-  let doIndex = 0;
-  for (const m of found) {
-    while (doIndex < doBlocks.length && doBlocks[doIndex].end <= m.start) {
-      const block = doBlocks[doIndex++];
-      units.push({ start: block.start, end: block.end, token: html.slice(block.start, block.end) });
-    }
-    if (doBlocks[doIndex] && m.start >= doBlocks[doIndex].start) continue;
-    units.push(m);
-  }
-  for (; doIndex < doBlocks.length; doIndex++) {
-    const block = doBlocks[doIndex];
-    units.push({ start: block.start, end: block.end, token: html.slice(block.start, block.end) });
-  }
-  units.sort((a, b) => a.start - b.start);
-  const tokens2 = [];
-  const resultLines = [];
-  let unit = 0;
-  let lineStart = 0;
-  while (lineStart <= html.length) {
-    let lineEnd = lineStart;
-    const lineUnits = [];
-    for (; ; ) {
-      while (unit < units.length && units[unit].end <= lineEnd) unit++;
-      const inside = units[unit] && units[unit].start <= lineEnd ? units[unit] : void 0;
-      if (inside) {
-        lineUnits.push(inside);
-        lineEnd = inside.end;
-        unit++;
-        continue;
-      }
-      if (lineEnd >= html.length || html[lineEnd] === "\n") break;
-      lineEnd++;
-    }
-    const line = html.slice(lineStart, lineEnd);
-    const indent = line.match(/^(\s*)/)?.[1] ?? "";
-    if (lineUnits.length === 0) {
-      resultLines.push(line);
-    } else if (!lineHasTag(tags, lineStart, lineEnd)) {
-      const idx = tokens2.length;
-      tokens2.push(line.trim());
-      resultLines.push(`${indent}<!--SP:${idx}-->`);
-    } else {
-      let replaced = "";
-      let last2 = lineStart;
-      for (const u of lineUnits) {
-        const idx = tokens2.length;
-        tokens2.push(u.token);
-        replaced += html.slice(last2, u.start) + (u.inAttribute ? `__SP${idx}__` : `<!--SP:${idx}-->`);
-        last2 = u.end;
-      }
-      resultLines.push(replaced + html.slice(last2, lineEnd));
-    }
-    lineStart = lineEnd + 1;
-  }
-  return { text: resultLines.join("\n"), tokens: tokens2 };
-}
-function restoreSpindleTokens(text2, tokens2) {
-  let result = text2;
-  for (let i2 = 0; i2 < tokens2.length; i2++) {
-    result = result.replace(`<!--SP:${i2}-->`, () => tokens2[i2]);
-    result = result.replace(`__SP${i2}__`, () => tokens2[i2]);
-  }
-  return result;
-}
-var init_placeholders = __esm({
-  "src/plugins/format/placeholders.ts"() {
-    "use strict";
-    init_tooling();
   }
 });
 
@@ -27974,50 +28305,22 @@ function buildDefaultIsBlock(text2) {
 }
 async function formatDocument(text2, options) {
   if (text2.charCodeAt(0) === 65279) return "\uFEFF" + await formatDocument(text2.slice(1), options);
-  const eol = dominantEol(text2);
-  const output = await formatLf(text2.replace(/\r\n/g, "\n"), options);
+  const eol = dominantEol2(text2);
+  const output = await formatLf2(text2.replace(/\r\n/g, "\n"), options);
   return eol === "\r\n" ? output.replace(/\n/g, "\r\n") : output;
 }
-function dominantEol(text2) {
+function dominantEol2(text2) {
   const crlf = (text2.match(/\r\n/g) ?? []).length;
   const lf = (text2.match(/\n/g) ?? []).length - crlf;
   if (crlf !== lf) return crlf > lf ? "\r\n" : "\n";
   return text2.indexOf("\r\n") !== -1 && text2.indexOf("\r\n") < text2.indexOf("\n") ? "\r\n" : "\n";
 }
-function newlineSentinel(text2) {
-  for (let code = 57344; code <= 63743; code++) {
-    const ch = String.fromCharCode(code);
-    if (!text2.includes(ch)) return ch;
-  }
-  throw new Error("no free private-use character for the newline stand-in");
-}
-function protectMultilineTokens(body, sentinel) {
-  const { tokens: tokens2, doBlocks } = scanSpindleMarkup(body);
-  const spans = [];
-  for (const m of tokens2) {
-    if (m.token.includes("\n")) spans.push([m.start, m.end]);
-  }
-  for (const block of doBlocks) {
-    for (const [a, b] of multilineJsLiterals(body.slice(block.bodyStart, block.bodyEnd))) {
-      spans.push([block.bodyStart + a, block.bodyStart + b]);
-    }
-  }
-  spans.sort((x2, y) => x2[0] - y[0]);
-  let out = "";
-  let last2 = 0;
-  for (const [a, b] of spans) {
-    out += body.slice(last2, a) + body.slice(a, b).replaceAll("\n", sentinel);
-    last2 = b;
-  }
-  return out + body.slice(last2);
-}
-async function formatLf(text2, options) {
+async function formatLf2(text2, options) {
   const isBlock = options?.isBlock ?? buildDefaultIsBlock(text2);
-  const isDedenting = options?.isDedentingSubMacro ?? ((name) => DEFAULT_DEDENTING.has(name.toLowerCase()));
+  const isDedentingSubMacro = options?.isDedentingSubMacro ?? ((name) => DEFAULT_DEDENTING2.has(name.toLowerCase()));
+  const prettier2 = await loadPrettier();
   const passages = splitPassages(text2);
-  const sentinel = newlineSentinel(text2);
   const resultLines = [];
-  const hardBreakLines = /* @__PURE__ */ new Set();
   for (let pi2 = 0; pi2 < passages.length; pi2++) {
     const passage = passages[pi2];
     if (pi2 > 0 && passage.header) {
@@ -28030,226 +28333,24 @@ async function formatLf(text2, options) {
     }
     if (passage.header) {
       const header = PASSAGE_HEADER_REGEX2.test(passage.header) ? normalizePassageHeader(passage.header) : passage.header;
-      resultLines.push(header);
-    }
-    const kind = classifyPassage(passage.header);
-    if (kind === "script") {
-      const formatted = await formatJS(passage.body.trim());
-      resultLines.push(formatted.trim());
-      continue;
-    }
-    if (kind === "stylesheet") {
-      const formatted = await formatCSS(passage.body.trim());
-      resultLines.push(formatted.trim());
-      continue;
-    }
-    const regions = segmentRegions(protectMultilineTokens(passage.body, sentinel));
-    for (const region of regions) {
-      if (region.type !== "spindle") {
-        region.lines = region.lines.map((l) => l.replaceAll(sentinel, "\n"));
-      }
-      if (region.type === "script") {
-        if (region.lines.length === 1) {
-          resultLines.push(region.lines[0]);
-          continue;
-        }
-        const firstLine = region.lines[0];
-        const lastLine = region.lines[region.lines.length - 1];
-        const innerLines = region.lines.slice(1, region.lines.length - 1);
-        const innerCode = innerLines.join("\n");
-        const formatted = await formatJS(innerCode.trim());
-        resultLines.push(firstLine);
-        if (formatted.trim()) {
-          for (const fLine of formatted.trim().split("\n")) {
-            resultLines.push("  " + fLine);
-          }
-        }
-        resultLines.push(lastLine);
-        continue;
-      }
-      if (region.type === "svg") {
-        resultLines.push(...region.lines);
-        continue;
-      }
-      if (region.type === "html") {
-        const htmlText = region.lines.join("\n");
-        const { text: svgPlaceholdered, tokens: svgTokens } = replaceSvgBlocks(htmlText);
-        const { text: placeholdered, tokens: tokens2 } = replaceSpindleTokens(svgPlaceholdered);
-        const formatted = await formatHTML(placeholdered);
-        const restoredSpindle = restoreSpindleTokens(formatted.trim(), tokens2.map((t) => t.replaceAll("\n", sentinel)));
-        const restored = restoreSvgBlocks(restoredSpindle, svgTokens);
-        for (const fLine of restored.split("\n")) {
-          resultLines.push(fLine);
-        }
-        continue;
-      }
-      let indented = indentMacros(region.lines, isBlock, isDedenting);
-      if (options?.maxLineLength) {
-        indented = wrapLines(indented, options.maxLineLength);
-      }
-      for (const line of indented) {
-        if (line.endsWith("  ")) hardBreakLines.add(resultLines.length);
-        resultLines.push(line);
-      }
-    }
-  }
-  let output = resultLines.map((l, i2) => hardBreakLines.has(i2) ? l : l.replace(/\s+$/, "")).join("\n");
-  output = output.replace(/\n*$/, "\n");
-  return output.replaceAll(sentinel, "\n");
-}
-function indentMacros(lines, isBlock, isDedenting) {
-  const macrosOnLine = macroTokensByLine(lines);
-  const bodies = [{ openLine: -1, minCol: Infinity, keepRelative: false }];
-  const stack = [0];
-  const info = [];
-  const openBody = (line) => {
-    bodies.push({ openLine: line, minCol: Infinity, keepRelative: false });
-    stack.push(bodies.length - 1);
-  };
-  const closeBody = () => stack.length > 1 ? stack.pop() : void 0;
-  const addLine = (col, text2) => {
-    const body = bodies[stack[stack.length - 1]];
-    body.minCol = Math.min(body.minCol, col);
-    if (LIST_ITEM_REGEX.test(text2) || CODE_FENCE_REGEX.test(text2)) body.keepRelative = true;
-    info.push({ body: stack[stack.length - 1], col, text: text2 });
-  };
-  for (let i2 = 0; i2 < lines.length; i2++) {
-    const trimmed2 = lines[i2].trim();
-    if (trimmed2 === "") {
-      info.push(null);
-      continue;
-    }
-    const col = indentColumn(lines[i2]);
-    const lead = lines[i2].length - lines[i2].trimStart().length;
-    const [first, ...rest] = macrosOnLine[i2];
-    const startsWithMacro = first !== void 0 && first.start === lead;
-    if (startsWithMacro && !first.isClose && isDedenting(first.name)) {
-      const closed2 = closeBody();
-      if (closed2 === void 0) addLine(col, trimmed2);
-      else info.push({ body: stack[stack.length - 1], closes: closed2, col, text: trimmed2 });
-      openBody(i2);
-      continue;
-    }
-    const closed = startsWithMacro && first.isClose ? closeBody() : void 0;
-    if (closed === void 0) addLine(col, trimmed2);
-    else info.push({ body: stack[stack.length - 1], closes: closed, col, text: trimmed2 });
-    if (startsWithMacro && !first.isClose && isBlock(first.name)) {
-      openBody(i2);
-    }
-    for (const macro of startsWithMacro ? rest : macrosOnLine[i2]) {
-      if (macro.isClose && macro.start > lead) closeBody();
-    }
-  }
-  const outCol = [];
-  const result = [];
-  for (let i2 = 0; i2 < info.length; i2++) {
-    const line = info[i2];
-    if (!line) {
-      outCol.push(0);
-      result.push("");
-      continue;
-    }
-    let col;
-    if (line.closes !== void 0) {
-      col = outCol[bodies[line.closes].openLine];
-    } else {
-      const body = bodies[line.body];
-      const isRoot = body.openLine === -1;
-      const base = isRoot ? 0 : outCol[body.openLine] + 2;
-      col = base + (body.keepRelative ? line.col - (isRoot ? 0 : body.minCol) : 0);
-    }
-    outCol.push(col);
-    const hardBreak = / {2,}$/.test(lines[i2]) && info[i2 + 1] ? "  " : "";
-    result.push(" ".repeat(col) + line.text + hardBreak);
-  }
-  return result;
-}
-function macroTokensByLine(lines) {
-  const byLine = lines.map(() => []);
-  const starts = [];
-  let offset2 = 0;
-  for (const line2 of lines) {
-    starts.push(offset2);
-    offset2 += line2.length + 1;
-  }
-  let line = 0;
-  for (const token of tokenizeMarkupTolerant(lines.join("\n")).tokens) {
-    if (token.type !== "macro") continue;
-    while (line + 1 < lines.length && starts[line + 1] <= token.start) line++;
-    byLine[line].push({ ...token, start: token.start - starts[line], end: token.end - starts[line] });
-  }
-  return byLine;
-}
-function indentColumn(line) {
-  let col = 0;
-  for (const ch of line) {
-    if (ch === " ") col++;
-    else if (ch === "	") col += 4 - col % 4;
-    else break;
+      resultLines.push(header.replace(/\s+$/, ""));
+    }
+    if (passage.body === "") continue;
+    const body = await formatPassage(passage.body, {
+      kind: classifyPassage(passage.header),
+      prettier: prettier2?.prettier,
+      prettierOptions: prettier2?.options,
+      isBlock,
+      isDedentingSubMacro,
+      maxLineLength: options?.maxLineLength
+    });
+    resultLines.push(body.replace(/\n$/, ""));
   }
-  return col;
+  return resultLines.join("\n").replace(/\n*$/, "\n");
 }
 async function formatRange(text2, _range, options) {
   return formatDocument(text2, options);
 }
-function wrapLines(lines, maxLen) {
-  const result = [];
-  for (const line of lines) {
-    if (line.length <= maxLen) {
-      result.push(line);
-      continue;
-    }
-    const trimmed2 = line.trim();
-    if (trimmed2 === "" || /^::/.test(trimmed2) || /^\{[\/#.]/.test(trimmed2) || // closing/opening-only macro lines
-    /^\[\[/.test(trimmed2) || // links
-    /^\{choice\b/.test(trimmed2) || // choice macros
-    /^\{choices\b/.test(trimmed2)) {
-      result.push(line);
-      continue;
-    }
-    const indentMatch = line.match(/^(\s*)/);
-    const indent = indentMatch ? indentMatch[1] : "";
-    const wrapped = wordWrap(trimmed2, maxLen, indent);
-    if (line.endsWith("  ")) wrapped[wrapped.length - 1] += "  ";
-    result.push(...wrapped);
-  }
-  return result;
-}
-function wordWrap(text2, maxLen, indent) {
-  const lines = [];
-  const inToken = new Array(text2.length).fill(false);
-  for (const token of tokenizeMarkupTolerant(text2).tokens) {
-    if (token.type === "text" || token.type === "html") continue;
-    inToken.fill(true, token.start, token.end);
-  }
-  const room = maxLen - indent.length;
-  let pos = 0;
-  while (pos < text2.length) {
-    if (text2.length - pos <= room) {
-      lines.push(indent + text2.slice(pos));
-      break;
-    }
-    let breakIdx = -1;
-    for (let i2 = pos + 1; i2 < text2.length && i2 - pos <= room; i2++) {
-      if (text2[i2] === " " && !inToken[i2]) breakIdx = i2;
-    }
-    if (breakIdx === -1) {
-      for (let i2 = pos + room + 1; i2 < text2.length; i2++) {
-        if (text2[i2] === " " && !inToken[i2]) {
-          breakIdx = i2;
-          break;
-        }
-      }
-    }
-    if (breakIdx === -1) {
-      lines.push(indent + text2.slice(pos));
-      break;
-    }
-    lines.push(indent + text2.slice(pos, breakIdx));
-    pos = breakIdx + 1;
-  }
-  return lines;
-}
 function normalizePassageHeader(line) {
   const headerMatch = line.match(/^::\s+(.*)/);
   if (!headerMatch) return line;
@@ -28270,19 +28371,16 @@ function normalizePassageHeader(line) {
   }
   return `:: ${name}${suffix}`;
 }
-var PASSAGE_HEADER_REGEX2, DEFAULT_DEDENTING, BUILTIN_CONTAINERS, LIST_ITEM_REGEX, CODE_FENCE_REGEX, formatPlugin;
+var PASSAGE_HEADER_REGEX2, DEFAULT_DEDENTING2, BUILTIN_CONTAINERS, formatPlugin;
 var init_format = __esm({
   "src/plugins/format.ts"() {
     "use strict";
     init_tooling();
     init_segment();
     init_prettier_bridge();
-    init_placeholders();
     PASSAGE_HEADER_REGEX2 = /^(::)\s+/;
-    DEFAULT_DEDENTING = /* @__PURE__ */ new Set(["else", "elseif", "next", "case", "default"]);
+    DEFAULT_DEDENTING2 = /* @__PURE__ */ new Set(["else", "elseif", "next", "case", "default"]);
     BUILTIN_CONTAINERS = new Set(builtinMacros.filter((m) => m.block).map((m) => m.name.toLowerCase()));
-    LIST_ITEM_REGEX = /^(?:[-+*]|\d{1,9}[.)])(?:[ \t]|$)/;
-    CODE_FENCE_REGEX = /^(?:`{3,}|~{3,})/;
     formatPlugin = {
       id: "format",
       capabilities: {
@@ -28293,7 +28391,7 @@ var init_format = __esm({
         const formatOpts = {
           // Block widgets (whose body renders {@children}) are containers too
           isBlock: (name) => ctx.workspace.isContainer(name),
-          isDedentingSubMacro: (name) => DEFAULT_DEDENTING.has(name.toLowerCase())
+          isDedentingSubMacro: (name) => DEFAULT_DEDENTING2.has(name.toLowerCase())
         };
         ctx.connection.onDocumentFormatting(async (params) => {
           const text2 = ctx.workspace.documents.getText(params.textDocument.uri);
@@ -72604,7 +72702,7 @@ var init_server4 = __esm({
 
 // src/bin.ts
 var args = process.argv.slice(2);
-var VERSION = "0.13.3";
+var VERSION = "0.14.0";
 var HELP = `spindle-lsp v${VERSION}
 Language Server Protocol server for Spindle story format