@rohal12/spindle-lsp 0.10.0 → 0.11.0

package/dist/bin.js

@@ -6694,7 +6694,7 @@ var init_macro_registry = __esm({
   }
 });
 
-// src/core/parsing/macro-parser.ts
+// src/core/parsing/code-scanner.ts
 function buildCodeScanner(input, from) {
   const n = input.length;
   const close = new Int32Array(n + 2).fill(-1);
@@ -6745,6 +6745,293 @@ function buildCodeScanner(input, from) {
 function createCodeScanner(input) {
   return buildCodeScanner(input, 0);
 }
+var NON_STRING_QUOTE_PREFIX;
+var init_code_scanner = __esm({
+  "src/core/parsing/code-scanner.ts"() {
+    "use strict";
+    NON_STRING_QUOTE_PREFIX = /[\p{L}\p{N}_\\]/u;
+  }
+});
+
+// src/core/parsing/html-scanner.ts
+function plainBraceMatches(input) {
+  const match2 = new Int32Array(input.length).fill(-1);
+  const open = [];
+  for (let i = 0; i < input.length; i++) {
+    if (input[i] === "{") open.push(i);
+    else if (input[i] === "}" && open.length > 0) match2[open.pop()] = i;
+  }
+  return match2;
+}
+function scanHtmlTags(text) {
+  const n = text.length;
+  const tags = [];
+  const macros = [];
+  const code = createCodeScanner(text);
+  const plain = plainBraceMatches(text);
+  const rawBodies = [];
+  let doCloses;
+  let nextDoClose = 0;
+  const rawBody = (end) => {
+    doCloses ??= [...text.matchAll(/\{\/do\s*\}/gi)].map((match2) => match2.index);
+    while (nextDoClose < doCloses.length && doCloses[nextDoClose] < end) nextDoClose++;
+    if (nextDoClose < doCloses.length) rawBodies.push([end, doCloses[nextDoClose]]);
+  };
+  const rawBodyLimit = (limit2) => {
+    if (rawBodies.length === 0) return limit2;
+    const macroStarts = new Set(macros);
+    let t = 0;
+    for (const [start, close] of rawBodies) {
+      if (start >= limit2) break;
+      if (close < limit2 && !macroStarts.has(close)) {
+        limit2 = start;
+        break;
+      }
+      while (t < tags.length && tags[t].start < start) t++;
+      if (t < tags.length && tags[t].start < Math.min(close, limit2)) limit2 = tags[t].start;
+    }
+    return limit2;
+  };
+  const braceEnd = (open) => {
+    const close = code.closeBrace(open + 1);
+    if (close !== plain[open]) return GIVE_UP;
+    return close === -1 ? open + 1 : close + 1;
+  };
+  const displayEnd = (open, sigil) => {
+    let j = sigil + 1;
+    while (j < n && DISPLAY_NAME_CHAR.test(text[j])) j++;
+    return text[j] === "}" ? j + 1 : braceEnd(open);
+  };
+  const afterBrace = (i2) => {
+    let at = i2 + 1;
+    const selectors = text[at] === "." || text[at] === "#";
+    if (selectors) {
+      at = selectorsEnd(text, at);
+      if (text[at] === " ") at++;
+    }
+    const c3 = text[at];
+    if (c3 === "$" || c3 === "_" || c3 === "@" || c3 === "%") return displayEnd(i2, at);
+    if (c3 === void 0) return i2 + 1;
+    if (LETTER.test(c3) || c3 === "/" && !selectors) {
+      const end = braceEnd(i2);
+      if (end > i2 + 1) {
+        macros.push(i2);
+        if (/^do$/i.test(text.slice(at, end - 1).trim().split(/\s/)[0])) rawBody(end);
+      }
+      return end;
+    }
+    return i2 + 1;
+  };
+  const readTag = (i2) => {
+    let j = i2 + 1;
+    const isClose = text[j] === "/";
+    if (isClose) j++;
+    const nameStart = j;
+    while (j < n && TAG_NAME_CHAR.test(text[j])) j++;
+    const name = text.slice(nameStart, j);
+    if (!name || !LETTER.test(name[0])) return i2 + 1;
+    const isVoid = VOID_ELEMENTS.has(name.toLowerCase());
+    if (isClose) {
+      while (j < n && WHITESPACE.test(text[j])) j++;
+      if (text[j] !== ">") return i2 + 1;
+      if (!isVoid) tags.push({ name, kind: "close", start: i2, end: j + 1 });
+      return j + 1;
+    }
+    const attrs = readAttributes(j);
+    if (attrs.end === GIVE_UP) return GIVE_UP;
+    j = attrs.end;
+    let selfClosing = isVoid;
+    if (text[j] === "/") {
+      selfClosing = true;
+      j++;
+    }
+    if (text[j] === ">") {
+      tags.push({ name, kind: selfClosing ? "void" : "open", start: i2, end: j + 1, values: attrs.values });
+      return j + 1;
+    }
+    return attrs.count > 0 ? GIVE_UP : i2 + 1;
+  };
+  const readAttributes = (j) => {
+    let count = 0;
+    const values = [];
+    while (j < n) {
+      while (j < n && WHITESPACE.test(text[j])) j++;
+      if (j >= n || text[j] === ">" || text[j] === "/" && text[j + 1] === ">") break;
+      const nameStart = j;
+      while (j < n && ATTR_NAME_CHAR.test(text[j])) j++;
+      if (j === nameStart) break;
+      count++;
+      if (text[j] !== "=") continue;
+      j++;
+      const quote = text[j];
+      if (quote === '"' || quote === "'") {
+        const close = quotedValueEnd(j + 1, quote);
+        if (close === GIVE_UP) return { end: GIVE_UP, count, values };
+        values.push([j + 1, close]);
+        j = close < n ? close + 1 : close;
+      } else {
+        const start = j;
+        while (j < n && !WHITESPACE.test(text[j]) && text[j] !== ">") j++;
+        values.push([start, j]);
+      }
+    }
+    return { end: j, count, values };
+  };
+  const quotedValueEnd = (from, quote) => {
+    let depth = 0;
+    let sawBrace = false;
+    let k = from;
+    for (; k < n; k++) {
+      const c3 = text[k];
+      if (c3 === "{") {
+        depth++;
+        sawBrace = true;
+      } else if (c3 === "}") {
+        depth--;
+        sawBrace = true;
+      } else if (c3 === quote && depth <= 0) {
+        break;
+      }
+    }
+    if (!sawBrace) return k;
+    let d = from;
+    while (d < n) {
+      if (text[d] === "{") {
+        const close = code.closeBrace(d + 1);
+        if (close !== -1) {
+          d = close + 1;
+          continue;
+        }
+      } else if (text[d] === quote) {
+        break;
+      }
+      d++;
+    }
+    return d === k ? k : GIVE_UP;
+  };
+  let i = 0;
+  let stoppedAt = -1;
+  while (i < n) {
+    const c3 = text[i];
+    let next;
+    if (c3 === "\\") {
+      let k = i + 1;
+      while (text[k] === "\\") k++;
+      if (text[k] === "{" || text[k] === "}") next = (k - i) % 2 === 1 ? k + 1 : GIVE_UP;
+      else next = k;
+    } else if (c3 === "[" && text[i + 1] === "[") {
+      next = linkEnd(text, i);
+    } else if (c3 === "{") {
+      next = afterBrace(i);
+    } else if (c3 === "<") {
+      next = readTag(i);
+    } else {
+      next = i + 1;
+    }
+    if (next === GIVE_UP) {
+      stoppedAt = i;
+      break;
+    }
+    i = next;
+  }
+  const limit = rawBodyLimit(stoppedAt === -1 ? n : stoppedAt);
+  if (limit === stoppedAt || limit === n) return { tags, stoppedAt, macros };
+  return {
+    tags: tags.filter((tag) => tag.start < limit),
+    stoppedAt: limit,
+    macros: macros.filter((at) => at < limit)
+  };
+}
+function selectorsEnd(text, i) {
+  const n = text.length;
+  while (i < n && (text[i] === "." || text[i] === "#")) {
+    i++;
+    while (i < n) {
+      if (SELECTOR_NAME_CHAR.test(text[i])) {
+        i++;
+      } else if (text[i] === "{" && (text[i + 1] === "$" || text[i + 1] === "_" || text[i + 1] === "@")) {
+        let j = i + 2;
+        while (j < n && DISPLAY_NAME_CHAR.test(text[j])) j++;
+        if (text[j] !== "}") break;
+        i = j + 1;
+      } else {
+        break;
+      }
+    }
+  }
+  return i;
+}
+function linkEnd(text, i) {
+  const n = text.length;
+  let depth = 1;
+  let j = i + 2;
+  while (j < n) {
+    if (text[j] === "[" && text[j + 1] === "[") {
+      depth++;
+      j += 2;
+    } else if (text[j] === "]" && text[j + 1] === "]") {
+      if (--depth === 0) return j + 2;
+      j += 2;
+    } else {
+      j++;
+    }
+  }
+  return GIVE_UP;
+}
+function attributeValueSpans(text) {
+  const spans = [];
+  if (!text.includes("<")) return spans;
+  const headers = [...text.matchAll(/^::.*$/gm)];
+  const scan = (from2, to) => {
+    const content = text.slice(from2, to);
+    if (!content.includes("<")) return;
+    for (const tag of scanHtmlTags(content).tags) {
+      for (const [start, end] of tag.values ?? []) spans.push([from2 + start, from2 + end]);
+    }
+  };
+  let from = 0;
+  for (const header of headers) {
+    scan(from, header.index);
+    from = header.index + header[0].length;
+  }
+  scan(from, text.length);
+  return spans;
+}
+function inAttributeValue(text, offset) {
+  return attributeValueSpans(text).some(([start, end]) => start <= offset && offset < end);
+}
+var VOID_ELEMENTS, TAG_NAME_CHAR, LETTER, ATTR_NAME_CHAR, WHITESPACE, SELECTOR_NAME_CHAR, DISPLAY_NAME_CHAR, GIVE_UP;
+var init_html_scanner = __esm({
+  "src/core/parsing/html-scanner.ts"() {
+    "use strict";
+    init_code_scanner();
+    VOID_ELEMENTS = /* @__PURE__ */ new Set([
+      "area",
+      "base",
+      "br",
+      "col",
+      "embed",
+      "hr",
+      "img",
+      "input",
+      "link",
+      "meta",
+      "param",
+      "source",
+      "track",
+      "wbr"
+    ]);
+    TAG_NAME_CHAR = /[a-zA-Z0-9-]/;
+    LETTER = /[a-zA-Z]/;
+    ATTR_NAME_CHAR = /[a-zA-Z0-9_\-:@]/;
+    WHITESPACE = /[^\S ]/;
+    SELECTOR_NAME_CHAR = /[a-zA-Z0-9_-]/;
+    DISPLAY_NAME_CHAR = /[\w.]/;
+    GIVE_UP = -2;
+  }
+});
+
+// src/core/parsing/macro-parser.ts
 function buildLineStarts(text) {
   const starts = [0];
   for (let i = 0; i < text.length; i++) {
@@ -6775,10 +7062,20 @@ function parseMacros(text) {
   const scanner = createCodeScanner(cleaned);
   const macros = [];
   let id = 0;
+  const attributeValues = attributeValueSpans(text);
+  let value = 0;
+  const inAttributeValue2 = (offset) => {
+    while (value < attributeValues.length && attributeValues[value][1] <= offset) value++;
+    return value < attributeValues.length && attributeValues[value][0] <= offset;
+  };
   macroHeadRegex.lastIndex = 0;
   let match2;
   while ((match2 = macroHeadRegex.exec(text)) !== null) {
     const matchStart = match2.index;
+    if (inAttributeValue2(matchStart)) {
+      macroHeadRegex.lastIndex = matchStart + 1;
+      continue;
+    }
     const closeIdx = scanner.closeBrace(matchStart + 1);
     if (closeIdx === -1) {
       macroHeadRegex.lastIndex = matchStart + 1;
@@ -6838,17 +7135,19 @@ function pairMacros(macros, isBlock, passageStartLines = []) {
     }
   }
 }
-var variableInterpolationRegex, SELECTOR_PATTERN, macroHeadRegex, NON_STRING_QUOTE_PREFIX;
+var variableInterpolationRegex, SELECTOR_PATTERN, macroHeadRegex;
 var init_macro_parser = __esm({
   "src/core/parsing/macro-parser.ts"() {
     "use strict";
+    init_code_scanner();
+    init_html_scanner();
+    init_code_scanner();
     variableInterpolationRegex = /(?<!\\)\{([$_@%][A-Za-z_$][\w$.]*)\}/g;
     SELECTOR_PATTERN = String.raw`(?:[.#](?:[\w-]|\{[$_@][\w.]*\})*)+`;
     macroHeadRegex = new RegExp(
       String.raw`(?<!\\)\{(?:(\/)|(${SELECTOR_PATTERN}) )?([A-Za-z][\w-]*)(?=[\s}]|\{[$_@%][A-Za-z_$][\w$.]*\})`,
       "gi"
     );
-    NON_STRING_QUOTE_PREFIX = /[\p{L}\p{N}_\\]/u;
   }
 });
 
@@ -16107,6 +16406,7 @@ var init_diagnostic_codes = __esm({
       UndefinedMacro: "SP100",
       MalformedContainer: "SP101",
       MalformedElement: "SP102",
+      UnevaluatedAttributeBlock: "SP103",
       IllegalClosingTag: "SP104",
       InvalidChildren: "SP107",
       ExpectedNoArguments: "SP108",
@@ -16136,6 +16436,7 @@ var init_diagnostic_codes = __esm({
       SP100: "warning",
       SP101: "error",
       SP102: "error",
+      SP103: "warning",
       SP104: "error",
       SP107: "error",
       SP108: "error",
@@ -16434,255 +16735,159 @@ var init_argument_lexer = __esm({
   }
 });
 
-// src/core/parsing/html-scanner.ts
-function plainBraceMatches(input) {
-  const match2 = new Int32Array(input.length).fill(-1);
-  const open = [];
-  for (let i = 0; i < input.length; i++) {
-    if (input[i] === "{") open.push(i);
-    else if (input[i] === "}" && open.length > 0) match2[open.pop()] = i;
-  }
-  return match2;
-}
-function scanHtmlTags(text) {
-  const n = text.length;
-  const tags = [];
-  const macros = [];
-  const code = createCodeScanner(text);
-  const plain = plainBraceMatches(text);
-  const rawBodies = [];
-  let doCloses;
-  let nextDoClose = 0;
-  const rawBody = (end) => {
-    doCloses ??= [...text.matchAll(/\{\/do\s*\}/gi)].map((match2) => match2.index);
-    while (nextDoClose < doCloses.length && doCloses[nextDoClose] < end) nextDoClose++;
-    if (nextDoClose < doCloses.length) rawBodies.push([end, doCloses[nextDoClose]]);
-  };
-  const rawBodyLimit = (limit2) => {
-    if (rawBodies.length === 0) return limit2;
-    const macroStarts = new Set(macros);
-    let t = 0;
-    for (const [start, close] of rawBodies) {
-      if (start >= limit2) break;
-      if (close < limit2 && !macroStarts.has(close)) {
-        limit2 = start;
-        break;
-      }
-      while (t < tags.length && tags[t].start < start) t++;
-      if (t < tags.length && tags[t].start < Math.min(close, limit2)) limit2 = tags[t].start;
-    }
-    return limit2;
-  };
-  const braceEnd = (open) => {
-    const close = code.closeBrace(open + 1);
-    if (close !== plain[open]) return GIVE_UP;
-    return close === -1 ? open + 1 : close + 1;
-  };
-  const displayEnd = (open, sigil) => {
-    let j = sigil + 1;
-    while (j < n && DISPLAY_NAME_CHAR.test(text[j])) j++;
-    return text[j] === "}" ? j + 1 : braceEnd(open);
-  };
-  const afterBrace = (i2) => {
-    let at = i2 + 1;
-    const selectors = text[at] === "." || text[at] === "#";
-    if (selectors) {
-      at = selectorsEnd(text, at);
-      if (text[at] === " ") at++;
-    }
-    const c3 = text[at];
-    if (c3 === "$" || c3 === "_" || c3 === "@" || c3 === "%") return displayEnd(i2, at);
-    if (c3 === void 0) return i2 + 1;
-    if (LETTER.test(c3) || c3 === "/" && !selectors) {
-      const end = braceEnd(i2);
-      if (end > i2 + 1) {
-        macros.push(i2);
-        if (/^do$/i.test(text.slice(at, end - 1).trim().split(/\s/)[0])) rawBody(end);
-      }
-      return end;
-    }
-    return i2 + 1;
-  };
-  const readTag = (i2) => {
-    let j = i2 + 1;
-    const isClose = text[j] === "/";
-    if (isClose) j++;
-    const nameStart = j;
-    while (j < n && TAG_NAME_CHAR.test(text[j])) j++;
-    const name = text.slice(nameStart, j);
-    if (!name || !LETTER.test(name[0])) return i2 + 1;
-    const isVoid = VOID_ELEMENTS.has(name.toLowerCase());
-    if (isClose) {
-      while (j < n && WHITESPACE.test(text[j])) j++;
-      if (text[j] !== ">") return i2 + 1;
-      if (!isVoid) tags.push({ name, kind: "close", start: i2, end: j + 1 });
-      return j + 1;
-    }
-    const attrs = readAttributes(j);
-    if (attrs.end === GIVE_UP) return GIVE_UP;
-    j = attrs.end;
-    let selfClosing = isVoid;
-    if (text[j] === "/") {
-      selfClosing = true;
-      j++;
-    }
-    if (text[j] === ">") {
-      tags.push({ name, kind: selfClosing ? "void" : "open", start: i2, end: j + 1 });
-      return j + 1;
+// src/core/parsing/attribute-blocks.ts
+function findUnevaluatedBlocks(value, lookup) {
+  const blocks = [];
+  if (!value.includes("{")) return blocks;
+  const code = createCodeScanner(value);
+  let i = 0;
+  while (i < value.length) {
+    i = value.indexOf("{", i);
+    if (i === -1) break;
+    const block = readBlock(value, code, i);
+    if (block.kind === "skip") {
+      i = block.next;
+      continue;
     }
-    return attrs.count > 0 ? GIVE_UP : i2 + 1;
-  };
-  const readAttributes = (j) => {
-    let count = 0;
-    while (j < n) {
-      while (j < n && WHITESPACE.test(text[j])) j++;
-      if (j >= n || text[j] === ">" || text[j] === "/" && text[j + 1] === ">") break;
-      const nameStart = j;
-      while (j < n && ATTR_NAME_CHAR.test(text[j])) j++;
-      if (j === nameStart) break;
-      count++;
-      if (text[j] !== "=") continue;
-      j++;
-      const quote = text[j];
-      if (quote === '"' || quote === "'") {
-        const close = quotedValueEnd(j + 1, quote);
-        if (close === GIVE_UP) return { end: GIVE_UP, count };
-        j = close < n ? close + 1 : close;
-      } else {
-        while (j < n && !WHITESPACE.test(text[j]) && text[j] !== ">") j++;
+    const inner = value.slice(i + 1, block.close);
+    const head = MACRO_HEAD.exec(inner);
+    if (head && lookup.isMacro(head[2])) {
+      const closing = head[1] === "/";
+      let end = block.close + 1;
+      if (!closing && lookup.isContainer(head[2])) {
+        end = containerEnd(value, code, end, head[2]) ?? end;
       }
+      blocks.push({ start: i, end, kind: "macro", macro: closing ? `/${head[2]}` : head[2] });
+      i = end;
+    } else if (usesVariable(inner)) {
+      blocks.push({ start: i, end: block.close + 1, kind: "expression" });
+      i = block.close + 1;
+    } else {
+      i++;
     }
-    return { end: j, count };
-  };
-  const quotedValueEnd = (from, quote) => {
-    let depth = 0;
-    let sawBrace = false;
-    let k = from;
-    for (; k < n; k++) {
-      const c3 = text[k];
-      if (c3 === "{") {
-        depth++;
-        sawBrace = true;
-      } else if (c3 === "}") {
-        depth--;
-        sawBrace = true;
-      } else if (c3 === quote && depth <= 0) {
-        break;
-      }
+  }
+  return blocks;
+}
+function readBlock(value, code, i) {
+  if (i > 0 && value[i - 1] === "\\") return { kind: "skip", next: i + 1 };
+  if (SIGILS.has(value[i + 1])) {
+    const end = Math.max(plainClose(value, i + 1), code.closeBrace(i + 1));
+    return { kind: "skip", next: end === -1 ? i + 1 : end + 1 };
+  }
+  const close = code.closeBrace(i + 1);
+  return close === -1 ? { kind: "skip", next: i + 1 } : { kind: "text", close };
+}
+function plainClose(value, i) {
+  let depth = 1;
+  for (; i < value.length; i++) {
+    if (value[i] === "{") depth++;
+    else if (value[i] === "}" && --depth === 0) return i;
+  }
+  return -1;
+}
+function containerEnd(value, code, from, name) {
+  const lower = name.toLowerCase();
+  let depth = 1;
+  let i = from;
+  while (i < value.length) {
+    i = value.indexOf("{", i);
+    if (i === -1) break;
+    const block = readBlock(value, code, i);
+    if (block.kind === "skip") {
+      i = block.next;
+      continue;
     }
-    if (!sawBrace) return k;
-    let d = from;
-    while (d < n) {
-      if (text[d] === "{") {
-        const close = code.closeBrace(d + 1);
-        if (close !== -1) {
-          d = close + 1;
-          continue;
-        }
-      } else if (text[d] === quote) {
-        break;
-      }
-      d++;
+    const head = MACRO_HEAD.exec(value.slice(i + 1, block.close));
+    if (head && head[2].toLowerCase() === lower) {
+      depth += head[1] === "/" ? -1 : 1;
+      if (depth === 0) return block.close + 1;
+      i = block.close + 1;
+    } else {
+      i++;
     }
-    return d === k ? k : GIVE_UP;
-  };
+  }
+  return void 0;
+}
+function usesVariable(inner) {
+  const code = createCodeScanner(inner);
+  let masked = "";
   let i = 0;
-  let stoppedAt = -1;
-  while (i < n) {
-    const c3 = text[i];
-    let next;
-    if (c3 === "\\") {
-      let k = i + 1;
-      while (text[k] === "\\") k++;
-      if (text[k] === "{" || text[k] === "}") next = (k - i) % 2 === 1 ? k + 1 : GIVE_UP;
-      else next = k;
-    } else if (c3 === "[" && text[i + 1] === "[") {
-      next = linkEnd(text, i);
-    } else if (c3 === "{") {
-      next = afterBrace(i);
-    } else if (c3 === "<") {
-      next = readTag(i);
-    } else {
-      next = i + 1;
+  while (i < inner.length) {
+    const literal2 = code.literalEnd(i);
+    if (literal2 !== -1) {
+      masked += " ".repeat(literal2 - i);
+      i = literal2;
+      continue;
     }
-    if (next === GIVE_UP) {
-      stoppedAt = i;
-      break;
+    if (inner[i] === "{" && SIGILS.has(inner[i + 1])) {
+      const close = code.closeBrace(i + 1);
+      if (close !== -1) {
+        masked += " ".repeat(close + 1 - i);
+        i = close + 1;
+        continue;
+      }
     }
-    i = next;
+    masked += inner[i];
+    i++;
   }
-  const limit = rawBodyLimit(stoppedAt === -1 ? n : stoppedAt);
-  if (limit === stoppedAt || limit === n) return { tags, stoppedAt, macros };
-  return {
-    tags: tags.filter((tag) => tag.start < limit),
-    stoppedAt: limit,
-    macros: macros.filter((at) => at < limit)
-  };
+  return VARIABLE_REFERENCE.test(masked);
 }
-function selectorsEnd(text, i) {
-  const n = text.length;
-  while (i < n && (text[i] === "." || text[i] === "#")) {
-    i++;
-    while (i < n) {
-      if (SELECTOR_NAME_CHAR.test(text[i])) {
-        i++;
-      } else if (text[i] === "{" && (text[i + 1] === "$" || text[i + 1] === "_" || text[i + 1] === "@")) {
-        let j = i + 2;
-        while (j < n && DISPLAY_NAME_CHAR.test(text[j])) j++;
-        if (text[j] !== "}") break;
-        i = j + 1;
-      } else {
-        break;
-      }
+function conditionalExpression(source) {
+  const match2 = IF_ELSE.exec(source);
+  if (!match2) return null;
+  const condition = match2[1].trim();
+  const [whenTrue, whenFalse = ""] = [match2[2], match2[3]];
+  if (!/^[$_@%]\w/.test(condition)) return null;
+  if (/[`\r\n]/.test(condition) || /[\r\n]/.test(whenTrue + whenFalse)) return null;
+  const code = createCodeScanner(condition);
+  let operators = "";
+  for (let i = 0; i < condition.length; ) {
+    const literal2 = code.literalEnd(i);
+    if (literal2 !== -1) {
+      i = literal2;
+      continue;
     }
+    operators += condition[i];
+    i++;
   }
-  return i;
+  if (/(?:<<|>>)=/.test(operators)) return null;
+  const rest = operators.replace(/\?\?|\?\./g, "").replace(/[!=]==?|[<>]=/g, "");
+  if (/[?=,;]/.test(rest)) return null;
+  const quote = (s) => `'${s.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}'`;
+  return `{${condition} ? ${quote(whenTrue)} : ${quote(whenFalse)}}`;
 }
-function linkEnd(text, i) {
-  const n = text.length;
-  let depth = 1;
-  let j = i + 2;
-  while (j < n) {
-    if (text[j] === "[" && text[j + 1] === "[") {
-      depth++;
-      j += 2;
-    } else if (text[j] === "]" && text[j + 1] === "]") {
-      if (--depth === 0) return j + 2;
-      j += 2;
-    } else {
-      j++;
+function printExpression(source) {
+  const match2 = /^\{print\s+([^{}\r\n]*)\}$/.exec(source);
+  if (!match2) return null;
+  const expr = match2[1].trim();
+  if (!/^[$_@%]\w/.test(expr)) return null;
+  const code = createCodeScanner(expr);
+  let depth = 0;
+  for (let i = 0; i < expr.length; ) {
+    const literal2 = code.literalEnd(i);
+    if (literal2 !== -1) {
+      i = literal2;
+      continue;
     }
+    const c3 = expr[i];
+    if (c3 === "(" || c3 === "[") depth++;
+    else if (c3 === ")" || c3 === "]") depth--;
+    else if (c3 === ";" || c3 === "," && depth <= 0) return null;
+    i++;
   }
-  return GIVE_UP;
+  return SIMPLE_PATH.test(expr) && expr.includes(".") ? `{${expr} ?? ''}` : `{${expr}}`;
 }
-var VOID_ELEMENTS, TAG_NAME_CHAR, LETTER, ATTR_NAME_CHAR, WHITESPACE, SELECTOR_NAME_CHAR, DISPLAY_NAME_CHAR, GIVE_UP;
-var init_html_scanner = __esm({
-  "src/core/parsing/html-scanner.ts"() {
+var SIGILS, MACRO_HEAD, VARIABLE_REFERENCE, IF_ELSE, SIMPLE_PATH;
+var init_attribute_blocks = __esm({
+  "src/core/parsing/attribute-blocks.ts"() {
     "use strict";
+    init_code_scanner();
     init_macro_parser();
-    VOID_ELEMENTS = /* @__PURE__ */ new Set([
-      "area",
-      "base",
-      "br",
-      "col",
-      "embed",
-      "hr",
-      "img",
-      "input",
-      "link",
-      "meta",
-      "param",
-      "source",
-      "track",
-      "wbr"
-    ]);
-    TAG_NAME_CHAR = /[a-zA-Z0-9-]/;
-    LETTER = /[a-zA-Z]/;
-    ATTR_NAME_CHAR = /[a-zA-Z0-9_\-:@]/;
-    WHITESPACE = /[^\S ]/;
-    SELECTOR_NAME_CHAR = /[a-zA-Z0-9_-]/;
-    DISPLAY_NAME_CHAR = /[\w.]/;
-    GIVE_UP = -2;
+    SIGILS = /* @__PURE__ */ new Set(["$", "_", "@", "%"]);
+    MACRO_HEAD = new RegExp(String.raw`^(?:(\/)|${SELECTOR_PATTERN} )?([A-Za-z][\w-]*)(?=\s|$|\{[$_@%])`);
+    VARIABLE_REFERENCE = /(?:^|[^\w$.@%])[$_@%][A-Za-z_$]/;
+    IF_ELSE = /^\{if\s+([^{}]*)\}([^{}]*?)(?:\{else\s*\}([^{}]*))?\{\/if\s*\}$/;
+    SIMPLE_PATH = /^[$_@%][\w.]+$/;
   }
 });
 
@@ -17544,6 +17749,10 @@ function computeDiagnostics(uri, workspace, options) {
       diagnostics.push(...replay.errors);
     } catch {
     }
+    try {
+      validateAttributeBlocks(markupText, passages, workspace, diagnostics);
+    } catch {
+    }
     try {
       validateMacros(macros, elements, workspace, diagnostics);
     } catch {
@@ -17771,6 +17980,40 @@ function replayPassage(macros, from, to, scan, base, lineStarts, workspace, repl
     if ("element" in entry) report2(tagRange(entry.element), `unclosed <${entry.element.name}>`);
   }
 }
+function validateAttributeBlocks(text, passages, workspace, diagnostics) {
+  if (!text.includes("<")) return;
+  const lineStarts = buildLineStarts(text);
+  const lineOffset = (line) => lineStarts[line] ?? text.length;
+  const lookup = {
+    isMacro: (name) => workspace.macros.getMacro(name) !== void 0 || workspace.widgets.getWidget(name) !== void 0,
+    isContainer: (name) => workspace.isContainer(name)
+  };
+  for (const passage of passages) {
+    if (!isMarkupPassage(passage)) continue;
+    const base = lineOffset(passage.range.start.line + 1);
+    const content = text.slice(base, lineOffset(passage.range.end.line + 1));
+    if (!content.includes("<") || !content.includes("{")) continue;
+    let rawText;
+    for (const tag of scanHtmlTags(content).tags) {
+      const name = tag.name.toLowerCase();
+      if (rawText !== void 0) {
+        if (tag.kind === "close" && name === rawText) rawText = void 0;
+        continue;
+      }
+      for (const [start, end] of tag.values ?? []) {
+        for (const block of findUnevaluatedBlocks(content.slice(start, end), lookup)) {
+          const range2 = {
+            start: offsetToPosition(base + start + block.start, lineStarts),
+            end: offsetToPosition(base + start + block.end, lineStarts)
+          };
+          const message = block.kind === "macro" ? MACRO_IN_ATTRIBUTE(block.macro) : EXPRESSION_IN_ATTRIBUTE;
+          diagnostics.push(makeDiag(range2, DiagnosticCode.UnevaluatedAttributeBlock, message));
+        }
+      }
+      if (tag.kind === "open" && RAW_TEXT_ELEMENTS.has(name)) rawText = name;
+    }
+  }
+}
 function isInsideParent(macros, index, parents, workspace) {
   const parentSet = new Set(parents.map((p) => p.toLowerCase()));
   for (let i = index - 1; i >= 0; i--) {
@@ -18264,7 +18507,7 @@ function toLspDiagnostic(d) {
     message: d.message
   };
 }
-var DIRECT_CHILD_MACROS, NON_MARKUP_PASSAGES, WILL_NOT_START, DEFERRED_CONTAINERS, EXPRESSION_BUILTINS2, diagnosticsPlugin;
+var DIRECT_CHILD_MACROS, NON_MARKUP_PASSAGES, RAW_TEXT_ELEMENTS, MACRO_IN_ATTRIBUTE, EXPRESSION_IN_ATTRIBUTE, WILL_NOT_START, DEFERRED_CONTAINERS, EXPRESSION_BUILTINS2, diagnosticsPlugin;
 var init_diagnostics = __esm({
   "src/plugins/diagnostics.ts"() {
     "use strict";
@@ -18272,6 +18515,7 @@ var init_diagnostics = __esm({
     init_macro_parser();
     init_argument_lexer();
     init_html_scanner();
+    init_attribute_blocks();
     init_widget_arguments();
     init_parameter_validator();
     init_link_parser();
@@ -18285,6 +18529,9 @@ var init_diagnostics = __esm({
       "StoryTransients",
       "SaveTitle"
     ]);
+    RAW_TEXT_ELEMENTS = /* @__PURE__ */ new Set(["script", "style"]);
+    MACRO_IN_ATTRIBUTE = (macro) => `Macros are not evaluated inside HTML attributes, so Spindle outputs this {${macro}} as text. Use an expression such as {$x ? 'a' : 'b'}`;
+    EXPRESSION_IN_ATTRIBUTE = "Spindle evaluates {\u2026} in an HTML attribute only when $, _, @ or % follows the brace, so it outputs this block as text. Start the expression with a variable, as in {$x ? 'a' : 'b'}";
     WILL_NOT_START = "Spindle will not start the story.";
     DEFERRED_CONTAINERS = /* @__PURE__ */ new Set(["link", "button"]);
     EXPRESSION_BUILTINS2 = /* @__PURE__ */ new Set([
@@ -60030,8 +60277,9 @@ function getCompletions(uri, position, triggerChar, workspace) {
   const lines = text.split("\n");
   if (position.line >= lines.length) return [];
   const lineText = lines[position.line].substring(0, position.character);
+  const inAttribute = () => inAttributeValue(text, (buildLineStarts(text)[position.line] ?? 0) + position.character - 1);
   if (/\{\/[A-Za-z\w-]*$/.test(lineText)) {
-    return getClosingMacroCompletions(uri, text, position, workspace);
+    return inAttribute() ? [] : getClosingMacroCompletions(uri, text, position, workspace);
   }
   const transientDotPathMatch = /%([\w$]+)\.([A-Za-z_$][\w$]*)?$/.exec(lineText);
   if (transientDotPathMatch) {
@@ -60057,7 +60305,7 @@ function getCompletions(uri, position, triggerChar, workspace) {
     return getPassageNameCompletions(workspace);
   }
   if (/(?:^|[^\\])\{[A-Za-z\w-]*$/.test(lineText)) {
-    return getMacroCompletions(workspace);
+    return inAttribute() ? [] : getMacroCompletions(workspace);
   }
   return [];
 }
@@ -60229,6 +60477,7 @@ var init_completions = __esm({
   "src/plugins/completions.ts"() {
     "use strict";
     init_macro_parser();
+    init_html_scanner();
     completionsPlugin = {
       id: "completions",
       capabilities: {
@@ -60467,11 +60716,13 @@ function getHoverInfo(uri, position, workspace) {
   const lines = text.split("\n");
   if (position.line >= lines.length) return null;
   const line = lines[position.line];
-  const macroResult = getMacroHover(line, position, workspace);
+  const offset = (buildLineStarts(text)[position.line] ?? 0) + position.character;
+  const inAttribute = inAttributeValue(text, offset);
+  const macroResult = inAttribute ? null : getMacroHover(line, position, workspace);
   if (macroResult) return macroResult;
   const varResult = getVariableHover(uri, line, position, workspace);
   if (varResult) return varResult;
-  const widgetResult = getWidgetHover(line, position, workspace);
+  const widgetResult = inAttribute ? null : getWidgetHover(line, position, workspace);
   if (widgetResult) return widgetResult;
   return null;
 }
@@ -60633,6 +60884,7 @@ var init_hover = __esm({
     "use strict";
     init_macro_parser();
     init_references();
+    init_html_scanner();
     hoverPlugin = {
       id: "hover",
       capabilities: {
@@ -61457,6 +61709,11 @@ function computeCodeActions(uri, diagnostics, workspace, options = {}) {
         if (action) actions.push(action);
         break;
       }
+      case DiagnosticCode.UnevaluatedAttributeBlock: {
+        const action = fixAttributeMacro(uri, diag, workspace);
+        if (action) actions.push(action);
+        break;
+      }
     }
   }
   return actions;
@@ -61699,6 +61956,21 @@ function fixNullVariableValue(uri, diag) {
     }]
   };
 }
+function fixAttributeMacro(uri, diag, workspace) {
+  const text = workspace.documents.getText(uri);
+  if (text === void 0) return null;
+  const lineStarts = buildLineStarts(text);
+  const offset = (p) => (lineStarts[p.line] ?? text.length) + p.character;
+  const source = text.slice(offset(diag.range.start), offset(diag.range.end));
+  const expression = conditionalExpression(source) ?? printExpression(source);
+  if (!expression) return null;
+  return {
+    title: `Rewrite as ${expression}`,
+    kind: "quickfix",
+    diagnosticCodes: [DiagnosticCode.UnevaluatedAttributeBlock],
+    edits: [{ uri, range: diag.range, newText: expression }]
+  };
+}
 function toLspRange6(r) {
   return {
     start: { line: r.start.line, character: r.start.character },
@@ -61713,6 +61985,8 @@ var init_code_actions = __esm({
     init_diagnostic_codes();
     init_config_loader();
     init_macro_sources();
+    init_attribute_blocks();
+    init_macro_parser();
     DEFAULT_CONFIG_FILENAME = "spindle.config.yaml";
     NEW_MACRO_ENTRY = { description: "" };
     codeActionsPlugin = {
@@ -62346,7 +62620,7 @@ var init_server4 = __esm({
 
 // src/bin.ts
 var args = process.argv.slice(2);
-var VERSION = "0.10.0";
+var VERSION = "0.11.0";
 var HELP = `spindle-lsp v${VERSION}
 Language Server Protocol server for Spindle story format