@@ -1,193 +1,76 @@
1use std::collections::{HashMap, HashSet};
1use std::collections::{HashMap, HashSet};
2use std::path::{Path, PathBuf};
3use std::path::{Path, PathBuf};
5use crate::ast::*;
5use crate::ast::*;
6−use crate::diagnostic::code;
6+use crate::syntax::{self, Syntax};
7−pub use crate::diagnostic::{Diagnostic, Severity};
8−use crate::interp::{self, Sink};
9−use crate::syntax::{self, DirectiveArgs, LetForm, NodeKind, Segment, Tree};
10−use crate::value::{self, Value};
12// ---------------------------------------------------------------------------
8// ---------------------------------------------------------------------------
13// Public types
9// Public types
14// ---------------------------------------------------------------------------
10// ---------------------------------------------------------------------------
12+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
20+#[derive(Debug, Clone)]
21+pub struct Diagnostic {
23+ pub column: Option<usize>,
25+ pub severity: Severity,
26+ pub source_line: Option<String>,
16pub struct ParseResult {
29pub struct ParseResult {
17 pub document: Document,
30 pub document: Document,
18 pub diagnostics: Vec<Diagnostic>,
31 pub diagnostics: Vec<Diagnostic>,
19 pub included_files: Vec<PathBuf>,
32 pub included_files: Vec<PathBuf>,
22−/// An error that stops one line from being evaluated.
35+#[derive(Debug)]
23−type ParseError = Diagnostic;
36+struct ParseError {
25−// ---------------------------------------------------------------------------
27−// ---------------------------------------------------------------------------
31− /// The parameters in the order they are declared; one without a
32− /// default is required.
33− params: Vec<syntax::Param>,
34− /// The definition's line and its text (when it is one physical line),
35− /// and its node, for diagnostics about a default.
36 line: usize,
37 line: usize,
37− source: Option<String>,
38+ message: String,
39− body: Vec<syntax::Node>,
40− /// The file it is defined in, when that isn't the file being compiled
41− /// (see `ParseContext::current_file`).
42− file: Option<String>,
43− /// The slots its body declares (`@slot NAME`), in order.
45− /// Whether its body has a `@children` for the content of a call.
47− /// Its scoped `@style`: its class (`hl-fn-NAME-HASH`), and the
48− /// stylesheet nested under it, written into the page once the function
49− /// is called (see `Document::scoped_css`).
50− scoped: Option<(String, String)>,
51− /// What was visible where it was defined: its body and its defaults
52− /// see this, plus its parameters.
54− /// It is named like a built-in element and its body calls that name
55− /// outside any `@if`, meaning the element (`@let @nav` around `@nav`):
56− /// it would call itself forever, so a call writes nothing (the
57− /// definition's error says so).
61−impl FnDef {
41+impl fmt::Display for ParseError {
62− fn is_param(&self, name: &str) -> bool {
42+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
63− self.params.iter().any(|p| p.name == name)
43+ write!(f, "line {}: {}", self.line, self.message)
67−/// What a name means: every `@let`, parameter, loop variable and `@data`
47+// ---------------------------------------------------------------------------
68−/// binds one, and they share one namespace.
48+// Internal types
69−#[derive(Clone)]
49+// ---------------------------------------------------------------------------
72− Bundle(Rc<Vec<Attribute>>),
76−/// The names visible at a line: one frame per block it is in (the
77−/// standard library, the file, an element's children, an `@if` branch, an
78−/// iteration of `@each`, a function's body), the innermost last. A
79−/// definition goes into the innermost frame, so it is visible from its
80−/// line to the end of its block. A function keeps the frames visible
81−/// where it is defined; a frame is shared until one side changes it.
82−#[derive(Clone, Default)]
84− frames: Vec<Rc<HashMap<String, Binding>>>,
89− self.frames.push(Rc::default());
96− /// Give `name` a meaning in the innermost frame, replacing what it
97− /// meant there and hiding what it means outside it.
98− fn define(&mut self, name: &str, binding: Binding) {
99− if self.frames.is_empty() {
102− if let Some(frame) = self.frames.last_mut() {
103− Rc::make_mut(frame).insert(name.to_string(), binding);
107− /// What `name` means here: the innermost definition.
108− fn get(&self, name: &str) -> Option<&Binding> {
109− self.frames.iter().rev().find_map(|frame| frame.get(name))
112− fn value(&self, name: &str) -> Option<&Value> {
113− match self.get(name)? {
114− Binding::Value(value) => Some(value),
119− fn bundle(&self, name: &str) -> Option<&Rc<Vec<Attribute>>> {
120− match self.get(name)? {
121− Binding::Bundle(attrs) => Some(attrs),
126− fn function(&self, name: &str) -> Option<&Rc<FnDef>> {
127− match self.get(name)? {
128− Binding::Function(function) => Some(function),
133− /// Every name visible here, with what it means.
134− fn visible(&self) -> HashMap<&str, &Binding> {
135− let mut names = HashMap::new();
136− for frame in &self.frames {
137− for (name, binding) in frame.iter() {
138− names.insert(name.as_str(), binding);
144− /// The names of the values visible here.
145− fn value_names(&self) -> Vec<&str> {
148− .filter(|(_, binding)| matches!(binding, Binding::Value(_)))
149− .map(|(name, _)| name)
153− /// The names of the bundles visible here.
154− fn bundle_names(&self) -> Vec<&str> {
157− .filter(|(_, binding)| matches!(binding, Binding::Bundle(_)))
158− .map(|(name, _)| name)
163−impl interp::Scope for Env {
51+#[derive(Clone)]
164− fn get(&self, name: &str) -> Option<Value> {
52+struct FnDef {
165− self.value(name).cloned()
53+ params: Vec<String>,
166− }
54+ defaults: HashMap<String, String>,
169struct ParseContext {
58struct ParseContext {
170 /// Source line currently being parsed, for diagnostics raised deep
59 /// Source line currently being parsed, for diagnostics raised deep
171 /// inside helpers that don't take a line number.
60 /// inside helpers that don't take a line number.
172 current_line: usize,
61 current_line: usize,
173− /// What the `@page` said, once one has run
62+ /// Functions whose body has a scoped @style block.
174− page: Option<Page>,
63+ scoped_functions: std::collections::HashSet<String>,
175− /// Where that `@page` is, for the error a second one gets
64+ page_title: Option<String>,
176− page_at: Option<String>,
65+ lang: Option<String>,
66+ favicon: Option<String>,
177 meta_tags: Vec<(String, String)>,
67 meta_tags: Vec<(String, String)>,
178 head_blocks: Vec<String>,
68 head_blocks: Vec<String>,
179− /// The first `@meta` or `@head` that ran, for the warning a file
69+ variables: HashMap<String, String>,
180− /// without `@page` gets: a fragment has no `<head>` for them.
70+ defines: HashMap<String, Vec<Attribute>>,
181− head_at: Option<usize>,
71+ functions: HashMap<String, FnDef>,
182− /// What each name means at the line being evaluated.
184− /// Every function whose definition ran, by name (the last one), for
185− /// the checks of code that never runs.
186− defined_functions: HashMap<String, Rc<FnDef>>,
187 css_vars: Vec<(String, String)>,
72 css_vars: Vec<(String, String)>,
188 custom_css: Vec<String>,
73 custom_css: Vec<String>,
189− /// The scoped `@style` of each function called so far
190− scoped_css: Vec<String>,
191 og_tags: Vec<(String, String)>,
74 og_tags: Vec<(String, String)>,
192 diagnostics: Vec<Diagnostic>,
75 diagnostics: Vec<Diagnostic>,
193 base_path: Option<PathBuf>,
76 base_path: Option<PathBuf>,
@@ -207,550 +90,35 @@ struct ParseContext {
207 fn_lines: HashMap<String, usize>,
90 fn_lines: HashMap<String, usize>,
208 /// Line numbers of attribute bundle definitions (name -> line)
91 /// Line numbers of attribute bundle definitions (name -> line)
209 define_lines: HashMap<String, usize>,
92 define_lines: HashMap<String, usize>,
210− /// Syntax nodes evaluated at least once, by id.
211− visited: HashSet<usize>,
212− /// The id the next parsed tree starts at, so ids are unique across
213− /// the file, its includes and the standard library.
215− /// The file's tree and those of the files it includes, with the
216− /// include chain that leads to each, for the checks of code that never
218− trees: Vec<(Rc<Tree>, Option<String>)>,
219− /// The files each `@include` line brought in (by the line's node id),
220− /// with the include chain that leads to each, so the checks of
221− /// `@slot` and `@children` see an included file's lines where the
222− /// `@include` is written.
223− included_by: Rc<IncludedBy>,
224− /// Every function defined anywhere in the file or the files it
225− /// includes, whether or not its definition runs.
226− namespace: HashSet<String>,
227− /// The line being evaluated, and its text as written when it is one
228− /// physical line, for diagnostics that point at a column.
229− current_source: (usize, Option<String>),
230− /// Variable diagnostics already reported, so a line evaluated many
231− /// times (in a loop, in a function) reports each problem once.
232− /// Keyed by the syntax node (ids are unique across files), line,
233− /// column and message.
234− reported: HashSet<(usize, usize, Option<usize>, String)>,
235− /// The id of the syntax node being evaluated.
236− current_node: usize,
237− /// The file whose lines are being evaluated, when it isn't the file
238− /// being compiled: the standard library, or an included file (by its
240− current_file: Option<String>,
241− /// A call went deeper than [`MAX_CALL_DEPTH`]: the calls it is nested
242− /// in expand to nothing, until the outermost one returns.
244− /// A bundle's attributes are being read: a name that could be a
245− /// parameter of the function the bundle is passed to is checked where
246− /// the bundle is used instead.
248− /// `@page`'s attributes are being read: a name close to `favicon` is
249− /// a misspelled word of `@page`'s.
253−/// How deeply function calls may nest, so that a function that calls
254−/// itself without an `@if` that stops it is an error instead of a hang.
255−const MAX_CALL_DEPTH: usize = 64;
257−/// A CSS rule at the top level of a stylesheet that starts with `&`
258−/// (outside any `{}`, strings and comments).
259−fn has_top_level_ampersand(css: &str) -> bool {
260− let mut depth = 0usize;
261− let mut chars = css.chars().peekable();
262− let mut at_rule_start = true;
263− while let Some(c) = chars.next() {
265− '/' if chars.peek() == Some(&'*') => {
268− for c in chars.by_ref() {
269− if last == '*' && c == '/' {
277− for d in chars.by_ref() {
284− '}' => depth = depth.saturating_sub(1),
285− '&' if depth == 0 && at_rule_start => return true,
288− at_rule_start = match c {
289− '{' | '}' | ';' => true,
290− c if c.is_whitespace() => at_rule_start,
297−/// Whether a file is a library (see [`Tree::is_library`]), with the files
298−/// its `@include` lines name read relative to `base`.
301− base: Option<&Path>,
302− ctx: &mut ParseContext,
303− seen: &mut Vec<PathBuf>,
305− tree.is_library_with(&mut |path| {
306− if path.contains('$') {
309− let resolved = base.map_or_else(|| PathBuf::from(path), |base| base.join(path));
310− if seen.contains(&resolved) {
313− seen.push(resolved.clone());
314− let Ok(text) = ctx.read_file(&resolved) else {
317− let included = syntax::parse(&text);
318− is_library_file(&included, resolved.parent(), ctx, seen)
322−/// The frames around the file's top level: the standard library's and
323−/// the file's own (see [`load_prelude`]).
324−const FILE_FRAMES: usize = 2;
326/// Evaluates a syntax tree (see `syntax.rs`) into the document's nodes.
95/// Evaluates a syntax tree (see `syntax.rs`) into the document's nodes.
327struct Evaluator;
96struct Evaluator;
329impl ParseContext {
98impl ParseContext {
330− /// Bind a value to `name` in the innermost block.
99+ /// Evaluate an expression (see `expr.rs`), reporting errors at `line`.
331− fn bind(&mut self, name: &str, value: Value) {
100+ fn eval(&mut self, src: &str, line: usize) -> Option<crate::expr::Value> {
332− self.env.define(name, Binding::Value(value));
335− /// Evaluate an expression (see `expr.rs`) written at `line` and
336− /// `column` (when known), reporting its errors there.
341− column: Option<usize>,
342− ) -> Option<crate::expr::Value> {
343 track_var_refs(src, &mut self.used_variables);
101 track_var_refs(src, &mut self.used_variables);
344− match crate::expr::eval(src, &self.env) {
102+ let vars = &self.variables;
103+ let result = crate::expr::eval(src, &|name: &str| lookup(vars, name));
345 Ok(value) => Some(value),
105 Ok(value) => Some(value),
346− Err(error) => {
106+ Err(message) => {
347− // Without the line to point into, show the expression
107+ self.diagnostics.push(Diagnostic {
348− let shown = matches!(&self.current_source, (current, Some(_)) if *current == line);
108+ line,
349− let before = self.diagnostics.len();
109+ column: None,
350− self.report(error.at(0), line, column);
110+ message: format!("invalid expression: {}", message),
351− if !shown && let Some(diagnostic) = self.diagnostics.get_mut(before) {
111+ severity: Severity::Error,
352− diagnostic.source_line = Some(src.into());
112+ source_line: Some(src.to_string()),
359 /// Evaluate a condition; an invalid one is reported and counts as false.
119 /// Evaluate a condition; an invalid one is reported and counts as false.
360− fn condition(&mut self, src: &str, line: usize, column: Option<usize>) -> bool {
120+ fn condition(&mut self, src: &str, line: usize) -> bool {
361− self.eval(src, line, column)
121+ self.eval(src, line).is_some_and(|value| value.truthy())
362− .is_some_and(|value| value.truthy())
365− /// Fill in one slot of htmlang text written at `line` and `column`
366− /// (when known), for `sink`: its escapes stand for themselves and its
367− /// variables are filled in (see `interp.rs`). What can't be filled is
368− /// left as written and reported; the flag says whether everything was
374− column: Option<usize>,
376− ) -> (String, bool) {
377− let (filled, ok) = self.fill_protected(raw, line, column, sink);
378− (restore_escapes(&filled), ok)
381− /// [`fill`](Self::fill) for text.
382− fn interpolate_text(&mut self, raw: &str, line: usize, column: Option<usize>) -> String {
383− self.fill(raw, line, column, Sink::Text).0
386− /// [`fill`](Self::fill), with the escapes still placeholders (see
387− /// [`protect_escapes`]).
392− column: Option<usize>,
394− ) -> (String, bool) {
395− let mut protected = protect_escapes(raw);
396− if sink == Sink::Css {
397− protected = keep_css_string_escapes(&protected);
399− if !protected.contains('$') {
400− return (protected, true);
402− track_var_refs(&protected, &mut self.used_variables);
403− let (out, problems) = interp::interpolate_for(&protected, &self.env, sink);
404− let filled = problems.is_empty();
405− for mut problem in problems {
406− match &mut problem {
407− interp::Problem::Undefined { offset, .. }
408− | interp::Problem::CustomProperty { offset, .. }
409− | interp::Problem::Invalid { offset, .. }
410− | interp::Problem::Record { offset, .. } => {
411− // An offset into the protected text, as one into `raw`
412− *offset = protected[..*offset]
414− .map(|c| escape_of(c).map_or(c.len_utf8(), str::len))
418− self.report(problem, line, column);
423− /// Fill in a value slot (an attribute's value, a `@let` value, `@meta`'s
424− /// value) for `sink`, and say whether it is quoted text: one `"..."`, or
425− /// one variable that holds quoted text. Quoted text keeps its quotes
431− column: Option<usize>,
433− ) -> (String, Option<Quoted>, bool) {
434− if let Some(inner) = syntax::quoted_string(raw) {
435− let (css, ok) = self.fill(raw, line, column, Sink::Css);
436− // Already reported by the CSS pass, so filled in quietly
437− let (text, _) = interp::interpolate(&protect_escapes(inner), &self.env);
438− let quoted = Quoted {
439− text: restore_escapes(&text),
442− let out = match sink {
443− Sink::Css => quoted.css.clone(),
444− Sink::Text => quoted.text.clone(),
446− return (out, Some(quoted), ok);
448− let (out, ok) = self.fill(raw, line, column, sink);
449− let quoted = whole_reference(raw, &self.env).and_then(|path| {
450− match interp::resolve(&path, &self.env)? {
451− Value::Quoted(quoted) => Some(quoted),
458− /// The value of a value slot (a `@let` value, the source of `@each`, a
459− /// parameter's value or default), written at `line` and `column`:
461− /// - exactly one `$name` or `${...}` is the value it holds or gives,
462− /// whatever its type (a list, a record, quoted text);
463− /// - one `"..."` is quoted text;
464− /// - commas outside quotes, brackets and `${...}`, and not escaped
465− /// (`\,`), make a list, which prints as written;
466− /// - `A..B` or `A..B step N` with whole numbers is a range;
467− /// - anything else is text, with its variables filled in.
469− /// What can't be filled in is reported; the flag says whether
471− fn slot_value(&mut self, raw: &str, line: usize, column: Option<usize>) -> (Value, bool) {
472− let trimmed = raw.trim();
473− let column = column.map(|c| c + (raw.len() - raw.trim_start().len()));
474− if let Some(value) = self.whole_value(trimmed, line, column) {
477− if syntax::quoted_string(trimmed).is_some() {
478− let (text, quoted, ok) = self.fill_value(trimmed, line, column, Sink::Text);
479− return (quoted.map_or(Value::Str(text), Value::Quoted), ok);
481− let parts = syntax::split_list(trimmed);
482− if parts.len() > 1 {
483− // Each item is a value of its own; the list prints as written
484− let mut items = Vec::new();
485− let mut written = String::new();
489− let item = &trimmed[part.clone()];
490− let lead = item.len() - item.trim_start().len();
491− written.push_str(&trimmed[end..part.start + lead]);
492− end = part.start + lead + item.trim().len();
493− if item.trim().is_empty() {
496− let at = column.map(|c| c + part.start + lead);
497− let (value, text, filled) = self.item_value(item.trim(), line, at);
499− written.push_str(&text);
502− written.push_str(&trimmed[end..]);
503− let list = value::List {
504− items: Rc::new(items),
505− written: Some(written.into()),
507− return (Value::List(list), ok);
509− let (text, ok) = self.fill(trimmed, line, column, Sink::Text);
510− match value::written_range(&text) {
511− Some(Ok(range)) => (range, ok),
512− Some(Err(message)) => {
514− interp::Problem::Invalid { message, offset: 0 },
518− (Value::list(Vec::new()), false)
520− None => (Value::Str(text), ok),
524− /// An item of a list written in the source (see
525− /// [`slot_value`](Self::slot_value)), and how it is written in the
531− column: Option<usize>,
532− ) -> (Value, String, bool) {
533− let (value, ok) = match self.whole_value(item, line, column) {
534− Some(value) => value,
535− None if syntax::quoted_string(item).is_some() => {
536− let (text, quoted, ok) = self.fill_value(item, line, column, Sink::Text);
537− (quoted.map_or(Value::Str(text), Value::Quoted), ok)
540− let (text, ok) = self.fill(item, line, column, Sink::Text);
541− (Value::Str(text), ok)
544− // Quoted text keeps its quotes in the list's text, as written
547− .map_or_else(|| value.to_string(), str::to_string);
551− /// The value of a slot that is exactly one `$name` or `${...}`, with its
552− /// type; `None` when it is anything else.
557− column: Option<usize>,
558− ) -> Option<(Value, bool)> {
559− let after = raw.strip_prefix('$')?;
560− let (reference, len) = interp::reference(after, &self.env)?;
561− if len != after.len() {
564− track_var_refs(raw, &mut self.used_variables);
565− let problem = match reference {
566− interp::Reference::Var(path) => match interp::resolve(&path, &self.env) {
567− Some(value) => return Some((value, true)),
568− None => interp::Problem::Undefined {
573− interp::Reference::Expr(source) => match crate::expr::eval(source, &self.env) {
574− Ok(value) => return Some((value, true)),
575− Err(crate::expr::Error::Invalid(message)) => {
576− interp::Problem::Invalid { message, offset: 0 }
578− Err(error) => error.at(2),
581− self.report(problem, line, column);
582− Some((Value::Str(raw.to_string()), false))
585− /// Report a variable that can't be filled in, or an invalid `${...}`,
586− /// at `offset` from `column`.
587− fn report(&mut self, problem: interp::Problem, line: usize, column: Option<usize>) {
588− let (line_text, column) = match &self.current_source {
589− // The column is only shown with the line it points into
590− (current, Some(text)) if *current == line => (Some(text.clone()), column),
593− let diagnostic = match problem {
594− interp::Problem::Undefined { name, offset } => {
595− let column = column.map(|c| c + offset);
596− let mut diagnostic = self.undefined(&name, line);
597− if let Some(column) = column {
598− diagnostic = diagnostic.column(column);
602− interp::Problem::Invalid { message, offset } => {
603− let diagnostic = Diagnostic::error(
604− code::INVALID_EXPRESSION,
606− format!("invalid expression: {}", message),
609− Some(column) => diagnostic.column(column + offset),
613− interp::Problem::CustomProperty { name, offset } => {
614− let diagnostic = Diagnostic::error(
615− code::INVALID_VALUE,
617− interp::custom_property_message(&name),
619− .subject(format!("${}", name))
620− .suggest(Some(format!("var({})", name)));
622− Some(column) => diagnostic.column(column + offset),
626− interp::Problem::Record { message, offset } => {
627− let diagnostic = Diagnostic::error(code::INVALID_VALUE, line, message);
629− Some(column) => diagnostic.column(column + offset),
634− let diagnostic = match line_text {
635− Some(text) => diagnostic.source(text),
638− self.push_once(diagnostic);
641− /// Report a diagnostic unless the node being evaluated already did,
642− /// so a line evaluated many times (in a loop, in a function) reports
643− /// each problem once.
644− fn push_once(&mut self, diagnostic: Diagnostic) {
649− diagnostic.message.clone(),
651− if self.reported.insert(key) {
652− self.diagnostics.push(diagnostic);
656− /// The error for `$name` with no definition: what the name is if it is
657− /// something else, or the closest defined name.
658− fn undefined(&mut self, name: &str, line: usize) -> Diagnostic {
659− if self.env.bundle(name).is_some() {
660− // Reported here, so not also as unused
661− self.used_defines.insert(name.to_string());
662− return Diagnostic::error(
663− code::UNDEFINED_VARIABLE,
666− "'${}' is an attribute bundle, not a value: it goes in an attribute list \
667− as a whole attribute, `[${}]`",
673− if self.env.function(name).is_some() {
674− self.used_functions.insert(name.to_string());
675− return Diagnostic::error(
676− code::UNDEFINED_VARIABLE,
679− "'${}' is a function, not a value: it is called as an element, `@{}`",
685− // `$i-label` where `$i` is defined: a `-` joins a name
686− if let Some((defined, rest)) = name
688− .map(|(i, _)| (&name[..i], &name[i..]))
689− .find(|(before, _)| self.env.value(before).is_some())
691− return Diagnostic::error(
692− code::UNDEFINED_VARIABLE,
695− "undefined variable '${}': a `-` is part of a name. For '${}' followed \
696− by '{}', write `${{{}}}{}`",
697− name, defined, rest, defined, rest
702− let suggestion = suggest_var_name(name, &self.env.value_names());
703− let message = match (&suggestion, self.let_lines.get(name)) {
704− (Some(closest), _) => format!(
705− "undefined variable '${}', did you mean '${}'?",
708− // Defined, but not where this line can see it
709− (None, Some(_)) => format!(
710− "undefined variable '${}': a `@let` defines it, but not where this line \
711− can see it. A definition is visible from its line to the end of its \
712− block, and a function's body sees what is defined above the function",
715− (None, None) => format!("undefined variable '${}'", name),
717− Diagnostic::error(code::UNDEFINED_VARIABLE, line, message)
719− .suggest(suggestion)
722− /// Note the node being evaluated, for diagnostics.
723− fn enter(&mut self, node: &syntax::Node) {
724− self.current_line = node.span.line;
725− self.current_node = node.id;
727− (node.line_count <= 1).then(|| format!("{}{}", " ".repeat(node.indent), node.source));
728− self.current_source = (node.span.line, text);
731− /// Parse a file's text into a tree whose ids don't clash with the
732− /// trees parsed before it.
733− fn parse_tree(&mut self, text: &str) -> Rc<Tree> {
734− let tree = syntax::parse_from(text, self.next_id);
735− self.next_id = tree.end_id;
739− /// Read a file (once), relative to the current file.
740− fn read_file(&mut self, resolved: &Path) -> std::io::Result<String> {
741− if let Some(cached) = self.file_cache.get(resolved) {
742− return Ok(cached.clone());
744− let text = std::fs::read_to_string(resolved)?;
745− self.file_cache.insert(resolved.to_path_buf(), text.clone());
749− fn resolve(&self, filename: &str) -> PathBuf {
750− match &self.base_path {
751− Some(base) => base.join(filename),
752− None => PathBuf::from(filename),
@@ -759,19 +127,11 @@ impl ParseContext {
759const PRELUDE: &str = include_str!("std.hl");
127const PRELUDE: &str = include_str!("std.hl");
761fn load_prelude(ctx: &mut ParseContext) {
129fn load_prelude(ctx: &mut ParseContext) {
762− // The library's definitions are in a block of their own, around the
130+ let _ = Evaluator.eval_block(&syntax::parse(PRELUDE), ctx);
763− // file's, so the file's own `@let` of the same name hides them
765− let tree = ctx.parse_tree(PRELUDE);
766− collect_namespace(&tree.nodes, None, &mut HashSet::new(), ctx);
767− ctx.current_file = Some("std.hl".to_string());
768− let _ = Evaluator.eval_block(&tree.nodes, ctx);
769− ctx.current_file = None;
770 // Library definitions aren't the file's own: never report them unused.
131 // Library definitions aren't the file's own: never report them unused.
771 ctx.fn_lines.clear();
132 ctx.fn_lines.clear();
772 ctx.define_lines.clear();
133 ctx.define_lines.clear();
773 ctx.let_lines.clear();
134 ctx.let_lines.clear();
777pub fn parse(input: &str) -> ParseResult {
137pub fn parse(input: &str) -> ParseResult {
@@ -779,18 +139,20 @@ pub fn parse(input: &str) -> ParseResult {
781pub fn parse_with_base(input: &str, base_path: Option<&Path>) -> ParseResult {
141pub fn parse_with_base(input: &str, base_path: Option<&Path>) -> ParseResult {
142+ let tree = syntax::parse(input);
782 let mut ctx = ParseContext {
143 let mut ctx = ParseContext {
783 current_line: 0,
144 current_line: 0,
784− page: None,
145+ scoped_functions: std::collections::HashSet::new(),
785− page_at: None,
146+ page_title: None,
786 meta_tags: Vec::new(),
149 meta_tags: Vec::new(),
787 head_blocks: Vec::new(),
150 head_blocks: Vec::new(),
788− head_at: None,
151+ variables: HashMap::new(),
789− env: Env::default(),
152+ defines: HashMap::new(),
790− defined_functions: HashMap::new(),
153+ functions: HashMap::new(),
791 css_vars: Vec::new(),
154 css_vars: Vec::new(),
792 custom_css: Vec::new(),
155 custom_css: Vec::new(),
793− scoped_css: Vec::new(),
794 og_tags: Vec::new(),
156 og_tags: Vec::new(),
795 diagnostics: Vec::new(),
157 diagnostics: Vec::new(),
796 base_path: base_path.map(|p| p.to_path_buf()),
158 base_path: base_path.map(|p| p.to_path_buf()),
@@ -804,84 +166,22 @@ pub fn parse_with_base(input: &str, base_path: Option<&Path>) -> ParseResult {
804 let_lines: HashMap::new(),
166 let_lines: HashMap::new(),
805 fn_lines: HashMap::new(),
167 fn_lines: HashMap::new(),
806 define_lines: HashMap::new(),
168 define_lines: HashMap::new(),
807− visited: HashSet::new(),
810− included_by: Rc::default(),
811− namespace: HashSet::new(),
812− current_source: (0, None),
813− reported: HashSet::new(),
820 load_prelude(&mut ctx);
170 load_prelude(&mut ctx);
821− let tree = ctx.parse_tree(input);
171+ let nodes = Evaluator.eval_block(&tree, &mut ctx);
822− ctx.diagnostics.extend(tree.diagnostics.iter().cloned());
172+ validate_tree(&nodes, None, &mut ctx.diagnostics);
823− ctx.trees.push((tree.clone(), None));
173+ check_unused(&mut ctx);
826− base_path.map(Path::to_path_buf),
827− &mut HashSet::new(),
830− let nodes = Evaluator.eval_block(&tree.nodes, &mut ctx);
831− check_unevaluated(&mut ctx);
832− check_slot_places(&mut ctx);
833− validate_tree(&nodes, None, false, &mut ctx.diagnostics);
834− // A library's definitions are for the files that include it
835− let library = is_library_file(&tree, base_path, &mut ctx, &mut Vec::new());
836− let exported: HashSet<String> = if library {
839− .filter_map(|node| match node.directive().map(|d| &d.args) {
840− Some(DirectiveArgs::Let(def)) => Some(def.name.clone()),
847− check_unused(&mut ctx, &exported);
848− if let (None, Some(line)) = (&ctx.page, ctx.head_at)
851− ctx.diagnostics.push(Diagnostic::warning(
854− "a file without @page is a fragment, which has no <head>: @meta and @head are \
855− left out of it (give the file a @page, or put them in the page that includes it)"
859− dedupe(&mut ctx.diagnostics);
860− // What the file itself defines at its top level
861− let file = ctx.env.frames.last().cloned().unwrap_or_default();
862− let mut variables = HashMap::new();
863− let mut defines = HashMap::new();
864− for (name, binding) in file.iter() {
866− Binding::Value(value) => {
867− variables.insert(name.clone(), value.to_string());
869− Binding::Bundle(attrs) => {
870− defines.insert(name.clone(), attrs.to_vec());
872− Binding::Function(_) => {}
875 ParseResult {
174 ParseResult {
876 document: Document {
175 document: Document {
877− page: ctx.page,
176+ page_title: ctx.page_title,
178+ favicon: ctx.favicon,
878 meta_tags: ctx.meta_tags,
179 meta_tags: ctx.meta_tags,
879 head_blocks: ctx.head_blocks,
180 head_blocks: ctx.head_blocks,
880− variables,
181+ variables: ctx.variables,
881− defines,
182+ defines: ctx.defines,
882 css_vars: ctx.css_vars,
183 css_vars: ctx.css_vars,
883 custom_css: ctx.custom_css,
184 custom_css: ctx.custom_css,
884− scoped_css: ctx.scoped_css,
885 og_tags: ctx.og_tags,
185 og_tags: ctx.og_tags,
@@ -891,873 +191,444 @@ pub fn parse_with_base(input: &str, base_path: Option<&Path>) -> ParseResult {
893// ---------------------------------------------------------------------------
193// ---------------------------------------------------------------------------
894−// Code that never runs: an untaken branch, an uncalled function, a loop over
194+// Preprocessing: strip comments/blanks, collapse @raw blocks
896// ---------------------------------------------------------------------------
195// ---------------------------------------------------------------------------
898−/// Collect the functions defined anywhere in `nodes` and in the files they
197+// ---------------------------------------------------------------------------
899−/// include (by a literal path), into `ctx.namespace`.
198+// Evaluation
900−fn collect_namespace(
199+// ---------------------------------------------------------------------------
901− nodes: &[syntax::Node],
200+
902− base: Option<PathBuf>,
201+impl Evaluator {
903− seen: &mut HashSet<PathBuf>,
202+ fn eval_block(&mut self, block: &[Syntax], ctx: &mut ParseContext) -> Vec<Node> {
904− ctx: &mut ParseContext,
203+ let mut nodes = Vec::new();
905−) {
204+ for node in block {
906− let mut includes = Vec::new();
205+ match self.eval(node, ctx) {
907− for node in nodes {
206+ Ok(Some(new_nodes)) => nodes.extend(new_nodes),
908− node.walk(&mut |node| match node.directive().map(|d| &d.args) {
207+ Ok(None) => {}
909− Some(DirectiveArgs::Let(def)) if matches!(def.form, LetForm::Function(_)) => {
208+ // Record the error and go on, to report several in one pass
910− ctx.namespace.insert(def.name.clone());
209+ Err(e) => ctx.diagnostics.push(Diagnostic {
912− Some(DirectiveArgs::Text(Some(path))) if node.is_directive("include") => {
211+ column: None,
913− includes.push(path.raw.clone());
212+ message: e.message,
213+ severity: Severity::Error,
214+ source_line: Some(node.source()),
918− for path in includes {
919− let path = path.trim_matches('"');
920− if path.contains('$') {
923− let resolved = match &base {
924− Some(base) => base.join(path),
925− None => PathBuf::from(path),
927− if !seen.insert(resolved.clone()) {
930− let Ok(text) = ctx.read_file(&resolved) else {
218+ nodes
933− let tree = syntax::parse(&text);
934− let parent = resolved.parent().map(Path::to_path_buf);
935− collect_namespace(&tree.nodes, parent, seen, ctx);
939−/// Check the lines that were never evaluated: element and function names,
221+ /// Evaluate a block in its own scope: `@let` inside doesn't leak out.
940−/// and the attributes of built-in elements (those that don't depend on a
222+ fn eval_scoped(&mut self, block: &[Syntax], ctx: &mut ParseContext) -> Vec<Node> {
941−/// variable). Names that come from data are only checked when evaluated.
223+ let saved_vars = ctx.variables.clone();
942−fn check_unevaluated(ctx: &mut ParseContext) {
224+ let nodes = self.eval_block(block, ctx);
943− let trees = std::mem::take(&mut ctx.trees);
225+ ctx.variables = saved_vars;
944− let mut seen = HashSet::new();
226+ nodes
945− for (tree, chain) in &trees {
946− let before = ctx.diagnostics.len();
947− for node in &tree.nodes {
948− check_unevaluated_node(node, ctx);
950− let mut found = ctx.diagnostics.split_off(before);
951− if let Some(chain) = chain {
952− for d in &mut found {
953− d.message = format!("{}\n in {}", d.message, chain);
956− // A file included twice is checked twice: report each problem once
957− found.retain(|d| seen.insert((d.line, d.message.clone())));
958− ctx.diagnostics.extend(found);
963−fn check_unevaluated_node(node: &syntax::Node, ctx: &mut ParseContext) {
229+ fn eval(&mut self, node: &Syntax, ctx: &mut ParseContext) -> Result<Option<Vec<Node>>, ParseError> {
964− if !ctx.visited.contains(&node.id) {
230+ let line_num = node.line();
965− let line = node.span.line;
231+ ctx.current_line = line_num;
966− // A reference from code that doesn't run still counts as a use
232+ let (content, current_indent, children) = match node {
967− track_var_refs(&node.source, &mut ctx.used_variables);
233+ Syntax::Raw { text, .. } => return Ok(Some(vec![Node::Raw(text.clone())])),
968− let before = ctx.diagnostics.len();
234+ Syntax::Function { name, params, defaults, body, .. } => {
969− match &node.kind {
235+ self.define_function(name, params, defaults, body, line_num, ctx);
970− NodeKind::Element(element) => {
236+ return Ok(None);
971− for head in &element.chain {
237+ }
972− check_head(head, line, ctx);
238+ Syntax::If { branches } => {
973− }
239+ // Every condition is checked (and its errors reported);
974− check_unevaluated_content(node, element, ctx);
240+ // the first that holds picks the branch.
975− if let Some(text) = &element.text {
241+ let mut chosen = None;
976− check_inline_heads(text, line, ctx);
242+ for branch in branches {
243+ let holds = match &branch.condition {
244+ Some(condition) => ctx.condition(condition, branch.line),
247+ if holds && chosen.is_none() {
248+ chosen = Some(&branch.body);
251+ return Ok(chosen.map(|body| self.eval_scoped(body, ctx)));
979− NodeKind::Text(text) => check_inline_heads(text, line, ctx),
253+ Syntax::Each { header, body, empty, .. } => {
980− // `@page`'s attributes are checked like an element's (a layout's
254+ return self.eval_each(header, body, empty, line_num, ctx).map(Some);
981− // `@page` is in a function that may not run in this file)
982− NodeKind::Directive(syntax::Directive {
984− DirectiveArgs::Page {
985− attrs: Some(list), ..
989− let words: Vec<String> = crate::vocab::PAGE_WORDS
991− .map(|w| w.to_string())
994− check_attrs(&list.attrs, line, ctx, &words);
995− ctx.in_page = false;
996− check_page_tokens(&list.attrs, line, ctx);
998− _ => {}
256+ Syntax::Line { text, indent, children, .. } => (text.clone(), *indent, children),
1000− let text = written_line(node);
1001− for d in &mut ctx.diagnostics[before..] {
1002− d.source_line.get_or_insert_with(|| text.as_str().into());
1005− for child in &node.children {
1006− check_unevaluated_node(child, ctx);
1010−/// Check the content passed to the calls of a line that was never
1011−/// evaluated: its `@slot NAME` blocks, and, for a function without
1012−/// `@children`, any other content.
1013−fn check_unevaluated_content(
1014− node: &syntax::Node,
1015− element: &syntax::ElementLine,
1016− ctx: &mut ParseContext,
1018− let calls: Vec<Option<(String, Rc<FnDef>)>> = element
1022− let function = ctx.defined_functions.get(&head.name)?;
1023− Some((head.name.clone(), function.clone()))
1026− check_fillers(node, element, &calls, ctx);
1027− let last = calls.len() - 1;
1028− for (i, call) in calls.iter().enumerate() {
1029− let Some((name, function)) = call else {
1032− if function.has_children || function.wraps_itself {
1035− let content = if i == last {
1036− element.text.is_some() || holds_content(&node.children, ctx)
1038− element.chain[i + 1].name != "slot" || !slot_is_built_in(ctx)
1041− let head = &element.chain[i];
1042− ctx.push_once(no_children(
1045− name_column(head, node.span.line),
1051−/// Check a head that was never evaluated: its name, and its attributes
259+ // --- Directives ---
1052−/// (for a call, see [`check_call`]).
260+
1053−fn check_head(head: &syntax::Head, line: usize, ctx: &mut ParseContext) {
261+ // @page [lang en, favicon /f.png] Title
1054− let is_function =
262+ if let Some(rest) = content.strip_prefix("@page ") {
1055− ctx.namespace.contains(&head.name) || ctx.defined_functions.contains_key(&head.name);
263+ let rest = rest.trim_start();
1056− if is_function {
264+ let title = if rest.starts_with('[') {
1057− ctx.used_functions.insert(head.name.clone());
265+ let (attrs, title) = parse_attr_brackets_no_validate(rest, line_num, ctx)?;
1058− if let Some(function) = ctx.defined_functions.get(&head.name).cloned()
266+ for attr in attrs {
1059− && !function.wraps_itself
267+ let value = attr.value.unwrap_or_default();
1060− {
268+ match attr.key.as_str() {
1061− check_call(head, &function, line, ctx);
269+ "lang" => ctx.lang = Some(value),
270+ "favicon" => ctx.favicon = Some(value),
271+ other => ctx.diagnostics.push(Diagnostic {
275+ "unknown @page attribute '{}' (expected lang or favicon)",
278+ severity: Severity::Warning,
279+ source_line: Some(content.clone()),
287+ ctx.page_title = Some(substitute_vars(title.trim(), &ctx.variables));
1065− let kind = match parse_element_kind(&head.name, line, ctx) {
1068− ctx.diagnostics.push(e);
1072− if let Some(list) = &head.attrs {
1073− check_attrs(&list.attrs, line, ctx, &[]);
1074− // A word for laying out children on an element that doesn't lay
1075− // them out, as where the code runs (see `validate_tree`)
1076− if !kind.layout().is_container() && !has_no_element(&kind) {
1077− for attr in &list.attrs {
1078− let base = crate::vocab::base_attribute(&attr.key);
1080− && attr.choice.is_none()
1081− && attr.prefixed.is_none()
1082− && crate::vocab::CONTAINER_ATTRIBUTES.contains(&base)
1083− && !crate::vocab::split_prefixes(&attr.key)
1085− .contains(&"children:")
1087− ctx.push_once(not_a_container(&kind, line, base).column(attr.span.column));
1094−/// The attributes of a list that is never evaluated that can be checked
1095−/// together: not bundles or `if()`s. Names are checked; a value with a
1096−/// variable in it depends on what the variable holds, so only a literal
1097−/// value is (the other is checked as an empty value).
1098−/// `@page`'s own rules (see `check_page_attr`) for a list that isn't
1099−/// evaluated, as written: a value made from a variable counts as given.
1100−fn check_page_tokens(tokens: &[syntax::Attr], line: usize, ctx: &mut ParseContext) {
1101− for token in tokens {
1102− match &token.choice {
1104− for branch in &choice.branches {
1105− check_page_tokens(branch.attrs(), line, ctx);
1108− // Under prefixes there are only styles
1109− None if token.key.starts_with('$') || token.prefixed.is_some() => {}
1111− let value = token.value.as_deref().map(|v| v.trim_matches('"'));
1112− let value = match value {
1113− Some(v) if v.contains('$') => Some("$"),
1121− Some(token.span.column),
1129−fn literal_attrs(tokens: &[syntax::Attr]) -> Vec<syntax::Attr> {
1130− // A prefixed group is checked with its prefixes, as far as its own
1131− // attributes can be; a prefixed bundle or `if()` depends on what it holds
1132− let group = |a: &syntax::Attr| {
1133− let prefixed = a.prefixed.as_ref()?;
1134− let syntax::Branch::Group { list, trailing } = &prefixed.target else {
1137− let mut list = list.clone();
1138− list.attrs = literal_attrs(&list.attrs);
1139− let mut a = a.clone();
1140− a.prefixed = Some(Box::new(syntax::Prefixed {
1141− target: syntax::Branch::Group {
1143− trailing: trailing.clone(),
1145− ..(**prefixed).clone()
1149− let groups = tokens.iter().filter_map(group);
1153− let bundle = a.key.starts_with('$') && a.value.is_none() && !a.html;
1154− a.choice.is_none() && a.prefixed.is_none() && !bundle
1157− let mut a = a.clone();
1158− let variable = |v: &String| v.contains('$');
1159− if !a.key.contains('$') && a.value.as_ref().is_some_and(variable) {
1160− a.value = Some(String::new());
1161− a.raw = format!("{} ", a.key);
1169−/// Check a call that was never evaluated: how it passes its parameters
1170−/// (none written `name=value`, and every one without a default passed,
1171−/// when no bundle or `if()` could pass it), and its other attributes, like
1172−/// those of an element.
1173−fn check_call(head: &syntax::Head, function: &FnDef, line: usize, ctx: &mut ParseContext) {
1174− let name = head.name.as_str();
1175− let attrs = head.attrs.as_ref().map_or(&[][..], |list| &list.attrs[..]);
1176− written_parameter_forms(name, function, attrs, line, ctx);
1177− if let Some(list) = &head.attrs {
1178− let params: Vec<String> = function.params.iter().map(|p| p.name.clone()).collect();
1179− check_attrs(&list.attrs, line, ctx, ¶ms);
1181− let unknown = attrs
1183− .any(|a| a.choice.is_some() || (a.key.starts_with('$') && a.value.is_none()));
1187− for param in function.params.iter().filter(|p| p.default.is_none()) {
1188− if !attrs.iter().any(|a| a.key == param.name) {
1189− let column = name_column(head, line);
1190− ctx.push_once(missing_parameter(name, ¶m.name, line, column));
1195−/// Report each parameter a call's list writes `name=value`, with the value
292+ if let Some(rest) = content.strip_prefix("@let ") {
1196−/// as written and its column; returns their names, so the evaluated call
293+ let rest = rest.trim();
1197−/// doesn't report them again.
1198−fn written_parameter_forms(
1201− attrs: &[syntax::Attr],
1203− ctx: &mut ParseContext,
1205− let mut reported = Vec::new();
1206− for attr in attrs {
1207− if !(attr.html && function.is_param(&attr.key)) {
1210− let at = if attr.span.line == 0 {
1215− let value = attr.value.as_deref().unwrap_or("");
1216− let diagnostic = parameter_form(name, &attr.key, value, at).column(attr.span.column);
1217− ctx.push_once(match &ctx.current_source {
1218− (current, Some(text)) if *current == at => diagnostic.source(text.clone()),
1221− reported.push(attr.key.clone());
1226−fn check_inline_heads(text: &syntax::Text, line: usize, ctx: &mut ParseContext) {
295+ if !children.is_empty() {
1227− for segment in &text.segments {
296+ return Err(ParseError {
1228− if let Segment::Inline(inline) = segment {
297+ line: line_num,
1229− check_head(&inline.head, line, ctx);
298+ message: "@let with body requires a name".to_string(),
1230− if let Some(text) = &inline.text {
299+ });
1231− check_inline_heads(text, line, ctx);
1237−// ---------------------------------------------------------------------------
1239−// ---------------------------------------------------------------------------
1241−/// The `@else` lines that continue the `@if` or `@each` before `from`, and
1242−/// the position after them.
1243−fn else_branches(block: &[syntax::Node], from: usize, is_if: bool) -> (Vec<&syntax::Node>, usize) {
1244− let mut branches = Vec::new();
1245− let mut next = from;
1247− while i < block.len() {
1248− let node = &block[i];
1250− if node.is_trivia() {
1253− let condition = match node.directive().map(|d| &d.args) {
1254− Some(DirectiveArgs::Else { condition }) => condition.is_some(),
1257− if condition && !is_if {
1260− branches.push(node);
1269−impl Evaluator {
302+ if let Some((name, value)) = rest.split_once(' ') {
1270− fn eval_block(&mut self, block: &[syntax::Node], ctx: &mut ParseContext) -> Vec<Node> {
303+ let value = value.trim();
1271− let mut nodes = Vec::new();
304+ // `@let name = EXPR` computes its value (see expr.rs); any
1272− let mut i = 0;
305+ // other value is literal text with `$var` interpolation.
1273− while i < block.len() {
306+ if let Some(expression) = value.strip_prefix('=') {
1274− let node = &block[i];
307+ let value = ctx
1275− i += 1;
308+ .eval(expression.trim(), line_num)
1276− if node.is_trivia() {
309+ .map(|v| v.to_string())
1277− continue;
310+ .unwrap_or_default();
1278− }
311+ if name.starts_with("--") {
1279− let result = match node.directive().map(|d| d.name()) {
312+ ctx.css_vars.push((name.to_string(), value.clone()));
1280− Some(name @ ("if" | "each")) => {
1281− let (branches, next) = else_branches(block, i, name == "if");
1284− Ok(Some(self.eval_if(node, &branches, ctx)))
1286− self.eval_each(node, branches.first().copied(), ctx)
314+ ctx.variables.insert(name.to_string(), value);
315+ ctx.let_lines.entry(name.to_string()).or_insert(line_num);
1289− // Reported as a syntax error
1291− ctx.visited.insert(node.id);
1294− _ => self.eval(node, ctx),
1297− Ok(Some(new_nodes)) => nodes.extend(new_nodes),
1299− // Record the error and go on, to report several in one pass
1302− .get_or_insert_with(|| node.source.as_str().into());
1303− ctx.diagnostics.push(e);
1310− /// Evaluate a block in its own scope: what it defines is visible to
1311− /// the end of the block, and not after it.
1312− fn eval_scoped(&mut self, block: &[syntax::Node], ctx: &mut ParseContext) -> Vec<Node> {
1314− let nodes = self.eval_block(block, ctx);
1319− /// `@if` with its `@else if` / `@else` branches. Every condition is
319+ // Attribute bundle: @let name [attr1, attr2, ...]
1320− /// checked (and its errors reported); the first that holds picks the
320+ if value.starts_with('[') {
1321− /// branch.
321+ let (attrs, _) = parse_attr_brackets(value, line_num, ctx)?;
1322− fn eval_if(
322+ ctx.defines.insert(name.to_string(), attrs);
1323− &mut self,
323+ ctx.define_lines.entry(name.to_string()).or_insert(line_num);
1324− node: &syntax::Node,
324+ return Ok(None);
1325− branches: &[&syntax::Node],
1326− ctx: &mut ParseContext,
1328− let mut chosen = None;
1329− for branch in std::iter::once(node).chain(branches.iter().copied()) {
1330− ctx.visited.insert(branch.id);
1332− let holds = match branch.directive().map(|d| &d.args) {
1333− Some(DirectiveArgs::Condition(condition))
1334− | Some(DirectiveArgs::Else {
1335− condition: Some(condition),
1337− !condition.raw.is_empty()
1341− Some(condition.span.column),
1344− Some(DirectiveArgs::Else { condition: None }) => true,
1345− // A syntax error, already reported
1348− if holds && chosen.is_none() {
1349− chosen = Some(&branch.children);
1352− chosen.map_or_else(Vec::new, |body| self.eval_scoped(body, ctx))
1355− fn eval(
327+ let value = if value.starts_with('"') && value.ends_with('"') && value.len() >= 2 {
1356− &mut self,
328+ // Support quoted string interpolation: @let greeting "Hello $name"
1357− node: &syntax::Node,
329+ &value[1..value.len() - 1]
1358− ctx: &mut ParseContext,
330+ } else {
1359− ) -> Result<Option<Vec<Node>>, ParseError> {
331+ value
1360− ctx.visited.insert(node.id);
332+ };
1361− ctx.enter(node);
333+ track_var_refs(value, &mut ctx.used_variables);
1362− match &node.kind {
334+ let value = substitute_vars(value, &ctx.variables);
1363− NodeKind::Blank | NodeKind::Comment => Ok(None),
335+ if name.starts_with("--") {
1364− // `@code` and `@textarea` show their body as text; `@script`'s
336+ // CSS custom property
1365− // goes into the page as it is
337+ ctx.css_vars.push((name.to_string(), value.clone()));
1366− NodeKind::Verbatim(body) if body.escaped => {
1367− let text = body.text.trim_matches('\n').to_string();
1368− Ok(Some(vec![Node::Text(vec![TextSegment::Plain(text)])]))
1370− NodeKind::Verbatim(body) => Ok(Some(vec![Node::Raw(body.text.clone())])),
1371− NodeKind::Directive(directive) => {
1372− let mut nodes = self.eval_directive(node, directive, ctx)?;
1373− // A directive that takes no body: the lines indented under
1374− // it (a syntax error) are evaluated as its siblings. A
1375− // @let's body belongs to it even under a value (also an
1376− // error), so it is never evaluated in place.
1377− let takes_body = directive.spec.body != BodyKind::None;
1379− let siblings = self.eval_block(&node.children, ctx);
1380− nodes.get_or_insert_with(Vec::new).extend(siblings);
1382− Ok(nodes)
339+ ctx.variables.insert(name.to_string(), value);
1383− }
340+ ctx.let_lines.entry(name.to_string()).or_insert(line_num);
1384− NodeKind::Element(element) => self.eval_element(node, element, ctx).map(Some),
1385− NodeKind::Text(text) => {
1386− let mut nodes = vec![Node::Text(text_segments(text, ctx))];
1387− // Text takes no body: lines indented under it are its
1389− nodes.extend(self.eval_block(&node.children, ctx));
1395− fn eval_directive(
345+ // @meta NAME VALUE; `og:` names become Open Graph property tags
1396− &mut self,
346+ if let Some(rest) = content.strip_prefix("@meta ") {
1397− node: &syntax::Node,
347+ let rest = rest.trim();
1398− directive: &syntax::Directive,
348+ if let Some((name, value)) = rest.split_once(' ') {
1399− ctx: &mut ParseContext,
349+ let value = substitute_vars(value.trim(), &ctx.variables);
1400− ) -> Result<Option<Vec<Node>>, ParseError> {
350+ match name.trim().strip_prefix("og:") {
1401− let line_num = node.span.line;
351+ Some(property) => ctx.og_tags.push((property.to_string(), value)),
1402− let content = &node.source;
352+ None => ctx.meta_tags.push((name.trim().to_string(), value)),
1403− match (directive.name(), &directive.args) {
1404− // @page [lang=en, favicon /f.png, background #f8fafc] Title
1405− ("page", DirectiveArgs::Page { attrs, title }) => {
1406− let page = read_page(attrs.as_ref(), title.as_ref(), line_num, ctx);
1407− // A page has one root: a second `@page` (a layout called
1408− // twice, or one called after the page's own) is an error
1409− let here = match &ctx.current_file {
1410− Some(file) => format!("line {} of {}", line_num, file),
1411− None => format!("line {}", line_num),
1413− if let Some(first) = &ctx.page_at {
1414− let again = if *first == here {
1415− "this @page runs a second time (in a loop, or in a function called \
1419− format!("a second @page (this page already has one, on {})", first)
1421− let diagnostic = Diagnostic::error(
1422− code::DUPLICATE_PAGE,
1425− "{}: a page has one @page, the root element that styles its <body>",
1429− .source(content.clone())
1431− ctx.diagnostics.push(diagnostic);
1433− ctx.page_at = Some(here);
1434− ctx.page = Some(page);
1439− ("let", DirectiveArgs::Let(def)) => {
1440− let name = def.name.as_str();
1441− // Values, bundles and functions share one namespace: a
1442− // definition replaces whatever the name meant in its block
1444− LetForm::Function(function) => {
1445− self.define_function(name, &function.params, node, ctx);
1447− // `@let name = EXPR` computes its value (see expr.rs)
1448− LetForm::Computed(expression) => {
1450− .eval(&expression.raw, line_num, Some(expression.span.column))
1451− .unwrap_or_else(Value::empty);
1452− set_variable(name, value, line_num, ctx);
1454− // Attribute bundle: @let name [attr1, attr2, ...]
1455− LetForm::Bundle(list) => {
1456− ctx.in_bundle = true;
1457− let attrs = parse_attr_list(&list.attrs, line_num, ctx, true, &[]);
1458− ctx.in_bundle = false;
1459− ctx.env.define(name, Binding::Bundle(Rc::new(attrs)));
1460− ctx.define_lines.entry(name.to_string()).or_insert(line_num);
1462− // `@let size 16px`, `@let fruits apple, banana`,
1463− // `@let post $posts.0`: see `slot_value`
1464− LetForm::Value(value) => {
1466− ctx.slot_value(&value.raw, value.span.line, Some(value.span.column));
1467− set_variable(name, value, line_num, ctx);
1469− // Quoted text: `@let arrow "→ "`
1470− LetForm::Quoted(value) => {
1471− let raw = format!("\"{}\"", value.raw);
1472− let column = value.span.column.saturating_sub(1);
1473− let (text, quoted, _) =
1474− ctx.fill_value(&raw, value.span.line, Some(column), Sink::Text);
1475− let value = quoted.map_or(Value::Str(text), Value::Quoted);
1476− set_variable(name, value, line_num, ctx);
1482− // @meta NAME VALUE; `og:` names become Open Graph property tags
359+ if content == "@head" || content.starts_with("@head ") {
1483− ("meta", DirectiveArgs::Text(Some(arg))) => {
360+ let trimmed = block_text(children).trim().to_string();
1484− let Some((name, value)) = arg.raw.split_once(char::is_whitespace) else {
361+ if !trimmed.is_empty() {
1485− ctx.diagnostics.push(
362+ ctx.head_blocks.push(trimmed);
1487− code::MISSING_ARGUMENT,
1489− format!("@meta needs a name and a value: `@meta {} VALUE`", arg.raw),
1491− .source(content.clone()),
1495− let value_column = arg.span.column + arg.raw.len() - value.trim_start().len();
1496− // An HTML attribute value: quoted text loses its quotes
1497− let (value, _, _) =
1498− ctx.fill_value(value.trim(), line_num, Some(value_column), Sink::Text);
1499− // The same tag twice says nothing more (a layout called
1500− // twice): it is written once
1501− let (tags, tag) = match name.trim().strip_prefix("og:") {
1502− Some(property) => (&mut ctx.og_tags, (property.to_string(), value)),
1503− None => (&mut ctx.meta_tags, (name.trim().to_string(), value)),
1505− if !tags.contains(&tag) {
1508− ctx.head_at.get_or_insert(line_num);
1512− ("head", _) => {
367+ // --- @style block (raw CSS) ---
1513− let text = verbatim_content(node);
368+ if content.trim() == "@style" {
1514− if !text.trim().is_empty() {
369+ let trimmed = block_text(children).trim().to_string();
1515− ctx.head_blocks.push(text.trim().to_string());
370+ if !trimmed.is_empty() {
1516− ctx.head_at.get_or_insert(line_num);
371+ ctx.custom_css.push(trimmed);
1523− let text = verbatim_content(node);
1524− // Only the @style at the top of a function's body is
1525− // scoped; anywhere else `&` is `:scope`, the whole page
1526− if has_top_level_ampersand(&text) {
1527− ctx.push_once(Diagnostic::warning(
1528− code::INVALID_VALUE,
1530− "`&` in this @style is the whole page: only an @style at the top of a \
1531− function's body is scoped to the function, with `&` its root element"
1535− if !text.trim().is_empty() {
1536− ctx.custom_css.push(text.trim().to_string());
1541− // @markdown: an indented block, or a file
377+ // --- @markdown block or file (convert markdown to HTML) ---
1542− ("markdown", DirectiveArgs::Text(file)) => {
378+ if content.trim() == "@markdown" || content.trim().starts_with("@markdown ") {
1543− let Some(file) = file else {
379+ let arg = content.trim().strip_prefix("@markdown").unwrap().trim();
1544− let md_lines: Vec<String> = verbatim_text(&node.children)
380+ if arg.is_empty() {
1545− .lines()
381+ // Inline markdown block: indented children
1546− .map(String::from)
382+ let md_lines: Vec<String> = block_text(children).lines().map(String::from).collect();
1547− .collect();
383+ let html = markdown_to_html(&md_lines);
1548− return Ok(Some(vec![Node::Raw(markdown_to_html(&md_lines))]));
384+ return Ok(Some(vec![Node::Raw(html)]));
386+ // External markdown file: @markdown file.md
387+ let filename = substitute_vars(arg, &ctx.variables);
388+ let resolved = match &ctx.base_path {
389+ Some(base) => base.join(&filename),
390+ None => PathBuf::from(&filename),
1550− let filename = ctx.interpolate_text(&file.raw, line_num, Some(file.span.column));
392+ let md_text = if let Some(cached) = ctx.file_cache.get(&resolved) {
1551− let resolved = ctx.resolve(&filename);
393+ cached.clone()
1552− let md_text = match ctx.read_file(&resolved) {
394+ } else {
1553− Ok(text) => text,
395+ match std::fs::read_to_string(&resolved) {
1554− Err(e) => {
396+ Ok(text) => {
1555− ctx.diagnostics.push(
397+ ctx.file_cache.insert(resolved.clone(), text.clone());
1556− Diagnostic::error(
398+ text
1557− code::UNREADABLE_FILE,
399+ }
1558− line_num,
400+ Err(e) => {
1559− format!("cannot read markdown '{}': {}", filename, e),
401+ ctx.diagnostics.push(Diagnostic {
1560− )
402+ line: line_num,
1561− .source(content.clone()),
403+ column: None,
1562− );
404+ message: format!("cannot read markdown '{}': {}", filename, e),
1563− return Ok(None);
405+ severity: Severity::Error,
406+ source_line: Some(content.clone()),
1566 ctx.included_files.push(resolved);
412 ctx.included_files.push(resolved);
1567 let md_lines: Vec<String> = md_text.lines().map(|l| l.to_string()).collect();
413 let md_lines: Vec<String> = md_text.lines().map(|l| l.to_string()).collect();
1568− Ok(Some(vec![Node::Raw(markdown_to_html(&md_lines))]))
414+ let html = markdown_to_html(&md_lines);
415+ return Ok(Some(vec![Node::Raw(html)]));
1571− ("include", DirectiveArgs::Text(Some(path))) => {
1572− self.eval_include(node.id, path, line_num, content, ctx)
1575− ("data", DirectiveArgs::Data { name, source, .. }) => {
1576− self.eval_data(name, source, line_num, content, ctx);
1580− // @raw: the rest of its line, or its indented body, verbatim
421+ if let Some(rest) = content.strip_prefix("@include ") {
1581− ("raw", _) => {
422+ let rest = rest.trim();
1582− let text = verbatim_content(node);
423+ let filename = rest
1583− let text = text.trim_end_matches('\n');
424+ .strip_prefix('"')
1584− Ok((!text.is_empty()).then(|| vec![Node::Raw(text.to_string())]))
425+ .and_then(|f| f.strip_suffix('"'))
1585− }
426+ .unwrap_or(rest);
427+ let filename = substitute_vars(filename, &ctx.variables);
1587− // A header with a syntax error (reported), or a directive
429+ let resolved = match &ctx.base_path {
1588− // without its argument
430+ Some(base) => base.join(&filename),
1589− _ => Ok(None),
431+ None => PathBuf::from(&filename),
1593− fn eval_include(
434+ if ctx.include_stack.contains(&resolved) {
1594− &mut self,
435+ let cycle_chain = format_include_chain(&ctx.include_stack);
1595− id: usize,
436+ ctx.diagnostics.push(Diagnostic {
1596− path: &syntax::Arg,
437+ line: line_num,
1597− line_num: usize,
438+ column: None,
1598− content: &str,
439+ message: format!(
1599− ctx: &mut ParseContext,
1600− ) -> Result<Option<Vec<Node>>, ParseError> {
1601− let (filename, column) = match path.raw.strip_prefix('"').and_then(|f| f.strip_suffix('"'))
1603− Some(quoted) => (quoted, path.span.column + 1),
1604− None => (path.raw.as_str(), path.span.column),
1606− let filename = ctx.interpolate_text(filename, line_num, Some(column));
1607− let resolved = ctx.resolve(&filename);
1609− if ctx.include_stack.contains(&resolved) {
1610− let cycle_chain = format_include_chain(&ctx.include_stack);
1611− ctx.diagnostics.push(
1613− code::CIRCULAR_INCLUDE,
1616 "circular include '{}' (cycle: {} → {})",
440 "circular include '{}' (cycle: {} → {})",
1617 filename, cycle_chain, filename
441 filename, cycle_chain, filename
1619− )
443+ severity: Severity::Error,
1620− .source(content),
444+ source_line: Some(content.clone()),
1625− let imported_text = match ctx.read_file(&resolved) {
1628− ctx.diagnostics.push(
1630− code::UNREADABLE_FILE,
1632− format!("cannot include '{}': {}", filename, e),
1636 return Ok(None);
446 return Ok(None);
1640− ctx.included_files.push(resolved.clone());
449+ let imported_text = if let Some(cached) = ctx.file_cache.get(&resolved) {
1641− ctx.include_stack.push(resolved.clone());
450+ cached.clone()
1642− let saved_base = ctx.base_path.clone();
451+ } else {
1643− ctx.base_path = resolved.parent().map(|p| p.to_path_buf());
452+ match std::fs::read_to_string(&resolved) {
1645− let diag_count_before = ctx.diagnostics.len();
454+ ctx.file_cache.insert(resolved.clone(), text.clone());
1646− let import_chain = format_include_chain(&ctx.include_stack);
455+ text
1647− let tree = ctx.parse_tree(&imported_text);
456+ }
1648− ctx.diagnostics.extend(tree.diagnostics.iter().cloned());
457+ Err(e) => {
1649− ctx.trees.push((tree.clone(), Some(import_chain.clone())));
458+ ctx.diagnostics.push(Diagnostic {
1650− let files = Rc::make_mut(&mut ctx.included_by).entry(id).or_default();
459+ line: line_num,
1651− if !files.iter().any(|(_, chain)| *chain == import_chain) {
460+ column: None,
1652− files.push((tree.clone(), import_chain.clone()));
461+ message: format!("cannot include '{}': {}", filename, e),
1653− }
462+ severity: Severity::Error,
1654− let saved_file = ctx.current_file.replace(import_chain.clone());
463+ source_line: Some(content.clone()),
1655− let defined_before: HashSet<String> = ctx
464+ });
1656− .let_lines
465+ return Ok(None);
1658− .chain(ctx.define_lines.keys())
467+ }
1659− .chain(ctx.fn_lines.keys())
468+ };
1661− .collect();
470+ ctx.included_files.push(resolved.clone());
1662− let included_nodes = self.eval_block(&tree.nodes, ctx);
471+ ctx.include_stack.push(resolved.clone());
1663− ctx.current_file = saved_file;
472+ let saved_base = ctx.base_path.clone();
1664− // An included file's definitions aren't reported unused here, where
473+ ctx.base_path = resolved.parent().map(|p| p.to_path_buf());
1665− // their lines aren't this file's: a library's are there to be
474+
1666− // picked from, and any other file reports its own when checked
475+ let diag_count_before = ctx.diagnostics.len();
1667− let keep = |name: &String, _: &mut usize| defined_before.contains(name);
476+
1668− ctx.let_lines.retain(keep);
477+ let included_nodes = self.eval_block(&syntax::parse(&imported_text), ctx);
1669− ctx.define_lines.retain(keep);
478+
1670− ctx.fn_lines.retain(keep);
479+ // Annotate new diagnostics with import chain
1671−
480+ let import_chain = format_include_chain(&ctx.include_stack);
1672− // Annotate new diagnostics with import chain
481+ for d in &mut ctx.diagnostics[diag_count_before..] {
1673− for d in &mut ctx.diagnostics[diag_count_before..] {
482+ d.message = format!("{}\n in {}", d.message, import_chain);
1674− d.message = format!("{}\n in {}", d.message, import_chain);
483+ }
485+ ctx.base_path = saved_base;
486+ ctx.include_stack.pop();
487+ return Ok(Some(included_nodes));
1677− ctx.base_path = saved_base;
1678− ctx.include_stack.pop();
1679− Ok(Some(included_nodes))
1682− /// @data $name file.json values as $name.key
491+
1683− /// @data $name dir/*.json a list of the files' records
492+ // --- @data (load JSON file into variables) ---
1684− /// @data $name [...] / {...} inline JSON
493+
1685− /// @data $name env:NAME [DEFAULT] an environment variable
494+ // @data $name file.json values as $name.key
1686− fn eval_data(
495+ // @data $name dir/*.json a list of the files' records
1687− &mut self,
496+ // @data $name [...] / {...} inline JSON
1688− prefix: &str,
497+ // @data $name env:NAME [DEFAULT] an environment variable
1689− source: &syntax::Arg,
498+ if let Some(rest) = content.strip_prefix("@data ") {
1690− line_num: usize,
499+ let rest = rest.trim();
1691− content: &str,
500+ let Some((prefix, filename)) = rest
1692− ctx: &mut ParseContext,
501+ .strip_prefix('$')
1693− ) {
502+ .and_then(|named| named.split_once(char::is_whitespace))
1694− let prefix = prefix.to_string();
503+ .map(|(name, source)| (name.to_string(), source.trim().to_string()))
1695− let filename = source.raw.as_str();
504+ else {
1696− if let Some(env) = filename.strip_prefix("env:") {
505+ return Err(ParseError {
1697− let (var, default) = match env.split_once(char::is_whitespace) {
506+ line: line_num,
1698− Some((var, default)) => (var, Some(default.trim())),
507+ message: format!(
1699− None => (env, None),
508+ "@data needs a name: write `@data $name {}` and use `$name.key`",
509+ rest.trim_start_matches('$')
1701− let default_column = default.map(|d| source.span.column + filename.len() - d.len());
513+
1702− let value = std::env::var(var)
514+ if let Some(env) = filename.strip_prefix("env:") {
1703− .ok()
515+ let (var, default) = match env.split_once(char::is_whitespace) {
1704− .or_else(|| default.map(|d| ctx.interpolate_text(d, line_num, default_column)));
516+ Some((var, default)) => (var, Some(default.trim())),
1705− if value.is_none() {
517+ None => (env, None),
1706− ctx.diagnostics.push(
518+ };
1707− Diagnostic::warning(
519+ let value = std::env::var(var)
1708− code::UNSET_ENVIRONMENT,
520+ .ok()
1709− line_num,
521+ .or_else(|| default.map(|d| substitute_vars(d, &ctx.variables)));
1710− format!(
522+ if value.is_none() {
523+ ctx.diagnostics.push(Diagnostic {
1711 "environment variable '{}' is not set and has no default",
527 "environment variable '{}' is not set and has no default",
1714− )
530+ severity: Severity::Warning,
1715− .source(content),
531+ source_line: Some(content.clone()),
534+ ctx.variables.insert(prefix, value.unwrap_or_default());
1718− ctx.bind(&prefix, Value::Str(value.unwrap_or_default()));
1722− // Inline JSON: @data $links [{"label": "Home", "url": "/"}]
538+ // Inline JSON: @data $links [{"label": "Home", "url": "/"}]
1723− let (json_text, source) = if filename.starts_with(['[', '{']) {
539+ let (json_text, source) = if filename.starts_with(['[', '{']) {
1724− (filename.to_string(), "the inline data".to_string())
540+ (filename, "the inline data".to_string())
1725− } else {
541+ } else {
1726− let filename = ctx.interpolate_text(filename, line_num, Some(source.span.column));
542+ let filename = substitute_vars(&filename, &ctx.variables);
1727− if filename.contains('*') {
543+ if filename.contains('*') {
1728− self.load_data_glob(&prefix, &filename, line_num, content, ctx);
544+ self.load_data_glob(&prefix, &filename, line_num, &content, ctx);
1729− return;
545+ return Ok(None);
1731− let resolved = ctx.resolve(&filename);
1732− match std::fs::read_to_string(&resolved) {
1734− ctx.included_files.push(resolved);
1735− (text, format!("'{}'", filename))
1737− Err(e) => {
547+ let resolved = match &ctx.base_path {
1738− ctx.diagnostics.push(
548+ Some(base) => base.join(&filename),
1739− Diagnostic::error(
549+ None => PathBuf::from(&filename),
1740− code::UNREADABLE_FILE,
550+ };
1741− line_num,
551+ match std::fs::read_to_string(&resolved) {
1742− format!("cannot load data '{}': {}", filename, e),
552+ Ok(text) => {
1743− )
553+ ctx.included_files.push(resolved);
1744− .source(content),
554+ (text, format!("'{}'", filename))
1746− return;
556+ Err(e) => {
557+ ctx.diagnostics.push(Diagnostic {
560+ message: format!("cannot load data '{}': {}", filename, e),
561+ severity: Severity::Error,
562+ source_line: Some(content.clone()),
568+ match parse_json_with_error(&json_text) {
569+ Ok(json) => flatten_json(&prefix, &json, &mut ctx.variables),
570+ Err(detail) => ctx.diagnostics.push(Diagnostic {
573+ message: format!("invalid JSON in {}: {}", source, detail),
574+ severity: Severity::Error,
575+ source_line: Some(content.clone()),
1749− };
578+ return Ok(None);
1750− match parse_json_with_error(&json_text) {
579+ }
1751− Ok(json) => ctx.bind(&prefix, json_value(json)),
580+
1752− Err(detail) => ctx.diagnostics.push(
581+ // --- @if / @else ---
1753− Diagnostic::error(
582+
1754− code::INVALID_JSON,
583+ if content.trim() == "@else" || content.trim().starts_with("@else if ") {
1755− line_num,
584+ return Err(ParseError {
1756− format!("invalid JSON in {}: {}", source, detail),
585+ line: line_num,
1757− )
586+ message: "@else without matching @if".to_string(),
1758− .source(content),
587+ });
590+ // --- @each loop ---
592+ // @raw: its indented body, or the rest of the line, verbatim
593+ if content == "@raw" {
594+ let text = block_text(children);
595+ let text = text.trim_end_matches('\n');
596+ return Ok((!text.is_empty()).then(|| vec![Node::Raw(text.to_string())]));
598+ if let Some(rest) = content.strip_prefix("@raw ") {
599+ return Ok(Some(vec![Node::Raw(rest.to_string())]));
602+ // --- Function call ---
604+ if content.starts_with('@') {
605+ let name = extract_element_name(&content);
606+ if ctx.functions.contains_key(name) {
607+ ctx.used_functions.insert(name.to_string());
608+ let nodes = self.expand_fn_call(name, &content, children, line_num, ctx)?;
609+ return Ok(Some(nodes));
615+ if content.starts_with('@') {
616+ let node = self.parse_element_line(&content, children, line_num, ctx)?;
617+ return Ok(Some(vec![inline_svg(node, line_num, ctx)]));
620+ // --- Bare text ---
622+ let var_warnings = check_undefined_vars(
623+ &protect_escapes(&content),
628+ ctx.diagnostics.extend(var_warnings);
629+ track_var_refs(&content, &mut ctx.used_variables);
630+ let segments = parse_text_segments(&content, ctx);
631+ Ok(Some(vec![Node::Text(segments)]))
1763 /// `@data $name dir/*.json`: a list with one record per matching file
634 /// `@data $name dir/*.json`: a list with one record per matching file
@@ -1791,15 +662,13 @@ impl Evaluator {
1792 .collect(),
663 .collect(),
1793 Err(e) => {
664 Err(e) => {
1794− ctx.diagnostics.push(
665+ ctx.diagnostics.push(Diagnostic {
1795− Diagnostic::new(
666+ line: line_num,
1796− code::UNREADABLE_FILE,
667+ column: None,
1797− Severity::Error,
668+ message: format!("cannot read directory for '{}': {}", pattern, e),
1798− line_num,
669+ severity: Severity::Error,
1799− format!("cannot read directory for '{}': {}", pattern, e),
670+ source_line: Some(content.to_string()),
1801− .source(content.to_string()),
@@ -1814,15 +683,13 @@ impl Evaluator {
1814 let text = match std::fs::read_to_string(&file) {
683 let text = match std::fs::read_to_string(&file) {
1815 Ok(text) => text,
684 Ok(text) => text,
1816 Err(e) => {
685 Err(e) => {
1817− ctx.diagnostics.push(
686+ ctx.diagnostics.push(Diagnostic {
1818− Diagnostic::new(
687+ line: line_num,
1819− code::UNREADABLE_FILE,
688+ column: None,
1820− Severity::Error,
689+ message: format!("cannot load data '{}': {}", file.display(), e),
1821− line_num,
690+ severity: Severity::Error,
1822− format!("cannot load data '{}': {}", file.display(), e),
691+ source_line: Some(content.to_string()),
1824− .source(content.to_string()),
1826 continue;
693 continue;
@@ -1833,431 +700,245 @@ impl Evaluator {
1834 records.push(JsonValue::Object(pairs));
701 records.push(JsonValue::Object(pairs));
1836− Ok(_) => ctx.diagnostics.push(
703+ Ok(_) => ctx.diagnostics.push(Diagnostic {
1837− Diagnostic::new(
704+ line: line_num,
1838− code::INVALID_JSON,
705+ column: None,
1839− Severity::Error,
706+ message: format!("'{}' should hold a JSON object", file.display()),
1840− line_num,
707+ severity: Severity::Error,
1841− format!("'{}' should hold a JSON object", file.display()),
708+ source_line: Some(content.to_string()),
1843− .source(content.to_string()),
710+ Err(detail) => ctx.diagnostics.push(Diagnostic {
1844− ),
711+ line: line_num,
1845− Err(detail) => ctx.diagnostics.push(
712+ column: None,
1846− Diagnostic::new(
713+ message: format!("invalid JSON in '{}': {}", file.display(), detail),
1847− code::INVALID_JSON,
714+ severity: Severity::Error,
1848− Severity::Error,
715+ source_line: Some(content.to_string()),
1850− format!("invalid JSON in '{}': {}", file.display(), detail),
1852− .source(content.to_string()),
1855 ctx.included_files.push(file);
718 ctx.included_files.push(file);
1857− ctx.bind(name, json_value(JsonValue::Array(records)));
720+ flatten_json(name, &JsonValue::Array(records), &mut ctx.variables);
1860− /// `@each $item in LIST` or `@each $item, $index in LIST`, with the
723+ /// `@each $item in LIST` or `@each $item, $index in LIST`. A LIST from
1861− /// `@else` that follows it. LIST is a value (see
724+ /// JSON binds each record or value to `$item`; any other list is text,
1862− /// [`ParseContext::slot_value`]): a list written with commas, a range,
725+ /// split on commas, or a range `A..B [step N]`.
1863− /// or one `$name` or `${...}` that holds a list. Each item is bound
1864− /// whole to `$item`, and each iteration is a block of its own.
1865 fn eval_each(
726 fn eval_each(
1866 &mut self,
727 &mut self,
1867− node: &syntax::Node,
728+ header: &str,
1868− empty_branch: Option<&syntax::Node>,
729+ body: &[Syntax],
1869 ctx: &mut ParseContext,
732 ctx: &mut ParseContext,
1870− ) -> Result<Option<Vec<Node>>, ParseError> {
733+ ) -> Result<Vec<Node>, ParseError> {
1871− ctx.visited.insert(node.id);
734+ let Some((names, list_src)) = header.split_once(" in ") else {
1872− if let Some(branch) = empty_branch {
735+ return Err(ParseError {
1873− ctx.visited.insert(branch.id);
736+ line: line_num,
1874− }
737+ message: "@each requires: @each $item in LIST".to_string(),
1875− ctx.enter(node);
738+ });
1876− // A malformed header is a syntax error, already reported
1877− let Some(DirectiveArgs::Each(header)) = node.directive().map(|d| &d.args) else {
1880− let body = &node.children;
1881− let empty: &[syntax::Node] = empty_branch.map_or(&[], |b| &b.children);
1882− let (item, index) = (header.item.as_str(), header.index.as_deref());
1883− let list = &header.list;
1884− // `[...]` is an attribute list or JSON elsewhere, not a list here
1885− let bracketed = list.raw.starts_with('[') && list.raw.ends_with(']');
1886− let (source, filled) = match bracketed {
1887− true => (Value::empty(), false),
1888− false => ctx.slot_value(&list.raw, list.span.line, Some(list.span.column)),
1890− let not_a_list = |message: String, ctx: &ParseContext| {
1891− let diagnostic = Diagnostic::error(code::INVALID_LOOP, list.span.line, message)
1892− .column(list.span.column)
1893− .subject(list.raw.as_str());
1894− match &ctx.current_source {
1895− (current, Some(text)) if *current == list.span.line => {
1896− diagnostic.source(text.clone())
1901− if bracketed {
740+ let names: Vec<&str> = names.split(',').map(|v| v.trim().trim_start_matches('$')).collect();
1902− let inner = list.raw[1..list.raw.len() - 1].trim().to_string();
741+ if names.len() > 2 {
1903− let diagnostic = not_a_list(
742+ return Err(ParseError {
1904− format!(
743+ line: line_num,
1905− "@each takes a list written without brackets, `@each ${} in {}`; \
744+ message: "@each takes `$item` or `$item, $index`: to loop over records, \
1906− JSON data goes in `@data`",
745+ load them with @data and use `$item.key`"
1907− item, inner
746+ .to_string(),
1911− .suggest(Some(inner));
1912− ctx.push_once(diagnostic);
1914− let items: Vec<Value> = match source {
749+ let (item, index) = (names[0], names.get(1).copied());
1915− Value::List(list) => list.items.to_vec(),
750+ let list_src = list_src.trim();
1916− // Reported (an undefined `$name`, brackets): there is nothing
751+ track_var_refs(list_src, &mut ctx.used_variables);
1918− _ if !filled => Vec::new(),
753+ // A list loaded from JSON, by name
1919− Value::Record(_) => {
754+ let data_list = list_src.strip_prefix('$').and_then(|name| {
1920− let diagnostic = not_a_list(
755+ let len = ctx.variables.get(&format!("{}#", name))?.parse::<usize>().ok()?;
1921− format!(
756+ Some((name.to_string(), len))
1922− "@each repeats for the items of a list, and `{}` is a record: \
757+ });
1923− loop over a list of records, or use its fields",
758+ let undefined = list_src.strip_prefix('$').filter(|name| {
1924− list.raw
759+ name.chars().all(|c| c.is_alphanumeric() || matches!(c, '_' | '-' | '.'))
1925− ),
760+ && !ctx.variables.contains_key(*name)
1927− );
762+ let text_items: Vec<String> = match (&data_list, undefined) {
1928− ctx.push_once(diagnostic);
763+ (Some(_), _) => Vec::new(),
764+ // A missing variable is an empty list: quietly for a record's
765+ // missing field (`$post.tags`), with a warning otherwise
766+ (None, Some(name)) => {
767+ let root = name.split('.').next().unwrap_or(name);
768+ if !ctx.variables.contains_key(root) {
769+ ctx.diagnostics.push(Diagnostic {
772+ message: format!("undefined variable '${}'", name),
773+ severity: Severity::Warning,
774+ source_line: Some(format!("@each {}", header)),
1929 Vec::new()
777 Vec::new()
1931− // Empty text (a field a record doesn't have) is no items; any
779+ (None, None) => text_list_items(&substitute_vars(list_src, &ctx.variables)),
1932− // other value is one
1933− value if value.to_string().is_empty() => Vec::new(),
1934− value => vec![value],
781+ let count = data_list.as_ref().map_or(text_items.len(), |(_, len)| *len);
1937− if body.iter().all(syntax::Node::is_trivia) {
783+ if body.is_empty() {
1938− return Ok(Some(Vec::new()));
784+ return Ok(Vec::new());
1940− if items.is_empty() {
786+ if count == 0 {
1941− return Ok(Some(self.eval_scoped(empty, ctx)));
787+ return Ok(self.eval_scoped(empty, ctx));
789+ let saved_vars = ctx.variables.clone();
1943 let mut nodes = Vec::new();
790 let mut nodes = Vec::new();
1944− for (i, value) in items.into_iter().enumerate() {
791+ for i in 0..count {
1945− ctx.env.push();
792+ match &data_list {
1946− ctx.bind(item, value);
793+ Some((name, _)) => bind_item(&mut ctx.variables, &format!("{}.{}", name, i), item),
1947− if let Some(index) = index {
794+ None => {
1948− ctx.bind(index, Value::Num(i as f64));
795+ let text = text_items.get(i).cloned().unwrap_or_default();
796+ ctx.variables.insert(item.to_string(), text);
799+ if let Some(index) = index {
800+ ctx.variables.insert(index.to_string(), i.to_string());
1950 nodes.extend(self.eval_block(body, ctx));
802 nodes.extend(self.eval_block(body, ctx));
1953− Ok(Some(nodes))
804+ ctx.variables = saved_vars;
1956 fn define_function(
808 fn define_function(
1957 &mut self,
809 &mut self,
1958 name: &str,
810 name: &str,
1959− params: &[syntax::Param],
811+ params: &[String],
1960− node: &syntax::Node,
812+ defaults: &HashMap<String, String>,
1961 ctx: &mut ParseContext,
815 ctx: &mut ParseContext,
1963− let line_num = node.span.line;
1964− let body = &node.children;
1965 // An @style block at the top of the body is scoped to the
817 // An @style block at the top of the body is scoped to the
1966− // function: its rules apply inside a `.hl-fn-NAME-HASH` wrapper (a
818+ // function: its rules apply inside a `.hl-NAME` wrapper.
1967− // generated class never has a second `-`, so the two can't meet).
819+ let (style, body): (Vec<&Syntax>, Vec<&Syntax>) = body
1968− // The hash is the stylesheet's, so two functions of one name with
820+ .iter()
1969− // two stylesheets, in two files, don't style each other's elements
821+ .partition(|node| matches!(node, Syntax::Line { text, .. } if text == "@style"));
1970− // in a page that has both. It is written into the page when the
822+ if !style.is_empty() {
1971− // function is called.
1972− let (style, body): (Vec<&syntax::Node>, Vec<&syntax::Node>) =
1973− body.iter().partition(|node| node.is_directive("style"));
1974− let scoped = (!style.is_empty()).then(|| {
1975 let css: String = style
823 let css: String = style
1977− .map(|node| {
825+ .filter_map(|node| match node {
1978− ctx.visited.insert(node.id);
826+ Syntax::Line { children, .. } => Some(block_text(children)),
1979− verbatim_content(node)
827+ _ => None,
1981 .collect();
829 .collect();
1982− let digits = crate::codegen::CLASS_DIGITS;
1983− let hash = crate::codegen::hash_digits(crate::codegen::stable_hash(&css), digits);
1984− let class = format!("hl-fn-{}-{}", name, hash);
1985 // Nested under the scope class, so any CSS works (multi-line
830 // Nested under the scope class, so any CSS works (multi-line
1986 // rules, at-rules)
831 // rules, at-rules)
1987− let css = if css.trim().is_empty() {
832+ if !css.trim().is_empty() {
1988− String::new()
833+ ctx.custom_css.push(format!(".hl-{} {{\n{}}}", name, css));
1990− format!(".{} {{\n{}}}", class, css)
835+ ctx.scoped_functions.insert(name.to_string());
1995− // A default is filled in only when a call leaves its parameter
1996− // out, so the names in it count as used here
1997− for default in params.iter().filter_map(|p| p.default.as_ref()) {
1998− track_var_refs(default, &mut ctx.used_variables);
2000 ctx.fn_lines.entry(name.to_string()).or_insert(line_num);
838 ctx.fn_lines.entry(name.to_string()).or_insert(line_num);
2001− let wraps_itself = ElementKind::from_name(name).is_some()
839+ ctx.functions.insert(
2002− && body.iter().any(|node| calls_unguarded(node, name));
840+ name.to_string(),
2003− if wraps_itself {
841+ FnDef {
2004− ctx.push_once(
842+ params: params.to_vec(),
2005− Diagnostic::error(
843+ defaults: defaults.clone(),
2006− code::RECURSIVE_CALL,
844+ body: body.into_iter().cloned().collect(),
2009− "@{0} in the body of `@let @{0}` calls the function itself, not the \
2010− element @{0}, so it would never stop: give the function another name \
2011− (such as @site-{0})",
2018− for node in &body {
2019− node.walk(&mut |node| {
2020− if let Some(d) = marker_in_text(node) {
2025− let body: Vec<syntax::Node> = body.into_iter().cloned().collect();
2026− let (slots, has_children) = declared_slots(&body, ctx);
2027− let function = Rc::new(FnDef {
2028− params: params.to_vec(),
2030− source: ctx.current_source.1.clone(),
2033− file: ctx.current_file.clone(),
2037− env: ctx.env.clone(),
2040− ctx.defined_functions
2041− .insert(name.to_string(), function.clone());
2042− ctx.env.define(name, Binding::Function(function));
2045− /// An element line: a chain of elements and function calls, the last of
849+ fn expand_fn_call(
2046− /// which gets the indented children.
2048 &mut self,
850 &mut self,
2049− node: &syntax::Node,
851+ name: &str,
2050− element: &syntax::ElementLine,
852+ content: &str,
853+ children: &[Syntax],
2051 ctx: &mut ParseContext,
855 ctx: &mut ParseContext,
2052 ) -> Result<Vec<Node>, ParseError> {
856 ) -> Result<Vec<Node>, ParseError> {
2053− // An unclosed attribute list is a syntax error, already reported
857+ // Recursive function cycle detection
2054− if element
858+ if ctx.fn_call_stack.contains(&name.to_string()) {
2055− .chain
859+ return Err(ParseError {
2056− .iter()
860+ line: line_num,
2057− .any(|h| h.attrs.as_ref().is_some_and(|a| !a.closed))
861+ message: format!(
2058− {
862+ "recursive function call to @{} (call stack: {})",
2059− return Ok(Vec::new());
863+ name,
2060− }
864+ ctx.fn_call_stack.join(" -> ")
2061− let line_num = node.span.line;
865+ ),
2062− let last = element.chain.len() - 1;
866+ });
2063− // Each head is read where it is written, left to right. The
2064− // children belong to the last one, so the chain is built right to
2065− // left, each link wrapping the next.
2066− let mut links = Vec::new();
2067− for (i, head) in element.chain.iter().enumerate() {
2068− let text = if i == last {
2069− element.text.as_ref()
2073− links.push(resolve(head, text, line_num, &node.source, ctx)?);
2075− let calls: Vec<Option<(String, Rc<FnDef>)>> = links
2077− .map(|link| match link {
2078− Resolved::Call(call) => Some((call.name.clone(), call.function.clone())),
2079− Resolved::Element(_) => None,
2082− let mut current = self.eval_scoped(&node.children, ctx);
2083− // After the lines under the call ran, so the files they include
2085− check_fillers(node, element, &calls, ctx);
2086− for link in links.into_iter().rev() {
2087− current = self.complete(link, current, ctx)?;
2089− Ok(current)
868+ ctx.fn_call_stack.push(name.to_string());
2092− /// Give a resolved `@name` its children: an element holds them, and a
870+ // Parse [param value, ...] arguments
2093− /// function's body puts them where its `@children` is.
871+ let rest = &content[1 + name.len()..];
2094− fn complete(
872+ let rest = rest.trim_start();
2096− resolved: Resolved,
874+ let (args, trailing_text) = if rest.starts_with('[') {
2097− children: Vec<Node>,
875+ parse_attr_brackets_no_validate(rest, line_num, ctx)?
2098− ctx: &mut ParseContext,
876+ } else {
2099− ) -> Result<Vec<Node>, ParseError> {
877+ (Vec::new(), rest.to_string())
2100− match resolved {
878+ };
2101− Resolved::Element(mut element) => {
879+
2102− element.children.extend(children);
880+ // Clone function definition (releases borrow on ctx). If the function is
2103− let line = element.line_num;
881+ // missing (shouldn't normally happen — callers check ctx.functions.contains_key
2104− Ok(vec![inline_svg(Node::Element(element), line, ctx)])
882+ // first — but we avoid panicking on malformed state).
883+ let fn_def = match ctx.functions.get(name) {
884+ Some(def) => def.clone(),
886+ ctx.fn_call_stack.pop();
887+ return Err(ParseError {
889+ message: format!("undefined function @{}", name),
2106− Resolved::Call(call) => self.expand_fn_call(*call, children, ctx),
892+ };
2110− fn expand_fn_call(
894+ // Parse caller's children, separating named slots from default children
2111− &mut self,
895+ let all_caller_children = self.eval_block(children, ctx);
2113− all_caller_children: Vec<Node>,
2114− ctx: &mut ParseContext,
2115− ) -> Result<Vec<Node>, ParseError> {
2121− text: trailing_text,
2128− let (name, content) = (name.as_str(), content.as_str());
2130− // Separate the caller's `@slot NAME` blocks from its other
2131− // children. A block for a slot the function doesn't declare was
2132− // reported where it is written (see `check_fillers`), like one
2134 let mut slot_contents: HashMap<String, Vec<Node>> = HashMap::new();
896 let mut slot_contents: HashMap<String, Vec<Node>> = HashMap::new();
2135 let mut caller_children = Vec::new();
897 let mut caller_children = Vec::new();
2136 for child in all_caller_children {
898 for child in all_caller_children {
2137− if let Node::Element(elem) = child {
899+ if let Node::Element(ref elem) = child
2138− match elem.kind {
900+ && let ElementKind::Slot(ref slot_name) = elem.kind
2139− ElementKind::Slot(slot_name) => {
901+ && !slot_name.is_empty()
2140− slot_contents
902+ {
2141− .entry(slot_name)
903+ slot_contents
2142− .or_default()
904+ .entry(slot_name.clone())
2143− .extend(elem.children);
905+ .or_default()
2144− }
906+ .extend(elem.children.clone());
2145− kind => caller_children.push(Node::Element(Element { kind, ..elem })),
2147 continue;
907 continue;
2149 caller_children.push(child);
909 caller_children.push(child);
2151 // Text after the call, as in `@card [color red] New`, is content:
911 // Text after the call, as in `@card [color red] New`, is content:
2152− // it goes first among the caller's children, and like them it is
912+ // it goes first among the caller's children.
2153− // evaluated where the call is written.
913+ let trailing_text = trailing_text.trim();
2154− if let Some(text) = &trailing_text {
914+ if !trailing_text.is_empty() {
2155− caller_children.insert(0, Node::Text(text_segments(text, ctx)));
915+ caller_children.insert(0, Node::Text(parse_text_segments(trailing_text, ctx)));
2157− // Content goes where the body's `@children` is: without one, it
2158− // would be dropped
2159− if !fn_def.has_children && !caller_children.is_empty() {
2160− let (column, text) = match &name_at {
2161− Some((column, text)) => (Some(*column), text.as_str()),
2162− None => (None, content),
2164− ctx.push_once(no_children(name, line_num, column).source(text));
2167− if fn_def.wraps_itself {
918+ // Save variable state, inject function parameters
2168− return Ok(Vec::new());
919+ let saved_vars = ctx.variables.clone();
2170− // Only the body is inside the call, so a function may appear in the
2171− // content its caller passes it. A function may call itself, under
2172− // a condition that stops it; one that doesn't stop goes too deep.
2174− return Ok(Vec::new());
2176− if ctx.fn_call_stack.len() >= MAX_CALL_DEPTH {
2177− ctx.too_deep = true;
2178− return Err(too_deep(name, &ctx.fn_call_stack, line_num).source(content));
2182− ctx.current_source.clone(),
2185− ctx.fn_call_stack.push(name.to_string());
2187− // The body runs where the function is defined: it sees what was
2188− // visible there, the function itself (so it can call itself), and
2189− // its parameters, bound by name in the order they are declared. A
2190− // default is filled in at the call, seeing the same, with the
2191− // parameters before it.
2192− let caller_env = std::mem::replace(&mut ctx.env, fn_def.env.clone());
2194− ctx.env.define(name, Binding::Function(fn_def.clone()));
2195 let mut consumed = vec![false; args.len()];
920 let mut consumed = vec![false; args.len()];
2196− for param in &fn_def.params {
921+ for (i, param) in fn_def.params.iter().enumerate() {
2197− let mut passed = None;
922+ let named = args.iter().position(|a| a.key == *param);
2198− for (j, arg) in args.iter().enumerate() {
923+ // Positional fallback, unless that argument is named for a
2199− if arg.key != param.name {
924+ // different parameter.
2200− continue;
925+ let positional = args
927+ .filter(|a| !fn_def.params.contains(&a.key) && a.value.is_some())
930+ .filter(|&j| args[j].value.is_some())
934+ args[j].value.clone()
936+ .or_else(|| fn_def.defaults.get(param).cloned())
937+ .unwrap_or_default();
938+ if let Some(j) = named {
2202 consumed[j] = true;
939 consumed[j] = true;
2203− // The later one wins, as for any attribute: one written
2204− // after a bundle overrides it, and only one written twice
2205− // in the call's own list is reported
2206− if passed.is_some() && written_keys.iter().filter(|k| **k == param.name).count() > 1
2209− Diagnostic::warning(
2210− code::DUPLICATE_ATTRIBUTE,
2213− "parameter '{}' of @{} is passed twice: the later one wins",
2218− .subject(param.name.as_str()),
2221− // Written `name=value` in the call's own list is reported
2222− // as written; this is one from a bundle
2223− if arg.html && !written_form.contains(&arg.key) {
2224− let value = arg.value.as_deref().unwrap_or("");
2225− ctx.push_once(parameter_form(name, &arg.key, value, line_num).source(content));
2229− let value = match passed {
941+ ctx.variables.insert(param.clone(), value);
2230− // A parameter's name alone is true: `@post-card [featured]`
2231− Some(j) if args[j].value.is_none() => Value::Bool(true),
2232− // What the call passed, with its type: a record, a list,
2234− Some(j) => values[j].clone().unwrap_or_else(|| {
2235− let arg = &args[j];
2236− match &arg.quoted {
2237− Some(quoted) => Value::Quoted(quoted.clone()),
2238− None => Value::Str(arg.value.clone().unwrap_or_default()),
2241− None => match ¶m.default {
2243− let before = ctx.diagnostics.len();
2244− let value = fill_default(&fn_def, param, default, ctx);
2245− point_at_call(ctx, before, &fn_def, name, line_num, content);
2249− let (column, text) = match &name_at {
2250− Some((column, text)) => (Some(*column), text.as_str()),
2251− None => (None, content),
2254− missing_parameter(name, ¶m.name, line_num, column).source(text),
2260− ctx.bind(¶m.name, value);
2262 // Arguments that aren't parameters are attributes for the
943 // Arguments that aren't parameters are attributes for the
2263 // function's root element, so a function can be styled like an
944 // function's root element, so a function can be styled like an
@@ -2269,24 +950,12 @@ impl Evaluator {
2269 .map(|(a, _)| a.clone())
950 .map(|(a, _)| a.clone())
2270 .collect();
951 .collect();
2272− // Evaluate the body with the parameters in scope, as lines of the
953+ // Evaluate the body with the parameters in scope
2273− // file that defines the function
954+ let body_nodes = self.eval_block(&fn_def.body, ctx);
2274− let caller_file = std::mem::replace(&mut ctx.current_file, fn_def.file.clone());
2275− let before = ctx.diagnostics.len();
2276− let mut body_nodes = self.eval_block(&fn_def.body, ctx);
2277− ctx.current_file = caller_file;
2278− point_at_call(ctx, before, &fn_def, name, line_num, content);
2280− // Back to the caller's names and call stack
956+ // Restore variables and call stack
2281− ctx.env = caller_env;
957+ ctx.variables = saved_vars;
2282 ctx.fn_call_stack.pop();
958 ctx.fn_call_stack.pop();
2283− if ctx.fn_call_stack.is_empty() {
2284− ctx.too_deep = false;
2286− (ctx.current_line, ctx.current_source, ctx.current_node) = caller;
2288− // What the body wrote is the call's
2289− belongs_to_call(&mut body_nodes, name, line_num);
2291 // Replace @children with caller's children and @slot with slot content
960 // Replace @children with caller's children and @slot with slot content
2292 let mut result_nodes =
961 let mut result_nodes =
@@ -2294,7 +963,7 @@ impl Evaluator {
2295 // Attributes that aren't parameters style the function's root
964 // Attributes that aren't parameters style the function's root
2296 // element, and a scoped @style's class goes on it too.
965 // element, and a scoped @style's class goes on it too.
2297− let scope_class = fn_def.scoped.as_ref().map(|(class, _)| class.clone());
966+ let scope_class = ctx.scoped_functions.contains(name).then(|| format!("hl-{}", name));
2298 if !forwarded.is_empty() || scope_class.is_some() {
967 if !forwarded.is_empty() || scope_class.is_some() {
2299 let mut roots = result_nodes.iter_mut().filter_map(|n| match n {
968 let mut roots = result_nodes.iter_mut().filter_map(|n| match n {
2300 Node::Element(e) => Some(e),
969 Node::Element(e) => Some(e),
@@ -2307,45 +976,17 @@ impl Evaluator {
2307 let mut problems = Vec::new();
976 let mut problems = Vec::new();
2308 match root {
977 match root {
2309 Some(root) => {
978 Some(root) => {
2310− // A call's `class=` adds to the root's own classes
979+ root.attrs.extend(forwarded);
2311− for attr in forwarded {
2312− let existing = (attr.html && attr.key == "class")
2313− .then(|| root.attrs.iter_mut().find(|a| a.html && a.key == "class"))
2317− let mut value = class.value.take().unwrap_or_default();
2318− for name in attr.value.as_deref().unwrap_or("").split_whitespace() {
2319− if !value.split_whitespace().any(|c| c == name) {
2321− value.push_str(name);
2324− class.value = Some(value.trim().to_string());
2326− None => root.attrs.push(attr),
2329− // The scoped `@style` goes into the page once, when the
2330− // function is first called
2331− if let Some((_, css)) = &fn_def.scoped
2333− && !ctx.scoped_css.contains(css)
2335− ctx.scoped_css.push(css.clone());
2337 if let Some(class) = scope_class {
980 if let Some(class) = scope_class {
2338 match root.attrs.iter_mut().find(|a| a.html && a.key == "class") {
981 match root.attrs.iter_mut().find(|a| a.html && a.key == "class") {
2339 Some(attr) => {
982 Some(attr) => {
2340 let existing = attr.value.take().unwrap_or_default();
983 let existing = attr.value.take().unwrap_or_default();
2341− attr.value =
984+ attr.value = Some(format!("{} {}", existing, class).trim().to_string());
2342− Some(format!("{} {}", existing, class).trim().to_string());
2344 None => root.attrs.push(Attribute {
986 None => root.attrs.push(Attribute {
2345 key: "class".to_string(),
987 key: "class".to_string(),
2346 value: Some(class),
988 value: Some(class),
2347 html: true,
989 html: true,
@@ -2373,583 +1014,50 @@ impl Evaluator {
2375 for message in problems {
1016 for message in problems {
2376− ctx.diagnostics.push(
1017+ ctx.diagnostics.push(Diagnostic {
2377− Diagnostic::error(code::NO_SINGLE_ROOT, line_num, message)
1018+ line: line_num,
2378− .source(content)
1019+ column: None,
2379− .subject(name),
1020+ message,
2380− );
1021+ severity: Severity::Warning,
1022+ source_line: Some(content.to_string()),
2384 Ok(result_nodes)
1027 Ok(result_nodes)
2388−/// A `@name` read where it is written: a built-in element, or a call.
2394−/// A call of a function, with its arguments evaluated where it is written.
2397− function: Rc<FnDef>,
2398− args: Vec<Attribute>,
2399− /// The value of each argument that passes a parameter, with its type
2400− /// (see [`ParseContext::slot_value`]), in the order of `args`.
2401− values: Vec<Option<Value>>,
2402− /// Text after the attributes, which is content.
2403− text: Option<syntax::Text>,
2404− /// Parameters written `name=value`, already reported.
2405− written_form: Vec<String>,
2406− /// The keys written in the call's own list, not from a bundle.
2407− written_keys: Vec<String>,
2409− /// The column of the call's name and the line it is on, for a missing
2411− name_at: Option<(usize, String)>,
2412− /// The line as written, for diagnostics.
2416−/// What `@name` is where it is written: a call of the function `name`
2417−/// when one is defined, else the built-in element. A whole line, each link
2418−/// of a chain and an inline element in text all resolve here.
2420− head: &syntax::Head,
2421− text: Option<&syntax::Text>,
2424− ctx: &mut ParseContext,
2425−) -> Result<Resolved, ParseError> {
2426− let Some(function) = ctx.env.function(&head.name).cloned() else {
2427− return parse_single_element(head, text, line, ctx).map(Resolved::Element);
2429− ctx.used_functions.insert(head.name.clone());
2430− let params: Vec<String> = function.params.iter().map(|p| p.name.clone()).collect();
2431− let written = head.attrs.as_ref().map_or(&[][..], |list| &list.attrs[..]);
2432− let written_form = written_parameter_forms(&head.name, &function, written, line, ctx);
2433− let written_keys = written.iter().map(|a| a.key.clone()).collect();
2434− // Parameters are bound by name; every other attribute goes to the
2435− // root element, and is checked like any attribute
2436− let (args, values) = parse_attrs(written, line, ctx, true, ¶ms)
2439− let name_at = name_column(head, line).zip(match &ctx.current_source {
2440− (current, Some(text)) if *current == line => Some(text.clone()),
2443− Ok(Resolved::Call(Box::new(Call {
2444− name: head.name.clone(),
2448− text: text.cloned(),
2453− source: source.to_string(),
2457−/// A line of another file (the standard library, an included file) means
2458−/// nothing in this one: the problems reported since `before` while
2459−/// evaluating the function (its body, a default) are moved to the call.
2461− ctx: &mut ParseContext,
2468− if function.file == ctx.current_file {
2471− let defined_in = function
2474− .unwrap_or("the file being compiled");
2475− for d in &mut ctx.diagnostics[before..] {
2476− d.message = format!(
2477− "{}\n in @{} (line {} of {})",
2478− d.message, name, d.line, defined_in
2483− d.suggestion = None;
2484− d.source_line = Some(source.into());
2488−/// A call nested deeper than [`MAX_CALL_DEPTH`].
2489−fn too_deep(name: &str, stack: &[String], line: usize) -> Diagnostic {
2490− let message = if stack.iter().any(|n| n == name) {
2492− "recursive function call to @{} goes more than {} calls deep: a function that \
2493− calls itself needs a condition that stops it (`@if`)",
2494− name, MAX_CALL_DEPTH
2498− "function calls nest more than {} deep at @{} (starting with {})",
2504− .map(|n| format!("@{}", n))
2505− .collect::<Vec<_>>()
2509− Diagnostic::error(code::RECURSIVE_CALL, line, message).subject(name)
2512−/// Mark what a function's body wrote as the call's: it gets the call's
2513−/// line, so what is reported about it points at the call, and the name of
2514−/// the function, unless a call inside the body already claimed it.
2515−fn belongs_to_call(nodes: &mut [Node], function: &str, line: usize) {
2516− fn claim(element: &mut Element, function: &str, line: usize) {
2517− element.line_num = line;
2518− element.function.get_or_insert_with(|| function.to_string());
2519− belongs_to_call(&mut element.children, function, line);
2521− for node in nodes {
2523− Node::Element(element) => claim(element, function, line),
2524− Node::Text(segments) => {
2525− for segment in segments {
2526− if let TextSegment::Inline(element) = segment {
2527− claim(element, function, line);
2536−/// What an inline `{@name ...}` stands for in its line of text: an
2537−/// element; the text of a function whose body is text; or, for a body with
2538−/// several roots, its nodes as a fragment.
2539−fn inline_segments(mut nodes: Vec<Node>, line: usize) -> Vec<TextSegment> {
2540− if let [Node::Element(_)] = nodes.as_slice()
2541− && let Some(Node::Element(element)) = nodes.pop()
2543− return vec![TextSegment::Inline(element)];
2545− if nodes.iter().all(|n| matches!(n, Node::Text(_))) {
2546− let mut segments = Vec::new();
2547− for node in nodes {
2548− if let Node::Text(run) = node {
2549− if !segments.is_empty() {
2550− segments.push(TextSegment::Plain(" ".to_string()));
2552− segments.extend(run);
2557− vec![TextSegment::Inline(Element {
2558− kind: ElementKind::Fragment,
2567−/// Fill in the default of a parameter that a call leaves out, like the
2568−/// value of an attribute passed for it: variables are filled in, one
2569−/// `$name` keeps its type and one `"..."` is quoted text. It sees what the
2570−/// body sees: the names visible where the function is defined, and the
2571−/// parameters before it. Its problems are reported at the definition, once.
2574− param: &syntax::Param,
2576− ctx: &mut ParseContext,
2578− // A default that uses a later parameter is an error in the
2579− // definition; the later one isn't bound yet, so don't report it again
2583− .skip_while(|p| p.name != param.name)
2585− let names = interp::names(default);
2586− if later.clone().any(|p| names.contains(&p.name.as_str())) {
2587− return Value::empty();
2589− let line = param.span.line;
2590− let at_head = line == fn_def.line && fn_def.source.is_some();
2592− at_head.then(|| param.span.column + (param.span.end - param.span.start) - default.len());
2595− &mut ctx.current_source,
2596− (fn_def.line, fn_def.source.clone()),
2598− std::mem::replace(&mut ctx.current_node, fn_def.node),
2600− let (value, _) = ctx.slot_value(default, line, column);
2601− (ctx.current_source, ctx.current_node) = caller;
2605−/// Read `@page`'s attribute list and title. The page is the root element,
1030+ fn parse_element_line(
2606−/// and its attributes are checked like any element's: `key=value` (and a
1031+ &mut self,
2607−/// bare boolean HTML attribute) go on `<html>`, styles on `<body>`, and
1032+ content: &str,
2608−/// `favicon FILE` is its one word of htmlang's own.
1033+ children: &[Syntax],
2609−fn read_page(
1034+ line_num: usize,
2610− attrs: Option<&syntax::AttrList>,
1035+ ctx: &mut ParseContext,
2611− title: Option<&syntax::Arg>,
1036+ ) -> Result<Node, ParseError> {
2612− line: usize,
1037+ let segments = split_chain(content);
2613− ctx: &mut ParseContext,
2615− let mut page = Page::default();
2616− if let Some(list) = attrs {
2617− let words: Vec<String> = crate::vocab::PAGE_WORDS
2619− .map(|w| w.to_string())
2621− ctx.in_page = true;
2622− let read = parse_attr_list(&list.attrs, line, ctx, true, &words);
2623− ctx.in_page = false;
2624− // How many of each name have been read, to find where the next
2626− let mut seen: HashMap<String, usize> = HashMap::new();
2628− let boolean = attr.value.is_none() && crate::vocab::is_html_flag(&attr.key);
2629− // Where it is written, when it is written in the list itself
2630− let nth = seen.entry(attr.key.clone()).or_default();
2634− .filter(|token| token.key == attr.key)
2636− .map(|token| token.span.column);
2641− .map(|q| q.text.clone())
2642− .or(attr.value.clone());
2643− if !check_page_attr(&attr.key, attr.html, value.as_deref(), line, column, ctx) {
2646− if words.contains(&attr.key) {
2647− if page.favicon.is_some() {
2648− let diagnostic = Diagnostic::warning(
2649− code::DUPLICATE_ATTRIBUTE,
2651− "duplicate attribute 'favicon': the later one wins".to_string(),
2653− .subject("favicon");
2654− ctx.diagnostics.push(at_attribute(diagnostic, column, ctx));
2656− // The file itself goes into the page when it can be read
2657− // (relative to the file); otherwise it is linked
2658− page.favicon = value.map(|path| match std::fs::read(ctx.resolve(&path)) {
2659− Ok(data) => crate::codegen::data_uri(&path, &data),
2662− } else if attr.html || boolean {
2663− page.html_attrs.push(attr);
2665− page.styles.push(attr);
2669− page.title = match title {
2670− Some(title) => ctx.interpolate_text(&title.raw, title.span.line, Some(title.span.column)),
2671− None => String::new(),
2676−/// `@page`'s own rules for one of its attributes, checked where the
1039+ // Parse each segment into an Element
2677−/// `@page` runs and where it doesn't (a layout that isn't called): its
1040+ let mut elements: Vec<Element> = Vec::new();
2678−/// word is written `favicon FILE`, and `inline` belongs to `@image`.
1041+ for seg in &segments {
2679−/// Returns whether the attribute can be used (a `favicon` with its file,
1042+ let elem = parse_single_element(seg.trim(), line_num, ctx)?;
2680−/// or any other attribute but `inline`).
1043+ elements.push(elem);
2684− value: Option<&str>,
2686− column: Option<usize>,
2687− ctx: &mut ParseContext,
2689− let report = |ctx: &mut ParseContext, diagnostic: Diagnostic| {
2690− let diagnostic = at_attribute(diagnostic, column, ctx);
2691− ctx.diagnostics.push(diagnostic);
2693− if crate::vocab::PAGE_WORDS.contains(&key) {
2698− code::PARAMETER_FORM,
2701− "'{0}' is @page's own word, not an HTML attribute: write `{0} {1}`",
2703− value.filter(|v| !v.is_empty()).unwrap_or("FILE")
2706− .subject(format!("{}=", key))
2707− .suggest(Some(format!("{} ", key))),
2710− if value.is_none_or(|v| v.trim().is_empty()) {
2714− code::MISSING_VALUE,
2716− format!("'{0}' needs its file: `{0} favicon.png`", key),
2724− if !html && crate::vocab::base_attribute(key) == "inline" {
2728− code::UNEXPECTED_ARGUMENT,
2730− "`inline` puts an image's file into the page, and @page has none: it only \
2734− .subject("inline"),
2741−/// A parameter passed `name=value`, the form of an HTML attribute.
2742−fn parameter_form(function: &str, key: &str, value: &str, line: usize) -> Diagnostic {
2744− code::PARAMETER_FORM,
2747− "'{}' is a parameter of @{}: parameters are written `name value`, so write `{} {}`",
2748− key, function, key, value
2751− .subject(format!("{}=", key))
2752− .suggest(Some(format!("{} ", key)))
2755−/// A call that leaves out a parameter without a default.
2756−fn missing_parameter(
2760− column: Option<usize>,
2762− let diagnostic = Diagnostic::error(
2763− code::MISSING_PARAMETER,
2766− "@{} needs '{}': the parameter has no default, so pass it as `{} VALUE`",
2767− function, param, param
2772− Some(column) => diagnostic.column(column),
2773− None => diagnostic,
2777−/// The column of a call's `@name`, when it is on the call's line.
2778−fn name_column(head: &syntax::Head, line: usize) -> Option<usize> {
2779− (head.name_span.line == line).then_some(head.name_span.column)
2782−/// Define `$name`, or, for `--name`, the CSS custom property on `:root`
1046+ // Parse indented children (belong to the innermost element)
2783−/// (which gets quoted text with its quotes, and is read with
1047+ let children = self.eval_block(children, ctx);
2784−/// `var(--name)`, never as a variable). `@let name.field value` gives the
2785−/// record `$name` that field (or the list `$name` a new item at that
2786−/// index), as a new value in this block.
2787−fn set_variable(name: &str, value: Value, line_num: usize, ctx: &mut ParseContext) {
2788− if name.starts_with("--") {
2791− .map_or_else(|| value.to_string(), str::to_string);
2792− let at_line = |diagnostic: Diagnostic, ctx: &ParseContext| match &ctx.current_source {
2793− (current, Some(text)) if *current == line_num => diagnostic.source(text.clone()),
2796− // `:root` is one place for the whole page: a declaration inside a
2797− // block (an element, a loop, a function's body) would not be
2798− // kept to it, and each run would replace the last
2799− if ctx.env.frames.len() > FILE_FRAMES {
2800− let diagnostic = Diagnostic::error(
2801− code::INVALID_DEFINITION,
2804− "`@let {name}` declares {name} on :root, for the whole page, so it goes at \
2805− the top level of the file: to set it on an element and what is inside \
2806− it, write `[{name} value]` on that element"
2810− ctx.push_once(at_line(diagnostic, ctx));
2813− match css_breakout(&css) {
2815− let diagnostic = Diagnostic::error(
2816− code::INVALID_VALUE,
2819− "the value of '{}' has {}: `{}` can't be written into the page's CSS",
2823− .subject(css.as_str());
2824− ctx.push_once(at_line(diagnostic, ctx));
2826− None => match ctx.css_vars.iter_mut().find(|(n, _)| n == name) {
2827− Some(declared) => {
2828− let diagnostic = Diagnostic::warning(
2829− code::DUPLICATE_ATTRIBUTE,
2832− "{name} is declared again: :root has one value for the whole page, \
2833− so every element gets this one, also above this line (a theme \
2834− redefines a token on an element: `[dark:{name} {css}]`)"
2839− ctx.push_once(at_line(diagnostic, ctx));
2841− None => ctx.css_vars.push((name.to_string(), css)),
2846− let mut path = name.split('.');
2847− let root = path.next().unwrap_or(name);
2848− let fields: Vec<&str> = path.collect();
2849− let value = match fields.is_empty() {
2851− false => match with_field(ctx.env.value(root).cloned(), root, &fields, value) {
2852− Ok(value) => value,
2855− Diagnostic::error(code::INVALID_DEFINITION, line_num, message).subject(name);
2856− let diagnostic = match &ctx.current_source {
2857− (current, Some(text)) if *current == line_num => {
2858− diagnostic.source(text.clone())
2862− ctx.push_once(diagnostic);
2863− // Reported: the name keeps what it held
2864− ctx.let_lines.entry(root.to_string()).or_insert(line_num);
2869− ctx.bind(root, value);
2870− ctx.let_lines.entry(root.to_string()).or_insert(line_num);
2873−/// `value` (the value of `$name`) with the field at `path` set to `new`:
1049+ // Build chain right-to-left: rightmost gets children, each wraps the next
2874−/// a record's field, or the item of a list at an index it has. A name
1050+ let mut current_children = children;
2875−/// without a value, or one whose value is empty (a field a record doesn't
1051+ for mut elem in elements.into_iter().rev() {
2876−/// have), becomes a record; any other value has no fields to set.
1052+ elem.children.extend(current_children);
2877−fn with_field(
1053+ current_children = vec![Node::Element(elem)];
2878− value: Option<Value>,
2882−) -> Result<Value, String> {
2883− let Some((field, rest)) = path.split_first() else {
2886− let inner = format!("{}.{}", name, field);
2888− Some(Value::Record(fields)) => {
2889− let mut fields = fields.as_ref().clone();
2890− match fields.iter().position(|(key, _)| key == field) {
2892− let old = std::mem::replace(&mut fields[i].1, Value::empty());
2893− fields[i].1 = with_field(Some(old), &inner, rest, new)?;
2895− None => fields.push((field.to_string(), with_field(None, &inner, rest, new)?)),
2897− Ok(Value::Record(Rc::new(fields)))
2899− Some(Value::List(list)) => {
2900− let count = list.items.len();
2901− let Some(i) = field.parse::<usize>().ok().filter(|&i| i < count) else {
2902− return Err(format!(
2903− "`${}` is {}, so `.{}` isn't one of its items (they are `.0` to `.{}`)",
2905− Value::List(list).describe(),
2907− count.saturating_sub(1)
2910− let mut items = list.items.as_ref().clone();
2911− let old = std::mem::replace(&mut items[i], Value::empty());
2912− items[i] = with_field(Some(old), &inner, rest, new)?;
2913− // Its items changed, so it no longer prints as written
2914− Ok(Value::list(items))
2916− None => Ok(Value::Record(Rc::new(vec![(
2918− with_field(None, &inner, rest, new)?,
2920− Some(value) if value.to_string().is_empty() => with_field(None, name, path, new),
2921− Some(value) => Err(format!(
2922− "`@let {}.{}` sets a field of a record, but `${}` is {} (`{}`), which has no fields",
2932−/// What a verbatim directive holds (`@head`, `@style`, `@raw`): the rest
1056+ current_children.into_iter().next().ok_or(ParseError {
2933−/// of its line (`@style .a { color: red }`), or else its indented block.
1057+ line: line_num,
2934−/// The two together are a syntax error, reported by the tree; the line
1058+ message: "element chain produced no nodes (this is a parser bug)".to_string(),
2936−fn verbatim_content(node: &syntax::Node) -> String {
2937− match node.directive().map(|d| &d.args) {
2938− Some(DirectiveArgs::Text(Some(line))) => format!("{}\n", line.raw),
2939− _ => verbatim_text(&node.children),
2943−/// The text of a verbatim body (`@head`, `@style`, `@markdown`, `@raw`).
2944−fn verbatim_text(children: &[syntax::Node]) -> String {
2945− let mut text = String::new();
2946− for child in children {
2947− if let NodeKind::Verbatim(body) = &child.kind {
2948− text.push_str(&body.text);
2955// ---------------------------------------------------------------------------
1063// ---------------------------------------------------------------------------
@@ -2996,708 +1104,88 @@ fn replace_children_and_slots(
2998// ---------------------------------------------------------------------------
1106// ---------------------------------------------------------------------------
2999−// Where @slot and @children are written
1107+// Element parsing
3000// ---------------------------------------------------------------------------
1108// ---------------------------------------------------------------------------
3002−/// The files each `@include` line brought in, by the line's node id, with
1110+fn extract_element_name(content: &str) -> &str {
3003−/// the include chain that leads to each.
1111+ let without_at = &content[1..];
3004−type IncludedBy = HashMap<usize, Vec<(Rc<Tree>, String)>>;
1112+ match without_at.find([' ', '[']) {
3005−
1113+ Some(i) => &without_at[..i],
3006−/// The lines of the files an `@include` line brings in, and the include
1114+ None => without_at,
3007−/// chain of each (for diagnostics).
1115+ }
3008−type Included<'a, 'f> = &'f dyn Fn(&syntax::Node) -> Vec<(&'a [syntax::Node], Option<&'a str>)>;
3010−/// Whether `name` is a function here: defined so far, or anywhere in the
3011−/// file and the files it includes.
3012−fn is_function(name: &str, ctx: &ParseContext) -> bool {
3013− ctx.env.function(name).is_some() || ctx.namespace.contains(name)
3016−/// Whether `name` is one slot name: letters, digits, `-` and `_`,
1118+fn parse_single_element(
3017−/// starting with a letter (like a function's name).
1119+ content: &str,
3018−fn is_slot_name(name: &str) -> bool {
1120+ line_num: usize,
3019− name.chars().next().is_some_and(char::is_alphabetic)
1121+ ctx: &mut ParseContext,
3020− && name
1122+) -> Result<Element, ParseError> {
3021− .chars()
1123+ let (kind, rest) = if let Some(without_at) = content.strip_prefix('@') {
3022− .all(|c| c.is_alphanumeric() || c == '-' || c == '_')
1124+ match without_at.find([' ', '[']) {
1126+ let kind_str = &without_at[..i];
1127+ let rest = if without_at.as_bytes()[i] == b'[' {
1128+ without_at[i..].to_string()
1130+ without_at[i + 1..].to_string()
1132+ match parse_element_kind(kind_str, line_num) {
1133+ Ok(kind) => (kind, rest),
1135+ // Also suggest user-defined functions
1136+ if let Some(fn_suggestion) = suggest_fn_name(kind_str, ctx) {
1138+ format!("{}, or did you mean @{}?", e.message, fn_suggestion);
1144+ None => match parse_element_kind(without_at, line_num) {
1145+ Ok(kind) => (kind, String::new()),
1147+ if let Some(fn_suggestion) = suggest_fn_name(without_at, ctx) {
1148+ e.message = format!("{}, or did you mean @{}?", e.message, fn_suggestion);
1155+ return Err(ParseError {
1157+ message: format!("expected @element or [attrs], got: {}", content),
3025−/// What a `@slot` or `@children` line is written in.
1161+ // Parse optional [attrs]
3026−#[derive(Clone, Copy)]
1162+ let (attrs, rest) = if rest.starts_with('[') {
3027−enum Place<'a> {
1163+ parse_attr_brackets(&rest, line_num, ctx)?
3028− /// The top of a file or of a function's body, or a built-in element
1164+ } else {
3029− /// (by its name).
1165+ (Vec::new(), rest)
3030− Element(Option<&'a str>),
1166+ };
3031− /// A call: its content.
3035−/// Where a line is, for [`slot_uses`].
1168+ let rest = rest.trim().to_string();
3036−#[derive(Clone, Copy)]
1169+ track_var_refs(&rest, &mut ctx.used_variables);
3038− /// Inside a function's body.
3041− /// Outside a body: the call (and its line) whose content it is in.
3042− call: Option<(&'a str, usize)>,
3043− /// The include chain of the file it is in, when that isn't the file
3044− /// being compiled.
3045− file: Option<&'a str>,
3048−impl At<'_> {
1171+ // For @link, first token of rest is URL, remainder is inline text
3049− /// The top of a file, or of a function's body.
1172+ let mut children = Vec::new();
3050− fn top(body: bool) -> Self {
1173+ let argument = if rest.is_empty() {
3052− body,
1175+ } else if kind == ElementKind::Link {
3053− place: Place::Element(None),
1176+ let rest_sub = substitute_vars(&protect_escapes(&rest), &ctx.variables);
3054− call: None,
1177+ if let Some((url, text)) = rest_sub.split_once(' ') {
3055− file: None,
1178+ let text = text.trim();
3056− }
1179+ if !text.is_empty() {
3057− }
1180+ children.push(Node::Text(parse_text_segments(text, ctx)));
3059−
1182+ Some(restore_escapes(url))
3060−/// What [`slot_uses`] knows about the names and files it walks.
1183+ } else {
3061−struct Scan<'a, 'f> {
1184+ Some(restore_escapes(&rest_sub))
3062− is_function: &'f dyn Fn(&str) -> bool,
3063− included: Included<'a, 'f>,
3064− /// Visit the bodies of the functions defined in the lines too.
3068−/// A `@slot` or `@children` written in a file, and where.
3069−struct SlotUse<'a> {
3070− node: &'a syntax::Node,
3071− head: &'a syntax::Head,
3072− /// The text after it, which is a slot's name; `None` when it isn't
3073− /// the last head of its chain.
3074− text: Option<&'a syntax::Text>,
3075− /// Written inline in a line of text, `{@slot x}`.
3081− fn is_slot(&self) -> bool {
3082− self.head.name == "slot"
3085− /// The slot's name as written.
3086− fn name(&self) -> &str {
3087− self.text.map_or("", |t| t.raw.trim())
3090− /// A `@slot NAME` that marks a place in a function's body (not one
3091− /// that fills a slot of a call).
3092− fn declares(&self) -> bool {
3093− self.is_slot() && !self.inline && !matches!(self.at.place, Place::Call)
3097−/// Where each `@slot` and `@children` in `block` is written. A `@slot`
3098−/// directly under a call (under its `@if`, `@else` and `@each` too) fills
3099−/// one of its slots; anywhere else in a function's body it declares one.
3100−/// An included file's lines are where its `@include` is.
3102− block: &'a [syntax::Node],
3104− scan: &Scan<'a, '_>,
3105− out: &mut Vec<SlotUse<'a>>,
3108− text: &'a syntax::Text,
3109− node: &'a syntax::Node,
3111− scan: &Scan<'a, '_>,
3112− out: &mut Vec<SlotUse<'a>>,
3114− for segment in &text.segments {
3115− if let Segment::Inline(inline_element) = segment {
3116− let head = &inline_element.head;
3117− if matches!(head.name.as_str(), "slot" | "children")
3118− && !(scan.is_function)(&head.name)
3123− text: inline_element.text.as_ref(),
3128− if let Some(text) = &inline_element.text {
3129− inline(text, node, at, scan, out);
3134− for node in block {
3136− NodeKind::Directive(directive) => match &directive.args {
3137− DirectiveArgs::Let(def) if matches!(def.form, LetForm::Function(_)) => {
3138− if scan.into_lets {
3143− slot_uses(&node.children, top, scan, out);
3146− // A value's body is an error of its own
3147− DirectiveArgs::Let(_) => {}
3148− _ if directive.spec.body == BodyKind::Verbatim => {}
3149− // `@if`, `@else` and `@each` put their lines in place, and
3150− // `@include` its file's; the lines under a directive that
3151− // takes no body are its siblings
3153− for (lines, file) in (scan.included)(node) {
3154− slot_uses(lines, At { file, ..at }, scan, out);
3156− slot_uses(&node.children, at, scan, out);
3159− NodeKind::Element(line) => {
3161− let last = line.chain.len() - 1;
3162− for (i, head) in line.chain.iter().enumerate() {
3163− let text = if i == last { line.text.as_ref() } else { None };
3164− let function = (scan.is_function)(&head.name);
3165− if !function && matches!(head.name.as_str(), "slot" | "children") {
3173− } else if let Some(text) = text {
3174− inline(text, node, at, scan, out);
3177− at.place = Place::Call;
3179− at.call = Some((&head.name, node.span.line));
3182− at.place = Place::Element(Some(&head.name));
3185− slot_uses(&node.children, at, scan, out);
3187− NodeKind::Text(text) => {
3188− inline(text, node, at, scan, out);
3189− slot_uses(&node.children, at, scan, out);
3191− NodeKind::Blank | NodeKind::Comment | NodeKind::Verbatim(_) => {}
3196−/// The slots a function's body declares, and whether it has a
3197−/// `@children`, when it is defined. The files its `@include` lines bring
3198−/// in count too: they are read now, since they run only at a call.
3199−fn declared_slots(body: &[syntax::Node], ctx: &mut ParseContext) -> (Vec<String>, bool) {
3200− let mut files = HashMap::new();
3203− ctx.base_path.clone(),
3208− let included = |node: &syntax::Node| match files.get(&node.id) {
3209− Some(tree) => vec![(&tree.nodes[..], None)],
3210− None => Vec::new(),
3212− let is_function = |name: &str| is_function(name, ctx);
3213− slots_of(body, &is_function, &included)
3216−/// Read and parse the files the `@include` lines in `nodes` bring in (by
3217−/// a literal path, relative to `base`), and the files those include, by
3218−/// the node id of each `@include` line.
3220− nodes: &[syntax::Node],
3221− base: Option<PathBuf>,
3222− stack: &mut Vec<PathBuf>,
3223− ctx: &mut ParseContext,
3224− files: &mut HashMap<usize, Rc<Tree>>,
3226− let mut includes = Vec::new();
3227− for node in nodes {
3228− node.walk(&mut |node| {
3229− if let Some(DirectiveArgs::Text(Some(path))) = node.directive().map(|d| &d.args)
3230− && node.is_directive("include")
3232− includes.push((node.id, path.raw.clone()));
3236− for (id, path) in includes {
3237− let path = path.trim_matches('"');
3238− if path.contains('$') {
3241− let resolved = match &base {
3242− Some(base) => base.join(path),
3243− None => PathBuf::from(path),
3245− if stack.contains(&resolved) {
3248− let Ok(text) = ctx.read_file(&resolved) else {
3251− let tree = ctx.parse_tree(&text);
3252− stack.push(resolved.clone());
3253− let parent = resolved.parent().map(Path::to_path_buf);
3254− read_includes(&tree.nodes, parent, stack, ctx, files);
3256− files.insert(id, tree);
3260−/// The slots a function's body declares (`@slot NAME`, in order), and
3261−/// whether it has a `@children` for the content of a call. A `@slot`
3262−/// directly under a call in the body fills that call's slot instead, so
3263−/// `is_function` says which names are functions. The files the body
3264−/// includes aren't read.
3265−pub fn function_slots(
3266− body: &[syntax::Node],
3267− is_function: &dyn Fn(&str) -> bool,
3268−) -> (Vec<String>, bool) {
3269− slots_of(body, is_function, &|_| Vec::new())
3273− body: &'a [syntax::Node],
3274− is_function: &dyn Fn(&str) -> bool,
3275− included: Included<'a, '_>,
3276−) -> (Vec<String>, bool) {
3282− let mut uses = Vec::new();
3283− slot_uses(body, At::top(true), &scan, &mut uses);
3284− let mut slots: Vec<String> = Vec::new();
3285− for slot in uses.iter().filter(|u| u.declares()) {
3286− let name = slot.name();
3287− if is_slot_name(name) && !slots.iter().any(|s| s == name) {
3288− slots.push(name.to_string());
3291− let has_children = uses.iter().any(|u| !u.is_slot() && !u.inline);
3292− (slots, has_children)
3295−/// The line as written, indented, when it is one physical line, so a
3296−/// column points into it.
3297−fn written_line(node: &syntax::Node) -> String {
3298− match node.line_count <= 1 {
3299− true => format!("{}{}", " ".repeat(node.indent), node.source),
3300− false => node.source.clone(),
3304−/// The lines of the files an `@include` line brought in when it ran, from
3306−fn ran_includes<'a>(
3307− included_by: &'a IncludedBy,
3308− node: &syntax::Node,
3309−) -> Vec<(&'a [syntax::Node], Option<&'a str>)> {
3310− match included_by.get(&node.id) {
3311− Some(files) => files
3313− .map(|(tree, chain)| (&tree.nodes[..], Some(chain.as_str())))
3315− None => Vec::new(),
3319−/// Check where every `@slot` and `@children` of the file and the files it
3320−/// includes is written, whether or not it runs: a slot has one name, a
3321−/// function's body marks places with them, and a call fills its slots
3322−/// with `@slot` blocks directly under it. An included file's lines are
3323−/// where its `@include` is (in a body, under a call), so an `@include`
3324−/// that never ran leaves its file unchecked.
3325−fn check_slot_places(ctx: &mut ParseContext) {
3326− let trees = std::mem::take(&mut ctx.trees);
3327− let included_by = ctx.included_by.clone();
3328− let is_function = |name: &str| is_function(name, ctx);
3330− is_function: &is_function,
3331− included: &|node| ran_includes(&included_by, node),
3334− let mut uses = Vec::new();
3335− for (tree, _) in trees.iter().filter(|(_, chain)| chain.is_none()) {
3336− slot_uses(&tree.nodes, At::top(false), &scan, &mut uses);
3338− let found: Vec<Diagnostic> = uses
3340− .filter_map(|slot| {
3341− let mut d = slot_problem(slot)?;
3342− if d.column.is_none() {
3343− d = d.column(slot.head.name_span.column);
3345− d = d.source(written_line(slot.node));
3346− if let Some(file) = slot.at.file {
3347− d.message = format!("{}\n in {}", d.message, file);
3352− ctx.diagnostics.extend(found);
3356−/// What is wrong with a `@slot` or `@children` where it is written.
3357−fn slot_problem(slot: &SlotUse) -> Option<Diagnostic> {
3358− let line = slot.node.span.line;
3359− let what = if slot.is_slot() {
3360− match slot.name() {
3361− "" => "@slot".to_string(),
3362− name => format!("@slot {}", name),
3364 } else {
1186 } else {
3365− "@children".to_string()
1187+ Some(restore_escapes(&substitute_vars(&protect_escapes(&rest), &ctx.variables)))
3368− return Some(Diagnostic::error(
3369− code::MISPLACED_SLOT,
3372− "{} goes on a line of its own: inline in text it marks and fills nothing",
3377− if let Some(list) = &slot.head.attrs {
3380− code::UNEXPECTED_ARGUMENT,
3383− "{} takes no attributes: it is replaced by content, so style the \
3384− element around it",
3388− .column(list.span.column),
3391− if slot.is_slot() {
3392− let name = slot.name();
3393− if name.is_empty() {
3394− return Some(Diagnostic::error(
3395− code::MISSING_ARGUMENT,
3397− "@slot needs a name: `@slot footer` (the caller's content without a \
3398− name goes where `@children` is)"
3402− if !is_slot_name(name) {
3403− let joined = name.split_whitespace().collect::<Vec<_>>().join("-");
3404− let suggestion = is_slot_name(&joined).then_some(joined);
3405− let column = slot.text.map(|t| t.span.column);
3406− let d = Diagnostic::error(
3407− code::INVALID_SLOT_NAME,
3410− "'{}' is not a slot name: a slot's name is one word of letters, digits, \
3411− `-` and `_`, starting with a letter, and its content goes on the lines \
3417− .suggest(suggestion);
3418− return Some(match column {
3419− Some(column) => d.column(column),
3423− if matches!(slot.at.place, Place::Call) || slot.at.body {
3426− let message = match (slot.at.call, slot.at.place) {
3427− (Some((call, call_line)), Place::Element(Some(element))) => format!(
3428− "{} is inside @{}, so it fills nothing: a @slot block that fills a slot of \
3429− @{} (line {}) goes directly under the call",
3430− what, element, call, call_line
3433− "{} is outside a function's body: `@slot NAME` marks a place in a body \
3434− (`@let @name`), and directly under a call it fills one",
3438− return Some(Diagnostic::error(code::MISPLACED_SLOT, line, message));
3443− let message = match slot.at.call {
3444− Some((call, _)) => format!(
3445− "@children is outside a function's body, so it stands for nothing: the content \
3446− for @{} is written directly under the call",
3449− None => "@children is outside a function's body: it marks where a body puts the \
3450− content of each call"
3453− Some(Diagnostic::error(code::MISPLACED_SLOT, line, message))
3456−/// A `@slot NAME` block that fills a slot of a call.
3458− node: &'a syntax::Node,
3459− text: &'a syntax::Text,
3460− /// The include chain of the file it is in, when that isn't the file
3461− /// being compiled.
3462− file: Option<&'a str>,
3465−/// Whether `@slot` is the built-in element here, and not a function
3466−/// defined so far that took its name.
3467−fn slot_is_built_in(ctx: &ParseContext) -> bool {
3468− ctx.env.function("slot").is_none()
3471−/// The `@slot NAME` blocks directly under a call, in `block` (under its
3472−/// `@if`, `@else` and `@each` too, and in the files its `@include` lines
3475− block: &'a [syntax::Node],
3476− file: Option<&'a str>,
3477− included: &'a IncludedBy,
3478− out: &mut Vec<Filler<'a>>,
3480− for node in block {
3482− NodeKind::Directive(directive)
3483− if matches!(directive.name(), "if" | "else" | "each") =>
3485− fillers(&node.children, file, included, out);
3487− NodeKind::Directive(directive) if directive.name() == "include" => {
3488− for (lines, file) in ran_includes(included, node) {
3489− fillers(lines, file, included, out);
3492− NodeKind::Element(line) if line.chain.len() == 1 && line.chain[0].name == "slot" => {
3493− if let Some(text) = &line.text {
3494− out.push(Filler { node, text, file });
3502−/// Whether `block`, the lines under a call, holds content other than
3503−/// `@slot` blocks (under `@if`, `@else` and `@each` too): text, an
3504−/// element, raw HTML, Markdown or an included file. For code that doesn't
3506−fn holds_content(block: &[syntax::Node], ctx: &ParseContext) -> bool {
3507− block.iter().any(|node| match &node.kind {
3508− NodeKind::Directive(directive) => match directive.name() {
3509− "if" | "else" | "each" => holds_content(&node.children, ctx),
3510− name => matches!(name, "raw" | "markdown" | "include"),
3512− NodeKind::Element(line) => {
3513− line.chain[0].name != "slot" || !slot_is_built_in(ctx) || line.chain.len() > 1
3515− NodeKind::Text(_) => true,
3520−/// Check the `@slot NAME` blocks passed to each call of a line against
3521−/// the slots its function declares. `calls` has the function of each head
3522−/// of the chain that is a call.
3524− node: &syntax::Node,
3525− element: &syntax::ElementLine,
3526− calls: &[Option<(String, Rc<FnDef>)>],
3527− ctx: &mut ParseContext,
3529− if !slot_is_built_in(ctx) {
3532− let included = ctx.included_by.clone();
3533− let last = element.chain.len() - 1;
3534− for (i, call) in calls.iter().enumerate() {
3535− let Some((name, function)) = call else {
3538− let mut found = Vec::new();
3540− fillers(&node.children, None, &included, &mut found);
3541− } else if i + 1 == last
3542− && element.chain[last].name == "slot"
3543− && let Some(text) = &element.text
3545− // `@card > @slot footer`
3546− found.push(Filler {
3552− for filler in found {
3553− let slot = filler.text.raw.trim();
3554− if !is_slot_name(slot) || function.slots.iter().any(|s| s == slot) {
3557− let mut d = unknown_slot(name, slot, &function.slots, filler.text.span.line)
3558− .column(filler.text.span.column)
3559− .source(written_line(filler.node));
3560− if let Some(file) = filler.file {
3561− d.message = format!("{}\n in {}", d.message, file);
3568−/// A `@slot NAME` block for a slot the function doesn't declare.
3569−fn unknown_slot(function: &str, slot: &str, slots: &[String], line: usize) -> Diagnostic {
3570− let candidates: Vec<&str> = slots.iter().map(String::as_str).collect();
3571− let suggestion = suggest_closest(slot, &candidates);
3572− let message = match (slots.is_empty(), suggestion) {
3573− (true, _) => format!(
3574− "@{} has no slot '{}': its body declares no slots (`@slot NAME`)",
3577− (false, Some(close)) => format!(
3578− "@{} has no slot '{}', did you mean '{}'? (its slots: {})",
3584− (false, None) => format!(
3585− "@{} has no slot '{}' (its slots: {})",
3591− Diagnostic::error(code::UNKNOWN_SLOT, line, message)
3593− .suggest(suggestion)
3596−/// Content passed to a function whose body has no `@children`.
3597−fn no_children(function: &str, line: usize, column: Option<usize>) -> Diagnostic {
3598− let d = Diagnostic::error(
3599− code::UNEXPECTED_CONTENT,
3602− "@{0} takes no content: its body has no `@children`, so the text and lines \
3603− passed to it would be dropped (pass text as a parameter, `@{0} [name value]`, \
3604− or add `@children` to the body)",
3608− .subject(function);
3610− Some(column) => d.column(column),
3615−// ---------------------------------------------------------------------------
3617−// ---------------------------------------------------------------------------
3619−/// Build the element for `@name [attrs] text` (on its own line, in a chain,
3620−/// or inline in text).
3621−fn parse_single_element(
3622− head: &syntax::Head,
3623− text: Option<&syntax::Text>,
3625− ctx: &mut ParseContext,
3626−) -> Result<Element, ParseError> {
3627− let kind = parse_element_kind(&head.name, line_num, ctx)?;
3628− let mut attrs = head.attrs.as_ref().map_or_else(Vec::new, |list| {
3629− parse_attr_list(&list.attrs, line_num, ctx, true, &[])
3632− // The leading argument: for an element whose row names a leading
3633− // attribute (`@link`'s href, `@image`'s src, `@form`'s action, ...),
3634− // the first token of the text fills it, split before anything is
3635− // filled in, and the rest is content (an error on an element without
3636− // content). `@slot`'s whole text is its name. Any other element's text
3637− // is content, parsed like any line of text, as in `@el [padding 8]
3638− // Hello` or `@h2 Meet {@text htmlang}`; its layout decides how it
3639− // combines with the lines under it.
3640− let mut children = Vec::new();
3641− let mut argument = None;
3642− let leading = kind.arg().attributes();
3644− Some(text) if !leading.is_empty() => {
3645− let (token, rest) = text.split_leading();
3648− .find(|a| a.html && leading.contains(&a.key.as_str()))
3649− .map(|a| (a.key.clone(), a.value.clone().unwrap_or_default()));
3650− if let Some((key, value)) = given {
3651− // The attribute wins; the text is content, as if the
3652− // element had no leading argument
3653− ctx.push_once(leading_twice(&kind, &token, &key, &value, text, ctx));
3654− if !takes_no_text(&kind) {
3655− children.push(Node::Text(text_segments(text, ctx)));
3657− } else if let Some(d) = bad_leading_token(&kind, &token, &text.raw, ctx) {
3658− // Nothing is taken as the argument; the line is content
3660− if !takes_no_text(&kind) {
3661− children.push(Node::Text(text_segments(text, ctx)));
3664− let column = Some(token.span.column);
3665− if let Some(d) = text_as_url(&kind, &token, ctx) {
3669− ctx.fill_value(&token.raw, text.span.line, column, Sink::Text)
3672− if let Some(rest) = rest {
3673− if let Some(d) = chain_after_argument(&kind, &token.raw, &rest, ctx) {
3676− if takes_no_text(&kind) {
3677− let d = after_the_leading_argument(&kind, &token.raw, &rest);
3678− let d = at_attribute(d, Some(rest.span.column), ctx);
3681− children.push(Node::Text(text_segments(&rest, ctx)));
3686− Some(text) if matches!(kind, ElementKind::Slot(_)) => {
3688− Some(ctx.interpolate_text(&text.raw, text.span.line, Some(text.span.column)));
3690− Some(text) => children.push(Node::Text(text_segments(text, ctx))),
3691− // `@link [href=/about]`: the attribute is the leading argument, so
3692− // both forms compile the same (`@image [src=a.svg, inline]`). Not
3693− // for `@source`, whose attribute depends on where it is.
3694− None if leading.len() == 1 => {
3695− if let Some(i) = attrs.iter().position(|a| a.html && a.key == leading[0]) {
3696− argument = Some(attrs.remove(i).value.unwrap_or_default());
3702 // For @slot, the argument is the slot name
1190 // For @slot, the argument is the slot name
3703 let kind = if let ElementKind::Slot(_) = kind {
1191 let kind = if let ElementKind::Slot(_) = kind {
@@ -3706,352 +1194,72 @@ fn parse_single_element(
1197+ // Every other element treats its argument as leading text content, as
1198+ // in `@el [padding 8] Hello` or `@paragraph Read {@link /more more}`.
1199+ let argument = match argument {
1200+ Some(_) if !argument_is_special(&kind) && !renders_argument_as_text(&kind) => {
1201+ children.insert(0, Node::Text(parse_text_segments(&rest, ctx)));
3709 Ok(Element {
1207 Ok(Element {
3712 argument,
1210 argument,
3713 children,
1211 children,
3714 line_num,
1212 line_num,
3719−/// Whether `node` or a line inside it calls `@name` outside any `@if`
1216+/// Elements whose argument is not text content: a URL, a source, an action,
3720−/// (in a chain, or inline in text).
1217+/// or a slot name.
3721−fn calls_unguarded(node: &syntax::Node, name: &str) -> bool {
1218+fn argument_is_special(kind: &ElementKind) -> bool {
3722− if node.is_directive("if") || node.is_directive("else") {
1219+ matches!(
3723− return false;
1220+ kind,
3724− }
1221+ ElementKind::Link | ElementKind::Image | ElementKind::Script | ElementKind::Slot(_)
3725− let text_calls = |text: &syntax::Text| {
1222+ ) || kind
3726− text.segments
1223+ .spec()
3727− .iter()
1224+ .is_some_and(|spec| matches!(spec.arg, TagArg::Attr(_)))
3728− .any(|s| matches!(s, Segment::Inline(inline) if inline.head.name == name))
1225+}
3730− let here = match &node.kind {
1227+/// The directive names (without `@`) the parser recognizes, for tools such
3731− NodeKind::Element(element) => {
1228+/// as the language server.
3732− element.chain.iter().any(|head| head.name == name)
1229+pub fn known_directives() -> &'static [&'static str] {
3733− || element.text.as_ref().is_some_and(text_calls)
1230+ KNOWN_DIRECTIVES
3735− NodeKind::Text(text) => text_calls(text),
1232+
3736− _ => false,
1233+const KNOWN_DIRECTIVES: &[&str] = &[
3738− here || node
1235+ "let",
3739− .children
1236+ "include",
3740− .iter()
1237+ "raw",
3741− .any(|child| calls_unguarded(child, name))
1238+ "if",
3744−/// `@td [padding 8] @children`: `@children` and `@slot NAME` mark where a
1241+ "meta",
3745−/// call's content goes only on a line of their own; after an element's
1242+ "head",
3746−/// attributes, or in a verbatim body, they are text.
1243+ "style",
3747−fn marker_in_text(node: &syntax::Node) -> Option<Diagnostic> {
1244+ "markdown",
3748− let is_marker = |text: &str| {
1245+ "data",
3749− let text = text.trim();
1246+];
3750− text == "@children" || text == "@slot" || text.starts_with("@slot ")
3752− let mut line = node.span.line;
3753− let mut source = written_line(node);
3754− let (marker, message) = match &node.kind {
3755− NodeKind::Element(element) => {
3756− let text = element.text.as_ref()?;
3757− if !is_marker(&text.raw) {
3760− let name = &element.chain.last()?.name;
3761− let marker = text.raw.trim().to_string();
3762− let message = format!(
3763− "`{marker}` after @{name}'s attributes is text: it marks where a call's content \
3764− goes only on a line of its own, so write it on the next line, indented under \
3769− NodeKind::Verbatim(verbatim) if verbatim.escaped => {
3770− let (i, written) = verbatim
3774− .find(|(_, l)| is_marker(l))?;
3775− let marker = written.trim().to_string();
3777− source = written.to_string();
3778− let message = format!(
3779− "`{marker}` in a verbatim body is text: the body is written as it is, so it can't \
3780− hold a call's content (pass the text as a parameter instead)"
3787− Diagnostic::error(code::MISPLACED_SLOT, line, message)
3793−/// A first word that can't be a leading argument: an inline element
3794−/// (`@link {@b x} y`), or a quote that isn't closed (`@link "a b`).
3795−fn bad_leading_token(
3796− kind: &ElementKind,
3797− token: &syntax::Arg,
3799− ctx: &ParseContext,
3800−) -> Option<Diagnostic> {
3801− let what = leading_name(kind);
3802− let name = kind.name();
3803− let message = if token.raw.starts_with("{@") {
3805− "@{0} takes its {1} first, before any text: write `@{0} VALUE {2}`, or give it as \
3811− } else if token.raw.starts_with('"') && syntax::quoted_string(&token.raw).is_none() {
3813− "@{}'s {} starts with a `\"` that isn't closed: close it (`\"...\"`), or write \
3814− `\\\"` for a quote in the value",
3820− let d = Diagnostic::error(code::UNEXPECTED_ARGUMENT, token.span.line, message)
3821− .subject(token.raw.clone());
3822− Some(at_attribute(d, Some(token.span.column), ctx))
3825−/// A first word taken as a URL that reads as text: a word with a capital
3826−/// and nothing a URL or a file name has, as in `@link [hx-get=/panel] Open
3827−/// panel`, whose href would be `Open`. It still is (a relative URL can be
3828−/// such a word), with a warning.
3829−fn text_as_url(kind: &ElementKind, token: &syntax::Arg, ctx: &ParseContext) -> Option<Diagnostic> {
3830− const URLS: &[&str] = &["href", "src", "srcset", "action", "data"];
3831− let word = token.raw.as_str();
3832− let reads_as_text = word.starts_with(char::is_uppercase)
3833− && !word.contains([
3834− '/', '.', ':', '#', '?', '=', '&', '%', '~', '$', '{', '\\', '"',
3836− if !reads_as_text || !kind.arg().attributes().iter().any(|a| URLS.contains(a)) {
3839− let name = kind.name();
3840− let attr = leading_name(kind);
3841− let text = if takes_no_text(kind) {
3844− format!(": write the {attr} before the text, or put the text on the lines under it")
3846− let message = format!(
3847− "@{name} takes '{word}', its first word, as its {attr}{text}. A relative URL that \
3848− starts with a capital is written `./{word}`"
3850− let d = Diagnostic::warning(code::TEXT_AS_URL, token.span.line, message).subject(word);
3851− Some(at_attribute(d, Some(token.span.column), ctx))
3854−/// `@link /a > @image logo.png`: a `>` chains only after an element's
3855−/// name or its `[attributes]`, so after a leading argument it is text.
3856−/// Said when what follows names an element or a function.
3857−fn chain_after_argument(
3858− kind: &ElementKind,
3860− rest: &syntax::Text,
3861− ctx: &ParseContext,
3862−) -> Option<Diagnostic> {
3863− let after = rest.raw.strip_prefix('>')?;
3864− let name_start = after.trim_start().strip_prefix('@')?;
3865− if after.len() == after.trim_start().len() {
3868− let name: String = name_start
3870− .take_while(|c| c.is_ascii_alphanumeric() || *c == '-')
3872− if ElementKind::from_name(&name).is_none() && ctx.env.function(&name).is_none() {
3875− let attr = leading_name(kind);
3876− let d = Diagnostic::warning(
3877− code::UNEXPECTED_ARGUMENT,
3880− "`{}` after @{}'s {} is text, not a chain: `>` chains after an element's name or \
3881− its [attributes], so write `@{} [{}={}] {}`",
3882− rest.raw.trim_end(),
3888− rest.raw.trim_end()
3891− .subject(rest.raw.trim_end());
3892− Some(at_attribute(d, Some(rest.span.column), ctx))
3895−/// A leading argument given twice, as the first token and as its
3896−/// attribute: `@link [href=/a] About`.
3898− kind: &ElementKind,
3899− token: &syntax::Arg,
3902− text: &syntax::Text,
3903− ctx: &ParseContext,
3905− let name = kind.name();
3906− let what = leading_name(kind);
3907− // The value as one token: quoted when it is empty or has a space in it
3908− let value = if !value.is_empty() && syntax::leading_token_len(value) == value.len() {
3911− format!("\"{}\"", value.replace('\\', "\\\\").replace('"', "\\\""))
3913− let written = if takes_no_text(kind) {
3914− format!("@{} {}", name, value)
3916− format!("@{} {} {}", name, value, text.raw)
3918− let d = Diagnostic::error(
3919− code::DUPLICATE_ATTRIBUTE,
3922− "@{} takes its first word '{}' as its {}, and it also has {}=: give it once, \
3924− name, token.raw, what, key, written
3927− .subject(token.raw.clone());
3928− at_attribute(d, Some(token.span.column), ctx)
3931−/// The attribute an element's leading argument fills, for messages.
3932−fn leading_name(kind: &ElementKind) -> &'static str {
3934− TagArg::Source => "srcset in @picture or src elsewhere",
3935− arg => arg.attribute(false).unwrap_or("argument"),
3939−/// Whether text after an element's leading argument has nowhere to go:
3940−/// an element without content (`@image`, `@source`, ...), or `@optgroup`,
3941−/// which holds only `@option` lines, so `@optgroup Citrus fruits` would
3942−/// otherwise make `Citrus` the label and drop `fruits`.
3943−fn takes_no_text(kind: &ElementKind) -> bool {
3944− kind.layout() == Layout::Void || kind.is_tag("optgroup")
3947−/// Text after the leading argument of an element without content:
3948−/// `@image logo.png Our logo`.
3949−fn after_the_leading_argument(kind: &ElementKind, token: &str, rest: &syntax::Text) -> Diagnostic {
3950− let name = kind.name();
3951− let attr = leading_name(kind);
3952− let alt = if matches!(kind, ElementKind::Image) || kind.is_tag("area") {
3953− " For a text alternative, write `alt=...`."
3957− let holds = if kind.layout() == Layout::Void {
3958− "it has no content"
3960− "it holds only the elements on the lines under it"
3962− let bare = syntax::quoted_string(token).unwrap_or(token);
3964− code::UNEXPECTED_ARGUMENT,
3967− "@{0} takes one word after its attributes, its {1} ('{2}'), and {5}, so '{3}' \
3968− would go nowhere. A value with a space in it is quoted: `\"{6} {3}\"`.{4}",
3969− name, attr, token, rest.raw, alt, holds, bare
3972− .subject(rest.raw.clone())
3975−/// The element named `name`, or an "unknown element" error that suggests
1248+fn parse_element_kind(s: &str, line_num: usize) -> Result<ElementKind, ParseError> {
3976−/// the closest element, directive or function.
1249+ if let Some(kind) = ElementKind::from_name(s) {
3977−fn parse_element_kind(
3980− ctx: &mut ParseContext,
3981−) -> Result<ElementKind, ParseError> {
3982− if let Some(kind) = ElementKind::from_name(name) {
3983 return Ok(kind);
1250 return Ok(kind);
3985− // A known name in a place it can't go: say why instead of suggesting
3986− // the name itself.
3987− let misplaced = if crate::ast::directive(name).is_some() {
3989− "unknown element @{}: @{} is a directive, which goes at the start of its own line",
3992− } else if ctx.env.bundle(name).is_some() {
3994− "unknown element @{}: '{}' is an attribute bundle, used as `[${}]` \
3995− (a function is defined with `@let @{}`)",
3996− name, name, name, name
3998− } else if ctx.env.value(name).is_some() {
4000− "unknown element @{}: '{}' is a value, used as `${}` \
4001− (a function is defined with `@let @{}`)",
4002− name, name, name, name
4004− } else if ctx.namespace.contains(name) {
4005− ctx.used_functions.insert(name.to_string());
4007− "unknown element @{}: the function @{} isn't visible here. A definition is \
4008− visible from its line to the end of its block, and a function's body sees what \
4009− is defined above the function, so define @{} above this line, outside the block \
4013− } else if matches!(name, "svg" | "math" | "template") {
4015− "unknown element @{}: htmlang doesn't write <{}>; put its markup in the page with \
4020− " (or an SVG file with `@image [inline] file.svg`)"
4028− if let Some(message) = misplaced {
4029− return Err(Diagnostic::error(code::UNKNOWN_ELEMENT, line_num, message).subject(name));
4031 let all_known: Vec<&str> = ElementKind::all_names()
1252 let all_known: Vec<&str> = ElementKind::all_names()
4032− .chain(DIRECTIVES.iter().map(|d| d.name))
1253+ .chain(KNOWN_DIRECTIVES.iter().copied())
4033 .collect();
1254 .collect();
4034− // An HTML element htmlang writes under its own name (`@a` is `@link`).
1255+ let message = match suggest_closest(s, &all_known) {
4035− let written_otherwise = crate::ast::HTML_NAMES_WRITTEN_OTHERWISE
1256+ Some(closest) => format!("unknown element @{}, did you mean @{}?", s, closest),
4036− .iter()
1257+ None => format!("unknown element @{}", s),
4037− .find(|(html, _)| *html == name)
4038− .map(|(_, htmlang)| *htmlang);
4039− let closest = written_otherwise.or_else(|| suggest_closest(name, &all_known));
4040− let mut message = match (closest, written_otherwise) {
4041− (Some(closest), Some(_)) => format!(
4042− "unknown element @{}, did you mean @{}? (@{} writes <{}>)",
4043− name, closest, closest, name
4045− (Some(closest), None) => format!("unknown element @{}, did you mean @{}?", name, closest),
4046− (None, _) => format!("unknown element @{}", name),
4048− let function = suggest_fn_name(name, ctx);
1259+ Err(ParseError {
4049− if let Some(function) = &function {
1260+ line: line_num,
4050− message = format!("{}, or did you mean @{}?", message, function);
1261+ message,
4052− Err(Diagnostic::error(code::UNKNOWN_ELEMENT, line_num, message)
4054− .suggest(closest.map(str::to_string).or(function)))
4057/// Format include/import stack as a readable chain for error messages.
1265/// Format include/import stack as a readable chain for error messages.
@@ -4122,37 +1330,34 @@ fn suggest_closest<'a>(input: &str, candidates: &[&'a str]) -> Option<&'a str> {
4125−/// Suggest the closest user-defined function name for typos, from the
1333+/// Suggest the closest user-defined function name for typos.
4126−/// functions defined so far and those defined anywhere in the file.
4127fn suggest_fn_name(input: &str, ctx: &ParseContext) -> Option<String> {
1334fn suggest_fn_name(input: &str, ctx: &ParseContext) -> Option<String> {
4128 let input_chars: Vec<char> = input.chars().collect();
1335 let input_chars: Vec<char> = input.chars().collect();
4129 let max_allowed = 2usize.min(input_chars.len().saturating_sub(1));
1336 let max_allowed = 2usize.min(input_chars.len().saturating_sub(1));
4130− let mut best: Option<(usize, &String)> = None;
1337+ let mut best: Option<String> = None;
4131− let visible: Vec<&String> = ctx.defined_functions.keys().collect();
1338+ let mut best_dist = usize::MAX;
4132− for name in visible.into_iter().chain(ctx.namespace.iter()) {
1339+ for name in ctx.functions.keys() {
4133 let nlen = name.chars().count();
1340 let nlen = name.chars().count();
4134 if nlen.abs_diff(input_chars.len()) > max_allowed {
1341 if nlen.abs_diff(input_chars.len()) > max_allowed {
4135 continue;
1342 continue;
4137 let name_chars: Vec<char> = name.chars().collect();
1344 let name_chars: Vec<char> = name.chars().collect();
4138 let dist = levenshtein_bounded(&input_chars, &name_chars, max_allowed);
1345 let dist = levenshtein_bounded(&input_chars, &name_chars, max_allowed);
4139− if dist <= max_allowed && best.is_none_or(|b| (dist, name) < b) {
1346+ if dist < best_dist && dist <= max_allowed {
4140− best = Some((dist, name));
1347+ best_dist = dist;
1348+ best = Some(name.clone());
4143− best.map(|(_, name)| name.clone())
1351+ best
4146/// Suggest the closest variable name for undefined `$var` references.
1354/// Suggest the closest variable name for undefined `$var` references.
4147−fn suggest_var_name(input: &str, vars: &[&str]) -> Option<String> {
1355+fn suggest_var_name(input: &str, vars: &HashMap<String, String>) -> Option<String> {
4148 let input_chars: Vec<char> = input.chars().collect();
1356 let input_chars: Vec<char> = input.chars().collect();
4149 let max_allowed = 2usize.min(input_chars.len().saturating_sub(1));
1357 let max_allowed = 2usize.min(input_chars.len().saturating_sub(1));
4150 let mut best: Option<String> = None;
1358 let mut best: Option<String> = None;
4151 let mut best_dist = usize::MAX;
1359 let mut best_dist = usize::MAX;
4152− let mut vars = vars.to_vec();
1360+ for name in vars.keys().filter(|k| !k.ends_with('#')) {
4153− // The same answer every time, whatever the order of the names
4154− vars.sort_unstable();
4156 let nlen = name.chars().count();
1361 let nlen = name.chars().count();
4157 if nlen.abs_diff(input_chars.len()) > max_allowed {
1362 if nlen.abs_diff(input_chars.len()) > max_allowed {
4158 continue;
1363 continue;
@@ -4161,1988 +1366,992 @@ fn suggest_var_name(input: &str, vars: &[&str]) -> Option<String> {
4161 let dist = levenshtein_bounded(&input_chars, &name_chars, max_allowed);
1366 let dist = levenshtein_bounded(&input_chars, &name_chars, max_allowed);
4162 if dist < best_dist && dist <= max_allowed {
1367 if dist < best_dist && dist <= max_allowed {
4163 best_dist = dist;
1368 best_dist = dist;
4164− best = Some(name.to_string());
1369+ best = Some(name.clone());
4170−// ---------------------------------------------------------------------------
1375+/// Check for undefined `$var` references and return "did you mean?" diagnostics.
4171−// Attribute parsing
1376+/// `indent` is the line's leading whitespace, which `input` has had trimmed;
4172−// ---------------------------------------------------------------------------
1377+/// reported columns and source lines include it.
4173−
1378+fn check_undefined_vars(
4174−/// The quoted strings of a CSS value, without their quotes.
1379+ input: &str,
4175−fn css_strings(value: &str) -> Vec<&str> {
1380+ vars: &HashMap<String, String>,
4176− let mut strings = Vec::new();
1381+ line_num: usize,
4177− let mut start = None;
1382+ indent: usize,
4178− let mut escaped = false;
1383+) -> Vec<Diagnostic> {
4179− for (i, c) in value.char_indices() {
1384+ let mut warnings = Vec::new();
4180− match (c, start) {
1385+ if !input.contains('$') {
4181− _ if escaped => escaped = false,
1386+ return warnings;
4182− ('\\', Some(_)) => escaped = true,
1387+ }
4183− ('"', None) => start = Some(i + 1),
1388+ let chars: Vec<char> = input.chars().collect();
4184− ('"', Some(from)) => {
1389+ let mut i = 0;
4185− strings.push(&value[from..i]);
1390+ while i < chars.len() {
4186− start = None;
1391+ if chars[i] == '$'
1392+ && i + 1 < chars.len()
1393+ && (chars[i + 1].is_alphanumeric() || chars[i + 1] == '_' || chars[i + 1] == '-')
1397+ let mut end = start;
1398+ while end < chars.len()
1399+ && (chars[end].is_alphanumeric()
1400+ || chars[end] == '-'
1401+ || chars[end] == '_'
1402+ || chars[end] == '.')
4188− _ => {}
1406+ while end > start && chars[end - 1] == '.' {
1409+ let name: String = chars[start..end].iter().collect();
1410+ if !name.is_empty()
1411+ && !vars.contains_key(&name)
1412+ && let Some(closest) = suggest_var_name(&name, vars)
1414+ warnings.push(Diagnostic {
1416+ column: Some(indent + col),
1418+ "undefined variable '${}', did you mean '${}'?",
1421+ severity: Severity::Warning,
1422+ source_line: Some(format!("{}{}", " ".repeat(indent), input)),
4191− strings
1430+ warnings
4194−/// An `if(...)` in a CSS value that isn't CSS's if(): CSS writes each
1433+// ---------------------------------------------------------------------------
4195−/// branch `CONDITION: VALUE`, so an if() without a `:` is something else.
1434+// Attribute parsing
4196−/// Quoted CSS strings are text, not calls.
1435+// ---------------------------------------------------------------------------
4197−fn not_css_if(value: &str) -> Option<&str> {
1436+
4198− let mut quote = None;
1437+/// Attributes that expect purely numeric values (px-based) or values with CSS units.
4199− let mut prev = None;
1438+const NUMERIC_ATTRS: &[&str] = &[
4200− let mut chars = value.char_indices();
1439+ "spacing",
4201− while let Some((at, c)) = chars.next() {
1440+ "gap",
4202− match quote {
1441+ "padding",
4203− Some(_) if c == '\\' => {
1442+ "padding-top",
4204− chars.next();
1443+ "padding-bottom",
1461+const CSS_UNIT_SUFFIXES: &[&str] = &[
1462+ "px", "%", "rem", "em", "vh", "vw", "vmin", "vmax", "dvh", "svh", "lvh", "ch", "ex", "cm",
1463+ "mm", "in", "pt", "pc", "fr",
1466+fn has_css_unit(value: &str) -> bool {
1467+ CSS_UNIT_SUFFIXES.iter().any(|u| value.ends_with(u))
1468+ || value.starts_with("var(")
1469+ || value.starts_with("calc(")
1470+ || value.starts_with("clamp(")
1471+ || value.starts_with("min(")
1472+ || value.starts_with("max(")
1475+/// Attributes that accept numeric OR keyword values.
1476+const NUMERIC_OR_KEYWORD_ATTRS: &[&str] = &["width", "height"];
1477+const SIZE_KEYWORDS: &[&str] = &["fill", "shrink"];
1479+fn validate_attr_value(attr: &Attribute, line_num: usize, ctx: &mut ParseContext) {
1480+ let base_key = crate::vocab::base_attribute(attr.key.as_str());
1482+ if let Some(val) = &attr.value {
1483+ if NUMERIC_ATTRS.contains(&base_key) {
1484+ // All space-separated parts must be numeric or have a CSS unit
1485+ for part in val.split_whitespace() {
1486+ if part.parse::<f64>().is_err() && !has_css_unit(part) {
1487+ ctx.diagnostics.push(Diagnostic {
1491+ "'{}' expects a numeric value (with optional unit), got '{}'",
1494+ severity: Severity::Warning,
4206− Some(q) if c == q => quote = None,
1500+ } else if NUMERIC_OR_KEYWORD_ATTRS.contains(&base_key) {
4207− Some(_) => {}
1501+ let is_keyword = SIZE_KEYWORDS.contains(&val.as_str());
4208− None if matches!(c, '"' | '\'') => quote = Some(c),
1502+ let is_numeric = val.parse::<f64>().is_ok();
4209− None => {
1503+ let has_unit = has_css_unit(val);
4210− let word_before =
1504+ if !is_keyword && !is_numeric && !has_unit {
4211− prev.is_some_and(|p: char| p.is_alphanumeric() || matches!(p, '-' | '_'));
1505+ ctx.diagnostics.push(Diagnostic {
4212− if !word_before && value[at..].starts_with("if(") {
1506+ line: line_num,
4213− let mut depth = 0;
1507+ column: None,
4214− let close = value[at + 2..].char_indices().find_map(|(i, c)| {
1508+ message: format!(
4215− match c {
1509+ "'{}' expects a number or one of [{}], got '{}'",
4216− '(' => depth += 1,
1510+ attr.key,
4217− ')' => depth -= 1,
1511+ SIZE_KEYWORDS.join(", "),
4220− (depth == 0).then_some(at + 2 + i)
1514+ severity: Severity::Warning,
1518+ } else if base_key == "opacity" {
1519+ if let Ok(v) = val.parse::<f64>() {
1520+ if !(0.0..=1.0).contains(&v) {
1521+ ctx.diagnostics.push(Diagnostic {
1524+ message: format!("'opacity' should be between 0 and 1, got '{}'", val),
1525+ severity: Severity::Warning,
4222− let end = close.map_or(value.len(), |c| c + 1);
4223− if !value[at + 3..end].contains(':') {
4224− return Some(&value[at..end]);
1530+ ctx.diagnostics.push(Diagnostic {
1533+ message: format!("'opacity' expects a numeric value, got '{}'", val),
1534+ severity: Severity::Warning,
4228− }
1538+ } else if base_key == "z-index" {
4229− prev = Some(c);
1539+ if val.parse::<i32>().is_err() {
4230− }
1540+ ctx.diagnostics.push(Diagnostic {
4231− None
1541+ line: line_num,
4232−}
1542+ column: None,
4233−
1543+ message: format!("'z-index' expects an integer, got '{}'", val),
4234−/// Why a CSS value can't be written into a rule as it is, whatever it
1544+ severity: Severity::Warning,
4235−/// means: a `;` (outside parentheses, where CSS's own `if()` uses it), a
1545+ source_line: None,
4236−/// `{` or a `}` would end the declaration or the rule, and an unclosed
1546+ });
4237−/// quote or parenthesis would run on into the rules after it. Quoted
4238−/// strings are text, and a backslash escapes the character after it, as
4239−/// in CSS. A `</style` anywhere, even in a string, would end the page's
4240−/// `<style>` element and start HTML.
4241−fn css_breakout(value: &str) -> Option<&'static str> {
4242− if value.to_ascii_lowercase().contains("</style") {
4243− return Some("a `</style`, which would end the page's style element");
4245− let mut quote = None;
4246− let mut depth = 0usize;
4247− let mut chars = value.chars();
4248− while let Some(c) = chars.next() {
4253− (Some(q), c) if c == q => quote = None,
1548+ } else if base_key == "display" {
4254− (Some(_), _) => {}
1549+ const DISPLAY_VALUES: &[&str] = &[
4255− (None, '"' | '\'') => quote = Some(c),
1550+ "none",
4256− (None, '(') => depth += 1,
1551+ "block",
4257− (None, ')') if depth == 0 => return Some("a `)` that closes nothing"),
1552+ "inline",
4258− (None, ')') => depth -= 1,
1553+ "inline-block",
4259− (None, ';') if depth == 0 => return Some("a `;`, which would end the declaration"),
1554+ "flex",
4260− (None, '{' | '}') => return Some("a `{` or `}`, which would end the CSS rule"),
1555+ "inline-flex",
4261− _ => {}
1556+ "grid",
4262− }
1557+ "inline-grid",
4264− match (quote, depth) {
1559+ "table-row",
4265− (Some('"'), _) => Some("a `\"` that isn't closed"),
1560+ "table-cell",
4266− (Some(_), _) => Some("a `'` that isn't closed"),
1561+ "contents",
4267− (None, 0) => None,
1562+ "flow-root",
4268− (None, _) => Some("a `(` that isn't closed"),
1563+ "list-item",
4270−}
1565+ if !DISPLAY_VALUES.contains(&val.as_str()) && !val.starts_with("var(") {
4271−
1566+ let suggestion = suggest_closest(val, DISPLAY_VALUES);
4272−/// The hex colors of a CSS value that don't have 3, 4, 6 or 8 hex
1567+ let msg = match suggestion {
4273−/// digits. A `#` word in a CSS value is a color, except inside `url(...)`
1568+ Some(s) => format!("unknown display value '{}', did you mean '{}'?", val, s),
4274−/// and quoted strings.
1569+ None => format!("unknown display value '{}'", val),
4275−fn bad_hex_colors(value: &str) -> Vec<&str> {
1570+ };
4276− let mut bad = Vec::new();
1571+ ctx.diagnostics.push(Diagnostic {
4277− let mut quote = None;
1572+ line: line_num,
4278− let mut in_url = 0usize;
1573+ column: None,
4279− let mut depth = 0usize;
1574+ message: msg,
4280− let mut chars = value.char_indices().peekable();
1575+ severity: Severity::Warning,
4281− while let Some((at, c)) = chars.next() {
1576+ source_line: None,
4282− match (quote, c) {
1577+ });
4286− (Some(q), c) if c == q => quote = None,
1579+ } else if base_key == "position" {
4287− (Some(_), _) => {}
1580+ const POSITION_VALUES: &[&str] = &["static", "relative", "absolute", "fixed", "sticky"];
4288− (None, '"' | '\'') => quote = Some(c),
1581+ if !POSITION_VALUES.contains(&val.as_str()) && !val.starts_with("var(") {
4289− (None, '(') => {
1582+ let suggestion = suggest_closest(val, POSITION_VALUES);
4290− depth += 1;
1583+ let msg = match suggestion {
4291− if value[..at].ends_with("url") && in_url == 0 {
1584+ Some(s) => format!("unknown position value '{}', did you mean '{}'?", val, s),
4292− in_url = depth;
1585+ None => format!("unknown position value '{}'", val),
1587+ ctx.diagnostics.push(Diagnostic {
1591+ severity: Severity::Warning,
4295− (None, ')') => {
1595+ } else if base_key == "overflow" || base_key == "overflow-x" || base_key == "overflow-y" {
4296− if in_url == depth {
1596+ const OVERFLOW_VALUES: &[&str] = &["visible", "hidden", "scroll", "auto", "clip"];
4297− in_url = 0;
1597+ if !OVERFLOW_VALUES.contains(&val.as_str()) && !val.starts_with("var(") {
4298− }
1598+ let suggestion = suggest_closest(val, OVERFLOW_VALUES);
4299− depth = depth.saturating_sub(1);
1599+ let msg = match suggestion {
1600+ Some(s) => format!("unknown overflow value '{}', did you mean '{}'?", val, s),
1601+ None => format!("unknown overflow value '{}'", val),
1603+ ctx.diagnostics.push(Diagnostic {
1607+ severity: Severity::Warning,
4301− (None, '#') if in_url == 0 => {
1611+ } else if base_key == "text-align" {
4302− let end = value[at + 1..]
1612+ const TEXT_ALIGN_VALUES: &[&str] =
4303− .find(|c: char| !(c.is_alphanumeric() || c == '-' || c == '_'))
1613+ &["left", "right", "center", "justify", "start", "end"];
4304− .map_or(value.len(), |n| at + 1 + n);
1614+ if !TEXT_ALIGN_VALUES.contains(&val.as_str()) && !val.starts_with("var(") {
4305− let hex = &value[at + 1..end];
1615+ let suggestion = suggest_closest(val, TEXT_ALIGN_VALUES);
4306− if !(matches!(hex.len(), 3 | 4 | 6 | 8)
1616+ let msg = match suggestion {
4307− && hex.chars().all(|c| c.is_ascii_hexdigit()))
1617+ Some(s) => format!("unknown text-align value '{}', did you mean '{}'?", val, s),
4308− {
1618+ None => format!("unknown text-align value '{}'", val),
4309− bad.push(&value[at..end]);
1619+ };
4310− }
1620+ ctx.diagnostics.push(Diagnostic {
1624+ severity: Severity::Warning,
4312− _ => {}
1628+ } else if base_key == "cursor" {
4313− }
1629+ const CURSOR_VALUES: &[&str] = &[
4315− bad
1631+ "default",
4318−/// A diagnostic about an attribute, with its column and source line when
1634+ "wait",
4319−/// it is on the line being evaluated.
1635+ "text",
4320−fn at_attribute(diagnostic: Diagnostic, column: Option<usize>, ctx: &ParseContext) -> Diagnostic {
1636+ "move",
4321− match (&ctx.current_source, column) {
1637+ "not-allowed",
4322− ((current, Some(text)), Some(column)) if *current == diagnostic.line => {
1638+ "crosshair",
4323− diagnostic.column(column).source(text.clone())
1639+ "grab",
4325− _ => diagnostic,
1641+ "help",
4327−}
1643+ "col-resize",
4329−/// Check a style's value. Values go to the CSS as written, so only what
1645+ "n-resize",
4330−/// can't be wrong in any CSS is checked: a value that would break out of
1646+ "s-resize",
4331−/// its rule is an error (and it is left out); a hex color without 3, 4, 6
1647+ "e-resize",
4332−/// or 8 digits, an `if()` that isn't CSS's and a quoted font stack are
1648+ "w-resize",
4333−/// warnings. Returns whether the value can be written.
1649+ "zoom-in",
4334−fn check_css_value(
1650+ "zoom-out",
4335− attr: &Attribute,
1651+ "context-menu",
4336− base: &str,
1652+ "cell",
4337− line: usize,
1653+ "copy",
4338− column: Option<usize>,
1654+ "alias",
4339− ctx: &mut ParseContext,
1655+ "no-drop",
4341− let Some(value) = &attr.value else {
1657+ if !CURSOR_VALUES.contains(&val.as_str())
4342− return true;
1658+ && !val.starts_with("url(")
4343− };
1659+ && !val.starts_with("var(")
4344− if let Some(reason) = css_breakout(value) {
4345− let diagnostic = Diagnostic::error(
4346− code::INVALID_VALUE,
4349− "the value of '{}' has {}: `{}` can't be written into the page's CSS",
4350− attr.key, reason, value
4353− .subject(value.as_str());
4354− ctx.diagnostics.push(at_attribute(diagnostic, column, ctx));
4357− if crate::vocab::is_custom_property(base) {
4361− let warn = |ctx: &mut ParseContext, diagnostic: Diagnostic| {
4362− let diagnostic = at_attribute(diagnostic, column, ctx);
4363− ctx.diagnostics.push(diagnostic);
4365− // In CSS, a quoted font-family is one family, commas and all
4366− if base == "font-family"
4367− && let Some(family) = css_strings(value).into_iter().find(|s| s.contains(','))
4372− .collect::<Vec<_>>()
4376− Diagnostic::warning(
4377− code::INVALID_VALUE,
4380− "font-family \"{}\" is one family, whose name has a comma in it: \
4381− for a font stack, write `font-family {}`",
4385− .subject(format!("\"{}\"", family))
4386− .suggest(Some(stack)),
4389− if let Some(call) = not_css_if(value) {
4392− Diagnostic::warning(
4393− code::INVALID_VALUE,
4396− "'{}' is not CSS's if(), whose branches are written \
4397− `if(CONDITION: VALUE; else: VALUE)`",
4404− for color in bad_hex_colors(value) {
4407− Diagnostic::warning(
4408− code::INVALID_COLOR,
4411− "invalid hex color '{}': a hex color has 3, 4, 6 or 8 hex digits",
4421−/// An unknown prefix: the message, the text it is about, and what to write
4422−/// instead, when something is close enough.
4423−struct PrefixProblem {
4426− suggestion: Option<String>,
4429−/// What is wrong with the prefix `rest` starts with, when the known
4430−/// prefixes are already split off it and what is left still starts with
4431−/// one: a word and a `:` (`hovr:`), or a word and a parenthesised argument
4432−/// and a `:` (`nth-chld(2):`). Selector prefixes are CSS's pseudo-classes
4433−/// and pseudo-elements under their CSS names, so an unknown one gets the
4434−/// closest name as a suggestion. Only names with the same first letter are
4435−/// suggested: `odd:` is two edits from `md:`, which it doesn't mean.
4436−fn unknown_prefix(rest: &str) -> Option<PrefixProblem> {
4437− use crate::vocab::{self, Pseudo};
4438− let name_len = rest.find(|c: char| !(c.is_ascii_alphanumeric() || c == '-'))?;
4439− let name = &rest[..name_len];
4440− if name.is_empty() {
4443− if rest[name_len..].starts_with('(') {
4444− // `name(...):`: a pseudo-class with an argument
4445− let close = vocab::closing_paren(rest, name_len)?;
4446− if !rest[close + 1..].starts_with(':') {
4449− let written = &rest[..close + 2];
4450− if matches!(vocab::pseudo(name), Some(Pseudo::Class | Pseudo::Element)) {
4451− let bare = format!("{}:", name);
4452− return Some(PrefixProblem {
4454− "'{}': `{}` takes no argument: write `{}`",
4456− vocab::pseudo_selector(&bare).unwrap_or_default(),
4459− subject: written.to_string(),
4460− suggestion: Some(bare),
4463− let functional: Vec<&str> = vocab::functional_pseudos()
4465− .filter(|p| p.chars().next() == name.chars().next())
4467− let suggestion = suggest_closest(name, &functional)
4468− .filter(|&closest| closest != name)
4469− .map(|closest| format!("{}(", closest));
4470− let written = format!("{}(", name);
4471− let message = match &suggestion {
4472− Some(closest) => format!("unknown prefix '{}', did you mean '{}'?", written, closest),
4473− None => format!("unknown prefix '{}'", written),
4475− return Some(PrefixProblem {
4481− if !rest[name_len..].starts_with(':') {
4484− let written = &rest[..name_len + 1];
4485− // `has:`: its argument is missing
4486− if vocab::pseudo(name) == Some(Pseudo::Function) {
4487− return Some(PrefixProblem {
4489− "'{}': `:{}()` takes an argument, in parentheses, as in CSS: `{}(...):`",
4490− written, name, name
4492− subject: written.to_string(),
4496− let prefixes = vocab::all_prefixes();
4497− let candidates: Vec<&str> = prefixes
4499− .map(String::as_str)
4500− .filter(|p| p.chars().next() == written.chars().next())
4502− // The closest name that starts with the same letter (`hvoer:` →
4503− // `hover:`), else the first that starts with the word written and a `-`
4504− // (`first:` → `first-child:`)
4505− let suggestion = suggest_closest(written, &candidates)
4507− let longer = format!("{}-", name);
4508− candidates.iter().copied().find(|p| p.starts_with(&longer))
4510− .filter(|&closest| closest != written)
4511− .map(str::to_string);
4512− let message = match &suggestion {
4513− Some(closest) => format!("unknown prefix '{}', did you mean '{}'?", written, closest),
4514− None => format!("unknown prefix '{}'", written),
4516− Some(PrefixProblem {
4518− subject: written.to_string(),
4523−/// Check an attribute's element prefix (`@td:padding 8`), when it has one:
4524−/// it names a built-in element that has an HTML tag of its own (not a
4525−/// function, and not `@el`, whose `<div>` other elements write too), there
4526−/// is one, not with `children:`, and what it styles is a CSS property, not
4527−/// one of htmlang's words, which compile against each element's layout and
4528−/// its parent's. Returns false, after reporting, when the attribute can't
4530−fn check_element_prefixes(
4535− column: Option<usize>,
4536− ctx: &mut ParseContext,
4538− use crate::ast::ElementKind;
4540− let elements: Vec<&str> = prefixes
4543− .filter(|p| vocab::element_prefix(p).is_some())
4545− let Some(&prefix) = elements.first() else {
4548− let fail = |ctx: &mut ParseContext,
4549− code: &'static str,
4552− suggestion: Option<String>| {
4553− let diagnostic = Diagnostic::error(code, line, message)
4555− .suggest(suggestion);
4556− let diagnostic = at_attribute(diagnostic, column, ctx);
4557− ctx.diagnostics.push(diagnostic);
4560− let name = vocab::element_prefix(prefix).unwrap_or_default();
4561− if is_function(name, ctx) {
4564− code::INVALID_PREFIX,
4566− "'{}': @{} is a function, and `{}` would pick elements out by their HTML tag, \
4567− which a function doesn't have: style what @{} writes in its body, or pass it \
4569− attr.key, name, prefix, name
4575− match ElementKind::from_name(name) {
4577− let own: Vec<&str> = ElementKind::all_names()
4578− .filter(|n| ElementKind::from_name(n).is_some_and(|k| k.own_tag().is_some()))
4580− // An HTML name htmlang writes under another (`@a:` is `@link:`)
4581− let (written_otherwise, shared) = match crate::ast::HTML_NAMES_WRITTEN_OTHERWISE
4583− .find(|(html, _)| *html == name)
4585− Some((_, htmlang)) if own.contains(htmlang) => (Some(*htmlang), false),
1661+ let suggestion = suggest_closest(val, CURSOR_VALUES);
4586− Some(_) => (None, true),
1662+ let msg = match suggestion {
4587− None => (None, false),
1663+ Some(s) => format!("unknown cursor value '{}', did you mean '{}'?", val, s),
4588− };
1664+ None => format!("unknown cursor value '{}'", val),
4589− // `@each:`, `@markdown:`: a directive, which is no element
1665+ };
4590− if crate::ast::directive(name).is_some() {
1666+ ctx.diagnostics.push(Diagnostic {
4591− return fail(
1667+ line: line_num,
4592− ctx,
1668+ column: None,
4593− code::UNKNOWN_PREFIX,
1669+ message: msg,
4594− format!(
1670+ severity: Severity::Warning,
4595− "unknown element @{} in '{}': @{} is a directive, and an element \
1671+ source_line: None,
4596− prefix names an element with an HTML tag of its own, such as `@td:`",
1672+ });
4603− // `@div:`, `@span:`: several elements write it
1674+ } else if base_key == "font-weight" {
4604− if shared {
1675+ const WEIGHT_VALUES: &[&str] = &[
4605− return fail(
1676+ "normal", "bold", "bolder", "lighter", "100", "200", "300", "400", "500", "600",
4606− ctx,
1677+ "700", "800", "900",
4607− code::UNKNOWN_PREFIX,
1678+ ];
4608− format!(
1679+ if !WEIGHT_VALUES.contains(&val.as_str()) && !val.starts_with("var(") {
4609− "unknown element @{} in '{}': htmlang writes <{}> for several \
1680+ ctx.diagnostics.push(Diagnostic {
4610− elements, so no element prefix picks it out",
1681+ line: line_num,
4611− name, prefix, name
1682+ column: None,
1684+ "'font-weight' expects a weight keyword or number 100-900, got '{}'",
4613− prefix,
1687+ severity: Severity::Warning,
4614− None,
1688+ source_line: None,
4617− // A name with the same first letter first (`@tdd:` is `@td:`)
1691+ } else if base_key == "color" || base_key == "background" {
4618− let same_letter: Vec<&str> = own
1692+ // Validate named CSS colors (only if not hex, rgb, hsl, var, etc.)
4619− .iter()
1693+ if !val.starts_with('#')
4620− .copied()
1694+ && !val.starts_with("rgb")
4621− .filter(|n| n.chars().next() == name.chars().next())
1695+ && !val.starts_with("hsl")
4622− .collect();
1696+ && !val.starts_with("var(")
4623− let closest = written_otherwise
1697+ && !val.starts_with("linear-gradient")
4624− .or_else(|| suggest_closest(name, &same_letter))
1698+ && !val.starts_with("radial-gradient")
4625− .or_else(|| suggest_closest(name, &own));
1699+ && !val.starts_with("conic-gradient")
4626− let message = match (closest, written_otherwise) {
1700+ && !val.starts_with("oklch")
4627− (Some(closest), Some(_)) => format!(
1701+ && !val.starts_with("oklab")
4628− "unknown element @{} in '{}', did you mean '@{}:'? (@{} writes <{}>)",
1702+ && !val.starts_with("color(")
4629− name, prefix, closest, closest, name
1703+ && !val.starts_with("light-dark(")
4630− ),
1704+ && !val.contains("url(")
4631− (Some(closest), None) => format!(
1705+ && !val.contains(' ')
4632− "unknown element @{} in '{}', did you mean '@{}:'?",
1706+ // skip shorthand multi-value
4633− name, prefix, closest
1707+ {
4634− ),
1708+ const NAMED_COLORS: &[&str] = &[
4635− (None, _) => format!("unknown element @{} in '{}'", name, prefix),
1709+ "transparent",
4636− };
1710+ "currentcolor",
4637− let suggestion = closest.map(|c| format!("@{}:", c));
1711+ "inherit",
4638− fail(ctx, code::UNKNOWN_PREFIX, message, prefix, suggestion)
1712+ "initial",
4640− Some(kind) if kind.own_tag().is_none() => {
1714+ "black",
4641− let reason = match kind.tag() {
1715+ "white",
4642− None => format!(
1716+ "red",
4643− "@{} writes no element of its own, so there is nothing for `{}` to style",
1717+ "green",
4644− name, prefix
1718+ "blue",
4646− Some(_) if kind.is_verbatim() => {
1720+ "orange",
4647− format!("@{} isn't shown, so there is nothing to style", name)
1721+ "purple",
4649− Some("span") => format!(
1723+ "brown",
4650− "@{} writes a <span>, as every line of text in a row or column does, so \
1724+ "gray",
4651− `{}` can't pick it out",
1725+ "grey",
4652− name, prefix
1726+ "cyan",
4654− Some(tag) => {
1728+ "lime",
4655− let others: Vec<String> = ElementKind::all_names()
1729+ "olive",
4656− .filter(|n| {
1730+ "navy",
4657− *n != name
1731+ "teal",
4658− && ElementKind::from_name(n).and_then(|k| k.tag()) == Some(tag)
1732+ "aqua",
4660− .map(|n| format!("@{}", n))
1734+ "maroon",
4661− .collect();
1735+ "silver",
4662− let others = match others.split_last() {
1736+ "coral",
4663− Some((last, [])) => last.clone(),
1737+ "salmon",
4664− Some((last, rest)) => format!("{} and {}", rest.join(", "), last),
1738+ "tomato",
4665− None => String::new(),
1739+ "crimson",
1777+ if !NAMED_COLORS.contains(&val.to_lowercase().as_str()) {
1778+ let lower = val.to_lowercase();
1779+ let suggestion = suggest_closest(&lower, NAMED_COLORS);
1780+ let msg = match suggestion {
1781+ Some(s) => format!("unknown color '{}', did you mean '{}'?", val, s),
1782+ None => format!("unknown color '{}'", val),
4667− format!(
1784+ ctx.diagnostics.push(Diagnostic {
4668− "@{} writes a <{}>, as {} do, so `{}` can't pick it out",
1785+ line: line_num,
4669− name, tag, others, prefix
1786+ column: None,
4670− )
1787+ message: msg,
1788+ severity: Severity::Warning,
4675− code::INVALID_PREFIX,
4677− "'{}': {}. Give those elements their styles themselves, or a bundle \
4678− (`@let name [...]`, used as `[$name]`)",
4685− Some(_) if elements.len() > 1 => fail(
4687− code::INVALID_PREFIX,
4689− "'{}': a style takes one element prefix, which styles every such element \
4690− inside this one, at any depth",
4696− Some(_) if prefixes.contains(&vocab::CHILDREN) => fail(
4698− code::INVALID_PREFIX,
4700− "'{}': `children:` and `{}` each say which elements the style is for: write \
4707− Some(_) if vocab::is_htmlang_word(base, attr.value.as_deref()) => {
4708− let value = attr.value.as_deref().map(str::trim);
4709− let css = match (base, value) {
4710− ("spacing", _) => " (`gap`)",
4711− ("wrap", _) => " (`flex-wrap wrap`)",
4712− ("grid-cols", _) => " (`grid-template-columns`)",
4713− ("grid-rows", _) => " (`grid-template-rows`)",
4714− ("col-span", _) => " (`grid-column span N`)",
4715− ("row-span", _) => " (`grid-row span N`)",
4716− ("width", Some("fill")) => " (`flex 1` in a row, `width 100%` otherwise)",
4717− ("height", Some("fill")) => " (`flex 1` in a column, `height 100%` otherwise)",
4718− ("width", _) => " (`flex-shrink 0` in a row, `width fit-content` otherwise)",
4719− ("height", _) => " (`flex-shrink 0` in a column, `height fit-content` otherwise)",
4720− ("center-x", _) => " (`margin-inline auto`)",
4721− ("center-y", _) => " (`margin-block auto`)",
4724− let word = match value {
4725− Some(v) if matches!(base, "width" | "height") => format!("{} {}", base, v),
4726− _ => base.to_string(),
4730− code::INVALID_PREFIX,
4732− "'{}': `{}` is one of htmlang's layout words, which compile against each \
4733− element's layout and its parent's, and `{}` styles elements whose \
4734− parents it doesn't know: write `{}` on the elements themselves, or the \
4736− attr.key, word, prefix, word, css
4746−/// Check an attribute's prefixes: each is known, their selector prefixes
1797+fn parse_attr_brackets(
4747−/// read left to right with a pseudo-element (`before:`) last, the argument
1798+ input: &str,
4748−/// of `has(...)` or `nth-child(...)` can be written into the CSS, and a word that
1799+ line_num: usize,
4749−/// places an element in its parent (`width fill`, `center-x`, `align-*`)
4750−/// isn't under `children:`, whose styles go on the children. Media,
4751−/// container and width prefixes go anywhere. Returns false, after
4752−/// reporting, when the attribute can't be written.
4756− column: Option<usize>,
4757 ctx: &mut ParseContext,
1800 ctx: &mut ParseContext,
4758−) -> bool {
1801+) -> Result<(Vec<Attribute>, String), ParseError> {
4759− use crate::vocab;
1802+ parse_attr_brackets_inner(input, line_num, ctx, true)
4760− let (prefixes, base) = vocab::split_prefixes(&attr.key);
1803+}
4762− |ctx: &mut ParseContext, message: String, subject: &str, suggestion: Option<String>| {
4763− let diagnostic = Diagnostic::error(code::INVALID_PREFIX, line, message)
4765− .suggest(suggestion);
4766− let diagnostic = at_attribute(diagnostic, column, ctx);
4767− ctx.diagnostics.push(diagnostic);
4771− if let Some(problem) = unknown_prefix(base) {
1805+fn parse_attr_brackets_no_validate(
4772− let diagnostic = Diagnostic::error(code::UNKNOWN_PREFIX, line, problem.message)
1806+ input: &str,
4773− .subject(problem.subject)
1807+ line_num: usize,
4774− .suggest(problem.suggestion);
1808+ ctx: &mut ParseContext,
4775− let diagnostic = at_attribute(diagnostic, column, ctx);
1809+) -> Result<(Vec<Attribute>, String), ParseError> {
4776− ctx.diagnostics.push(diagnostic);
1810+ parse_attr_brackets_inner(input, line_num, ctx, false)
4779− if !check_element_prefixes(attr, &prefixes, base, line, column, ctx) {
4782− // The argument of `has(...)` or `nth-child(...)` goes into the CSS as
4784− for prefix in &prefixes {
4785− if let Some(reason) = css_breakout(prefix.trim_end_matches(':')) {
4789− "the prefix '{}' has {}: it can't be written into the page's CSS",
4797− // `nth-child():` or `has( ):`: CSS has no pseudo-class with an empty
4799− let empty_argument = |prefix: &str| {
4801− .strip_suffix("):")
4802− .and_then(|p| p.split_once('('))
4803− .is_some_and(|(_, argument)| argument.trim().is_empty())
4805− if let Some(empty) = prefixes.iter().find(|p| empty_argument(p)) {
4809− "'{}': `:{}()` takes an argument between its parentheses, as in CSS",
4811− vocab::pseudo_name(empty)
4817− // A pseudo-element is the last selector prefix: CSS has no
4818− // `::before:hover`
4819− let selectors: Vec<&str> = prefixes
4822− .filter(|p| vocab::at_rule_rank(p).is_none())
4824− // Only one: an element has one `::before`, which has no `::after`
4825− let elements: Vec<&str> = selectors
4828− .filter(|p| vocab::is_pseudo_element(p))
4830− if elements.len() > 1 {
4834− "'{}': `{}` and `{}` each select a pseudo-element, and a style applies to one \
4836− attr.key, elements[0], elements[1]
4842− if let Some(at) = selectors.iter().position(|p| vocab::is_pseudo_element(p))
4843− && at + 1 < selectors.len()
4845− let element = selectors[at];
4846− // The same prefixes, with the pseudo-element moved after the other
4847− // selector prefixes
4848− let mut order: Vec<&str> = prefixes.iter().copied().filter(|p| *p != element).collect();
4849− let last_selector = order
4851− .rposition(|p| vocab::at_rule_rank(p).is_none())
4852− .map_or(order.len(), |i| i + 1);
4853− order.insert(last_selector, element);
4854− let fixed = format!("{}{}", order.concat(), base);
4858− "'{}': `{}` selects a pseudo-element, which comes after the other selector \
4859− prefixes, as in CSS: write `{}`",
4860− attr.key, element, fixed
4866− // Under `children:` the styles go on the children, whose parent is this
4867− // element: a word that places an element in its parent can't say where
4868− if prefixes.contains(&"children:") && vocab::places_in_parent(base, attr.value.as_deref()) {
4869− // The CSS of `fill` and `shrink` depends on the direction: along
4870− // it, they are flex properties
4871− let (word, css) = match (base, attr.value.as_deref().map(str::trim)) {
4872− ("width", Some("fill")) => (
4874− " (`children:flex 1` in a row, `children:width 100%` otherwise)",
4876− ("height", Some("fill")) => (
4878− " (`children:flex 1` in a column, `children:height 100%` otherwise)",
4880− ("width", Some(_)) => (
4882− " (`children:flex-shrink 0` in a row, `children:width fit-content` otherwise)",
4884− ("height", Some(_)) => (
4886− " (`children:flex-shrink 0` in a column, `children:height fit-content` \
4894− "'{}{}': `{}` places an element in its parent, and under `children:` that \
4895− parent is this element: write `{}` on the children themselves, or the CSS \
4900− .map_or(String::new(), |v| format!(" {}", v.trim())),
4912−/// Check an attribute written as a style or a flag (not `key=value`): its
1813+fn parse_attr_brackets_inner(
4913−/// prefix, its name, and, for a style, its value. A name htmlang doesn't
1814+ input: &str,
4914−/// know but CSS could have (`corner-shape`) is passed to the CSS as written,
1815+ line_num: usize,
4915−/// with a warning; custom properties (`--brand`) and vendor-prefixed ones
4916−/// (`-webkit-...`) without one. Anything that can't be written into the
4917−/// page is an error; returns false then, and the attribute is left out.
4921− column: Option<usize>,
4922− before: Option<&Attribute>,
4923 ctx: &mut ParseContext,
1816 ctx: &mut ParseContext,
4924−) -> bool {
1817+ validate: bool,
4925− use crate::vocab;
1818+) -> Result<(Vec<Attribute>, String), ParseError> {
4926− let (prefixes, base) = vocab::split_prefixes(&attr.key);
1819+ let mut depth = 0;
4927− let fail = |ctx: &mut ParseContext, code: &'static str, message: String, subject: &str| {
1820+ let mut end_pos = 0;
4928− let diagnostic = Diagnostic::error(code, line, message).subject(subject);
4929− let diagnostic = at_attribute(diagnostic, column, ctx);
4930− ctx.diagnostics.push(diagnostic);
4934− if !check_prefixes(attr, line, column, ctx) {
1822+ for (i, c) in input.char_indices() {
4935− return false;
1823+ match c {
4936− }
1824+ '[' => depth += 1,
4937− let prefixed = !prefixes.is_empty();
1825+ ']' => {
4938− // `md:id=x`: `=` makes an HTML attribute, which has no states
1826+ depth -= 1;
4939− if prefixed && let Some((name, _)) = base.split_once('=') {
1827+ if depth == 0 {
4940− return fail(
1828+ end_pos = i;
4942− code::INVALID_PREFIX,
1830+ }
4944− "'{}': a prefix applies to a style, and `{}=` is an HTML attribute",
4950− let Some(value) = &attr.value else {
4951− // `inline` puts a file into the page as it compiles, which no
4952− // state or media condition can undo
4953− if base == "inline" && prefixed {
4956− code::INVALID_PREFIX,
4958− "'{}': `inline` puts the image's file into the page, which can't depend \
4965− if vocab::HTMLANG_FLAGS.contains(&base) {
4968− if vocab::is_html_flag(base) {
4972− return fail(
1832+ _ => {}
4974− code::INVALID_PREFIX,
4976− "'{}': a prefix applies to a style, and '{}' is an HTML attribute",
4982− if vocab::is_style_attribute(base)
4983− || vocab::is_custom_property(base)
4984− || vocab::is_vendor_property(base)
4988− code::MISSING_VALUE,
4989− format!("'{}' needs a value: `{} VALUE`", attr.key, attr.key),
4993− if vocab::is_html_attribute(base) && !prefixed {
4996− code::HTML_ATTRIBUTE_FORM,
4998− "'{}' is an HTML attribute that isn't a flag: write `{}=VALUE`",
5004− return unknown_attribute(attr, base, line, column, before, true, ctx);
5007− if vocab::HTMLANG_FLAGS.contains(&base) {
5010− code::INVALID_VALUE,
5012− "'{}' is a flag and takes no value: write `{}` alone",
5018− if vocab::is_style_attribute(base)
5019− || vocab::is_custom_property(base)
5020− || vocab::is_vendor_property(base)
5022− return check_css_value(attr, base, line, column, ctx);
5024− if vocab::is_html_attribute(base) && !prefixed {
1835+
5025− let diagnostic = Diagnostic::error(
1836+ if depth != 0 {
5026− code::HTML_ATTRIBUTE_FORM,
1837+ return Err(ParseError {
5027− line,
1838+ line: line_num,
5028− format!(
1839+ message: "unclosed '[' in attribute list".to_string(),
5029− "'{}' is an HTML attribute: write `{}={}`",
1840+ });
5030− attr.key, attr.key, value
5033− .subject(attr.key.as_str());
5034− let diagnostic = at_attribute(diagnostic, column, ctx);
5035− ctx.diagnostics.push(diagnostic);
5038− let passes = vocab::is_property_name(base);
5039− unknown_attribute(attr, base, line, column, before, !passes, ctx)
5040− && check_css_value(attr, base, line, column, ctx)
5043−/// Whether an attribute of a bundle could pass a parameter to a function
1843+ let attrs_inner = &input[1..end_pos];
5044−/// it is spliced into (`@let t [title Hello]`): a name without a prefix
1844+ let remaining = input[end_pos + 1..].trim().to_string();
5045−/// that isn't a style or a flag. Such a name is checked where the bundle is
1845+ let attrs = parse_attr_list(attrs_inner, line_num, ctx, validate);
5047−fn could_be_parameter(attr: &Attribute) -> bool {
5049− let key = attr.key.as_str();
5051− attr.value.is_none() && (vocab::HTMLANG_FLAGS.contains(&key) || vocab::is_html_flag(key));
5054− && !vocab::is_style_attribute(key)
5055− && key.starts_with(|c: char| c.is_alphabetic())
5058− .all(|c| c.is_alphanumeric() || matches!(c, '-' | '_'))
5061−/// At a call, a name close to one of the function's parameters is a
1847+ Ok((attrs, remaining))
5062−/// misspelled parameter, not an attribute for its root: report it, and
5063−/// return true (it is left out).
5064−fn misspelled_parameter(
5066− text_keys: &[String],
5068− column: Option<usize>,
5069− ctx: &mut ParseContext,
5071− if text_keys.is_empty() || !could_be_parameter(attr) {
5074− let params: Vec<&str> = text_keys.iter().map(String::as_str).collect();
5075− let Some(closest) = suggest_closest(&attr.key, ¶ms) else {
5078− let what = if ctx.in_page {
5083− let diagnostic = Diagnostic::error(
5084− code::UNKNOWN_ATTRIBUTE,
5087− "unknown {} '{}', did you mean '{}'?",
5088− what, attr.key, closest
5091− .subject(attr.key.as_str())
5092− .suggest(Some(closest));
5093− let diagnostic = at_attribute(diagnostic, column, ctx);
5094− ctx.diagnostics.push(diagnostic);
5098−/// An attribute name htmlang doesn't know. A style whose name CSS could
1850+fn is_valid_hex_color(s: &str) -> bool {
5099−/// have goes to the CSS as written, with a warning; anything else (a flag,
1851+ if !s.starts_with('#') {
5100−/// a name that isn't a word) is an error. Returns whether it is kept.
1852+ return true; // Not a hex color, skip
5101−fn unknown_attribute(
5105− column: Option<usize>,
5106− before: Option<&Attribute>,
5108− ctx: &mut ParseContext,
5110− // `@td padding 8`: an element prefix without its colon
5111− if let Some(name) = base.strip_prefix('@')
5112− && crate::ast::ElementKind::from_name(name).is_some()
5114− let example = match attr.value.as_deref() {
5115− Some(value) => format!("{}:{}", attr.key, value.trim()),
5116− None => format!("{}:padding 8", attr.key),
5118− let diagnostic = Diagnostic::error(
5119− code::UNKNOWN_ATTRIBUTE,
5122− "unknown attribute '{}': an element prefix ends in a colon, as in `{}`",
5127− let diagnostic = at_attribute(diagnostic, column, ctx);
5128− ctx.diagnostics.push(diagnostic);
5131− // `[card]` where `card` is a bundle: it is used as `$card`
5132− if attr.value.is_none() && ctx.env.bundle(base).is_some() && base == attr.key {
5133− ctx.used_defines.insert(base.to_string());
5134− let diagnostic = Diagnostic::error(
5135− code::UNKNOWN_ATTRIBUTE,
5138− "unknown attribute '{}': '{}' is an attribute bundle, used as `${}`",
5143− .suggest(Some(format!("${}", base)));
5144− let diagnostic = at_attribute(diagnostic, column, ctx);
5145− ctx.diagnostics.push(diagnostic);
5148− // `hover:title x`: an HTML attribute's name is not a suggestion for
5151− suggest_closest(base, &crate::vocab::all_attributes()).filter(|&closest| closest != base);
5152− // `hx-trigger=load, every 2s`: right after a `key=value`, a name that
5153− // isn't close to one htmlang knows is the rest of that value, which
5154− // the comma ended. It is left out.
5155− let cut = before.filter(|b| b.html && b.value.is_some());
5156− let rest = match &attr.value {
5157− Some(value) => format!("{} {}", attr.key, value),
5158− None => attr.key.clone(),
5160− let joined = cut.map(|cut| {
5161− let value = cut.value.as_deref().unwrap_or("");
5163− format!("{}={}", cut.key, value),
5164− format!("{}={}\\, {}", cut.key, value, rest),
5167− if let (Some((cut, joined)), None) = (&joined, suggestion) {
5168− let diagnostic = Diagnostic::error(
5172− "unknown attribute '{}' after `{}`: if '{}' is the rest of its value, the comma \
5173− ended it. To keep a comma in a value, write `\\,`: `{}`",
5174− base, cut, rest, joined
5178− let diagnostic = at_attribute(diagnostic, column, ctx);
5179− ctx.diagnostics.push(diagnostic);
5182− let mut message = match (&suggestion, error) {
1854+ let hex = &s[1..];
5183− (Some(closest), true) => {
1855+ matches!(hex.len(), 3 | 4 | 6 | 8) && hex.chars().all(|c| c.is_ascii_hexdigit())
5185− "unknown attribute '{}', did you mean '{}'?",
5189− (None, true) => format!("unknown attribute '{}'", attr.key),
5190− (Some(closest), false) => format!(
5191− "unknown CSS property '{}', did you mean '{}'? It is written to the CSS as it is",
5194− (None, false) => format!(
5195− "unknown CSS property '{}': it is written to the CSS as it is",
5199− // `box-shadow 0 1px red, 0 2px blue` or `font-family Inter,
5200− // sans-serif`: the comma ended the attribute, and the rest of the
5201− // value became one
5202− let rest_of_a_value = !base.starts_with(|c: char| c.is_ascii_alphabetic() || c == '-')
5203− || (suggestion.is_none() && attr.value.is_none() && before.is_some());
5204− if joined.is_some() || (rest_of_a_value && error) {
5205− if !message.ends_with('?') {
5209− Some((cut, joined)) => message.push_str(&format!(
5210− " If it is the rest of `{}`, the comma ended it: write `{}`",
5214− .push_str(" A comma separates attributes: to keep one in a value, write `\\,`"),
5217− let severity = if error {
5222− let diagnostic = Diagnostic::new(code::UNKNOWN_ATTRIBUTE, severity, line, message)
5224− .suggest(suggestion);
5225− let diagnostic = at_attribute(diagnostic, column, ctx);
5226− ctx.diagnostics.push(diagnostic);
5230−/// Evaluate the attributes of a list: bundles are spliced in, `if()`
5231−/// chooses, and variables fill values. A variable fills only the value it
5232−/// is written in: attributes come from bundles, never from text. With
5233−/// `validate`, unknown names and invalid values are reported. `text_keys`
5234−/// are a called function's parameters: their values are text rather than
5235−/// CSS, and they aren't checked as attributes.
5236fn parse_attr_list(
1858fn parse_attr_list(
5237− tokens: &[syntax::Attr],
1859+ input: &str,
5238 line_num: usize,
1860 line_num: usize,
5239 ctx: &mut ParseContext,
1861 ctx: &mut ParseContext,
5240 validate: bool,
1862 validate: bool,
5241− text_keys: &[String],
5242) -> Vec<Attribute> {
1863) -> Vec<Attribute> {
5243− parse_attrs(tokens, line_num, ctx, validate, text_keys)
1864+ let mut attrs = Vec::new();
5244− .into_iter()
1865+ let mut seen_keys: Vec<String> = Vec::new();
5245− .map(|(attr, _)| attr)
1866+
5246− .collect()
1867+ for part in split_commas(input) {
5247−}
1868+ let part = part.trim();
5248−
1869+ // A whole attribute `if(cond, a, b)` is the chosen branch's text.
5249−/// [`parse_attr_list`], with the value of each attribute whose key is one
1870+ let chosen;
5250−/// of `text_keys` (a call's parameters) as a value with its type (see
1871+ let part = match choose_if(part, ctx, line_num) {
5251−/// [`ParseContext::slot_value`]), so a parameter can get a list or a
1872+ Some(branch) => {
5252−/// record.
1873+ chosen = branch;
5253−fn parse_attrs(
1874+ chosen.as_str()
5254− tokens: &[syntax::Attr],
1875+ }
5255− line_num: usize,
1876+ None => part,
5256− ctx: &mut ParseContext,
5258− text_keys: &[String],
5259−) -> Vec<(Attribute, Option<Value>)> {
5260− let mut read = ReadAttrs::default();
5261− read_attrs(tokens, "", line_num, ctx, validate, text_keys, &mut read);
5265−/// The attributes of a list read so far, and the keys written (for the
5266−/// duplicate check).
5269− attrs: Vec<(Attribute, Option<Value>)>,
5270− seen_keys: Vec<(String, bool)>,
5273−/// [`parse_attrs`] for the attributes of `tokens`, each under the prefixes
5274−/// `prefix` (`md:` for those of `md:[...]`), which distribute over a
5275−/// group, a bundle and the branch an `if()` takes. Only styles take a
5276−/// prefix, so an HTML attribute there is an error.
5278− tokens: &[syntax::Attr],
5281− ctx: &mut ParseContext,
5283− text_keys: &[String],
5284− out: &mut ReadAttrs,
5286− let mut chosen = Vec::new();
5297− for token in &chosen {
5298− let line = if token.span.line == 0 {
5303− let (key, value, html) = (token.key.clone(), token.value.clone(), token.html);
1878+ if part.is_empty() {
5304− let column = |at: usize| Some(token.span.column + at);
5306− // `md:[...]`, `md:$card`, `md:if(...)`: the prefixes apply to each
5307− // attribute there, and a prefix a parameter can't have
5308− if let Some(prefixed) = &token.prefixed {
5309− if let Some(inner) = group_prefix(token, prefixed, prefix, line, ctx) {
5311− prefixed.target.attrs(),
5320 continue;
1879 continue;
5323− // `$name` (or `${name}`) alone: an attribute bundle, spliced in
1882+ // $define reference — expand attribute bundle
5324− let bundle = key.strip_prefix('$').filter(|_| value.is_none() && !html);
1883+ if let Some(name) = part.strip_prefix('$')
5325− let bundle = bundle.and_then(|after| match interp::reference(after, &ctx.env)? {
1884+ && let Some(define_attrs) = ctx.defines.get(name)
5326− (interp::Reference::Var(name), len) if len == after.len() => Some(name),
1885+ {
5327− _ => None,
1886+ ctx.used_defines.insert(name.to_string());
5328− });
1887+ attrs.extend(define_attrs.clone());
5329− if let Some(name) = bundle {
5330− if let Some(define_attrs) = ctx.env.bundle(&name).cloned() {
5331− ctx.used_defines.insert(name.clone());
5332− for attr in define_attrs.iter() {
5333− if !prefix.is_empty() {
5334− let prefixed = Attribute {
5335− key: format!("{}{}", prefix, attr.key),
5338− if prefixed_parameter(&prefixed, text_keys, line, column(0), validate, ctx)
5342− if let Some(attr) =
5343− prefixed_member(attr, prefix, &name, line, column(0), validate, ctx)
5345− out.attrs.push((attr, None));
5349− let attrs = &out.attrs;
5350− // Checked here, where it is either a parameter or not
5351− let checked_here = validate
5353− && could_be_parameter(attr)
5354− && !text_keys.contains(&attr.key);
5356− && (misspelled_parameter(attr, text_keys, line, column(0), ctx)
5357− || !check_attribute(
5361− attrs.last().map(|(a, _)| a),
5367− out.attrs.push((attr.clone(), None));
5370− not_a_bundle(&name, line, column(0), ctx);
5374− // A name never comes from a variable
5375− if key.contains('$') {
5376− track_var_refs(&key, &mut ctx.used_variables);
5377− ctx.diagnostics.push(
5379− code::ATTRIBUTE_FROM_VARIABLE,
5382− "'{}': an attribute's name can't come from a variable. A variable \
5383− fills a value (`padding $size`), and whole attributes come from a \
5384− bundle (`@let name [padding 8]`, used as `[$name]`)",
5388− .subject(key.as_str()),
5390 continue;
1888 continue;
5393− // Only a style has states: `md:[id=x]`, `md:id=x`
1891+ track_var_refs(part, &mut ctx.used_variables);
5394− if html && (!prefix.is_empty() || !crate::vocab::split_prefixes(&key).0.is_empty()) {
1892+
5395− let written = format!("{}{}", prefix, key);
1893+ // A value `if(cond, a, b)` picks `a` or `b` (free text) by `cond`;
5396− let (name, _) = crate::vocab::split_prefixes(&written);
1894+ // an empty choice leaves the attribute out.
5397− let diagnostic = Diagnostic::error(
1895+ let Some(part) = choose_if_value(part, ctx, line_num) else {
5398− code::INVALID_PREFIX,
5401− "'{}=': a prefix applies to a style, and `{}=` is an HTML attribute, \
5402− which has no states",
5404− &written[name.concat().len()..]
5407− .subject(token.key.as_str());
5408− let diagnostic = at_attribute(diagnostic, column(0), ctx);
5409− ctx.diagnostics.push(diagnostic);
5410 continue;
1896 continue;
5412− let key = if prefix.is_empty() {
5415− format!("{}{}", prefix, key)
1898+ let part = substitute_vars(&part, &ctx.variables);
5418− // A value's variables are filled in. A style's value is CSS, where
1900+ let attr = if let Some((key, value)) = split_html_attribute(&part) {
5419− // quoted text keeps its quotes; an HTML attribute's (and a
1901+ Attribute {
5420− // parameter's) is text, where it loses them.
1902+ key: key.to_string(),
5421− let sink = if html || text_keys.contains(&key) {
1903+ value: Some(value.to_string()),
5422− Sink::Text
1904+ html: true,
5426− let mut filled = true;
5427− let mut quoted = None;
5428− let mut typed = None;
5429− let value = match value {
5431− // A parameter's value keeps its type
5432− Some(value) if !html && text_keys.contains(&key) => {
5433− let at = column(token.raw.len() - value.len());
5434− let (value, ok) = ctx.slot_value(&value, line, at);
5436− if let Value::Quoted(q) = &value {
5437− quoted = Some(q.clone());
5439− let text = value.to_string();
5440− typed = Some(value);
5443− Some(value) => {
1906+ } else if let Some((key, value)) = part.split_once(' ') {
5444− let at = column(token.raw.len() - value.len());
1907+ let value = value.trim().to_string();
5445− let (text, is_quoted, ok) = ctx.fill_value(&value, line, at, sink);
1908+ Attribute {
5446− filled = ok;
1909+ key: key.trim().to_string(),
5447− quoted = is_quoted;
1910+ value: Some(value),
5448− Some(text)
1911+ html: false,
1915+ key: part.to_string(),
5451− let attr = Attribute {
5457− // A value that couldn't be filled in is already reported, and a
5458− // parameter's value is text for the function
5459− let validate = validate && filled && !text_keys.contains(&attr.key);
5461− // A duplicate is reported (compare the full key, so `border` and
1921+ // Warn on duplicate attributes (compare full key so pseudo-class
5462− // `hover:border` differ, and the form, so `width=800` and
1922+ // variants like `border` and `hover:border` are not conflated)
5463− // `width 200` do too), and the later one wins
5464 if validate {
1923 if validate {
5465− let seen = (normal_key(&attr.key), attr.html);
1924+ if seen_keys.contains(&attr.key) {
5466− if out.seen_keys.contains(&seen) {
1925+ ctx.diagnostics.push(Diagnostic {
5467− let written = if attr.html { "=" } else { "" };
1926+ line: line_num,
5468− let message = format!(
1927+ column: None,
5469− "duplicate attribute '{}{}': the later one wins",
1928+ message: format!("duplicate attribute '{}'", attr.key),
5470− attr.key, written
1929+ severity: Severity::Warning,
5471− );
1930+ source_line: None,
5472− let diagnostic = Diagnostic::warning(code::DUPLICATE_ATTRIBUTE, line, message)
1931+ });
5473− .subject(attr.key.as_str());
5474− let diagnostic = at_attribute(diagnostic, column(0), ctx);
5475− ctx.diagnostics.push(diagnostic);
5476 } else {
1932 } else {
5477− out.seen_keys.push(seen);
1933+ seen_keys.push(attr.key.clone());
5481− if validate && misspelled_parameter(&attr, text_keys, line, column(0), ctx) {
1936+ // Color validation for hex colors
5482− continue;
1937+ if !attr.html
5483− }
1938+ && matches!(crate::vocab::base_attribute(&attr.key), "background" | "color")
5484− if prefixed_parameter(&attr, text_keys, line, column(0), validate, ctx) {
1939+ && let Some(ref val) = attr.value
5485− continue;
1940+ && val.starts_with('#')
5486− }
1941+ && !is_valid_hex_color(val)
5487− if validate && attr.html && attr.key == "class" {
1942+ {
5488− reserved_class(&attr, line, column(0), ctx);
1943+ ctx.diagnostics.push(Diagnostic {
5489− }
1944+ line: line_num,
5490− // `padding=4`: a style written as an HTML attribute, which the
1945+ column: None,
5491− // browser ignores (`width=` and `height=` are real on some
1946+ message: format!("invalid hex color '{}'", val),
5492− // elements, see `validate_tree`)
1947+ severity: Severity::Warning,
5493− if validate
1948+ source_line: None,
5494− && attr.html
1949+ });
5495− && crate::vocab::is_style_attribute(&attr.key)
1950+ }
5496− && !crate::vocab::HTML_ATTRIBUTES.contains(&attr.key.as_str())
5498− let value = token.value.as_deref().unwrap_or("").trim();
5499− let diagnostic = Diagnostic::warning(
5500− code::HTML_ATTRIBUTE_FORM,
5503− "'{0}={1}' is an HTML attribute, but {0} is a style: write `{0} {1}`",
5507− .subject(token.raw.as_str())
5508− .suggest(Some(format!("{} {}", attr.key, value)));
5509− let diagnostic = at_attribute(diagnostic, column(0), ctx);
5510− ctx.diagnostics.push(diagnostic);
5513− // A style or a flag: its name is checked, and what can't be
1953+ // Warn on unknown attributes. `key=value` HTML attributes may use any
5514− // written into the page is an error and left out
1954+ // name; everything else must be a known style.
5515− let checked = validate && !attr.html && !(ctx.in_bundle && could_be_parameter(&attr));
1955+ if validate && !attr.html {
5516− let before = out.attrs.last().map(|(a, _)| a);
1956+ let base_key = crate::vocab::base_attribute(attr.key.as_str());
5517− if checked && !check_attribute(&attr, line, column(0), before, ctx) {
1957+ let is_boolean_html =
5518− continue;
1958+ attr.value.is_none() && crate::vocab::BOOLEAN_HTML_ATTRS.contains(&base_key);
1959+ if is_boolean_html || crate::vocab::is_style_attribute(base_key) {
1960+ validate_attr_value(&attr, line_num, ctx);
1961+ } else if crate::vocab::HTML_ATTRIBUTES.contains(&base_key)
1962+ || base_key.starts_with("aria-")
1963+ || base_key.starts_with("data-")
1965+ ctx.diagnostics.push(Diagnostic {
1969+ "'{}' is an HTML attribute: write `{}={}`",
1972+ attr.value.as_deref().unwrap_or("")
1974+ severity: Severity::Warning,
1978+ let suggestion = suggest_closest(base_key, &crate::vocab::all_attributes());
1979+ let msg = match suggestion {
1982+ "unknown attribute '{}', did you mean '{}'?",
1986+ None => format!("unknown attribute '{}'", attr.key),
1988+ ctx.diagnostics.push(Diagnostic {
1992+ severity: Severity::Warning,
5521− out.attrs.push((attr, typed));
1998+ attrs.push(attr);
5525−/// At a call, a parameter under prefixes (`md:title x`, `md:[title x]`):
2004+/// Split an HTML attribute written `key=value` (`alt=`, `type=email`,
5526−/// a parameter has one value, with no states, so it is reported (with
2005+/// `aria-label=Close menu`). Returns `None` for style attributes.
5527−/// `validate`) and left out; returns true then. A parameter named like a
2006+fn split_html_attribute(part: &str) -> Option<(&str, &str)> {
5528−/// style (`color`) is a style under a prefix, for the root element.
2007+ let first_token = part.split(char::is_whitespace).next()?;
5529−fn prefixed_parameter(
2008+ let eq = first_token.find('=')?;
5530− attr: &Attribute,
2009+ let key = &part[..eq];
5531− text_keys: &[String],
2010+ let valid_key = key.starts_with(|c: char| c.is_ascii_alphabetic())
5532− line: usize,
2011+ && key
5533− column: Option<usize>,
2012+ .chars()
5534− validate: bool,
2013+ .all(|c| c.is_ascii_alphanumeric() || matches!(c, '-' | '_' | '.'));
5535− ctx: &mut ParseContext,
2014+ valid_key.then(|| (key, part[eq + 1..].trim()))
5537− let (prefixes, name) = crate::vocab::split_prefixes(&attr.key);
5539− || prefixes.is_empty()
5540− || !text_keys.iter().any(|k| k == name)
5541− || crate::vocab::is_style_attribute(name)
5546− let what = if ctx.in_page {
5551− let diagnostic = Diagnostic::error(
5552− code::INVALID_PREFIX,
5555− "'{}': `{}` is {}, which has one value, and a prefix applies to a style, \
5557− attr.key, name, what
5560− .subject(attr.key.as_str());
5561− let diagnostic = at_attribute(diagnostic, column, ctx);
5562− ctx.diagnostics.push(diagnostic);
5567−/// The prefixes of a prefixed group, bundle or `if()` inside `outer` (the
2017+fn split_commas(input: &str) -> Vec<&str> {
5568−/// prefixes of the groups it is in), when they are all known; else the
2018+ let mut parts = Vec::new();
5569−/// unknown one is reported. Text after a group's `]` is an error too.
2019+ let mut start = 0;
5570−fn group_prefix(
2020+ let mut depth = 0;
5571− token: &syntax::Attr,
2021+ let mut in_quotes = false;
5572− prefixed: &syntax::Prefixed,
2022+
5573− outer: &str,
2023+ for (i, c) in input.char_indices() {
5574− line: usize,
2024+ match c {
5575− ctx: &mut ParseContext,
2025+ '"' => in_quotes = !in_quotes,
5576−) -> Option<String> {
2026+ _ if in_quotes => {}
5577− let at = |ctx: &ParseContext, diagnostic: Diagnostic, span: syntax::Span| match &ctx
2027+ '[' | '(' => depth += 1,
5578− .current_source
2028+ ']' | ')' => depth -= 1,
5579− {
2029+ ',' if depth == 0 => {
5580− (current, Some(text)) if span.line != 0 && *current == span.line => {
2030+ parts.push(&input[start..i]);
5581− diagnostic.column(span.column).source(text.clone())
2031+ start = i + 1;
5585− if let syntax::Branch::Group {
5586− trailing: Some(trailing),
5588− } = &prefixed.target
5590− let diagnostic = Diagnostic::error(
5591− code::UNEXPECTED_ARGUMENT,
5594− "'{}' after the `]` of `{}[...]`: the prefixes apply to the attributes in the \
5595− group, so it goes inside it",
5596− trailing.raw, prefixed.prefix
5599− .subject(trailing.raw.as_str());
5600− let diagnostic = at(ctx, diagnostic, trailing.span);
5601− ctx.push_once(diagnostic);
5603− let (known, rest) = crate::vocab::split_prefixes(&prefixed.prefix);
5604− if !rest.is_empty() {
5605− let problem = unknown_prefix(rest).unwrap_or_else(|| {
5606− let written = rest.split_inclusive(':').next().unwrap_or(rest);
5608− message: format!("unknown prefix '{}'", written),
5609− subject: written.to_string(),
5613− let diagnostic = Diagnostic::error(code::UNKNOWN_PREFIX, line, problem.message)
2034+ }
5614− .subject(problem.subject)
5615− .suggest(problem.suggestion);
5616− let diagnostic = at(ctx, diagnostic, token.span);
5617− ctx.push_once(diagnostic);
5620− Some(format!("{}{}", outer, known.concat()))
2036+ parts.push(&input[start..]);
5623−/// An attribute of the bundle `bundle`, spliced in under `prefix`
2040+// ---------------------------------------------------------------------------
5624−/// (`md:$card`): the same attribute with the prefixes in front, when it can
2041+// Chain splitting (the > operator)
5625−/// take them. An HTML attribute can't; a style's prefixes are checked, as
2042+// ---------------------------------------------------------------------------
5626−/// is a flag or a name that isn't a style (a bundle's parameter), which
2043+
5627−/// under a prefix are attributes like any other.
2044+fn split_chain(content: &str) -> Vec<String> {
5628−fn prefixed_member(
2045+ let mut segments = Vec::new();
5629− attr: &Attribute,
2046+ let mut current = String::new();
5630− prefix: &str,
2047+ let chars: Vec<char> = content.chars().collect();
5631− bundle: &str,
2048+ let mut i = 0;
5632− line: usize,
2049+ let mut bracket_depth = 0;
5633− column: Option<usize>,
2050+
5634− validate: bool,
2051+ while i < chars.len() {
5635− ctx: &mut ParseContext,
2052+ if chars[i] == '[' {
5636−) -> Option<Attribute> {
2053+ bracket_depth += 1;
5637− let key = format!("{}{}", prefix, attr.key);
5640− let diagnostic = Diagnostic::error(
5641− code::INVALID_PREFIX,
5644− "'{}${}': the bundle has `{}=`, an HTML attribute, and a prefix applies to \
5645− styles, which have states",
5646− prefix, bundle, attr.key
5649− .subject(format!("{}${}", prefix, bundle));
5650− let diagnostic = at_attribute(diagnostic, column, ctx);
5651− ctx.diagnostics.push(diagnostic);
5653− return None;
2055+ if chars[i] == ']' {
5654− }
2056+ bracket_depth -= 1;
5655− let prefixed = Attribute {
5660− let fine = if attr.value.is_none() || could_be_parameter(attr) {
5661− check_attribute(&prefixed, line, column, None, ctx)
5663− check_prefixes(&prefixed, line, column, ctx)
5672−/// `class=hl-x`: the `hl-` prefix is htmlang's, for its generated classes,
2059+ // Match " > @" outside brackets
5673−/// whose rules would then apply to the element too. It goes into the page
2060+ if bracket_depth == 0
5674−/// as written, so this is a warning.
2061+ && i + 3 < chars.len()
5675−fn reserved_class(attr: &Attribute, line: usize, column: Option<usize>, ctx: &mut ParseContext) {
2062+ && chars[i] == ' '
5676− let classes = attr.value.as_deref().unwrap_or_default();
2063+ && chars[i + 1] == '>'
5677− for class in classes.split_whitespace() {
2064+ && chars[i + 2] == ' '
5678− if class.starts_with(crate::codegen::CLASS_PREFIX) {
2065+ && chars[i + 3] == '@'
5679− let diagnostic = Diagnostic::warning(
2066+ {
5680− code::INVALID_VALUE,
2067+ segments.push(current.trim().to_string());
5681− line,
2068+ current = String::new();
5682− format!(
2069+ i += 3; // skip " > ", keep the "@"
5683− "class '{}' starts with `{}`, which htmlang keeps for the classes it \
2070+ continue;
5684− generates, so their styles could apply to this element: give it \
5687− crate::codegen::CLASS_PREFIX
5691− let diagnostic = at_attribute(diagnostic, column, ctx);
5692− ctx.diagnostics.push(diagnostic);
2073+ current.push(chars[i]);
5697−/// A style's key as the CSS reads it, for finding duplicates: its at-rule
2077+ if !current.trim().is_empty() {
5698−/// prefixes in one order (`dark:md:` is `md:dark:`), then its selector
2078+ segments.push(current.trim().to_string());
5699−/// prefixes as written, whose order is the selector's.
5700−fn normal_key(key: &str) -> String {
5701− let (prefixes, name) = crate::vocab::split_prefixes(key);
5702− let mut at: Vec<(usize, &str)> = prefixes
5704− .filter_map(|p| crate::vocab::at_rule_rank(p).map(|rank| (rank, *p)))
5706− at.sort_unstable();
5708− let mut normal: String = at.iter().map(|(_, p)| *p).collect();
5709− for prefix in prefixes
5711− .filter(|p| crate::vocab::at_rule_rank(p).is_none())
5713− normal.push_str(prefix);
5715− normal.push_str(name);
5719−/// `[$name]` where `$name` isn't an attribute bundle.
2081+ segments
5720−fn not_a_bundle(name: &str, line: usize, column: Option<usize>, ctx: &mut ParseContext) {
5721− track_var_refs(&format!("${}", name), &mut ctx.used_variables);
5722− let is_value = interp::name_len(name) > 0 && interp::resolve(name, &ctx.env).is_some();
5723− let diagnostic = if is_value {
5725− code::ATTRIBUTE_FROM_VARIABLE,
5728− "'${}' is a value, not an attribute: attributes come from a bundle \
5729− (`@let name [padding 8]`, used as `[$name]`), and a value fills an \
5730− attribute's value (`padding ${}`)",
5735− } else if ctx.env.function(name).is_some() {
5736− ctx.used_functions.insert(name.to_string());
5738− code::UNDEFINED_VARIABLE,
5741− "'${}' is a function, not an attribute bundle: it is called as an element, \
5748− let mut bundles = ctx.env.bundle_names();
5749− bundles.sort_unstable();
5750− let suggestion = suggest_closest(name, &bundles);
5751− let message = match suggestion {
5752− Some(closest) => format!(
5753− "undefined attribute bundle '${}', did you mean '${}'?",
5756− None => format!("undefined attribute bundle '${}'", name),
5758− Diagnostic::error(code::UNDEFINED_VARIABLE, line, message)
5760− .suggest(suggestion)
5762− let diagnostic = match (&ctx.current_source, column) {
5763− ((current, Some(text)), Some(column)) if *current == line => {
5764− diagnostic.column(column).source(text.clone())
5768− ctx.diagnostics.push(diagnostic);
5771// ---------------------------------------------------------------------------
2084// ---------------------------------------------------------------------------
5772// Text segment parsing (inline {...} elements)
2085// Text segment parsing (inline {...} elements)
5773// ---------------------------------------------------------------------------
2086// ---------------------------------------------------------------------------
5775−/// While a slot is filled in, each escape (see [`syntax::ESCAPES`]) is a
2088+/// Escapes in text: `\@`, `\$`, `\{`, `\--` and `\\` stand for the
5776−/// private-use placeholder, U+E000 plus its place in the table, so it
2089+/// character(s) themselves. While a text is processed, each is a private-use
5777−/// can't start a variable, a quote or an inline element. Afterwards it
2090+/// placeholder, so it can't start a variable, an inline element or a line.
5778−/// becomes what it stands for.
2091+const ESCAPES: &[(&str, char, &str)] = &[
2092+ ("\\\\", '\u{E000}', "\\"),
2093+ ("\\$", '\u{E001}', "$"),
2094+ ("\\{", '\u{E002}', "{"),
2095+ ("\\@", '\u{E003}', "@"),
2096+ ("\\--", '\u{E004}', "--"),
5779fn protect_escapes(text: &str) -> String {
2099fn protect_escapes(text: &str) -> String {
5780 if !text.contains('\\') {
2100 if !text.contains('\\') {
5781 return text.to_string();
2101 return text.to_string();
5783− let mut out = String::with_capacity(text.len());
2103+ let mut out = text.to_string();
5784− let mut i = 0;
2104+ for (escape, placeholder, _) in ESCAPES {
5785− while let Some(c) = text[i..].chars().next() {
2105+ out = out.replace(escape, &placeholder.to_string());
5786− let len = syntax::escape_len(&text[i..]);
5792− let escape = &text[i..i + len];
5793− let index = syntax::ESCAPES.iter().position(|e| *e == escape);
5794− out.extend(index.and_then(|n| char::from_u32(0xE000 + n as u32)));
5800−/// The escape a placeholder stands for, as written (`\,`).
5801−fn escape_of(c: char) -> Option<&'static str> {
5802− let index = (c as u32).checked_sub(0xE000)?;
5803− syntax::ESCAPES.get(index as usize).copied()
5806fn restore_escapes(text: &str) -> String {
2110fn restore_escapes(text: &str) -> String {
5807− text.chars()
2111+ let mut out = text.to_string();
5808− .fold(String::with_capacity(text.len()), |mut out, c| {
2112+ for (_, placeholder, literal) in ESCAPES {
5809− match escape_of(c) {
2113+ out = out.replace(*placeholder, literal);
5810− // What the escape stands for: what follows the backslash
5811− Some(escape) => out.push_str(&escape[1..]),
5812− None => out.push(c),
5818−/// Inside the quoted strings of a CSS value, `\"` and `\\` mean in CSS what
5819−/// they mean in htmlang, so they stay as written there.
5820−fn keep_css_string_escapes(protected: &str) -> String {
5821− let mut out = String::with_capacity(protected.len());
5822− let mut inside = false;
5823− for c in protected.chars() {
5824− match escape_of(c) {
5825− Some(escape @ ("\\\"" | "\\\\")) if inside => out.push_str(escape),
5837−/// Evaluate text: fill in the variables of its plain runs and build its
2118+fn parse_text_segments(input: &str, ctx: &mut ParseContext) -> Vec<TextSegment> {
5838−/// inline elements. Each run is one slot, so a value can't make markup.
5839−fn text_segments(text: &syntax::Text, ctx: &mut ParseContext) -> Vec<TextSegment> {
5840 let mut segments = Vec::new();
2119 let mut segments = Vec::new();
5841− // The plain text so far, and where it starts
2120+ let mut current_text = String::new();
5842− let mut plain = String::new();
2121+ let chars: Vec<char> = protect_escapes(input).chars().collect();
5843− let mut start: Option<syntax::Span> = None;
2122+ let mut i = 0;
5844− let flush = |plain: &mut String,
2123+
5845− start: &mut Option<syntax::Span>,
2124+ while i < chars.len() {
5846− segments: &mut Vec<TextSegment>,
2125+ if chars[i] == '{' && i + 1 < chars.len() && chars[i + 1] == '@' {
5847− ctx: &mut ParseContext| {
2126+ // Flush accumulated plain text
5848− if !plain.is_empty() {
2127+ if !current_text.is_empty() {
5849− let at = start.unwrap_or(text.span);
2128+ segments.push(TextSegment::Plain(restore_escapes(&substitute_vars(
5850− let filled = ctx.interpolate_text(plain, at.line, Some(at.column));
2129+ ¤t_text,
5851− segments.push(TextSegment::Plain(filled));
2130+ &ctx.variables,
5852− plain.clear();
2131+ ))));
5853− }
2132+ current_text.clear();
5854− *start = None;
2133+ }
5856− for segment in &text.segments {
2135+ // Find matching }
5857− match segment {
2136+ let mut depth = 0;
5858− Segment::Plain { raw, span } => {
2137+ let start = i + 1; // after {
5859− start.get_or_insert(*span);
2138+ i += 1;
5860− plain.push_str(raw);
2139+ loop {
5861− }
2140+ if i >= chars.len() {
5862− Segment::Inline(inline) => {
2141+ break;
5863− let line = ctx.current_line;
2142+ }
5864− match resolve(&inline.head, inline.text.as_ref(), line, &text.raw, ctx) {
2143+ if chars[i] == '{' {
5865− Ok(resolved) => {
2144+ depth += 1;
5866− if !inline.closed {
2145+ } else if chars[i] == '}' {
5867− let d = Diagnostic::warning(
2146+ if depth == 0 {
5868− code::UNCLOSED_BRACKET,
2147+ break;
5871− "unclosed `{{`: the inline @{} runs to the end of the line. \
5872− An inline element ends with `}}` (a brace that is text is \
5877− let d = at_attribute(d, Some(inline.span.column), ctx);
5880− flush(&mut plain, &mut start, &mut segments, ctx);
5881− // A function called inline gets no children: its
5882− // content is the text after its attributes
5883− match Evaluator.complete(resolved, Vec::new(), ctx) {
5884− Ok(nodes) => segments.extend(inline_segments(nodes, line)),
5887− .get_or_insert_with(|| text.raw.as_str().into());
5888− ctx.diagnostics.push(e);
5892− Err(mut e) => {
2149+ depth -= 1;
5893− // A misspelled element is an error inline too (a
2150+ }
5894− // brace that is text is written `\{`); the braces
2151+ i += 1;
5895− // stay as written
2152+ }
5896− e.source_line = Some(text.raw.as_str().into());
2153+
5897− ctx.diagnostics.push(e);
2154+ let inner: String = chars[start..i].iter().collect();
5898− start.get_or_insert(inline.span);
2155+ i += 1; // skip }
5899− plain.push('{');
2156+
5900− plain.push_str(&inline.raw);
2157+ match parse_single_element(&inner, ctx.current_line, ctx) {
5901− if inline.closed {
2158+ Ok(elem) => segments.push(TextSegment::Inline(elem)),
5902− plain.push('}');
2159+ Err(e) => {
5903− }
2160+ // Keep the braces as literal text, but flag what looks
2161+ // like a mistyped inline element.
2162+ if inner.trim_start().starts_with('@') {
2163+ ctx.diagnostics.push(Diagnostic {
2164+ line: ctx.current_line,
2166+ message: e.message,
2167+ severity: Severity::Warning,
2168+ source_line: Some(input.to_string()),
2171+ current_text.push('{');
2172+ current_text.push_str(&inner);
2173+ current_text.push('}');
2177+ current_text.push(chars[i]);
5909− flush(&mut plain, &mut start, &mut segments, ctx);
5913−/// The variable `raw` is, when it is exactly one `$name` or `${name}`.
2182+ if !current_text.is_empty() {
5914−fn whole_reference(raw: &str, env: &Env) -> Option<String> {
2183+ segments.push(TextSegment::Plain(restore_escapes(&substitute_vars(
5915− let after = raw.trim().strip_prefix('$')?;
2184+ ¤t_text,
5916− match interp::reference(after, env)? {
2185+ &ctx.variables,
5917− (interp::Reference::Var(path), len) if len == after.len() => Some(path),
2186+ ))));
5922−/// The attributes of `tokens` after each whole-attribute `if()` has
2192+/// The items of a text list: a range `A..B [step N]`, or comma-separated.
5923−/// chosen (see [`syntax::Choice`]), in order, into `out`. The branch not
2193+fn text_list_items(list: &str) -> Vec<String> {
5924−/// taken isn't evaluated; with `validate`, its attribute names are checked
2194+ if let Some((start, rest)) = list.split_once("..") {
5925−/// like code that doesn't run, under the prefixes `prefix` the `if()` is
2195+ let (end, step) = match rest.split_once(" step ") {
5926−/// under (`hover:if(...)`).
2196+ Some((end, step)) => (end.trim(), step.trim().parse::<i64>().unwrap_or(1).max(1)),
5927−fn choose_attrs(
2197+ None => (rest.trim(), 1),
5928− tokens: &[syntax::Attr],
5931− ctx: &mut ParseContext,
5933− text_keys: &[String],
5934− out: &mut Vec<syntax::Attr>,
5936− for token in tokens {
5937− let Some(choice) = &token.choice else {
5938− out.push(token.clone());
5941− let Some(condition) = choice_shape(token, choice, line_num, ctx) else {
5944− let taken = match condition.span.line {
5945− 0 => ctx.condition(&condition.raw, line_num, None),
5946− line => ctx.condition(&condition.raw, line, Some(condition.span.column)),
5948− let (chosen, other) = match taken {
2199+ if let (Ok(start), Ok(end)) = (start.trim().parse::<i64>(), end.parse::<i64>()) {
5949− true => (choice.branches.first(), choice.branches.get(1)),
2200+ return numeric_range(start, end, step);
5950− false => (choice.branches.get(1), choice.branches.first()),
5952− if let Some(other) = other {
5953− track_var_refs(&branch_text(other), &mut ctx.used_variables);
5955− check_branch(token, other, prefix, line_num, ctx, text_keys);
5958− if let Some(branch) = chosen {
2204+ .map(|s| s.trim().to_string())
2205+ .filter(|s| !s.is_empty())
5972−/// Report what is wrong with the shape of `if()`: an empty condition, a
2209+/// Make `$target` (and `$target.key`, and nested lists) a copy of the list
5973−/// number of branches other than one or two, text after a group's `]`.
2210+/// item stored under `source`.
5974−/// Returns the condition when the `if()` can be evaluated.
2211+fn bind_item(vars: &mut HashMap<String, String>, source: &str, target: &str) {
5975−fn choice_shape<'a>(
2212+ let under = |key: &str, name: &str| {
5976− token: &syntax::Attr,
2213+ key.strip_prefix(name)
5977− choice: &'a syntax::Choice,
2214+ .is_some_and(|rest| rest.is_empty() || rest.starts_with(['.', '#']))
5979− ctx: &mut ParseContext,
5980−) -> Option<&'a syntax::Arg> {
5981− let line = if token.span.line == 0 {
5986− // The line the column points into, when it is the one being evaluated
5987− let source = |ctx: &ParseContext, diagnostic: Diagnostic, at: usize| match &ctx.current_source {
5988− (current, Some(text)) if *current == at => diagnostic.source(text.clone()),
5991− for branch in &choice.branches {
2216+ vars.retain(|key, _| !under(key, target));
5992− if let syntax::Branch::Group {
2217+ let copies: Vec<(String, String)> = vars
5993− trailing: Some(trailing),
2218+ .iter()
5994− ..
2219+ .filter(|(key, _)| under(key, source))
5995− } = branch
2220+ .map(|(key, value)| (format!("{}{}", target, &key[source.len()..]), value.clone()))
5997− let diagnostic = source(
2222+ vars.extend(copies);
5998− ctx,
2223+ // A record has no text of its own
5999− Diagnostic::error(
2224+ vars.entry(target.to_string()).or_default();
6000− code::UNEXPECTED_ARGUMENT,
2225+}
6001− trailing.span.line,
2226+
6002− format!(
2227+/// Inclusive integer range from `start` to `end` (counting down when
6003− "'{}' after the `]` of a group in if(): a branch is one attribute, \
2228+/// `start > end`), stepping by `step`. Stops instead of overflowing.
6004− one `[group]` of attributes or one `$bundle`",
2229+fn numeric_range(start: i64, end: i64, step: i64) -> Vec<String> {
6005− trailing.raw
2230+ let mut items = Vec::new();
6006− ),
2231+ let mut n = start;
6007− )
2232+ if start <= end {
6008− .column(trailing.span.column)
2233+ while n <= end {
6009− .subject(trailing.raw.as_str()),
2234+ items.push(n.to_string());
6010− trailing.span.line,
2235+ match n.checked_add(step) {
6011− );
2236+ Some(next) => n = next,
6012− ctx.push_once(diagnostic);
2237+ None => break,
6015− match &choice.condition {
2241+ while n >= end {
6016− Some(condition) if (1..=2).contains(&choice.branches.len()) => Some(condition),
2242+ items.push(n.to_string());
6017− _ => {
2243+ match n.checked_sub(step) {
6018− let diagnostic = source(
2244+ Some(next) => n = next,
6019− ctx,
2245+ None => break,
6020− Diagnostic::error(
2246+ }
6021− code::INVALID_EXPRESSION,
6024− "`{}`: if() takes a condition and one or two branches, \
6025− `if(CONDITION, A, B)`",
6029− .column(token.span.column),
6032− ctx.push_once(diagnostic);
6038−/// A branch's text, for the names it uses.
6039−fn branch_text(branch: &syntax::Branch) -> String {
6040− let raws: Vec<&str> = branch.attrs().iter().map(|a| a.raw.as_str()).collect();
6044−/// Check attributes that are never evaluated (in code that doesn't run,
6045−/// or the branch an `if()` didn't take), as far as they can be checked:
6046−/// names are, and literal values; a value with a variable depends on what
6047−/// the variable holds. Each branch of an `if()` is checked on its own.
6048−fn check_attrs(tokens: &[syntax::Attr], line: usize, ctx: &mut ParseContext, text_keys: &[String]) {
6049− parse_attr_list(&literal_attrs(tokens), line, ctx, true, text_keys);
6050− check_choices(tokens, "", line, ctx, text_keys);
6053−/// [`check_attrs`] for a branch of the `if()` `token`, under the prefixes
2254+/// Evaluate `if(cond, a)` or `if(cond, a, b)` when it is all of `text`,
6054−/// `prefix` it is under: `hover:if($on, color red, [id=x])` checks
2255+/// returning the chosen branch (empty when `cond` fails and there is no `b`).
6055−/// `hover:[id=x]`, an error whichever branch is taken.
2256+fn choose_if(text: &str, ctx: &mut ParseContext, line: usize) -> Option<String> {
6056−fn check_branch(
2257+ let inner = text.strip_prefix("if(")?.strip_suffix(')')?;
6057− token: &syntax::Attr,
2258+ let args = split_if_args(inner);
6058− branch: &syntax::Branch,
2259+ // `if(a) (b)` isn't one call
6059− prefix: &str,
2260+ if split_trailing_paren(inner) || !(2..=3).contains(&args.len()) {
6060− line: usize,
2261+ return None;
6061− ctx: &mut ParseContext,
6062− text_keys: &[String],
6064− if prefix.is_empty() {
6065− check_attrs(branch.attrs(), line, ctx, text_keys);
6068− let list = syntax::AttrList {
2263+ let branch = if ctx.condition(args[0].trim(), line) {
6069− attrs: branch.attrs().to_vec(),
2264+ args[1]
6070− span: token.span,
2265+ } else {
6071− closed: true,
2266+ args.get(2).copied().unwrap_or("")
6072− quoted_close: None,
6074− let grouped = syntax::Attr {
2268+ Some(branch.trim().to_string())
6075− key: prefix.to_string(),
2269+}
6077− html: false,
2271+/// Whether the parentheses in `inner` close before its end, as in the
6078− raw: token.raw.clone(),
2272+/// inside of `if(a)(b)`.
6079− span: token.span,
2273+fn split_trailing_paren(inner: &str) -> bool {
6080− choice: None,
2274+ let mut depth = 0i32;
6081− prefixed: Some(Box::new(syntax::Prefixed {
2275+ let mut quote = None;
6082− prefix: prefix.to_string(),
2276+ for c in inner.chars() {
6083− prefix_span: token.span,
2277+ match c {
6084− target: syntax::Branch::Group {
2278+ '"' | '\'' if quote == Some(c) => quote = None,
6085− list,
2279+ '"' | '\'' if quote.is_none() => quote = Some(c),
6086− trailing: None,
2280+ _ if quote.is_some() => {}
6087− },
2281+ '(' => depth += 1,
2294+/// Resolve a value written `if(cond, a, b)`: evaluate `cond` and keep the
2295+/// chosen branch's text, or `None` when the choice is empty. Other
2296+/// attributes are returned unchanged.
2297+fn choose_if_value(part: &str, ctx: &mut ParseContext, line: usize) -> Option<String> {
2298+ let Some(pos) = part.find(['=', ' ']) else {
2299+ return Some(part.to_string());
6090− check_attrs(std::slice::from_ref(&grouped), line, ctx, text_keys);
2301+ let (head, value) = part.split_at(pos + 1);
2302+ match choose_if(value.trim(), ctx, line) {
2303+ Some(branch) if branch.is_empty() => None,
2304+ Some(branch) => Some(format!("{}{}", head, branch)),
2305+ None => Some(part.to_string()),
6093−/// [`check_attrs`] for the branches of each `if()` of `tokens`, which are
2309+fn split_if_args(input: &str) -> Vec<&str> {
6094−/// under the prefixes `prefix`, also inside a prefixed group or as a
2310+ let mut parts = Vec::new();
6095−/// prefixed `if()`.
2311+ let mut start = 0;
6096−fn check_choices(
2312+ let mut depth = 0;
6097− tokens: &[syntax::Attr],
2313+ let mut quote = None;
6098− prefix: &str,
2314+ for (i, c) in input.char_indices() {
6099− line: usize,
2315+ match c {
6100− ctx: &mut ParseContext,
2316+ '"' | '\'' if quote == Some(c) => quote = None,
6101− text_keys: &[String],
2317+ '"' | '\'' if quote.is_none() => quote = Some(c),
6102−) {
2318+ _ if quote.is_some() => {}
6103− for token in tokens {
2319+ '(' => depth += 1,
6104− if let Some(choice) = &token.choice
2320+ ')' => depth -= 1,
6105− && choice_shape(token, choice, line, ctx).is_some()
2321+ ',' if depth == 0 => {
6106− {
2322+ parts.push(&input[start..i]);
6107− for branch in &choice.branches {
2323+ start = i + 1;
6108− check_branch(token, branch, prefix, line, ctx, text_keys);
6111− if let Some(prefixed) = &token.prefixed {
6112− let inner = format!("{}{}", prefix, prefixed.prefix);
6113− check_choices(prefixed.target.attrs(), &inner, line, ctx, text_keys);
2328+ parts.push(&input[start..]);
6118// ---------------------------------------------------------------------------
2332// ---------------------------------------------------------------------------
6119// Post-parse validation (context-dependent warnings)
2333// Post-parse validation (context-dependent warnings)
6120// ---------------------------------------------------------------------------
2334// ---------------------------------------------------------------------------
2336+/// Attributes that only make sense on container elements (@row, @el, @el).
2337+const CONTAINER_ONLY_ATTRS: &[&str] = &[
6122fn element_kind_name(kind: &ElementKind) -> String {
2348fn element_kind_name(kind: &ElementKind) -> String {
6123 format!("@{}", kind.name())
2349 format!("@{}", kind.name())
6126−/// HTML elements whose start tag ends an open `<p>`: written inside a
2352+fn is_container(kind: &ElementKind) -> bool {
6127−/// `@paragraph`, the browser moves them out of it. (`div` isn't here:
2353+ matches!(kind, ElementKind::Row | ElementKind::El)
6128−/// inside text, htmlang writes its `<div>`s as `<span>`s.)
2354+ || kind.spec().is_some_and(|spec| spec.container)
6130−const ENDS_A_PARAGRAPH: &[&str] = &[
6131− "address", "article", "aside", "blockquote", "dd", "details", "dialog", "dl", "dt",
6132− "fieldset", "figcaption", "figure", "footer", "form", "h1", "h2", "h3", "h4", "h5", "h6",
6133− "header", "hgroup", "hr", "li", "main", "menu", "nav", "ol", "p", "pre", "search",
6134− "section", "summary", "table", "ul",
6137−/// The HTML element `kind` is written as, if the browser would take it out
6139−fn ends_a_paragraph(kind: &ElementKind) -> Option<&'static str> {
6140− let html = match kind {
6141− ElementKind::Paragraph => "p",
6142− ElementKind::Tag(spec) => spec.html,
6145− ENDS_A_PARAGRAPH.contains(&html).then_some(html)
6148/// Stricter checks for `htmlang lint`, on top of the diagnostics every
2357/// Stricter checks for `htmlang lint`, on top of the diagnostics every
@@ -6152,171 +2361,133 @@ pub fn lint(nodes: &[Node]) -> Vec<Diagnostic> {
6152 fn walk(nodes: &[Node], depth: usize, out: &mut Vec<Diagnostic>) {
2361 fn walk(nodes: &[Node], depth: usize, out: &mut Vec<Diagnostic>) {
6153 for node in nodes {
2362 for node in nodes {
6154 let Node::Element(elem) = node else { continue };
2363 let Node::Element(elem) = node else { continue };
6155− let start = out.len();
2364+ let mut warn = |message: String| {
6156− let mut warn = |code: &'static str, message: String| {
2365+ out.push(Diagnostic {
6157− out.push(Diagnostic::warning(code, elem.line_num, message))
2366+ line: elem.line_num,
2369+ severity: Severity::Warning,
6159 if depth > 10 {
2373 if depth > 10 {
6160− warn(
2374+ warn(format!(
6161− code::DEEP_NESTING,
2375+ "deeply nested element ({} levels): consider simplifying",
6162− format!(
2376+ depth
6163− "deeply nested element ({} levels): consider simplifying",
2377+ ));
6168− // A function's body may draw with an empty element (a spacer,
2379+ if matches!(elem.kind, ElementKind::Row | ElementKind::El)
6169− // a dot): only one written in the page is flagged
6170− if elem.kind.layout().is_container()
6171 && elem.children.is_empty()
2380 && elem.children.is_empty()
6172− && elem.function.is_none()
6174− warn(
2382+ warn(format!("empty container (@{}) has no children", elem.kind.name()));
6175− code::EMPTY_CONTAINER,
6176− format!("empty container (@{}) has no children", elem.kind.name()),
6179 if elem.kind.is_tag("button") && !elem.attrs.iter().any(|a| a.key == "type") {
2384 if elem.kind.is_tag("button") && !elem.attrs.iter().any(|a| a.key == "type") {
6180− warn(
2385+ warn("@button missing 'type' attribute (defaults to submit)".to_string());
6181− code::MISSING_BUTTON_TYPE,
6182− "@button missing 'type' attribute (defaults to submit)".to_string(),
6185− in_function_body(elem, &mut out[start..]);
6186 walk(&elem.children, depth + 1, out);
2387 walk(&elem.children, depth + 1, out);
6189 let mut out = Vec::new();
2390 let mut out = Vec::new();
6190 walk(nodes, 0, &mut out);
2391 walk(nodes, 0, &mut out);
6195−/// `in_paragraph`: the nodes are inside a `@paragraph` (and not inside a
2395+
6196−/// `@button` in it, which the browser keeps whole).
6197fn validate_tree(
2396fn validate_tree(
6198 nodes: &[Node],
2397 nodes: &[Node],
6199 parent_kind: Option<&ElementKind>,
2398 parent_kind: Option<&ElementKind>,
6200− in_paragraph: bool,
6201 diagnostics: &mut Vec<Diagnostic>,
2399 diagnostics: &mut Vec<Diagnostic>,
6203 for node in nodes {
2401 for node in nodes {
6204− // An element inside a line of text (`{@kbd ...}`, an inline call)
6205− // is checked like one on a line of its own
6206− if let Node::Text(segments) = node {
6207− let inline: Vec<Node> = segments
6209− .filter_map(|segment| match segment {
6210− TextSegment::Inline(elem) => Some(Node::Element(elem.clone())),
6214− validate_tree(&inline, parent_kind, in_paragraph, diagnostics);
6216 if let Node::Element(elem) = node {
2402 if let Node::Element(elem) = node {
6217− let start = diagnostics.len();
6218− dropped_by_the_element(elem, diagnostics);
6219− if in_paragraph && let Some(html) = ends_a_paragraph(&elem.kind) {
6221− Diagnostic::warning(
6222− code::BLOCK_IN_PARAGRAPH,
6225− "{0} inside @paragraph: HTML ends a <p> before a <{1}>, so the \
6226− browser moves the <{1}> out of the paragraph. Put {0} after the \
6227− paragraph, or use @el, @row or @grid, which are laid out inline \
6229− element_kind_name(&elem.kind),
6233− .subject(elem.kind.name()),
6236 for attr in &elem.attrs {
2403 for attr in &elem.attrs {
6237 let base = crate::vocab::base_attribute(&attr.key);
2404 let base = crate::vocab::base_attribute(&attr.key);
6238−
2405+ if base == "width"
6239− // htmlang's words for laying out children, on an element
2406+ && attr.value.as_deref() == Some("fill")
6240− // that doesn't lay out its children: left out (codegen)
2407+ && !matches!(parent_kind, Some(ElementKind::Row))
6241− if !attr.html
2408+ {
6242− && crate::vocab::CONTAINER_ATTRIBUTES.contains(&base)
2409+ diagnostics.push(Diagnostic {
6243− && !elem.kind.layout().is_container()
2410+ line: elem.line_num,
6244− && !has_no_element(&elem.kind)
2411+ column: None,
6245− && !crate::vocab::split_prefixes(&attr.key)
2412+ message: "'width fill' works best inside @row; using 100% as fallback"
6246− .0
2413+ .to_string(),
6247− .contains(&"children:")
2414+ severity: Severity::Warning,
2418+ if base == "height"
2419+ && attr.value.as_deref() == Some("fill")
2420+ && !parent_kind.is_some_and(ElementKind::is_column)
6249− diagnostics.push(not_a_container(&elem.kind, elem.line_num, base));
2422+ diagnostics.push(Diagnostic {
2423+ line: elem.line_num,
2425+ message: "'height fill' works best inside @el; using 100% as fallback"
2427+ severity: Severity::Warning,
2432+ // Container-only attributes on non-container elements
2433+ if CONTAINER_ONLY_ATTRS.contains(&base) && !is_container(&elem.kind) {
2434+ diagnostics.push(Diagnostic {
2435+ line: elem.line_num,
2438+ "'{}' has no effect on {} (only works on @row, @el, @el)",
2440+ element_kind_name(&elem.kind)
2442+ severity: Severity::Warning,
6252 // Form-specific: placeholder only on @input/@textarea
2447 // Form-specific: placeholder only on @input/@textarea
6253 if base == "placeholder"
2448 if base == "placeholder"
6254 && !(elem.kind.is_tag("input") || elem.kind.is_tag("textarea"))
2449 && !(elem.kind.is_tag("input") || elem.kind.is_tag("textarea"))
6256− diagnostics.push(Diagnostic::new(
2451+ diagnostics.push(Diagnostic {
6257− code::NO_EFFECT,
2452+ line: elem.line_num,
6258− Severity::Warning,
2453+ column: None,
6259− elem.line_num,
2454+ message: format!(
6261 "'placeholder' has no effect on {} (only works on @input, @textarea)",
2455 "'placeholder' has no effect on {} (only works on @input, @textarea)",
6262 element_kind_name(&elem.kind)
2456 element_kind_name(&elem.kind)
6264− ));
2458+ severity: Severity::Warning,
6267− // 'for' only on @label and @output
2463+ // 'for' only on @label
6268− if base == "for" && !(elem.kind.is_tag("label") || elem.kind.is_tag("output")) {
2464+ if base == "for" && !elem.kind.is_tag("label") {
6269− diagnostics.push(Diagnostic::new(
2465+ diagnostics.push(Diagnostic {
6270− code::NO_EFFECT,
2466+ line: elem.line_num,
6271− Severity::Warning,
2467+ column: None,
6272− elem.line_num,
2468+ message: format!(
6273− format!(
2469+ "'for' has no effect on {} (only works on @label)",
6274− "'for' has no effect on {} (only works on @label and @output)",
6275 element_kind_name(&elem.kind)
2470 element_kind_name(&elem.kind)
6277− ));
2472+ severity: Severity::Warning,
6278− }
2473+ source_line: None,
6280− // `width=` and `height=` are HTML attributes of media and
6281− // embedded content only; elsewhere they are styles
6283− && (base == "width" || base == "height")
6284− && !matches!(elem.kind, ElementKind::Image)
6286− "video", "canvas", "iframe", "embed", "object", "input", "source",
6289− .any(|tag| elem.kind.is_tag(tag))
6291− let value = attr.value.as_deref().unwrap_or("");
6293− Diagnostic::warning(
6294− code::HTML_ATTRIBUTE_FORM,
6297− "'{0}={1}' has no effect on {2}, which has no {0} attribute: \
6298− the style is written `{0} {1}`",
6301− element_kind_name(&elem.kind)
6304− .subject(format!("{}={}", base, value)),
6308 // 'rows'/'cols' only on @textarea
2477 // 'rows'/'cols' only on @textarea
6309− if (base == "rows" || base == "cols") && !elem.kind.is_tag("textarea") {
2478+ if (base == "rows" || base == "cols") && !elem.kind.is_tag("textarea")
6310− diagnostics.push(Diagnostic::new(
2479+ {
6311− code::NO_EFFECT,
2480+ diagnostics.push(Diagnostic {
6312− Severity::Warning,
2481+ line: elem.line_num,
6313− elem.line_num,
2482+ column: None,
6314− format!(
2483+ message: format!(
6315 "'{}' has no effect on {} (only works on @textarea)",
2484 "'{}' has no effect on {} (only works on @textarea)",
6317 element_kind_name(&elem.kind)
2486 element_kind_name(&elem.kind)
6319− ));
2488+ severity: Severity::Warning,
6322 // Media-specific attributes only on @video/@audio
2493 // Media-specific attributes only on @video/@audio
@@ -6331,35 +2502,40 @@ fn validate_tree(
6331 | "preload"
2502 | "preload"
6332 ) && !matches!(elem.kind.name(), "video" | "audio")
2503 ) && !matches!(elem.kind.name(), "video" | "audio")
6334− diagnostics.push(Diagnostic::new(
2505+ diagnostics.push(Diagnostic {
6335− code::NO_EFFECT,
2506+ line: elem.line_num,
6336− Severity::Warning,
2507+ column: None,
6337− elem.line_num,
2508+ message: format!(
6339 "'{}' has no effect on {} (only works on @video, @audio)",
2509 "'{}' has no effect on {} (only works on @video, @audio)",
6341 element_kind_name(&elem.kind)
2511 element_kind_name(&elem.kind)
6343− ));
2513+ severity: Severity::Warning,
6346 // Missing alt text on @image
2518 // Missing alt text on @image
6347 if matches!(elem.kind, ElementKind::Image) && !elem.attrs.iter().any(|a| a.key == "alt")
2519 if matches!(elem.kind, ElementKind::Image) && !elem.attrs.iter().any(|a| a.key == "alt")
6349− diagnostics.push(Diagnostic::new(
2521+ diagnostics.push(Diagnostic {
6350− code::MISSING_ALT,
2522+ line: elem.line_num,
6351− Severity::Warning,
2523+ column: None,
6352− elem.line_num,
2524+ message: "@image missing 'alt' attribute (accessibility)".to_string(),
6353− "@image missing 'alt' attribute (accessibility)".to_string(),
2525+ severity: Severity::Warning,
6354− ));
2526+ source_line: None,
6356− if elem.kind.is_tag("input") && !elem.attrs.iter().any(|a| a.key == "type") {
2529+ if elem.kind.is_tag("input")
6357− diagnostics.push(Diagnostic::new(
2530+ && !elem.attrs.iter().any(|a| a.key == "type")
6358− code::MISSING_INPUT_TYPE,
2531+ {
6359− Severity::Warning,
2532+ diagnostics.push(Diagnostic {
6360− elem.line_num,
2533+ line: elem.line_num,
6361− "@input missing 'type' attribute (defaults to 'text')".to_string(),
2534+ column: None,
6362− ));
2535+ message: "@input missing 'type' attribute (defaults to 'text')".to_string(),
2536+ severity: Severity::Warning,
6364 if matches!(elem.kind, ElementKind::Link) {
2540 if matches!(elem.kind, ElementKind::Link) {
6365 // For @link, argument is the URL, not text content
2541 // For @link, argument is the URL, not text content
@@ -6370,50 +2546,44 @@ fn validate_tree(
6371 .any(|a| a.key == "aria-label" || a.key == "title")
2547 .any(|a| a.key == "aria-label" || a.key == "title")
6373− diagnostics.push(Diagnostic::new(
2549+ diagnostics.push(Diagnostic {
6374− code::MISSING_LINK_TEXT,
2550+ line: elem.line_num,
6375− Severity::Warning,
2551+ column: None,
6376− elem.line_num,
2552+ message: "@link has no visible text or aria-label (accessibility)"
6377− "@link has no visible text or aria-label (accessibility)".to_string(),
2553+ .to_string(),
6378− ));
2554+ severity: Severity::Warning,
6382− // Contrast ratio check for hex color pairs, each pair on the
2560+ // Contrast ratio check for hex color pairs
6383− // same elements: the element's own, or those an element prefix
2561+ {
6384− // (`@td:`) picks out inside it
2562+ let bg_color = elem
6385− let inside = |key: &str| {
2563+ .attrs
6386− crate::vocab::split_prefixes(key)
2564+ .iter()
6387− .0
2565+ .find(|a| crate::vocab::base_attribute(&a.key) == "background")
6388− .into_iter()
2566+ .and_then(|a| a.value.as_deref());
6389− .find_map(crate::vocab::element_prefix)
2567+ let fg_color = elem
6390− .map(str::to_string)
2568+ .attrs
6392− let mut targets: Vec<Option<String>> = Vec::new();
2570+ .find(|a| crate::vocab::base_attribute(&a.key) == "color")
6393− for attr in elem.attrs.iter().filter(|a| !a.html) {
2571+ .and_then(|a| a.value.as_deref());
6394− let target = inside(&attr.key);
6395− if !targets.contains(&target) {
6396− targets.push(target);
6399− for target in targets {
6400− let color = |property: &str| {
6403− .filter(|a| !a.html && inside(&a.key) == target)
6404− .find(|a| crate::vocab::base_attribute(&a.key) == property)
6405− .and_then(|a| a.value.as_deref())
6407− let (bg_color, fg_color) = (color("background"), color("color"));
6408 if let (Some(bg), Some(fg)) = (bg_color, fg_color)
2572 if let (Some(bg), Some(fg)) = (bg_color, fg_color)
6409− && let (Some(bg_rgb), Some(fg_rgb)) = (parse_hex_rgb(bg), parse_hex_rgb(fg))
2573+ && let (Some(bg_rgb), Some(fg_rgb)) = (crate::expr::parse_hex_rgb(bg), crate::expr::parse_hex_rgb(fg))
6411 let ratio = contrast_ratio(bg_rgb, fg_rgb);
2575 let ratio = contrast_ratio(bg_rgb, fg_rgb);
6412 if ratio < 4.5 {
2576 if ratio < 4.5 {
6413− diagnostics.push(Diagnostic::new(code::LOW_CONTRAST, Severity::Warning, elem.line_num, format!(
2577+ diagnostics.push(Diagnostic {
2578+ line: elem.line_num,
6414 "low contrast ratio {:.1}:1 between '{}' and '{}' (WCAG AA requires 4.5:1)",
2581 "low contrast ratio {:.1}:1 between '{}' and '{}' (WCAG AA requires 4.5:1)",
6415 ratio, fg, bg
2582 ratio, fg, bg
2584+ severity: Severity::Warning,
@@ -6428,34 +2598,45 @@ fn validate_tree(
6428 let has_title = elem.attrs.iter().any(|a| a.key == "title");
2598 let has_title = elem.attrs.iter().any(|a| a.key == "title");
6429 let in_label = parent_kind.is_some_and(|k| k.is_tag("label"));
2599 let in_label = parent_kind.is_some_and(|k| k.is_tag("label"));
6430 if !has_id && !has_aria_label && !has_title && !in_label {
2600 if !has_id && !has_aria_label && !has_title && !in_label {
6431− diagnostics.push(Diagnostic::new(code::MISSING_LABEL, Severity::Warning, elem.line_num, format!(
2601+ diagnostics.push(Diagnostic {
2602+ line: elem.line_num,
6432 "{} should have an 'id' (with matching @label[for]), 'aria-label', or be wrapped in @label (accessibility)",
2605 "{} should have an 'id' (with matching @label[for]), 'aria-label', or be wrapped in @label (accessibility)",
6433 element_kind_name(&elem.kind)
2606 element_kind_name(&elem.kind)
2608+ severity: Severity::Warning,
6438 // @iframe should have title attribute
2614 // @iframe should have title attribute
6439− if elem.kind.is_tag("iframe") && !elem.attrs.iter().any(|a| a.key == "title") {
2615+ if elem.kind.is_tag("iframe")
6440− diagnostics.push(Diagnostic::new(
2616+ && !elem.attrs.iter().any(|a| a.key == "title")
6441− code::MISSING_TITLE,
2617+ {
6442− Severity::Warning,
2618+ diagnostics.push(Diagnostic {
6443− elem.line_num,
2619+ line: elem.line_num,
6444− "@iframe missing 'title' attribute (accessibility)".to_string(),
2620+ column: None,
6445− ));
2621+ message: "@iframe missing 'title' attribute (accessibility)".to_string(),
2622+ severity: Severity::Warning,
6448 // @button should have accessible text
2627 // @button should have accessible text
6449 if elem.kind.is_tag("button") {
2628 if elem.kind.is_tag("button") {
6450− let has_text = !elem.children.is_empty();
2629+ let has_text = elem.argument.is_some() || !elem.children.is_empty();
6451 let has_aria = elem.attrs.iter().any(|a| a.key == "aria-label");
2630 let has_aria = elem.attrs.iter().any(|a| a.key == "aria-label");
6452 if !has_text && !has_aria {
2631 if !has_text && !has_aria {
6453− diagnostics.push(Diagnostic::new(
2632+ diagnostics.push(Diagnostic {
6454− code::MISSING_BUTTON_TEXT,
2633+ line: elem.line_num,
6455− Severity::Warning,
2634+ column: None,
6456− elem.line_num,
2635+ message: "@button has no text content or aria-label (accessibility)"
6457− "@button has no text content or aria-label (accessibility)".to_string(),
2636+ .to_string(),
6458− ));
2637+ severity: Severity::Warning,
@@ -6468,15 +2649,16 @@ fn validate_tree(
6468 let has_track = elem
2649 let has_track = elem
6469 .children
2650 .children
6471− .any(|c| matches!(c, Node::Element(e) if e.kind.is_tag("track")));
2652+ .any(|c| matches!(c, Node::Element(e) if e.kind.is_tag("source")));
6472 if !has_aria && !has_track {
2653 if !has_aria && !has_track {
6473− diagnostics.push(Diagnostic::new(
2654+ diagnostics.push(Diagnostic {
6474− code::MISSING_CAPTIONS,
2655+ line: elem.line_num,
6475− Severity::Warning,
2656+ column: None,
6476− elem.line_num,
2657+ message: "@video should have aria-label or captions for accessibility"
6477− "@video should have aria-label or a captions @track for accessibility"
6478 .to_string(),
2658 .to_string(),
6479− ));
2659+ severity: Severity::Warning,
@@ -6486,204 +2668,20 @@ fn validate_tree(
6486 && let Ok(n) = val.parse::<i32>()
2668 && let Ok(n) = val.parse::<i32>()
6487 && n > 0
2669 && n > 0
6489− diagnostics.push(Diagnostic::new(code::POSITIVE_TABINDEX, Severity::Warning, elem.line_num, format!("tabindex {} is positive — avoid positive tabindex values as they disrupt natural tab order", n)));
2671+ diagnostics.push(Diagnostic {
2672+ line: elem.line_num,
2674+ message: format!("tabindex {} is positive — avoid positive tabindex values as they disrupt natural tab order", n),
2675+ severity: Severity::Warning,
6491− in_function_body(elem, &mut diagnostics[start..]);
6493− // An element that ends the <p> takes what is inside it out of
6494− // the paragraph too, so only it is reported
6495− let in_paragraph = elem.kind == ElementKind::Paragraph
6497− && ends_a_paragraph(&elem.kind).is_none()
6498− && !elem.kind.is_tag("button"));
6499− validate_tree(&elem.children, Some(&elem.kind), in_paragraph, diagnostics);
6504−/// What an element has no place for in HTML, which would otherwise be
6505−/// left out of the page: attributes on `@fragment` (which has no element
6506−/// of its own), styles on `@script` (which isn't shown), a body under a
6507−/// `@script` that has a src (which the browser doesn't run), an element
6508−/// under a `@script` (whose body is code), and content in a void element
6509−/// such as `@input`.
6510−fn dropped_by_the_element(elem: &Element, diagnostics: &mut Vec<Diagnostic>) {
6511− let name = elem.kind.name();
6512− let keys = |attrs: Vec<&Attribute>| {
6515− .map(|a| format!("'{}'", a.key))
6516− .collect::<Vec<_>>()
6519− let mut error = |code: &'static str, message: String| {
6520− diagnostics.push(Diagnostic::error(code, elem.line_num, message).subject(name))
6522− if elem.kind == ElementKind::Fragment && !elem.attrs.is_empty() {
6524− code::UNEXPECTED_ARGUMENT,
6526− "@fragment has no element of its own to put attributes on, so {} would go \
6527− nowhere: put them on its children, or use @el",
6528− keys(elem.attrs.iter().collect())
6532− // The leading argument given twice: an attribute passed to the root
6533− // of a function whose body gives the argument (written on one line,
6534− // it is reported where it is read, and the attribute wins there)
6535− if let Some(argument) = &elem.argument
6536− && let Some(attr) = elem
6539− .find(|a| a.html && elem.kind.arg().attributes().contains(&a.key.as_str()))
6542− code::DUPLICATE_ATTRIBUTE,
6544− "@{} takes '{}' as its {}, and it also has {}={}: give it once",
6547− leading_name(&elem.kind),
6549− attr.value.as_deref().unwrap_or("")
6553− if elem.kind.is_verbatim() {
6554− let styles: Vec<&Attribute> = elem
6557− .filter(|a| !a.html && !crate::vocab::is_html_flag(&a.key))
6559− if !styles.is_empty() {
6561− code::UNEXPECTED_ARGUMENT,
6563− "@{} isn't shown on the page, so its styles {} would go nowhere",
6569− let src = elem.argument.clone().or_else(|| {
6572− .find(|a| a.html && a.key == "src")
6573− .map(|a| a.value.clone().unwrap_or_default())
6575− if let Some(src) = src
6576− && !elem.children.is_empty()
6579− code::UNEXPECTED_CONTENT,
6581− "@{0} has both a src ('{1}') and a body: the browser runs only the file, \
6582− so the body would go nowhere. Put the code in {1}, or leave out the src",
6586− } else if let Some(Node::Element(child)) = elem
6589− .find(|child| matches!(child, Node::Element(_)))
6591− // `@script > @b x`: its body is code, not elements
6593− code::UNEXPECTED_CONTENT,
6595− "@{} holds its code as the lines under it, kept as written, so @{} would \
6603− if elem.kind != ElementKind::Image && elem.attrs.iter().any(|a| !a.html && a.key == "inline") {
6605− code::UNEXPECTED_ARGUMENT,
6607− "`inline` puts an image's file into the page, and @{} has none: it only \
6613− if elem.kind.layout() == Layout::Void && !elem.children.is_empty() {
6615− code::UNEXPECTED_CONTENT,
6617− "@{} takes no content: it is an element without a closing tag, so its text \
6618− and indented lines would go nowhere",
6625−/// `@fragment`, `@script`, `@children` and `@slot`, whose attributes are
6626−/// reported on their own (see `dropped_by_the_element`).
6627−fn has_no_element(kind: &ElementKind) -> bool {
6630− ElementKind::Fragment | ElementKind::Children | ElementKind::Slot(_)
6631− ) || kind.is_verbatim()
6634−/// htmlang's word `word` for laying out children (`spacing`, `wrap`,
6635−/// `grid-cols`, `grid-rows`) on an element that doesn't lay out its
6636−/// children: an error, and the word is left out.
6637−fn not_a_container(kind: &ElementKind, line: usize, word: &str) -> Diagnostic {
6638− let name = element_kind_name(kind);
6639− let (what, instead) = match kind.layout() {
6641− "is text, whose lines and children flow together with no gap between them",
6642− "; to space the children out, put them in an @el or @row",
6644− Layout::Void => ("has no content to lay out", ""),
6646− "keeps HTML's own layout",
6647− "; for a flex layout of your own, write CSS, such as `display flex, gap 8`",
6654− "'{0}' can't go on {1}: {1} {2}. `{0}` works on a row, column or grid \
6655− (@el, @row, @grid, @section, ...){3}",
6656− word, name, what, instead
6662−/// Diagnostics about an element a function's body wrote are reported at
2680+ validate_tree(&elem.children, Some(&elem.kind), diagnostics);
6663−/// the call (see `belongs_to_call`); say which body the element is in.
6664−fn in_function_body(elem: &Element, diagnostics: &mut [Diagnostic]) {
6665− if let Some(function) = &elem.function {
6666− for d in diagnostics {
6667− d.message = format!("{}\n in the body of @{}", d.message, function);
6672−/// Report each diagnostic once: a line that runs many times (in a loop, in
6673−/// a function called from one place many times) reports its problems once.
6674−fn dedupe(diagnostics: &mut Vec<Diagnostic>) {
6675− let mut seen = HashSet::new();
6676− diagnostics.retain(|d| {
6687fn relative_luminance(r: u8, g: u8, b: u8) -> f64 {
2685fn relative_luminance(r: u8, g: u8, b: u8) -> f64 {
6688 fn linearize(c: u8) -> f64 {
2686 fn linearize(c: u8) -> f64 {
6689 let s = c as f64 / 255.0;
2687 let s = c as f64 / 255.0;
@@ -6696,24 +2694,6 @@ fn relative_luminance(r: u8, g: u8, b: u8) -> f64 {
6696 0.2126 * linearize(r) + 0.7152 * linearize(g) + 0.0722 * linearize(b)
2694 0.2126 * linearize(r) + 0.7152 * linearize(g) + 0.0722 * linearize(b)
6699−/// The red, green and blue of a `#rgb` or `#rrggbb` colour.
6700−fn parse_hex_rgb(s: &str) -> Option<(u8, u8, u8)> {
6701− let s = s.strip_prefix('#')?;
6702− if !s.bytes().all(|b| b.is_ascii_hexdigit()) {
6705− let channel = |i: usize, len: usize| u8::from_str_radix(&s[i..i + len], 16).ok();
6708− channel(0, 1)? * 17,
6709− channel(1, 1)? * 17,
6710− channel(2, 1)? * 17,
6712− 6 => Some((channel(0, 2)?, channel(2, 2)?, channel(4, 2)?)),
6717fn contrast_ratio(c1: (u8, u8, u8), c2: (u8, u8, u8)) -> f64 {
2697fn contrast_ratio(c1: (u8, u8, u8), c2: (u8, u8, u8)) -> f64 {
6718 let l1 = relative_luminance(c1.0, c1.1, c1.2);
2698 let l1 = relative_luminance(c1.0, c1.1, c1.2);
6719 let l2 = relative_luminance(c2.0, c2.1, c2.2);
2699 let l2 = relative_luminance(c2.0, c2.1, c2.2);
@@ -6721,48 +2701,65 @@ fn contrast_ratio(c1: (u8, u8, u8), c2: (u8, u8, u8)) -> f64 {
6721 (lighter + 0.05) / (darker + 0.05)
2701 (lighter + 0.05) / (darker + 0.05)
2704+// ---------------------------------------------------------------------------
2705+// Variable substitution
2706+// ---------------------------------------------------------------------------
2708+/// Interpolate `$name` variables and `${expr}` expressions into text.
2709+/// Undefined variables, and expressions that don't evaluate, are left as
2710+/// written so they show up in the output.
2711+fn substitute_vars(input: &str, vars: &HashMap<String, String>) -> String {
2712+ if !input.contains('$') {
2713+ return input.to_string();
2715+ let is_name_char = |c: char| c.is_alphanumeric() || matches!(c, '_' | '-' | '.');
2716+ let mut result = String::with_capacity(input.len());
2717+ let mut rest = input;
2718+ while let Some(pos) = rest.find('$') {
2719+ result.push_str(&rest[..pos]);
2720+ let after = &rest[pos + 1..];
2721+ if after.starts_with('{')
2722+ && let Some(close) = matching_brace(after)
2724+ let source = &after[1..close];
2725+ match crate::expr::eval(source, &|name: &str| lookup(vars, name)) {
2726+ Ok(value) => result.push_str(&value.to_string()),
2727+ Err(_) => result.push_str(&rest[pos..pos + 1 + close + 1]),
2729+ rest = &after[close + 1..];
2732+ let mut end = after.find(|c: char| !is_name_char(c)).unwrap_or(after.len());
2733+ while end > 0 && after[..end].ends_with('.') {
2736+ let name = &after[..end];
2737+ match vars.get(name) {
2738+ Some(value) if !name.is_empty() => result.push_str(value),
2741+ result.push_str(name);
2744+ rest = &after[end..];
2746+ result.push_str(rest);
6724/// `@image [inline] icon.svg` becomes the SVG's markup, with `width`,
2750/// `@image [inline] icon.svg` becomes the SVG's markup, with `width`,
6725−/// `height`, `color` / `fill` and the HTML attributes (`class=`, `id=`,
2751+/// `height`, `color` / `fill`, `class=` and `id=` applied to the `<svg>`
6726−/// `aria-label=`, ...) applied to the `<svg>` tag; any other attribute is
2752+/// tag. Other nodes are returned unchanged.
6727−/// an error. Other nodes are returned unchanged.
6728fn inline_svg(node: Node, line_num: usize, ctx: &mut ParseContext) -> Node {
2753fn inline_svg(node: Node, line_num: usize, ctx: &mut ParseContext) -> Node {
6729 let Node::Element(elem) = &node else {
2754 let Node::Element(elem) = &node else {
6730 return node;
2755 return node;
6732− let inline = elem.kind == ElementKind::Image
2757+ let is_inline_svg = elem.kind == ElementKind::Image
6733 && elem.attrs.iter().any(|a| a.key == "inline" && !a.html)
2758 && elem.attrs.iter().any(|a| a.key == "inline" && !a.html)
6734− && elem.argument.as_deref().is_some_and(|src| !src.is_empty());
2759+ && elem.argument.as_deref().is_some_and(|src| src.ends_with(".svg"));
6735− if !inline {
2760+ if !is_inline_svg {
6736 return node;
2761 return node;
6738− // A raster image: its file, read relative to this one, as a `data:` URI
6742− .is_some_and(|src| src.ends_with(".svg"))
6744− let Node::Element(mut elem) = node else {
6747− let filename = elem.argument.clone().unwrap_or_default();
6748− let resolved = ctx.resolve(&filename);
6749− match std::fs::read(&resolved) {
6751− elem.argument = Some(crate::codegen::data_uri(&filename, &data));
6752− ctx.included_files.push(resolved);
6754− Err(e) => ctx.diagnostics.push(Diagnostic::new(
6755− code::UNREADABLE_FILE,
6759− "cannot load image '{}' to put it into the page: {}",
6764− return Node::Element(elem);
6766 let filename = elem.argument.clone().unwrap_or_default();
2763 let filename = elem.argument.clone().unwrap_or_default();
6767 let resolved = match &ctx.base_path {
2764 let resolved = match &ctx.base_path {
6768 Some(base) => base.join(&filename),
2765 Some(base) => base.join(&filename),
@@ -6771,104 +2768,81 @@ fn inline_svg(node: Node, line_num: usize, ctx: &mut ParseContext) -> Node {
6771 let mut svg = match std::fs::read_to_string(&resolved) {
2768 let mut svg = match std::fs::read_to_string(&resolved) {
6772 Ok(text) => text.trim().to_string(),
2769 Ok(text) => text.trim().to_string(),
6773 Err(e) => {
2770 Err(e) => {
6774− ctx.diagnostics.push(Diagnostic::new(
2771+ ctx.diagnostics.push(Diagnostic {
6775− code::UNREADABLE_FILE,
2772+ line: line_num,
6776− Severity::Error,
2773+ column: None,
6777− line_num,
2774+ message: format!("cannot load SVG '{}': {}", filename, e),
6778− format!("cannot load SVG '{}': {}", filename, e),
2775+ severity: Severity::Error,
6779− ));
2776+ source_line: None,
6780 return node;
2778 return node;
6783 ctx.included_files.push(resolved);
2781 ctx.included_files.push(resolved);
6784− // The file's markup has no class of its own, so a style reaches it only
6785− // as one of the root's attributes: anything else is reported, never
6786− // left out silently
6787− let mut left_out: Vec<String> = Vec::new();
6788− // The styles go in the root's `style=`, where a length takes its unit
6789− // and `var(--name)` works, as in any CSS
6790− let mut style: Vec<String> = Vec::new();
6791 for attr in &elem.attrs {
2782 for attr in &elem.attrs {
6792− let target = match (attr.key.as_str(), attr.html, &attr.value) {
2783+ let Some(value) = &attr.value else { continue };
6793− ("inline", false, None) | ("src", true, _) => continue,
2784+ let target = match (attr.key.as_str(), attr.html) {
6794− // `fill` and `shrink` are layout words, which need a class
2785+ ("width", false) | ("height", false) => attr.key.as_str(),
6795− ("width" | "height", false, Some(value))
2786+ ("color", false) | ("fill", false) => "fill",
6796− if matches!(value.as_str(), "fill" | "shrink") =>
2787+ ("class", true) | ("id", true) => attr.key.as_str(),
6797− {
2788+ _ => continue,
6798− left_out.push(format!("{} {}", attr.key, value));
6801− ("width" | "height", false, Some(value)) => {
6802− let value = crate::vocab::with_px(&attr.key, value);
6803− style.push(format!("{}:{}", attr.key, value));
6806− ("color" | "fill", false, Some(value)) => {
6807− style.push(format!("fill:{}", value));
6810− ("style", true, Some(value)) => {
6811− style.insert(0, value.trim().trim_end_matches(';').to_string());
6814− ("alt", true, _) => {
6815− left_out.push("alt".to_string());
6818− (key, true, Some(_)) => key,
6819− (key, false, None) if crate::vocab::is_html_flag(key) => key,
6821− left_out.push(attr.key.clone());
6825− let value = attr.value.as_deref().unwrap_or("");
2790+ svg = set_svg_attr(&svg, target, value);
6826− svg = set_svg_attr(&svg, target, &html_escape_md(value));
6828− if !style.is_empty() {
6829− // After the file's own `style=`, which stays: these come later, so
6830− // they win where both set a property
6831− let mut value = html_escape_md(&style.join(";"));
6832− if let Some(own) = svg_attr_value(&svg, "style")
6833− .map(|range| svg[range].trim().trim_end_matches(';').to_string())
6834− .filter(|own| !own.is_empty())
6836− value = format!("{};{}", own, value);
6838− svg = set_svg_attr(&svg, "style", &value);
6840− if !left_out.is_empty() {
2792+ Node::Raw(svg)
6841− let alt = left_out.iter().any(|name| name == "alt");
2793+}
6842− let names = left_out
2794+
6843− .iter()
2795+/// Index of the `}` matching the `{` that `s` starts with (skipping
6844− .map(|name| format!("'{}'", name))
2796+/// braces inside string literals).
6845− .collect::<Vec<_>>()
2797+fn matching_brace(s: &str) -> Option<usize> {
6846− .join(", ");
2798+ let mut depth = 0;
6847− let mut message = format!(
2799+ let mut in_string = false;
6848− "{} can't go on an inline SVG: `@image [inline]` puts the file's own markup into the page, which takes `width` and `height` as lengths, `color` or `fill` (as its fill) and HTML attributes (`class=`, `aria-label=`, ...)",
2800+ for (i, c) in s.char_indices() {
6849− names
2801+ match c {
6850− );
2802+ '"' => in_string = !in_string,
6851− if alt {
2803+ _ if in_string => {}
6852− message.push_str("; an SVG has no alt text: name it with `aria-label=` and `role=img`");
2804+ '{' => depth += 1,
6854− ctx.diagnostics.push(Diagnostic::new(
6855− code::UNEXPECTED_ARGUMENT,
6861− Node::Raw(svg)
2814+ None
6864// ---------------------------------------------------------------------------
2817// ---------------------------------------------------------------------------
6865// Variable usage tracking
2818// Variable usage tracking
6866// ---------------------------------------------------------------------------
2819// ---------------------------------------------------------------------------
6868−/// Record the names a string refers to (by syntax) as used.
2821+/// Scan a string for $name references and record them in the used set.
6869fn track_var_refs(input: &str, used: &mut HashSet<String>) {
2822fn track_var_refs(input: &str, used: &mut HashSet<String>) {
6870− if input.contains('$') {
2823+ if !input.contains('$') {
6871− used.extend(interp::names(input).into_iter().map(String::from));
2824+ return;
2826+ let chars: Vec<char> = input.chars().collect();
2828+ while i < chars.len() {
2830+ && i + 1 < chars.len()
2831+ && (chars[i + 1].is_alphanumeric() || chars[i + 1] == '_' || chars[i + 1] == '-')
2834+ let mut end = start;
2835+ while end < chars.len()
2836+ && (chars[end].is_alphanumeric() || chars[end] == '-' || chars[end] == '_')
2840+ let name: String = chars[start..end].iter().collect();
@@ -6876,63 +2850,49 @@ fn track_var_refs(input: &str, used: &mut HashSet<String>) {
6876// Unused definition warnings
2850// Unused definition warnings
6877// ---------------------------------------------------------------------------
2851// ---------------------------------------------------------------------------
6879−/// Warn about definitions nothing uses, except `exported` ones (the
2853+fn check_unused(ctx: &mut ParseContext) {
6880−/// definitions of a library, for the files that include it).
6881−fn check_unused(ctx: &mut ParseContext, exported: &HashSet<String>) {
6882 // Check unused @let variables
2854 // Check unused @let variables
6883 for (name, &line) in &ctx.let_lines {
2855 for (name, &line) in &ctx.let_lines {
6884− if exported.contains(name) {
2856+ if name.starts_with("--") {
6885− // A library's names are for other files (a custom property
2857+ continue; // CSS vars are always used
6886− // isn't a variable, so it is never listed here)
6889 if !ctx.used_variables.contains(name) {
2859 if !ctx.used_variables.contains(name) {
6890− ctx.diagnostics.push(
2860+ ctx.diagnostics.push(Diagnostic {
6891− Diagnostic::new(
2861+ line,
6892− code::UNUSED_VARIABLE,
2862+ column: None,
6893− Severity::Warning,
2863+ message: format!("unused variable '${}' (defined but never referenced)", name),
6894− line,
2864+ severity: Severity::Warning,
6895− format!("unused variable '${}' (defined but never referenced)", name),
2865+ source_line: None,
6897− .subject(name.as_str()),
6902− // Check unused attribute bundles (@let name [...]). A `$name` in code
2870+ // Check unused attribute bundles (@let name [...])
6903− // that doesn't run (an `if()` branch or `@if` not taken) counts too.
6904 for (name, &line) in &ctx.define_lines {
2871 for (name, &line) in &ctx.define_lines {
6905− if !ctx.used_defines.contains(name)
2872+ if !ctx.used_defines.contains(name) {
6906− && !ctx.used_variables.contains(name)
2873+ ctx.diagnostics.push(Diagnostic {
6907− && !exported.contains(name)
2874+ line,
6908− {
2875+ column: None,
6909− ctx.diagnostics.push(
2876+ message: format!(
6910− Diagnostic::new(
2877+ "unused attribute bundle '${}' (defined but never referenced)",
6911− code::UNUSED_BUNDLE,
2878+ name
6912− Severity::Warning,
2879+ ),
6913− line,
2880+ severity: Severity::Warning,
6914− format!(
2881+ source_line: None,
6915− "unused attribute bundle '${}' (defined but never referenced)",
2882+ });
6919− .subject(name.as_str()),
6924 // Check unused functions (@let name ... with body)
2886 // Check unused functions (@let name ... with body)
6925 for (name, &line) in &ctx.fn_lines {
2887 for (name, &line) in &ctx.fn_lines {
6926− if !ctx.used_functions.contains(name) && !exported.contains(name) {
2888+ if !ctx.used_functions.contains(name) {
6927− ctx.diagnostics.push(
2889+ ctx.diagnostics.push(Diagnostic {
6928− Diagnostic::new(
2890+ line,
6929− code::UNUSED_FUNCTION,
2891+ column: None,
6930− Severity::Warning,
2892+ message: format!("unused function '@{}' (defined but never called)", name),
6931− line,
2893+ severity: Severity::Warning,
6932− format!("unused function '@{}' (defined but never called)", name),
2894+ source_line: None,
6934− .subject(name.as_str()),
@@ -7018,6 +2978,34 @@ fn parse_json_with_error(input: &str) -> Result<JsonValue, String> {
2981+/// Visit the lines of a block in source order, children after their line.
2982+fn for_each_line<'a>(block: &'a [Syntax], f: &mut impl FnMut(&'a Syntax)) {
2983+ for node in block {
2985+ if let Syntax::Line { children, .. } = node {
2986+ for_each_line(children, f);
2991+/// The text of a block whose lines are content, not htmlang (`@head`,
2992+/// `@style`, `@markdown`): each line trimmed, verbatim text as is.
2993+fn block_text(block: &[Syntax]) -> String {
2994+ let mut text = String::new();
2995+ for_each_line(block, &mut |node| match node {
2996+ Syntax::Line { text: line, .. } => {
2997+ text.push_str(line.trim());
3000+ Syntax::Raw { text: raw, .. } => {
3001+ text.push_str(raw);
7021fn parse_json_value(chars: &[char], mut pos: usize) -> Option<(JsonValue, usize)> {
3009fn parse_json_value(chars: &[char], mut pos: usize) -> Option<(JsonValue, usize)> {
7022 pos = skip_ws(chars, pos);
3010 pos = skip_ws(chars, pos);
7023 if pos >= chars.len() {
3011 if pos >= chars.len() {
@@ -7198,21 +3186,68 @@ fn skip_ws(chars: &[char], mut pos: usize) -> usize {
7201−/// A JSON value as an htmlang value: an object is a record, an array a
3189+/// Flatten a JSON value into variable assignments.
7202−/// list, a string text (never quoted text), `null` empty. A number keeps
3190+/// - Top-level object: each key becomes `prefix.key`
7203−/// the text it is written with (`1.50`), and reads as a number.
3191+/// - Top-level array: `prefix` becomes comma-separated, `prefix._count` set
7204−fn json_value(json: JsonValue) -> Value {
3192+/// - Array of objects: each item becomes space-separated values for @each destructuring
7205− match json {
3193+fn flatten_json(prefix: &str, value: &JsonValue, vars: &mut HashMap<String, String>) {
7206− JsonValue::Null => Value::empty(),
3194+ match value {
7207− JsonValue::Bool(b) => Value::Bool(b),
3195+ JsonValue::Str(s) => {
7208− JsonValue::Number(n) | JsonValue::Str(n) => Value::Str(n),
3196+ vars.insert(prefix.to_string(), s.clone());
7209− JsonValue::Array(items) => Value::list(items.into_iter().map(json_value).collect()),
3197+ }
7210− JsonValue::Object(pairs) => Value::Record(Rc::new(
3198+ JsonValue::Number(n) => {
7211− pairs
3199+ vars.insert(prefix.to_string(), n.clone());
7212− .into_iter()
3200+ }
7213− .map(|(key, value)| (key, json_value(value)))
3201+ JsonValue::Bool(b) => {
3202+ vars.insert(prefix.to_string(), b.to_string());
3204+ JsonValue::Null => {
3205+ vars.insert(prefix.to_string(), String::new());
3207+ JsonValue::Object(pairs) => {
3208+ for (key, val) in pairs {
3209+ flatten_json(&format!("{}.{}", prefix, key), val, vars);
3212+ JsonValue::Array(items) => {
3213+ // A list: its length under `NAME#` (see `lookup`), its text
3214+ // items joined as its value, and each item as `NAME.INDEX`
3215+ vars.insert(format!("{}#", prefix), items.len().to_string());
3216+ let text: Vec<String> = items
3218+ .map(json_value_to_string)
3219+ .filter(|s| !s.is_empty())
3221+ vars.insert(prefix.to_string(), text.join(", "));
3222+ // Also set indexed access: prefix.0, prefix.1, etc.
3223+ for (i, item) in items.iter().enumerate() {
3224+ flatten_json(&format!("{}.{}", prefix, i), item, vars);
3230+/// Resolve `$name` for an expression: a list if `name` was loaded from a
3231+/// JSON array, else its text.
3232+fn lookup(vars: &HashMap<String, String>, name: &str) -> Option<crate::expr::Value> {
3233+ use crate::expr::Value;
3234+ match vars.get(&format!("{}#", name)).and_then(|n| n.parse::<usize>().ok()) {
3235+ Some(len) => Some(Value::List(
3237+ .map(|i| vars.get(&format!("{}.{}", name, i)).cloned().unwrap_or_default())
7214 .collect(),
3238 .collect(),
3240+ None => vars.get(name).cloned().map(Value::Str),
3244+fn json_value_to_string(v: &JsonValue) -> String {
3246+ JsonValue::Str(s) => s.clone(),
3247+ JsonValue::Number(n) => n.clone(),
3248+ JsonValue::Bool(b) => b.to_string(),
3249+ JsonValue::Null => String::new(),
3250+ JsonValue::Array(_) | JsonValue::Object(_) => String::new(),
@@ -7220,29 +3255,6 @@ fn json_value(json: JsonValue) -> Value {
7220// SVG attribute injection helper
3255// SVG attribute injection helper
7221// ---------------------------------------------------------------------------
3256// ---------------------------------------------------------------------------
7223−/// Where the root `<svg ...>` tag's `attr_name="..."` value is, as a byte
7224−/// range of `svg`. Only the opening tag is read, so a child's attribute is
7225−/// never found, and the name must follow whitespace, so `width` doesn't
7226−/// match `stroke-width`.
7227−fn svg_attr_value(svg: &str, attr_name: &str) -> Option<std::ops::Range<usize>> {
7228− let tag_start = svg.find("<svg")?;
7229− let tag_end = svg[tag_start..]
7231− .map(|p| tag_start + p)
7232− .unwrap_or(svg.len());
7233− let tag = &svg[tag_start..tag_end];
7234− let pattern = format!("{}=\"", attr_name);
7235− let (pos, _) = tag.match_indices(&pattern).find(|(pos, _)| {
7239− .is_some_and(char::is_whitespace)
7241− let value_start = tag_start + pos + pattern.len();
7242− let end = svg[value_start..tag_end].find('"')?;
7243− Some(value_start..value_start + end)
7246fn set_svg_attr(svg: &str, attr_name: &str, value: &str) -> String {
3258fn set_svg_attr(svg: &str, attr_name: &str, value: &str) -> String {
7247 // Only the opening <svg ...> tag is touched, so child attributes such as
3259 // Only the opening <svg ...> tag is touched, so child attributes such as
7248 // `stroke-width` are left alone.
3260 // `stroke-width` are left alone.
@@ -7253,14 +3265,26 @@ fn set_svg_attr(svg: &str, attr_name: &str, value: &str) -> String {
7253 .find('>')
3265 .find('>')
7254 .map(|p| tag_start + p)
3266 .map(|p| tag_start + p)
7255 .unwrap_or(svg.len());
3267 .unwrap_or(svg.len());
3268+ let tag = &svg[tag_start..tag_end];
7257− // Replace an existing attribute
3270+ // Replace an existing attribute (must be preceded by whitespace so that
7258− if let Some(existing) = svg_attr_value(svg, attr_name) {
3271+ // `width` doesn't match `stroke-width`).
7259− let mut result = String::with_capacity(svg.len());
3272+ let pattern = format!("{}=\"", attr_name);
7260− result.push_str(&svg[..existing.start]);
3273+ let existing = tag.match_indices(&pattern).find(|(pos, _)| {
7261− result.push_str(value);
3274+ tag[..*pos]
7262− result.push_str(&svg[existing.end..]);
3275+ .chars()
7263− return result;
3276+ .next_back()
3277+ .is_some_and(char::is_whitespace)
3279+ if let Some((pos, _)) = existing {
3280+ let value_start = tag_start + pos + pattern.len();
3281+ if let Some(end) = svg[value_start..tag_end].find('"') {
3282+ let mut result = String::with_capacity(svg.len());
3283+ result.push_str(&svg[..value_start]);
3284+ result.push_str(value);
3285+ result.push_str(&svg[value_start + end..]);
7266 // Otherwise inject it into the opening tag (before a self-closing `/`).
3290 // Otherwise inject it into the opening tag (before a self-closing `/`).
@@ -7583,10 +3607,7 @@ mod tests {
7584 fn parses_page_directive() {
3608 fn parses_page_directive() {
7585 let r = parse_ok("@page My Title\n");
3609 let r = parse_ok("@page My Title\n");
7586− assert_eq!(
3610+ assert_eq!(r.document.page_title.as_deref(), Some("My Title"));
7587− r.document.page.map(|p| p.title).as_deref(),