From bbbe303db76056a682fc5ca279f1d428b90bf15f Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 21 Nov 2025 11:05:28 +0800
Subject: [PATCH 01/67] fix: remove unexpected spaces in Mustache interpolation

---
 markup_fmt/src/printer.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 23311157..c7de2e88 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -732,7 +732,7 @@ impl<'s> DocGen<'s> for Element<'s> {
                                 "{{{{ {} }}}}",
                                 ctx.format_expr(expr, false, *start),
                             )),
-                            Language::Mustache => Cow::from(format!("{{{{ {expr} }}}}")),
+                            Language::Mustache => Cow::from(format!("{{{{{expr}}}}}")),
                             _ => unreachable!(),
                         }))
                         .collect::<String>()
@@ -1132,7 +1132,7 @@ impl<'s> DocGen<'s> for NativeAttribute<'s> {
                                 "{{{{ {} }}}}",
                                 ctx.format_expr(expr, true, *start),
                             )),
-                            Language::Mustache => Cow::from(format!("{{{{ {expr} }}}}")),
+                            Language::Mustache => Cow::from(format!("{{{{{expr}}}}}")),
                             _ => unreachable!(),
                         }))
                         .collect::<String>(),

From 5eae751874a0865518b527a38bf874d66843d166 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 22 Nov 2025 11:59:02 +0800
Subject: [PATCH 02/67] feat: support Handlebars (close #128)

---
 .gitattributes                                |  1 +
 .vscode/settings.json                         |  2 +-
 README.md                                     |  4 +-
 dprint_plugin/src/config.rs                   |  2 +
 markup_fmt/Cargo.toml                         |  2 +-
 markup_fmt/README.md                          |  2 +-
 markup_fmt/src/ast.rs                         | 12 ++-
 markup_fmt/src/lib.rs                         |  2 +-
 markup_fmt/src/parser.rs                      | 78 ++++++++++++++++---
 markup_fmt/src/printer.rs                     | 49 +++++++-----
 markup_fmt/tests/fmt.rs                       |  2 +-
 .../tests/fmt/mustache/handlebars/block.hbs   | 13 ++++
 .../tests/fmt/mustache/handlebars/block.snap  | 16 ++++
 .../tests/fmt/mustache/handlebars/context.hbs |  9 +++
 .../fmt/mustache/handlebars/context.snap      | 12 +++
 .../tests/fmt/mustache/handlebars/partial.hbs |  8 ++
 .../fmt/mustache/handlebars/partial.snap      | 11 +++
 17 files changed, 184 insertions(+), 41 deletions(-)
 create mode 100644 markup_fmt/tests/fmt/mustache/handlebars/block.hbs
 create mode 100644 markup_fmt/tests/fmt/mustache/handlebars/block.snap
 create mode 100644 markup_fmt/tests/fmt/mustache/handlebars/context.hbs
 create mode 100644 markup_fmt/tests/fmt/mustache/handlebars/context.snap
 create mode 100644 markup_fmt/tests/fmt/mustache/handlebars/partial.hbs
 create mode 100644 markup_fmt/tests/fmt/mustache/handlebars/partial.snap

diff --git a/.gitattributes b/.gitattributes
index 6c0983bc..d9518406 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,3 +6,4 @@
 **/*.njk linguist-detectable=false
 **/*.vto linguist-detectable=false
 **/*.mustache linguist-detectable=false
+**/*.hbs linguist-detectable=false
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1c59ca82..b6055b31 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,6 +1,6 @@
 {
   "rust-analyzer.cargo.features": ["config_serde"],
-  "[html][vue][svelte][markdown]": {
+  "[html][vue][svelte][markdown][handlebars]": {
     "editor.formatOnSave": false
   }
 }
diff --git a/README.md b/README.md
index 40c91976..42326641 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 <h1 align="center">markup_fmt</h1>
 
 <p align="center">
-markup_fmt is a configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache and XML formatter.
+markup_fmt is a configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter.
 </p>
 
 ## Notes for Vue and Svelte Users
@@ -20,7 +20,7 @@ This will make ESLint faster because less rules will be executed.
 
 We've provided [dprint](https://dprint.dev/) integration.
 
-This plugin only formats HTML syntax of your HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache and XML files.
+This plugin only formats HTML syntax of your HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML files.
 You also need other dprint plugins to format the code in `<script>` and `<style>` tags.
 You can use [dprint-plugin-typescript](https://github.com/dprint/dprint-plugin-typescript) to
 format TypeScript/JavaScript code and [Malva](https://github.com/g-plane/malva) to format CSS/SCSS/Sass/Less code.
diff --git a/dprint_plugin/src/config.rs b/dprint_plugin/src/config.rs
index 9dbd1eab..056f6692 100644
--- a/dprint_plugin/src/config.rs
+++ b/dprint_plugin/src/config.rs
@@ -431,6 +431,8 @@ pub(crate) fn resolve_config(
                 "vto",
                 "component.html",
                 "mustache",
+                "hbs",
+                "handlebars",
                 "xml",
                 "svg",
                 "wsdl",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 63b45f83..67c6c4a1 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -3,7 +3,7 @@ name = "markup_fmt"
 version = "0.24.1"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
-description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache and XML formatter."
+description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."
 repository = "https://github.com/g-plane/markup_fmt"
 license = "MIT"
 exclude = ["/tests"]
diff --git a/markup_fmt/README.md b/markup_fmt/README.md
index e74f72f0..c8ce696e 100644
--- a/markup_fmt/README.md
+++ b/markup_fmt/README.md
@@ -1,4 +1,4 @@
-markup_fmt is a configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache and XML formatter.
+markup_fmt is a configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter.
 
 ## Basic Usage
 
diff --git a/markup_fmt/src/ast.rs b/markup_fmt/src/ast.rs
index 0e98a11c..1250a85c 100644
--- a/markup_fmt/src/ast.rs
+++ b/markup_fmt/src/ast.rs
@@ -201,9 +201,17 @@ pub enum JinjaTagOrChildren<'s, T> {
 ///
 /// See https://mustache.github.io/mustache.5.html
 pub struct MustacheBlock<'s> {
+    pub controls: Vec<MustacheBlockControl<'s>>,
+    pub children: Vec<Vec<Node<'s>>>,
+}
+
+#[derive(Debug)]
+pub struct MustacheBlockControl<'s> {
+    pub name: &'s str,
     pub prefix: &'s str,
-    pub content: &'s str,
-    pub children: Vec<Node<'s>>,
+    pub content: Option<&'s str>,
+    pub wc_before: bool,
+    pub wc_after: bool,
 }
 
 #[derive(Debug)]
diff --git a/markup_fmt/src/lib.rs b/markup_fmt/src/lib.rs
index 423cfa75..80caf3ab 100644
--- a/markup_fmt/src/lib.rs
+++ b/markup_fmt/src/lib.rs
@@ -133,7 +133,7 @@ pub fn detect_language(path: impl AsRef<Path>) -> Option<Language> {
         Some("astro") => Some(Language::Astro),
         Some("jinja" | "jinja2" | "j2" | "twig" | "njk") => Some(Language::Jinja),
         Some("vto") => Some(Language::Vento),
-        Some("mustache") => Some(Language::Mustache),
+        Some("mustache" | "hbs" | "handlebars") => Some(Language::Mustache),
         Some("xml" | "svg" | "wsdl" | "xsd" | "xslt" | "xsl") => Some(Language::Xml),
         _ => None,
     }
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 8551090b..82eed8f5 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -1449,35 +1449,77 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_mustache_block_or_interpolation(&mut self) -> PResult<NodeKind<'s>> {
-        let (content, _) = self.parse_mustache_interpolation()?;
+        let mut controls = vec![];
+        let (raw, _) = self.parse_mustache_interpolation()?;
+        let (content, wc_before, wc_after) = strip_hbs_whitespace_control(raw);
         if let Some((prefix, rest)) = content
             .split_at_checked(1)
             .filter(|(c, _)| matches!(*c, "#" | "^" | "$" | "<"))
         {
+            let (prefix, rest) = if rest.strip_prefix(['>', '*']).is_some() {
+                content.split_at(2)
+            } else {
+                (prefix, rest)
+            };
             let trimmed_rest = rest.trim_ascii();
-            let mut children = vec![];
+            let (block_name, rest) = if let Some((name, rest)) =
+                trimmed_rest.split_once(|c: char| c.is_ascii_whitespace())
+            {
+                (name, Some(rest))
+            } else {
+                (trimmed_rest, None)
+            };
+            controls.push(MustacheBlockControl {
+                name: block_name,
+                prefix,
+                content: rest,
+                wc_before,
+                wc_after,
+            });
+            let mut children = vec![vec![]];
             loop {
                 let chars = self.chars.clone();
-                if self
-                    .parse_mustache_interpolation()
-                    .ok()
-                    .and_then(|(content, _)| content.strip_prefix('/'))
-                    .is_some_and(|s| s.trim_ascii() == trimmed_rest)
+                if let Some((content, _)) = self.parse_mustache_interpolation().ok()
+                    && let (content, wc_before, wc_after) = strip_hbs_whitespace_control(content)
+                    && content
+                        .strip_prefix('/')
+                        .is_some_and(|s| s.trim_ascii() == block_name)
                 {
+                    controls.push(MustacheBlockControl {
+                        name: block_name,
+                        prefix: "/",
+                        content: None,
+                        wc_before,
+                        wc_after,
+                    });
                     break;
                 } else {
                     self.chars = chars;
                 }
-                children.push(self.parse_node()?);
+                let node = self.parse_node()?;
+                if let NodeKind::MustacheInterpolation(interpolation) = &node.kind
+                    && let ("else", wc_before, wc_after) =
+                        strip_hbs_whitespace_control(interpolation.content)
+                {
+                    controls.push(MustacheBlockControl {
+                        name: "else",
+                        prefix: "",
+                        content: None,
+                        wc_before,
+                        wc_after,
+                    });
+                    children.push(vec![]);
+                } else if let Some(nodes) = children.last_mut() {
+                    nodes.push(node);
+                }
             }
             Ok(NodeKind::MustacheBlock(MustacheBlock {
-                prefix,
-                content: rest,
+                controls,
                 children,
             }))
         } else {
             Ok(NodeKind::MustacheInterpolation(MustacheInterpolation {
-                content,
+                content: raw,
             }))
         }
     }
@@ -2876,6 +2918,20 @@ fn is_vento_interpolation(tag_name: &str) -> bool {
     )
 }
 
+fn strip_hbs_whitespace_control(text: &str) -> (&str, bool, bool) {
+    let (text, before) = if let Some(stripped) = text.strip_prefix('~') {
+        (stripped, true)
+    } else {
+        (text, false)
+    };
+    let (text, after) = if let Some(stripped) = text.strip_suffix('~') {
+        (stripped, true)
+    } else {
+        (text, false)
+    };
+    (text, before, after)
+}
+
 pub type PResult<T> = Result<T, SyntaxError>;
 type AngularIfCond<'s> = ((&'s str, usize), Option<(&'s str, usize)>);
 
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index c7de2e88..58a1507b 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -965,27 +965,34 @@ impl<'s> DocGen<'s> for MustacheBlock<'s> {
     where
         F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
     {
-        let content = self.content.trim_ascii();
-        Doc::text("{{")
-            .append(Doc::text(self.prefix))
-            .concat(reflow_raw(content))
-            .nest(ctx.indent_width)
-            .append(Doc::line_or_nil())
-            .append(Doc::text("}}"))
-            .group()
-            .append(format_control_structure_block_children(
-                &self.children,
-                ctx,
-                state,
-            ))
-            .group()
-            .append(
-                Doc::text("{{/")
-                    .concat(reflow_raw(content))
-                    .append(Doc::line_or_nil())
-                    .append(Doc::text("}}"))
-                    .group(),
-            )
+        Doc::list(
+            self.controls
+                .iter()
+                .map(|control| {
+                    let mut docs = Vec::with_capacity(3);
+                    docs.push(Doc::text("{{"));
+                    if control.wc_before {
+                        docs.push(Doc::text("~"));
+                    }
+                    docs.push(Doc::text(control.prefix));
+                    docs.push(Doc::text(control.name));
+                    if let Some(content) = control.content {
+                        docs.push(Doc::space());
+                        docs.extend(reflow_raw(content.trim_ascii()));
+                    }
+                    if control.wc_after {
+                        docs.push(Doc::text("~"));
+                    }
+                    docs.push(Doc::text("}}"));
+                    Doc::list(docs)
+                })
+                .interleave(
+                    self.children
+                        .iter()
+                        .map(|nodes| format_control_structure_block_children(nodes, ctx, state)),
+                )
+                .collect(),
+        )
     }
 }
 
diff --git a/markup_fmt/tests/fmt.rs b/markup_fmt/tests/fmt.rs
index 8cc7b829..3b9f2dc8 100644
--- a/markup_fmt/tests/fmt.rs
+++ b/markup_fmt/tests/fmt.rs
@@ -4,7 +4,7 @@ use std::{collections::HashMap, fs, path::Path};
 
 #[test]
 fn fmt_snapshot() {
-    let pattern = "fmt/**/*.{html,vue,svelte,astro,jinja,njk,vto,mustache,xml}";
+    let pattern = "fmt/**/*.{html,vue,svelte,astro,jinja,njk,vto,mustache,hbs,xml}";
     glob!(pattern, |path| {
         let input = fs::read_to_string(path).unwrap();
         let language = detect_language(path).unwrap();
diff --git a/markup_fmt/tests/fmt/mustache/handlebars/block.hbs b/markup_fmt/tests/fmt/mustache/handlebars/block.hbs
new file mode 100644
index 00000000..da82f8fa
--- /dev/null
+++ b/markup_fmt/tests/fmt/mustache/handlebars/block.hbs
@@ -0,0 +1,13 @@
+{{#unless license}}
+<h3 class="warning">WARNING: This entry does not have a license!</h3>
+{{/unless}}
+
+{{#each nav~}}
+  <a href="{{url}}">
+    {{~#if test}}
+      {{~title}}
+    {{~else~}}
+      Empty
+    {{~/if~}}
+  </a>
+{{~/each}}
diff --git a/markup_fmt/tests/fmt/mustache/handlebars/block.snap b/markup_fmt/tests/fmt/mustache/handlebars/block.snap
new file mode 100644
index 00000000..5455cf7b
--- /dev/null
+++ b/markup_fmt/tests/fmt/mustache/handlebars/block.snap
@@ -0,0 +1,16 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+{{#unless license}}
+  <h3 class="warning">WARNING: This entry does not have a license!</h3>
+{{/unless}}
+
+{{#each nav~}}
+  <a href="{{url}}">
+    {{~#if test}}
+      {{~title}}
+    {{~else~}}
+      Empty
+    {{~/if~}}
+  </a>
+{{~/each}}
diff --git a/markup_fmt/tests/fmt/mustache/handlebars/context.hbs b/markup_fmt/tests/fmt/mustache/handlebars/context.hbs
new file mode 100644
index 00000000..3c9a825a
--- /dev/null
+++ b/markup_fmt/tests/fmt/mustache/handlebars/context.hbs
@@ -0,0 +1,9 @@
+{{#with person}}
+{{firstname}} {{lastname}}
+{{/with}}
+
+<ul class="people_list">
+  {{#each people}}
+    <li>{{this}}</li>
+  {{/each}}
+</ul>
diff --git a/markup_fmt/tests/fmt/mustache/handlebars/context.snap b/markup_fmt/tests/fmt/mustache/handlebars/context.snap
new file mode 100644
index 00000000..a5197095
--- /dev/null
+++ b/markup_fmt/tests/fmt/mustache/handlebars/context.snap
@@ -0,0 +1,12 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+{{#with person}}
+  {{firstname}} {{lastname}}
+{{/with}}
+
+<ul class="people_list">
+  {{#each people}}
+    <li>{{this}}</li>
+  {{/each}}
+</ul>
diff --git a/markup_fmt/tests/fmt/mustache/handlebars/partial.hbs b/markup_fmt/tests/fmt/mustache/handlebars/partial.hbs
new file mode 100644
index 00000000..714c65e5
--- /dev/null
+++ b/markup_fmt/tests/fmt/mustache/handlebars/partial.hbs
@@ -0,0 +1,8 @@
+{{#> layout}}
+  {{#*inline "nav"}}
+    My Nav
+  {{/inline}}
+  {{#*inline "content"}}
+    My Content
+  {{/inline}}
+{{/layout}}
diff --git a/markup_fmt/tests/fmt/mustache/handlebars/partial.snap b/markup_fmt/tests/fmt/mustache/handlebars/partial.snap
new file mode 100644
index 00000000..1d63932e
--- /dev/null
+++ b/markup_fmt/tests/fmt/mustache/handlebars/partial.snap
@@ -0,0 +1,11 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+{{#>layout}}
+  {{#*inline "nav"}}
+    My Nav
+  {{/inline}}
+  {{#*inline "content"}}
+    My Content
+  {{/inline}}
+{{/layout}}

From 21c7a51ff3176d10713e7b833a474bd092276ed7 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 22 Nov 2025 12:07:49 +0800
Subject: [PATCH 03/67] docs: update readme

---
 README.md | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/README.md b/README.md
index 42326641..e28a6ade 100644
--- a/README.md
+++ b/README.md
@@ -40,16 +40,6 @@ you can add dprint-plugin-json:
 dprint config add json
 ```
 
-Or Biome:
-
-```diff
-- dprint config add typescript
-- dprint config add json
-+ dprint config add biome
-```
-
-If you use Biome, you need to set [`"scriptFormatter"`](https://markup-fmt.netlify.app/config/script-formatter.html) to `"biome"` in markup_fmt's config.
-
 If you want to format Jinja, it's recommended to add [Pretty Jinja](https://github.com/g-plane/pretty_jinja) dprint plugin as well.
 
 After adding the dprint plugins, update your `dprint.json` and add configuration:

From 4a04e9cef27ef4217ee31e6fb752e1bb99c2fc9e Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 22 Nov 2025 21:14:31 +0800
Subject: [PATCH 04/67] feat: support Angular `@defer` block (close #125)

---
 markup_fmt/src/ast.rs                         |  8 +++
 markup_fmt/src/error.rs                       |  8 +--
 markup_fmt/src/parser.rs                      | 70 ++++++++++++++++++-
 markup_fmt/src/printer.rs                     | 44 ++++++++++++
 .../fmt/angular/blocks/defer.component.html   | 21 ++++++
 .../fmt/angular/blocks/defer.component.snap   | 24 +++++++
 6 files changed, 169 insertions(+), 6 deletions(-)
 create mode 100644 markup_fmt/tests/fmt/angular/blocks/defer.component.html
 create mode 100644 markup_fmt/tests/fmt/angular/blocks/defer.component.snap

diff --git a/markup_fmt/src/ast.rs b/markup_fmt/src/ast.rs
index 1250a85c..0a443b75 100644
--- a/markup_fmt/src/ast.rs
+++ b/markup_fmt/src/ast.rs
@@ -33,6 +33,13 @@ pub struct AngularElseIf<'s> {
     pub children: Vec<Node<'s>>,
 }
 
+#[derive(Debug)]
+pub struct AngularGenericBlock<'s> {
+    pub keyword: &'s str,
+    pub header: Option<&'s str>,
+    pub children: Vec<Node<'s>>,
+}
+
 #[derive(Debug)]
 /// Angular interpolation: `{{ expression }}`.
 ///
@@ -241,6 +248,7 @@ pub struct Node<'s> {
 #[derive(Debug)]
 pub enum NodeKind<'s> {
     AngularFor(AngularFor<'s>),
+    AngularGenericBlocks(Vec<AngularGenericBlock<'s>>),
     AngularIf(AngularIf<'s>),
     AngularInterpolation(AngularInterpolation<'s>),
     AngularLet(AngularLet<'s>),
diff --git a/markup_fmt/src/error.rs b/markup_fmt/src/error.rs
index f7af6cb6..00a3f5aa 100644
--- a/markup_fmt/src/error.rs
+++ b/markup_fmt/src/error.rs
@@ -11,8 +11,7 @@ pub struct SyntaxError {
 
 #[derive(Clone, Debug)]
 pub enum SyntaxErrorKind {
-    ExpectAngularFor,
-    ExpectAngularIf,
+    ExpectAngularBlock(&'static str),
     ExpectAngularLet,
     ExpectAngularSwitch,
     ExpectAstroAttr,
@@ -59,8 +58,9 @@ pub enum SyntaxErrorKind {
 impl fmt::Display for SyntaxErrorKind {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         let reason: Cow<_> = match self {
-            SyntaxErrorKind::ExpectAngularFor => "expected Angular `@for`".into(),
-            SyntaxErrorKind::ExpectAngularIf => "expected Angular `@if`".into(),
+            SyntaxErrorKind::ExpectAngularBlock(keyword) => {
+                format!("expected Angular `@{keyword}` block").into()
+            }
             SyntaxErrorKind::ExpectAngularLet => "expected Angular `@let`".into(),
             SyntaxErrorKind::ExpectAngularSwitch => "expected Angular `@switch`".into(),
             SyntaxErrorKind::ExpectAstroAttr => "expected Astro attribute".into(),
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 82eed8f5..dc83261f 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -138,6 +138,38 @@ impl<'s> Parser<'s> {
         Ok(children)
     }
 
+    fn parse_angular_defer(&mut self) -> PResult<Vec<AngularGenericBlock<'s>>> {
+        if self
+            .chars
+            .next_if(|(_, c)| *c == '@')
+            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'd'))
+            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
+            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'f'))
+            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
+            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'r'))
+            .is_none()
+        {
+            return Err(self.emit_error(SyntaxErrorKind::ExpectAngularBlock("defer")));
+        }
+        self.skip_ws();
+        let mut blocks = vec![self.parse_angular_generic_block("defer")?];
+
+        loop {
+            let chars = self.chars.clone();
+            self.skip_ws();
+            if self.chars.next_if(|(_, c)| *c == '@').is_some()
+                && let Ok(name) = self.parse_identifier()
+                && matches!(name, "loading" | "error" | "placeholder")
+            {
+                self.skip_ws();
+                blocks.push(self.parse_angular_generic_block(name)?);
+            } else {
+                self.chars = chars;
+                return Ok(blocks);
+            }
+        }
+    }
+
     fn parse_angular_for(&mut self) -> PResult<AngularFor<'s>> {
         if self
             .chars
@@ -147,7 +179,7 @@ impl<'s> Parser<'s> {
             .and_then(|_| self.chars.next_if(|(_, c)| *c == 'r'))
             .is_none()
         {
-            return Err(self.emit_error(SyntaxErrorKind::ExpectAngularFor));
+            return Err(self.emit_error(SyntaxErrorKind::ExpectAngularBlock("for")));
         }
         self.skip_ws();
 
@@ -236,6 +268,37 @@ impl<'s> Parser<'s> {
         })
     }
 
+    fn parse_angular_generic_block(
+        &mut self,
+        keyword: &'s str,
+    ) -> PResult<AngularGenericBlock<'s>> {
+        let header = if let Some((start, _)) = self.chars.next_if(|(_, c)| *c == '(') {
+            let mut paren_stack = 0u8;
+            loop {
+                match self.chars.next() {
+                    Some((_, '(')) => paren_stack += 1,
+                    Some((i, ')')) => {
+                        if paren_stack == 0 {
+                            break Some(unsafe { self.source.get_unchecked(start..i + 1) });
+                        } else {
+                            paren_stack -= 1;
+                        }
+                    }
+                    Some(..) => {}
+                    None => return Err(self.emit_error(SyntaxErrorKind::ExpectChar(')'))),
+                }
+            }
+        } else {
+            None
+        };
+        self.skip_ws();
+        Ok(AngularGenericBlock {
+            keyword,
+            header,
+            children: self.parse_angular_control_flow_children()?,
+        })
+    }
+
     fn parse_angular_if(&mut self) -> PResult<AngularIf<'s>> {
         if self
             .chars
@@ -244,7 +307,7 @@ impl<'s> Parser<'s> {
             .and_then(|_| self.chars.next_if(|(_, c)| *c == 'f'))
             .is_none()
         {
-            return Err(self.emit_error(SyntaxErrorKind::ExpectAngularIf));
+            return Err(self.emit_error(SyntaxErrorKind::ExpectAngularBlock("if")));
         }
         self.skip_ws();
 
@@ -1719,6 +1782,9 @@ impl<'s> Parser<'s> {
                     Some((_, 'f')) => self.parse_angular_for().map(NodeKind::AngularFor),
                     Some((_, 's')) => self.parse_angular_switch().map(NodeKind::AngularSwitch),
                     Some((_, 'l')) => self.parse_angular_let().map(NodeKind::AngularLet),
+                    Some((_, 'd')) => self
+                        .parse_angular_defer()
+                        .map(NodeKind::AngularGenericBlocks),
                     _ => self.parse_text_node().map(NodeKind::Text),
                 }
             }
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 58a1507b..b19e303e 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -85,6 +85,49 @@ impl<'s> DocGen<'s> for AngularFor<'s> {
     }
 }
 
+impl<'s> DocGen<'s> for AngularGenericBlock<'s> {
+    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    where
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    {
+        let mut docs = Vec::with_capacity(5);
+        docs.push(Doc::text("@"));
+        docs.push(Doc::text(self.keyword));
+        if let Some(header) = self.header {
+            docs.push(Doc::space());
+            docs.push(Doc::text(header));
+        }
+        docs.push(Doc::text(" {"));
+        docs.push(format_control_structure_block_children(
+            &self.children,
+            ctx,
+            state,
+        ));
+        docs.push(Doc::text("}"));
+        Doc::list(docs)
+    }
+}
+
+impl<'s> DocGen<'s> for Vec<AngularGenericBlock<'s>> {
+    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    where
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    {
+        let next_block_ws = if ctx.options.angular_next_control_flow_same_line {
+            Doc::space()
+        } else {
+            Doc::hard_line()
+        };
+        Doc::list(
+            itertools::intersperse(
+                self.iter().map(|block| block.doc(ctx, state)),
+                next_block_ws,
+            )
+            .collect(),
+        )
+    }
+}
+
 impl<'s> DocGen<'s> for AngularIf<'s> {
     fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
     where
@@ -1178,6 +1221,7 @@ impl<'s> DocGen<'s> for NodeKind<'s> {
     {
         match self {
             NodeKind::AngularFor(angular_for) => angular_for.doc(ctx, state),
+            NodeKind::AngularGenericBlocks(blocks) => blocks.doc(ctx, state),
             NodeKind::AngularIf(angular_if) => angular_if.doc(ctx, state),
             NodeKind::AngularInterpolation(angular_interpolation) => {
                 angular_interpolation.doc(ctx, state)
diff --git a/markup_fmt/tests/fmt/angular/blocks/defer.component.html b/markup_fmt/tests/fmt/angular/blocks/defer.component.html
new file mode 100644
index 00000000..eef08a8d
--- /dev/null
+++ b/markup_fmt/tests/fmt/angular/blocks/defer.component.html
@@ -0,0 +1,21 @@
+<div aria-live="polite" aria-atomic="true">
+  @defer (on timer(2000)) {
+    <user-profile [user]="currentUser" />
+  } @placeholder {
+    Loading user profile...
+  } @loading {
+    Please wait...
+  } @error {
+    Failed to load profile
+  }
+</div>
+
+@defer (on timer(2000)) {
+<user-profile [user]="currentUser" />
+} @error (error) {
+Failed to load profile
+} @loading (after 100ms; minimum 1s) {
+Please wait...
+} @placeholder (minimum 500ms) {
+Loading user profile...
+}
diff --git a/markup_fmt/tests/fmt/angular/blocks/defer.component.snap b/markup_fmt/tests/fmt/angular/blocks/defer.component.snap
new file mode 100644
index 00000000..3b7878df
--- /dev/null
+++ b/markup_fmt/tests/fmt/angular/blocks/defer.component.snap
@@ -0,0 +1,24 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<div aria-live="polite" aria-atomic="true">
+  @defer (on timer(2000)) {
+    <user-profile [user]="currentUser" />
+  } @placeholder {
+    Loading user profile...
+  } @loading {
+    Please wait...
+  } @error {
+    Failed to load profile
+  }
+</div>
+
+@defer (on timer(2000)) {
+  <user-profile [user]="currentUser" />
+} @error (error) {
+  Failed to load profile
+} @loading (after 100ms; minimum 1s) {
+  Please wait...
+} @placeholder (minimum 500ms) {
+  Loading user profile...
+}

From 2a8d900f5630d76bf05d60c8a12340226f7b6e41 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 22 Nov 2025 23:04:43 +0800
Subject: [PATCH 05/67] chore: update dependencies

---
 Cargo.lock               | 12 ++++++------
 Cargo.toml               |  2 +-
 dprint_plugin/Cargo.toml |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f8acfa2d..4fe1a541 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -257,9 +257,9 @@ dependencies = [
 
 [[package]]
 name = "dprint-plugin-json"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb59d5e75ae9fb879a8793fdfc72e25ed9f0c91e62f5dc53e4f8ebb72103f100"
+checksum = "44eda084193a0bfff508f408db288d6d7dc889d56aa3ecbbe8ac47f005b35cb3"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -536,9 +536,9 @@ dependencies = [
 
 [[package]]
 name = "insta"
-version = "1.43.1"
+version = "1.44.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371"
+checksum = "e8732d3774162a0851e3f2b150eb98f31a9885dd75985099421d393385a01dfd"
 dependencies = [
  "console",
  "globset",
@@ -576,9 +576,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jsonc-parser"
-version = "0.26.3"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d6d80e6d70e7911a29f3cf3f44f452df85d06f73572b494ca99a2cad3fcf8f4"
+checksum = "01958dcb05b69d9612853b47df8f7881810e4f61b5cedd8894be04291f28ccb9"
 
 [[package]]
 name = "libc"
diff --git a/Cargo.toml b/Cargo.toml
index b49bd03b..4a36ef3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ resolver = "3"
 
 [workspace.dependencies]
 anyhow = "1.0"
-insta = { version = "1.43", features = ["glob"] }
+insta = { version = "1.44", features = ["glob"] }
 similar-asserts = "1.7"
 toml = "0.9"
 
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index b121e7df..f40975b4 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -20,7 +20,7 @@ markup_fmt = { path = "../markup_fmt", features = ["config_serde"] }
 serde_json = "1.0"
 
 [dev-dependencies]
-dprint-plugin-json = { version = "0.20", features = ["wasm"] }
+dprint-plugin-json = { version = "0.21", features = ["wasm"] }
 dprint-plugin-typescript = { version = "0.95", features = ["wasm"] }
 insta.workspace = true
 malva = { version = "0.14", features = ["config_serde"] }

From 50eca34419cb4e60d62c777e9a95cbb96e2e741f Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 22 Nov 2025 23:05:48 +0800
Subject: [PATCH 06/67] v0.25.0

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4fe1a541..93357d00 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.24.1"
+version = "0.25.0"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -614,7 +614,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.24.1"
+version = "0.25.0"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index e28a6ade..3010ea47 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.24.1.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.0.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index f40975b4..77d3a74c 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.24.1"
+version = "0.25.0"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index b95c5e3e..a9406a93 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.24.1",
+  "version": "0.25.0",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index 6dd5a1e6..e5ab9e7e 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.24.1/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.25.0/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 67c6c4a1..52db4b88 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.24.1"
+version = "0.25.0"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From 35bf6377eab1b5725a12c09285cfa5bd698d9f2e Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 26 Nov 2025 17:04:31 +0800
Subject: [PATCH 07/67] fix: fix formatting spread attribute (fix #171)

---
 dprint_plugin/tests/integration/basic.astro   |  2 +
 dprint_plugin/tests/integration/basic.svelte  |  2 +
 .../integration/dprint_ts/basic.astro.snap    |  2 +
 .../integration/dprint_ts/basic.svelte.snap   |  2 +
 markup_fmt/src/ctx.rs                         | 55 +++++++++++--------
 5 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/dprint_plugin/tests/integration/basic.astro b/dprint_plugin/tests/integration/basic.astro
index 2db1055a..6c6318bd 100644
--- a/dprint_plugin/tests/integration/basic.astro
+++ b/dprint_plugin/tests/integration/basic.astro
@@ -63,3 +63,5 @@ let title =
 {/* <svg><rect x="182.56" y="230.58" width="100.48" height="104.25" rx="50.24" ry="50.24"></rect></svg> */}
 
 {/* https://example.com */}
+
+<div {...props}></div>
diff --git a/dprint_plugin/tests/integration/basic.svelte b/dprint_plugin/tests/integration/basic.svelte
index c43b6d94..fe90835a 100644
--- a/dprint_plugin/tests/integration/basic.svelte
+++ b/dprint_plugin/tests/integration/basic.svelte
@@ -52,3 +52,5 @@ function generateHtml(data:unknown) {
           </ul>
 
 <div style="background-color :{"w"+"h"+`${"i"+"t"}`}e;"></div>
+
+<div {...props}></div>
diff --git a/dprint_plugin/tests/integration/dprint_ts/basic.astro.snap b/dprint_plugin/tests/integration/dprint_ts/basic.astro.snap
index 22b8e991..068e06ed 100644
--- a/dprint_plugin/tests/integration/dprint_ts/basic.astro.snap
+++ b/dprint_plugin/tests/integration/dprint_ts/basic.astro.snap
@@ -69,3 +69,5 @@ document.getElementById("button").addEventListener("click", handleClick);
 {/* <svg><rect x="182.56" y="230.58" width="100.48" height="104.25" rx="50.24" ry="50.24"></rect></svg> */}
 
 {/* https://example.com */}
+
+<div {...props}></div>
diff --git a/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap b/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap
index b0dc3a7f..26f8e462 100644
--- a/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap
+++ b/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap
@@ -55,3 +55,5 @@ function generateHtml(data: unknown) {
 </ul>
 
 <div style="background-color: {'w' + 'h' + `${'i' + 't'}`}e"></div>
+
+<div {...props}></div>
diff --git a/markup_fmt/src/ctx.rs b/markup_fmt/src/ctx.rs
index 74530c89..ea2b8bfc 100644
--- a/markup_fmt/src/ctx.rs
+++ b/markup_fmt/src/ctx.rs
@@ -142,14 +142,15 @@ where
             // Trim original code before sending it to the external formatter.
             // This makes sure the code will be trimmed
             // though external formatter isn't available.
-            let wrapped = if code.trim_start().starts_with('{') {
+            let preprocessed = code.trim_start();
+            let wrapped = if preprocessed.starts_with('{') || preprocessed.starts_with("...") {
                 self.source
                     .get(0..start.saturating_sub(1))
                     .unwrap_or_default()
                     .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                    + "("
+                    + "["
                     + code.trim()
-                    + ")"
+                    + "]"
             } else {
                 self.source
                     .get(0..start)
@@ -166,25 +167,10 @@ where
                     ext: "tsx",
                 },
             )?;
-            let formatted = formatted.trim_matches(|c: char| c.is_ascii_whitespace() || c == ';');
-            let formatted = if code.trim_start().chars().take_while(|c| *c == '(').count()
-                < formatted.chars().take_while(|c| *c == '(').count()
-                && code
-                    .trim_end()
-                    .chars()
-                    .rev()
-                    .take_while(|c| *c == ')')
-                    .count()
-                    < formatted.chars().rev().take_while(|c| *c == ')').count()
-            {
-                formatted
-                    .trim_ascii()
-                    .strip_prefix('(')
-                    .and_then(|s| s.strip_suffix(')'))
-                    .unwrap_or(formatted)
-            } else {
-                formatted
-            };
+            let mut formatted =
+                formatted.trim_matches(|c: char| c.is_ascii_whitespace() || c == ';');
+            formatted = trim_delim(preprocessed, formatted, '[', ']');
+            formatted = trim_delim(preprocessed, formatted, '(', ')');
             Ok(formatted.trim_ascii().to_owned())
         }
     }
@@ -445,3 +431,28 @@ pub struct Hints<'s> {
     /// Fake file extension.
     pub ext: &'s str,
 }
+
+fn trim_delim<'a>(user_input: &str, formatted: &'a str, start: char, end: char) -> &'a str {
+    if user_input
+        .trim_start()
+        .chars()
+        .take_while(|c| *c == start)
+        .count()
+        < formatted.chars().take_while(|c| *c == start).count()
+        && user_input
+            .trim_end()
+            .chars()
+            .rev()
+            .take_while(|c| *c == end)
+            .count()
+            < formatted.chars().rev().take_while(|c| *c == end).count()
+    {
+        formatted
+            .trim_ascii()
+            .strip_prefix(start)
+            .and_then(|s| s.strip_suffix(end))
+            .unwrap_or(formatted)
+    } else {
+        formatted
+    }
+}

From 7c87b705590ccf550dad4d7ca3179ca8894963c4 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 26 Nov 2025 17:20:07 +0800
Subject: [PATCH 08/67] v0.25.1

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 93357d00..8aad3689 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.25.0"
+version = "0.25.1"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -614,7 +614,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.25.0"
+version = "0.25.1"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index 3010ea47..c5770939 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.0.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.1.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index 77d3a74c..8d3daa98 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.25.0"
+version = "0.25.1"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index a9406a93..6ba95b73 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index e5ab9e7e..3786bab6 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.25.0/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.25.1/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 52db4b88..1f8b7201 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.25.0"
+version = "0.25.1"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From 0ca9201884f63c52a9ed375633f80aff34798b69 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 11 Dec 2025 11:30:49 +0800
Subject: [PATCH 09/67] feat: format event handler inlined in attributes (close
 #174)

---
 .../tests/integration/dprint_ts/event.html.snap       |  5 +++++
 dprint_plugin/tests/integration/event.html            |  2 ++
 markup_fmt/src/printer.rs                             | 11 ++++++++++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 dprint_plugin/tests/integration/dprint_ts/event.html.snap
 create mode 100644 dprint_plugin/tests/integration/event.html

diff --git a/dprint_plugin/tests/integration/dprint_ts/event.html.snap b/dprint_plugin/tests/integration/dprint_ts/event.html.snap
new file mode 100644
index 00000000..a612f29f
--- /dev/null
+++ b/dprint_plugin/tests/integration/dprint_ts/event.html.snap
@@ -0,0 +1,5 @@
+---
+source: dprint_plugin/tests/integration.rs
+---
+<button onclick="window.open(url)"></button>
+<button on9="not an event handler"></button>
diff --git a/dprint_plugin/tests/integration/event.html b/dprint_plugin/tests/integration/event.html
new file mode 100644
index 00000000..2ae63174
--- /dev/null
+++ b/dprint_plugin/tests/integration/event.html
@@ -0,0 +1,2 @@
+<button onclick="window.open( url )"></button>
+<button on9="not an event handler"></button>
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index b19e303e..10dc12d7 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -1131,7 +1131,16 @@ impl<'s> DocGen<'s> for NativeAttribute<'s> {
                 {
                     Cow::from(ctx.format_expr(value, false, value_start))
                 }
-                _ => Cow::from(value),
+                _ => {
+                    if !matches!(ctx.language, Language::Angular | Language::Xml)
+                        && self.name.starts_with("on")
+                    {
+                        ctx.try_format_expr(value, true, value_start)
+                            .map_or_else(|_| Cow::from(value), Cow::from)
+                    } else {
+                        Cow::from(value)
+                    }
+                }
             };
             let quote;
             let mut docs = Vec::with_capacity(5);

From f81a3aa433713d7189b724fbe2f020f788456168 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 11 Dec 2025 11:32:40 +0800
Subject: [PATCH 10/67] v0.25.2

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8aad3689..1199f8cb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.25.1"
+version = "0.25.2"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -614,7 +614,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.25.1"
+version = "0.25.2"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index c5770939..8db3b6f0 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.1.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.2.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index 8d3daa98..fd206b07 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.25.1"
+version = "0.25.2"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index 6ba95b73..205343b0 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.25.1",
+  "version": "0.25.2",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index 3786bab6..b8d91f63 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.25.1/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.25.2/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 1f8b7201..37707a41 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.25.1"
+version = "0.25.2"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From 3d50f454436bde943e2c2fb33d4a9e1a6b860d8c Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 12 Dec 2025 08:34:38 +0800
Subject: [PATCH 11/67] fix: fix Astro spread attr with shorthand disabled (fix
 #175)

---
 markup_fmt/src/printer.rs                                   | 6 ++++--
 markup_fmt/tests/fmt/astro/attr-shorthand/fixture.astro     | 1 +
 .../tests/fmt/astro/attr-shorthand/fixture.default.snap     | 1 +
 .../tests/fmt/astro/attr-shorthand/fixture.disabled.snap    | 1 +
 .../tests/fmt/astro/attr-shorthand/fixture.enabled.snap     | 1 +
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 10dc12d7..6cd590db 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -258,12 +258,14 @@ impl<'s> DocGen<'s> for AstroAttribute<'s> {
             .concat(reflow_with_indent(&expr_code, true))
             .append(Doc::text("}"));
         if let Some(name) = self.name {
-            if (matches!(ctx.options.astro_attr_shorthand, Some(true))) && name == expr_code {
+            if matches!(ctx.options.astro_attr_shorthand, Some(true)) && name == expr_code {
                 expr
             } else {
                 Doc::text(name).append(Doc::text("=")).append(expr)
             }
-        } else if matches!(ctx.options.astro_attr_shorthand, Some(false)) {
+        } else if matches!(ctx.options.astro_attr_shorthand, Some(false))
+            && !expr_code.starts_with("...")
+        {
             Doc::text(expr_code.clone())
                 .append(Doc::text("="))
                 .append(expr)
diff --git a/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.astro b/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.astro
index 133c3513..8c33284e 100644
--- a/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.astro
+++ b/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.astro
@@ -4,3 +4,4 @@ import Comp from "./comp.astro"
     <Comp options={options} />
     <Comp {options} />
     <Comp options={ options } />
+    <div {...rest}></div>
diff --git a/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.default.snap b/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.default.snap
index 21623fec..5d358ed5 100644
--- a/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.default.snap
+++ b/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.default.snap
@@ -7,3 +7,4 @@ import Comp from "./comp.astro"
 <Comp options={options} />
 <Comp {options} />
 <Comp options={options} />
+<div {...rest}></div>
diff --git a/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.disabled.snap b/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.disabled.snap
index c0ecad34..8b59781b 100644
--- a/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.disabled.snap
+++ b/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.disabled.snap
@@ -7,3 +7,4 @@ import Comp from "./comp.astro"
 <Comp options={options} />
 <Comp options={options} />
 <Comp options={options} />
+<div {...rest}></div>
diff --git a/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.enabled.snap b/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.enabled.snap
index 5c33ad33..acb97d6d 100644
--- a/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.enabled.snap
+++ b/markup_fmt/tests/fmt/astro/attr-shorthand/fixture.enabled.snap
@@ -7,3 +7,4 @@ import Comp from "./comp.astro"
 <Comp {options} />
 <Comp {options} />
 <Comp {options} />
+<div {...rest}></div>

From b47c64c50ace5b4d8aed67740af0394d2809b283 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 12 Dec 2025 08:35:41 +0800
Subject: [PATCH 12/67] v0.25.3

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1199f8cb..6ff0f8f7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.25.2"
+version = "0.25.3"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -614,7 +614,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.25.2"
+version = "0.25.3"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index 8db3b6f0..9baa24f1 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.2.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.3.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index fd206b07..ff300b33 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.25.2"
+version = "0.25.3"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index 205343b0..3361b6f3 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.25.2",
+  "version": "0.25.3",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index b8d91f63..4f5db005 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.25.2/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.25.3/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 37707a41..3ea98066 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.25.2"
+version = "0.25.3"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From 789d15e57181877526fddad42d47dce30613c403 Mon Sep 17 00:00:00 2001
From: Yacine Hmito <6893840+yacinehmito@users.noreply.github.com>
Date: Fri, 19 Dec 2025 14:32:37 +0100
Subject: [PATCH 13/67] fix: preserve array/object destructuring in v-for
 without extra parentheses (#178)

Co-authored-by: Pig Fang <g-plane@hotmail.com>
---
 markup_fmt/src/printer.rs                           | 8 +++++++-
 markup_fmt/tests/fmt/vue/v-for/fixture.default.snap | 8 ++++++++
 markup_fmt/tests/fmt/vue/v-for/fixture.in.snap      | 8 ++++++++
 markup_fmt/tests/fmt/vue/v-for/fixture.of.snap      | 8 ++++++++
 markup_fmt/tests/fmt/vue/v-for/fixture.vue          | 8 ++++++++
 5 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 6cd590db..d4c8637e 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -2572,7 +2572,13 @@ where
 {
     let left = ctx.format_expr(left, false, start);
     let right = ctx.format_expr(right, false, start + 4);
-    if left.contains(',') && !left.contains('(') {
+    let left_trimmed = left.trim_start();
+    // Add parentheses around tuple unpacking (e.g., `a, i` → `(a, i)`),
+    // but not around destructuring patterns that are already wrapped
+    // with brackets `[...]` or braces `{...}` or parentheses `(...)`.
+    let needs_parens = left.contains(',')
+        && !left_trimmed.starts_with(['(', '[', '{']);
+    if needs_parens {
         format!("({left}) {delimiter} {right}")
     } else {
         format!("{left} {delimiter} {right}")
diff --git a/markup_fmt/tests/fmt/vue/v-for/fixture.default.snap b/markup_fmt/tests/fmt/vue/v-for/fixture.default.snap
index e80f5554..70e08df9 100644
--- a/markup_fmt/tests/fmt/vue/v-for/fixture.default.snap
+++ b/markup_fmt/tests/fmt/vue/v-for/fixture.default.snap
@@ -4,4 +4,12 @@ source: markup_fmt/tests/fmt.rs
 <template>
   <div v-for="a in b"></div>
   <div v-for="a of b"></div>
+  <div v-for="(a, i) in b"></div>
+  <div v-for="(a, i) of b"></div>
+  <div v-for="[key, value] in Object.entries(obj)"></div>
+  <div v-for="[key, value] of Object.entries(obj)"></div>
+  <div v-for="([key, value], i) in Object.entries(obj)"></div>
+  <div v-for="([key, value], i) of Object.entries(obj)"></div>
+  <div v-for="{ foo, bar } in items"></div>
+  <div v-for="{ foo, bar } of items"></div>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/v-for/fixture.in.snap b/markup_fmt/tests/fmt/vue/v-for/fixture.in.snap
index 40a20d47..fa0d9f47 100644
--- a/markup_fmt/tests/fmt/vue/v-for/fixture.in.snap
+++ b/markup_fmt/tests/fmt/vue/v-for/fixture.in.snap
@@ -4,4 +4,12 @@ source: markup_fmt/tests/fmt.rs
 <template>
   <div v-for="a in b"></div>
   <div v-for="a in b"></div>
+  <div v-for="(a, i) in b"></div>
+  <div v-for="(a, i) in b"></div>
+  <div v-for="[key, value] in Object.entries(obj)"></div>
+  <div v-for="[key, value] in Object.entries(obj)"></div>
+  <div v-for="([key, value], i) in Object.entries(obj)"></div>
+  <div v-for="([key, value], i) in Object.entries(obj)"></div>
+  <div v-for="{ foo, bar } in items"></div>
+  <div v-for="{ foo, bar } in items"></div>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/v-for/fixture.of.snap b/markup_fmt/tests/fmt/vue/v-for/fixture.of.snap
index 03d1c154..8ebec445 100644
--- a/markup_fmt/tests/fmt/vue/v-for/fixture.of.snap
+++ b/markup_fmt/tests/fmt/vue/v-for/fixture.of.snap
@@ -4,4 +4,12 @@ source: markup_fmt/tests/fmt.rs
 <template>
   <div v-for="a of b"></div>
   <div v-for="a of b"></div>
+  <div v-for="(a, i) of b"></div>
+  <div v-for="(a, i) of b"></div>
+  <div v-for="[key, value] of Object.entries(obj)"></div>
+  <div v-for="[key, value] of Object.entries(obj)"></div>
+  <div v-for="([key, value], i) of Object.entries(obj)"></div>
+  <div v-for="([key, value], i) of Object.entries(obj)"></div>
+  <div v-for="{ foo, bar } of items"></div>
+  <div v-for="{ foo, bar } of items"></div>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/v-for/fixture.vue b/markup_fmt/tests/fmt/vue/v-for/fixture.vue
index 9269f235..97990c1a 100644
--- a/markup_fmt/tests/fmt/vue/v-for/fixture.vue
+++ b/markup_fmt/tests/fmt/vue/v-for/fixture.vue
@@ -1,4 +1,12 @@
 <template>
   <div v-for="a in b"></div>
   <div v-for="a of b"></div>
+  <div v-for="(a, i) in b"></div>
+  <div v-for="(a, i) of b"></div>
+  <div v-for="[key, value] in Object.entries(obj)"></div>
+  <div v-for="[key, value] of Object.entries(obj)"></div>
+  <div v-for="([key, value], i) in Object.entries(obj)"></div>
+  <div v-for="([key, value], i) of Object.entries(obj)"></div>
+  <div v-for="{ foo, bar } in items"></div>
+  <div v-for="{ foo, bar } of items"></div>
 </template>

From b9df5cca01c017d9cc5b6b7c8aa6c972796260c8 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 19 Dec 2025 21:34:26 +0800
Subject: [PATCH 14/67] refactor: inline variable

---
 markup_fmt/src/printer.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index d4c8637e..f2448765 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -2576,9 +2576,7 @@ where
     // Add parentheses around tuple unpacking (e.g., `a, i` → `(a, i)`),
     // but not around destructuring patterns that are already wrapped
     // with brackets `[...]` or braces `{...}` or parentheses `(...)`.
-    let needs_parens = left.contains(',')
-        && !left_trimmed.starts_with(['(', '[', '{']);
-    if needs_parens {
+    if left.contains(',') && !left_trimmed.starts_with(['(', '[', '{']) {
         format!("({left}) {delimiter} {right}")
     } else {
         format!("{left} {delimiter} {right}")

From 1ac2405a3c2b9aa5d2a4bf7933c8cd4fe4edf295 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 19 Dec 2025 21:35:23 +0800
Subject: [PATCH 15/67] refactor: inline variable

---
 markup_fmt/src/printer.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index f2448765..58972434 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -2572,11 +2572,10 @@ where
 {
     let left = ctx.format_expr(left, false, start);
     let right = ctx.format_expr(right, false, start + 4);
-    let left_trimmed = left.trim_start();
     // Add parentheses around tuple unpacking (e.g., `a, i` → `(a, i)`),
     // but not around destructuring patterns that are already wrapped
     // with brackets `[...]` or braces `{...}` or parentheses `(...)`.
-    if left.contains(',') && !left_trimmed.starts_with(['(', '[', '{']) {
+    if left.contains(',') && !left.trim_start().starts_with(['(', '[', '{']) {
         format!("({left}) {delimiter} {right}")
     } else {
         format!("{left} {delimiter} {right}")

From a8edecfe15b07e8f57ad181bdfe00f0d3c872d66 Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Sun, 21 Dec 2025 01:46:46 +0100
Subject: [PATCH 16/67] feat: format `speculationrules` as JSON (#180)

---
 .../tests/integration/dprint_ts/json.html.snap        | 11 +++++++++++
 dprint_plugin/tests/integration/json.html             |  3 +++
 markup_fmt/src/printer.rs                             | 10 +++++++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dprint_plugin/tests/integration/dprint_ts/json.html.snap b/dprint_plugin/tests/integration/dprint_ts/json.html.snap
index 89dc9560..27d7895c 100644
--- a/dprint_plugin/tests/integration/dprint_ts/json.html.snap
+++ b/dprint_plugin/tests/integration/dprint_ts/json.html.snap
@@ -11,6 +11,17 @@ source: dprint_plugin/tests/integration.rs
       }
     }
     </script>
+    <script type="speculationrules">
+    {
+      "prefetch": [
+        {
+          "urls": ["next.html", "next2.html"],
+          "requires": ["anonymous-client-ip-when-cross-origin"],
+          "referrer_policy": "no-referrer"
+        }
+      ]
+    }
+    </script>
     <script type="application/json">
     { "ssrData": { "items": [1, 2, 3] } }
     </script>
diff --git a/dprint_plugin/tests/integration/json.html b/dprint_plugin/tests/integration/json.html
index 6705b91f..0863f21e 100644
--- a/dprint_plugin/tests/integration/json.html
+++ b/dprint_plugin/tests/integration/json.html
@@ -3,6 +3,9 @@
     <script type=importmap>
       {"imports": { "square": "./module/shapes/square.js", "circle": "https://example.com/shapes/circle.js" }}
     </script>
+    <script type="speculationrules">
+      {"prefetch": [{"urls": ["next.html", "next2.html"],"requires": ["anonymous-client-ip-when-cross-origin"],"referrer_policy": "no-referrer"}]}
+    </script>
     <script type="application/json">
     {"ssrData":{"items":[1,2,3]}}
     </script>
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 58972434..6bfadb58 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -673,9 +673,13 @@ impl<'s> DocGen<'s> for Element<'s> {
                     if let Attribute::Native(native_attr) = attr {
                         native_attr.name.eq_ignore_ascii_case("type")
                             && native_attr.value.is_some_and(|(value, _)| {
-                                value == "importmap"
-                                    || value == "application/json"
-                                    || value == "application/ld+json"
+                                matches!(
+                                    value,
+                                    "importmap"
+                                        | "application/json"
+                                        | "application/ld+json"
+                                        | "speculationrules"
+                                )
                             })
                     } else {
                         false

From abb899131d2974ad64a7ab2e4c890c7f5638e71e Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 28 Dec 2025 11:02:16 +0800
Subject: [PATCH 17/67] fix: fix Vento interpolation trimming (fix #181)

---
 markup_fmt/src/ast.rs                                  |  2 ++
 markup_fmt/src/parser.rs                               |  2 ++
 markup_fmt/src/printer.rs                              | 10 ++++++++++
 .../tests/fmt/vento/interpolation/interpolation.snap   |  6 ++++++
 .../tests/fmt/vento/interpolation/interpolation.vto    |  3 +++
 5 files changed, 23 insertions(+)
 create mode 100644 markup_fmt/tests/fmt/vento/interpolation/interpolation.snap
 create mode 100644 markup_fmt/tests/fmt/vento/interpolation/interpolation.vto

diff --git a/markup_fmt/src/ast.rs b/markup_fmt/src/ast.rs
index 0a443b75..4b4c0f22 100644
--- a/markup_fmt/src/ast.rs
+++ b/markup_fmt/src/ast.rs
@@ -437,6 +437,8 @@ pub struct VentoEval<'s> {
 pub struct VentoInterpolation<'s> {
     pub expr: &'s str,
     pub start: usize,
+    pub trim_prev: bool,
+    pub trim_next: bool,
 }
 
 #[derive(Debug)]
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index dc83261f..15b0dfee 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -2834,6 +2834,8 @@ impl<'s> Parser<'s> {
             Ok(NodeKind::VentoInterpolation(VentoInterpolation {
                 expr: first_tag,
                 start: first_tag_start,
+                trim_prev,
+                trim_next,
             }))
         } else {
             Ok(NodeKind::VentoTag(VentoTag {
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 6bfadb58..093dda07 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -1732,6 +1732,11 @@ impl<'s> DocGen<'s> for VentoInterpolation<'s> {
         F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
     {
         Doc::text("{{")
+            .append(if self.trim_prev {
+                Doc::text("-")
+            } else {
+                Doc::nil()
+            })
             .append(Doc::line_or_space())
             .concat(itertools::intersperse(
                 self.expr.split("|>").map(|expr| {
@@ -1746,6 +1751,11 @@ impl<'s> DocGen<'s> for VentoInterpolation<'s> {
             ))
             .nest(ctx.indent_width)
             .append(Doc::line_or_space())
+            .append(if self.trim_next {
+                Doc::text("-")
+            } else {
+                Doc::nil()
+            })
             .append(Doc::text("}}"))
             .group()
     }
diff --git a/markup_fmt/tests/fmt/vento/interpolation/interpolation.snap b/markup_fmt/tests/fmt/vento/interpolation/interpolation.snap
new file mode 100644
index 00000000..de45d5e0
--- /dev/null
+++ b/markup_fmt/tests/fmt/vento/interpolation/interpolation.snap
@@ -0,0 +1,6 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+{{- example }}
+{{ example -}}
+{{- example -}}
diff --git a/markup_fmt/tests/fmt/vento/interpolation/interpolation.vto b/markup_fmt/tests/fmt/vento/interpolation/interpolation.vto
new file mode 100644
index 00000000..e9d78db2
--- /dev/null
+++ b/markup_fmt/tests/fmt/vento/interpolation/interpolation.vto
@@ -0,0 +1,3 @@
+{{- example }}
+{{ example -}}
+{{- example -}}

From 17a3d0fb1e1c7e5ac9ed2af52e09e3b5cbbb0b97 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 31 Dec 2025 16:38:19 +0800
Subject: [PATCH 18/67] fix: treat unknown type of script tag as raw text (fix
 #179)

---
 markup_fmt/src/printer.rs                     | 144 ++++++++++--------
 .../tests/fmt/html/whitespace/snippets.snap   |  24 +--
 2 files changed, 94 insertions(+), 74 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 093dda07..097eaa3b 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -669,76 +669,96 @@ impl<'s> DocGen<'s> for Element<'s> {
             if text_node.raw.chars().all(|c| c.is_ascii_whitespace()) {
                 docs.push(Doc::hard_line());
             } else {
-                let is_json = self.attrs.iter().any(|attr| {
-                    if let Attribute::Native(native_attr) = attr {
-                        native_attr.name.eq_ignore_ascii_case("type")
-                            && native_attr.value.is_some_and(|(value, _)| {
-                                matches!(
-                                    value,
-                                    "importmap"
-                                        | "application/json"
-                                        | "application/ld+json"
-                                        | "speculationrules"
-                                )
-                            })
-                    } else {
-                        false
+                let type_attr = self.attrs.iter().find_map(|attr| match attr {
+                    Attribute::Native(native) if native.name.eq_ignore_ascii_case("type") => {
+                        native.value.map(|(value, _)| value.to_ascii_lowercase())
                     }
+                    _ => None,
                 });
-                let is_script_indent = ctx.script_indent();
-                let formatted = if is_json {
-                    ctx.format_json(text_node.raw, text_node.start, &state)
-                } else {
-                    if is_script_indent {
-                        state.indent_level += 1;
-                    }
-                    let lang = self
-                        .attrs
-                        .iter()
-                        .find_map(|attr| match attr {
+                match type_attr.as_deref() {
+                    Some(
+                        "module"
+                        | "application/javascript"
+                        | "text/javascript"
+                        | "application/ecmascript"
+                        | "text/ecmascript"
+                        | "application/x-javascript"
+                        | "application/x-ecmascript"
+                        | "text/x-javascript"
+                        | "text/x-ecmascript"
+                        | "text/jsx"
+                        | "text/babel",
+                    )
+                    | None => {
+                        let is_script_indent = ctx.script_indent();
+                        if is_script_indent {
+                            state.indent_level += 1;
+                        }
+                        let lang = self
+                            .attrs
+                            .iter()
+                            .find_map(|attr| match attr {
+                                Attribute::Native(native)
+                                    if native.name.eq_ignore_ascii_case("lang") =>
+                                {
+                                    native.value.map(|(value, _)| value)
+                                }
+                                _ => None,
+                            })
+                            .unwrap_or(if matches!(ctx.language, Language::Astro) {
+                                "ts"
+                            } else {
+                                "js"
+                            });
+                        let lang = if self.attrs.iter().any(|attr| match attr {
                             Attribute::Native(native)
-                                if native.name.eq_ignore_ascii_case("lang") =>
+                                if native.name.eq_ignore_ascii_case("type") =>
                             {
-                                native.value.map(|(value, _)| value)
+                                native.value.is_some_and(|(value, _)| value == "module")
+                            }
+                            _ => false,
+                        }) {
+                            match lang {
+                                "ts" => "mts",
+                                "js" => "mjs",
+                                lang => lang,
                             }
-                            _ => None,
-                        })
-                        .unwrap_or(if matches!(ctx.language, Language::Astro) {
-                            "ts"
                         } else {
-                            "js"
-                        });
-                    let lang = if self.attrs.iter().any(|attr| match attr {
-                        Attribute::Native(native) if native.name.eq_ignore_ascii_case("type") => {
-                            native.value.is_some_and(|(value, _)| value == "module")
-                        }
-                        _ => false,
-                    }) {
-                        match lang {
-                            "ts" => "mts",
-                            "js" => "mjs",
-                            lang => lang,
+                            lang
+                        };
+                        let formatted =
+                            ctx.format_script(text_node.raw, lang, text_node.start, &state);
+                        let doc = if matches!(
+                            ctx.options.script_formatter,
+                            Some(ScriptFormatter::Dprint)
+                        ) {
+                            Doc::hard_line().concat(reflow_owned(formatted.trim()))
+                        } else {
+                            Doc::hard_line().concat(reflow_with_indent(formatted.trim(), true))
+                        };
+                        if is_script_indent {
+                            docs.push(doc.nest(ctx.indent_width));
+                        } else {
+                            docs.push(doc);
                         }
-                    } else {
-                        lang
-                    };
-                    ctx.format_script(text_node.raw, lang, text_node.start, &state)
-                };
-                let doc = if !is_json
-                    && matches!(ctx.options.script_formatter, Some(ScriptFormatter::Dprint))
-                {
-                    Doc::hard_line().concat(reflow_owned(formatted.trim()))
-                } else {
-                    Doc::hard_line().concat(reflow_with_indent(formatted.trim(), true))
-                };
-                docs.push(
-                    if is_script_indent {
-                        doc.nest(ctx.indent_width)
-                    } else {
-                        doc
                     }
-                    .append(Doc::hard_line()),
-                );
+                    Some(
+                        "importmap"
+                        | "application/json"
+                        | "application/ld+json"
+                        | "speculationrules",
+                    ) => {
+                        let formatted = ctx.format_json(text_node.raw, text_node.start, &state);
+                        docs.push(
+                            Doc::hard_line().concat(reflow_with_indent(formatted.trim(), true)),
+                        );
+                    }
+                    Some(..) => {
+                        docs.push(Doc::hard_line());
+                        docs.extend(reflow_raw(text_node.raw.trim_matches('\n')));
+                    }
+                }
+                docs.push(Doc::hard_line());
             }
         } else if tag_name.eq_ignore_ascii_case("style")
             && let [
diff --git a/markup_fmt/tests/fmt/html/whitespace/snippets.snap b/markup_fmt/tests/fmt/html/whitespace/snippets.snap
index fff5b575..0082315a 100644
--- a/markup_fmt/tests/fmt/html/whitespace/snippets.snap
+++ b/markup_fmt/tests/fmt/html/whitespace/snippets.snap
@@ -39,24 +39,24 @@ source: markup_fmt/tests/fmt.rs
 <p><span>X</span>   or   <span>Y</span></p><p>X   or   Y</p>
 <!-- U+2005 -->
 <script type="text/unknown" lang="unknown">
-// comment
-// comment
-// comment
-// comment
+         // comment
+          // comment
+          // comment
+          // comment
 </script>
 <!-- U+005F -->
 <script type="text/unknown" lang="unknown">
-_    // comment
-// comment
-// comment
-// comment
+    _    // comment
+          // comment
+          // comment
+          // comment
 </script>
 <!-- U+0020 -->
 <script type="text/unknown" lang="unknown">
-// comment
-// comment
-// comment
-// comment
+         // comment
+          // comment
+          // comment
+          // comment
 </script>
 
 <!-- U+2005 -->

From 8c30321d73ec0d587e755e4cabb86819807637e1 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 6 Jan 2026 09:36:28 +0800
Subject: [PATCH 19/67] fix: remove unexpected comma in JS expr (fix #183)

---
 markup_fmt/src/ctx.rs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/markup_fmt/src/ctx.rs b/markup_fmt/src/ctx.rs
index ea2b8bfc..734a3783 100644
--- a/markup_fmt/src/ctx.rs
+++ b/markup_fmt/src/ctx.rs
@@ -143,7 +143,9 @@ where
             // This makes sure the code will be trimmed
             // though external formatter isn't available.
             let preprocessed = code.trim_start();
-            let wrapped = if preprocessed.starts_with('{') || preprocessed.starts_with("...") {
+            let will_add_brackets =
+                preprocessed.starts_with('{') || preprocessed.starts_with("...");
+            let wrapped = if will_add_brackets {
                 self.source
                     .get(0..start.saturating_sub(1))
                     .unwrap_or_default()
@@ -171,6 +173,9 @@ where
                 formatted.trim_matches(|c: char| c.is_ascii_whitespace() || c == ';');
             formatted = trim_delim(preprocessed, formatted, '[', ']');
             formatted = trim_delim(preprocessed, formatted, '(', ')');
+            if will_add_brackets {
+                formatted = formatted.trim_ascii_end().trim_end_matches(',');
+            }
             Ok(formatted.trim_ascii().to_owned())
         }
     }

From 4e6c2b3f7586656fe9506824e7f810caf45cad4f Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 6 Jan 2026 11:22:21 +0800
Subject: [PATCH 20/67] fix: fix unterminated comment and interpolation (fix
 #184)

---
 markup_fmt/src/parser.rs                           | 14 ++++++++++----
 .../fmt/jinja/invalid/unterminated-comment.jinja   |  5 +++++
 .../fmt/jinja/invalid/unterminated-comment.snap    |  9 +++++++++
 .../jinja/invalid/unterminated-interpolation.jinja |  5 +++++
 .../jinja/invalid/unterminated-interpolation.snap  | 10 ++++++++++
 5 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 markup_fmt/tests/fmt/jinja/invalid/unterminated-comment.jinja
 create mode 100644 markup_fmt/tests/fmt/jinja/invalid/unterminated-comment.snap
 create mode 100644 markup_fmt/tests/fmt/jinja/invalid/unterminated-interpolation.jinja
 create mode 100644 markup_fmt/tests/fmt/jinja/invalid/unterminated-interpolation.snap

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 15b0dfee..b3ee5274 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -1379,7 +1379,7 @@ impl<'s> Parser<'s> {
         };
         let start = start + 1;
 
-        let mut end = start;
+        let end;
         loop {
             match self.chars.next() {
                 Some((i, '#')) => {
@@ -1391,7 +1391,10 @@ impl<'s> Parser<'s> {
                     }
                 }
                 Some(..) => continue,
-                None => break,
+                None => {
+                    end = self.source.len();
+                    break;
+                }
             }
         }
 
@@ -1598,7 +1601,7 @@ impl<'s> Parser<'s> {
         let start = start + 1;
 
         let mut braces_stack = 0usize;
-        let mut end = start;
+        let end;
         loop {
             match self.chars.next() {
                 Some((_, '{')) => braces_stack += 1,
@@ -1613,7 +1616,10 @@ impl<'s> Parser<'s> {
                     }
                 }
                 Some(..) => continue,
-                None => break,
+                None => {
+                    end = self.source.len();
+                    break;
+                }
             }
         }
 
diff --git a/markup_fmt/tests/fmt/jinja/invalid/unterminated-comment.jinja b/markup_fmt/tests/fmt/jinja/invalid/unterminated-comment.jinja
new file mode 100644
index 00000000..a91ceb60
--- /dev/null
+++ b/markup_fmt/tests/fmt/jinja/invalid/unterminated-comment.jinja
@@ -0,0 +1,5 @@
+{# comment %}
+
+This gets nuked
+
+This too
diff --git a/markup_fmt/tests/fmt/jinja/invalid/unterminated-comment.snap b/markup_fmt/tests/fmt/jinja/invalid/unterminated-comment.snap
new file mode 100644
index 00000000..a9b73581
--- /dev/null
+++ b/markup_fmt/tests/fmt/jinja/invalid/unterminated-comment.snap
@@ -0,0 +1,9 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+{# comment %}
+
+This gets nuked
+
+This too
+#}
diff --git a/markup_fmt/tests/fmt/jinja/invalid/unterminated-interpolation.jinja b/markup_fmt/tests/fmt/jinja/invalid/unterminated-interpolation.jinja
new file mode 100644
index 00000000..b1ab4423
--- /dev/null
+++ b/markup_fmt/tests/fmt/jinja/invalid/unterminated-interpolation.jinja
@@ -0,0 +1,5 @@
+{{ comment #}
+
+This gets nuked
+
+This too
diff --git a/markup_fmt/tests/fmt/jinja/invalid/unterminated-interpolation.snap b/markup_fmt/tests/fmt/jinja/invalid/unterminated-interpolation.snap
new file mode 100644
index 00000000..687d3b1d
--- /dev/null
+++ b/markup_fmt/tests/fmt/jinja/invalid/unterminated-interpolation.snap
@@ -0,0 +1,10 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+{{
+  comment #}
+
+  This gets nuked
+
+  This too
+}}

From e5b8fa7ff33f4d6aa9ebab2194738f7c115759e6 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 11 Jan 2026 09:31:07 +0800
Subject: [PATCH 21/67] fix: fix Jinja interpolation trimming (fix #187)

---
 markup_fmt/src/ast.rs                            |  2 ++
 markup_fmt/src/parser.rs                         | 16 +++++++++++++++-
 markup_fmt/src/printer.rs                        | 10 ++++++++++
 .../tests/fmt/jinja/interpolation/fixture.jinja  |  4 ++++
 .../tests/fmt/jinja/interpolation/fixture.snap   |  4 ++++
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/markup_fmt/src/ast.rs b/markup_fmt/src/ast.rs
index 4b4c0f22..b5764216 100644
--- a/markup_fmt/src/ast.rs
+++ b/markup_fmt/src/ast.rs
@@ -186,6 +186,8 @@ pub struct JinjaComment<'s> {
 pub struct JinjaInterpolation<'s> {
     pub expr: &'s str,
     pub start: usize,
+    pub trim_prev: bool,
+    pub trim_next: bool,
 }
 
 #[derive(Debug)]
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index b3ee5274..8e53c4c1 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -1705,9 +1705,23 @@ impl<'s> Parser<'s> {
                                         NodeKind::VueInterpolation(VueInterpolation { expr, start })
                                     }
                                     Language::Jinja => {
+                                        let (trim_prev, expr) =
+                                            if let Some(rest) = expr.strip_prefix('-') {
+                                                (true, rest)
+                                            } else {
+                                                (false, expr)
+                                            };
+                                        let (trim_next, expr) =
+                                            if let Some(rest) = expr.strip_suffix('-') {
+                                                (true, rest)
+                                            } else {
+                                                (false, expr)
+                                            };
                                         NodeKind::JinjaInterpolation(JinjaInterpolation {
                                             expr,
-                                            start,
+                                            start: if trim_prev { start + 1 } else { start },
+                                            trim_prev,
+                                            trim_next,
                                         })
                                     }
                                     _ => unreachable!(),
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 097eaa3b..15f19299 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -979,6 +979,11 @@ impl<'s> DocGen<'s> for JinjaInterpolation<'s> {
         F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
     {
         Doc::text("{{")
+            .append(if self.trim_prev {
+                Doc::text("-")
+            } else {
+                Doc::nil()
+            })
             .append(Doc::line_or_space())
             .concat(reflow_with_indent(
                 ctx.format_jinja(self.expr, self.start, true, state).trim(),
@@ -986,6 +991,11 @@ impl<'s> DocGen<'s> for JinjaInterpolation<'s> {
             ))
             .nest(ctx.indent_width)
             .append(Doc::line_or_space())
+            .append(if self.trim_next {
+                Doc::text("-")
+            } else {
+                Doc::nil()
+            })
             .append(Doc::text("}}"))
             .group()
     }
diff --git a/markup_fmt/tests/fmt/jinja/interpolation/fixture.jinja b/markup_fmt/tests/fmt/jinja/interpolation/fixture.jinja
index bd6dac05..64f8923a 100644
--- a/markup_fmt/tests/fmt/jinja/interpolation/fixture.jinja
+++ b/markup_fmt/tests/fmt/jinja/interpolation/fixture.jinja
@@ -36,3 +36,7 @@
 <{{ tag_name }}> Hello </{{ tag_name }}>
 <{{ tag_name }}  > Hello </{{ tag_name }}  >
 <{{ tag_name }}> very-very-very-very-very-very-very-very-very-long-title </{{ tag_name }}>
+
+{{- example }}
+{{ example -}}
+{{- example -}}
diff --git a/markup_fmt/tests/fmt/jinja/interpolation/fixture.snap b/markup_fmt/tests/fmt/jinja/interpolation/fixture.snap
index eb257655..66adb100 100644
--- a/markup_fmt/tests/fmt/jinja/interpolation/fixture.snap
+++ b/markup_fmt/tests/fmt/jinja/interpolation/fixture.snap
@@ -49,3 +49,7 @@ source: markup_fmt/tests/fmt.rs
 <{{ tag_name }}>
   very-very-very-very-very-very-very-very-very-long-title
 </{{ tag_name }}>
+
+{{- example }}
+{{ example -}}
+{{- example -}}

From 5f73f4f41e372514341c7d3245da37c2d6062b33 Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Mon, 12 Jan 2026 01:12:18 +0100
Subject: [PATCH 22/67] refactor: add `peek_pos` helper function (#188)

---
 markup_fmt/src/parser.rs | 68 +++++++++++-----------------------------
 1 file changed, 18 insertions(+), 50 deletions(-)

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 8e53c4c1..7d63ee4c 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -62,12 +62,16 @@ impl<'s> Parser<'s> {
         result
     }
 
-    fn emit_error(&mut self, kind: SyntaxErrorKind) -> SyntaxError {
-        let pos = self
-            .chars
+    #[inline]
+    fn peek_pos(&mut self) -> usize {
+        self.chars
             .peek()
-            .map(|(pos, _)| *pos)
-            .unwrap_or(self.source.len());
+            .map(|(i, _)| *i)
+            .unwrap_or(self.source.len())
+    }
+
+    fn emit_error(&mut self, kind: SyntaxErrorKind) -> SyntaxError {
+        let pos = self.peek_pos();
         self.emit_error_with_pos(kind, pos)
     }
 
@@ -107,17 +111,9 @@ impl<'s> Parser<'s> {
     where
         F: FnOnce(&mut Self) -> PResult<T>,
     {
-        let start = self
-            .chars
-            .peek()
-            .map(|(i, _)| *i)
-            .unwrap_or(self.source.len());
+        let start = self.peek_pos();
         let parsed = parser(self)?;
-        let end = self
-            .chars
-            .peek()
-            .map(|(i, _)| *i)
-            .unwrap_or(self.source.len());
+        let end = self.peek_pos();
         Ok((parsed, unsafe { self.source.get_unchecked(start..end) }))
     }
 
@@ -464,11 +460,7 @@ impl<'s> Parser<'s> {
             return Err(self.emit_error(SyntaxErrorKind::ExpectChar('=')));
         }
         self.skip_ws();
-        let start = self
-            .chars
-            .peek()
-            .map(|(i, _)| *i)
-            .unwrap_or(self.source.len());
+        let start = self.peek_pos();
         let expr = self.parse_angular_inline_script(start)?;
         if self.chars.next_if(|(_, c)| *c == ';').is_none() {
             return Err(self.emit_error(SyntaxErrorKind::ExpectChar(';')));
@@ -616,11 +608,7 @@ impl<'s> Parser<'s> {
         let mut children = Vec::with_capacity(1);
         let mut has_line_comment = false;
         let mut pair_stack = vec![];
-        let mut pos = self
-            .chars
-            .peek()
-            .map(|(i, _)| *i)
-            .unwrap_or(self.source.len());
+        let mut pos = self.peek_pos();
         while let Some((i, c)) = self.chars.peek() {
             match c {
                 '{' => {
@@ -678,11 +666,7 @@ impl<'s> Parser<'s> {
                             ));
                             children.push(AstroExprChild::Template(vec![node]));
                         }
-                        pos = self
-                            .chars
-                            .peek()
-                            .map(|(i, _)| *i)
-                            .unwrap_or(self.source.len());
+                        pos = self.peek_pos();
                     } else {
                         self.chars.next();
                     }
@@ -1814,11 +1798,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_raw_text_node(&mut self, tag_name: &str) -> PResult<TextNode<'s>> {
-        let start = self
-            .chars
-            .peek()
-            .map(|(i, _)| *i)
-            .unwrap_or(self.source.len());
+        let start = self.peek_pos();
 
         let allow_nested = tag_name.eq_ignore_ascii_case("pre");
         let mut nested = 0u16;
@@ -1962,11 +1942,7 @@ impl<'s> Parser<'s> {
         self.skip_ws();
 
         let expr = {
-            let start = self
-                .chars
-                .peek()
-                .map(|(i, _)| *i)
-                .unwrap_or(self.source.len());
+            let start = self.peek_pos();
             let mut end = start;
             let mut braces_stack = 0u8;
             loop {
@@ -2221,11 +2197,7 @@ impl<'s> Parser<'s> {
 
         let mut binding = None;
         let expr = {
-            let start = self
-                .chars
-                .peek()
-                .map(|(i, _)| *i)
-                .unwrap_or(self.source.len());
+            let start = self.peek_pos();
             let mut end = start;
             let mut pair_stack = vec![];
             loop {
@@ -2498,11 +2470,7 @@ impl<'s> Parser<'s> {
     fn parse_svelte_or_astro_expr(&mut self) -> PResult<(&'s str, usize)> {
         self.skip_ws();
 
-        let start = self
-            .chars
-            .peek()
-            .map(|(i, _)| *i)
-            .unwrap_or(self.source.len());
+        let start = self.peek_pos();
         let mut end = start;
         let mut braces_stack = 0u8;
         loop {

From 3ea472d1e58697d22f0fb49bfa6dc5bff5b2e4c0 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 15 Jan 2026 20:06:13 +0800
Subject: [PATCH 23/67] ci: remove Netlify build

---
 .github/workflows/CI.yml | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 1a5cc89c..028c6ee8 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -15,35 +15,5 @@ jobs:
     name: test
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.cargo/bin/
-            ~/.cargo/registry/index/
-            ~/.cargo/registry/cache/
-            ~/.cargo/git/db/
-            target/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: actions/checkout@v6
       - run: cargo test --all-features
-
-  docs:
-    name: documentation
-    if: ${{ github.event_name == 'push' }}
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install mdbook
-        run: |
-          tag=$(curl 'https://api.github.com/repos/rust-lang/mdbook/releases/latest' | jq -r '.tag_name')
-          url="https://github.com/rust-lang/mdbook/releases/download/${tag}/mdbook-${tag}-x86_64-unknown-linux-gnu.tar.gz"
-          mkdir mdbook
-          curl -sSL $url | tar -xz --directory=./mdbook
-          echo `pwd`/mdbook >> $GITHUB_PATH
-      - run: mdbook build docs
-      - name: Deploy Production
-        run: |
-          npm i --location=global netlify-cli
-          netlify deploy --dir=docs/book --site=3b07be0f-5f0e-4df0-a2e6-b40f84daccac --prod
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}

From 265321926666bf02a7f2b8b49cff560d9d6909e8 Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Fri, 23 Jan 2026 15:16:35 +0100
Subject: [PATCH 24/67] refactor: derive `Copy` on enums (#191)

---
 markup_fmt/src/config.rs  | 22 +++++++++++-----------
 markup_fmt/src/ctx.rs     |  3 +--
 markup_fmt/src/lib.rs     |  2 +-
 markup_fmt/src/printer.rs |  8 ++++----
 markup_fmt/tests/fmt.rs   |  4 ++--
 5 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/markup_fmt/src/config.rs b/markup_fmt/src/config.rs
index fd317a92..e700f03d 100644
--- a/markup_fmt/src/config.rs
+++ b/markup_fmt/src/config.rs
@@ -50,7 +50,7 @@ impl Default for LayoutOptions {
     }
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum LineBreak {
@@ -282,7 +282,7 @@ impl Default for LanguageOptions {
     }
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum Quotes {
@@ -291,7 +291,7 @@ pub enum Quotes {
     Single,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum ClosingTagLineBreakForEmpty {
@@ -301,7 +301,7 @@ pub enum ClosingTagLineBreakForEmpty {
     Never,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum WhitespaceSensitivity {
@@ -311,7 +311,7 @@ pub enum WhitespaceSensitivity {
     Ignore,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum DoctypeKeywordCase {
@@ -321,7 +321,7 @@ pub enum DoctypeKeywordCase {
     Lower,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum VBindStyle {
@@ -330,7 +330,7 @@ pub enum VBindStyle {
     Long,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum VOnStyle {
@@ -339,7 +339,7 @@ pub enum VOnStyle {
     Long,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum VForDelimiterStyle {
@@ -348,7 +348,7 @@ pub enum VForDelimiterStyle {
     Of,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum VSlotStyle {
@@ -359,7 +359,7 @@ pub enum VSlotStyle {
     VSlot,
 }
 
-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum VueComponentCase {
@@ -374,7 +374,7 @@ pub enum VueComponentCase {
     KebabCase,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 #[cfg_attr(feature = "config_serde", derive(Serialize, Deserialize))]
 #[cfg_attr(feature = "config_serde", serde(rename_all = "kebab-case"))]
 pub enum ScriptFormatter {
diff --git a/markup_fmt/src/ctx.rs b/markup_fmt/src/ctx.rs
index 734a3783..7184bfd4 100644
--- a/markup_fmt/src/ctx.rs
+++ b/markup_fmt/src/ctx.rs
@@ -86,8 +86,7 @@ where
                 matches!(
                     self.options
                         .component_whitespace_sensitivity
-                        .clone()
-                        .unwrap_or(self.options.whitespace_sensitivity.clone()),
+                        .unwrap_or(self.options.whitespace_sensitivity),
                     WhitespaceSensitivity::Css | WhitespaceSensitivity::Strict
                 )
             }
diff --git a/markup_fmt/src/lib.rs b/markup_fmt/src/lib.rs
index 80caf3ab..ede68f1b 100644
--- a/markup_fmt/src/lib.rs
+++ b/markup_fmt/src/lib.rs
@@ -107,7 +107,7 @@ where
             } else {
                 IndentKind::Space
             },
-            line_break: options.layout.line_break.clone().into(),
+            line_break: options.layout.line_break.into(),
             width: options.layout.print_width,
             tab_size: options.layout.indent_width,
         },
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 15f19299..127ad8f5 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -2529,14 +2529,14 @@ where
         .is_some_and(|name| name.eq_ignore_ascii_case("template"))
     {
         if slot == "default" {
-            ctx.options.default_v_slot_style.clone()
+            ctx.options.default_v_slot_style
         } else {
-            ctx.options.named_v_slot_style.clone()
+            ctx.options.named_v_slot_style
         }
     } else {
-        ctx.options.component_v_slot_style.clone()
+        ctx.options.component_v_slot_style
     };
-    option.or(ctx.options.v_slot_style.clone())
+    option.or(ctx.options.v_slot_style)
 }
 
 fn format_v_slot(style: VSlotStyle, slot: &str) -> Doc<'_> {
diff --git a/markup_fmt/tests/fmt.rs b/markup_fmt/tests/fmt.rs
index 3b9f2dc8..28a383ca 100644
--- a/markup_fmt/tests/fmt.rs
+++ b/markup_fmt/tests/fmt.rs
@@ -17,7 +17,7 @@ fn fmt_snapshot() {
 
         if let Some(options) = options {
             options.into_iter().for_each(|(option_name, options)| {
-                let output = run_format_test(path, &input, &options, language.clone());
+                let output = run_format_test(path, &input, &options, language);
                 build_settings(path).bind(|| {
                     let name = path.file_stem().unwrap().to_str().unwrap();
                     assert_snapshot!(format!("{name}.{option_name}"), output);
@@ -39,7 +39,7 @@ fn run_format_test(
     options: &FormatOptions,
     language: Language,
 ) -> String {
-    let output = format_text(&input, language.clone(), &options, |code, _| {
+    let output = format_text(&input, language, &options, |code, _| {
         Ok::<_, ()>(code.into())
     })
     .map_err(|err| format!("failed to format '{}': {:?}", path.display(), err))

From 0b0aa9534aaef6024385357ec8df17bbd1654d3f Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Wed, 28 Jan 2026 10:40:38 +0100
Subject: [PATCH 25/67] feat: always swap wrapping quotes if attribute contains
 one (#193)

---
 markup_fmt/src/printer.rs                            |  5 ++---
 .../attributes/mixed-quotes/mixed-quotes.double.snap | 12 ++++++------
 .../attributes/mixed-quotes/mixed-quotes.single.snap | 12 ++++++------
 .../fmt/jinja/attributes/tag-or-block-as-attr.snap   |  2 +-
 .../jinja/attributes/tag-or-block-in-attr-value.snap |  4 ++--
 .../fmt/jinja/attributes/unquoted-assignment.snap    |  2 +-
 6 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 127ad8f5..d2baab76 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -2679,7 +2679,6 @@ fn compute_attr_value_quote<'s, E, F>(
 where
     F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
 {
-    let is_jinja = matches!(ctx.language, Language::Jinja);
     let has_single = attr_value.contains('\'');
     let has_double = attr_value.contains('"');
     if has_double && has_single {
@@ -2690,9 +2689,9 @@ where
         } else {
             Doc::text("'")
         }
-    } else if has_double && !is_jinja {
+    } else if has_double {
         Doc::text("'")
-    } else if has_single && !is_jinja {
+    } else if has_single {
         Doc::text("\"")
     } else if let Quotes::Double = ctx.options.quotes {
         Doc::text("\"")
diff --git a/markup_fmt/tests/fmt/jinja/attributes/mixed-quotes/mixed-quotes.double.snap b/markup_fmt/tests/fmt/jinja/attributes/mixed-quotes/mixed-quotes.double.snap
index e93f9f5f..96817975 100644
--- a/markup_fmt/tests/fmt/jinja/attributes/mixed-quotes/mixed-quotes.double.snap
+++ b/markup_fmt/tests/fmt/jinja/attributes/mixed-quotes/mixed-quotes.double.snap
@@ -4,7 +4,7 @@ source: markup_fmt/tests/fmt.rs
 <div data-content="{% if status == "active" %}I'd like it{% endif %}"></div>
 <div data-content='{% if status == 'active' %}I"d like it{% endif %}'></div>
 
-<div data-content="{% if status == "active" %}Id like it{% endif %}"></div>
+<div data-content='{% if status == "active" %}Id like it{% endif %}'></div>
 <div data-content="{% if status == 'active' %}Id like it{% endif %}"></div>
 
 <!-- Unchanged (attr value contains both single and double quotes) -->
@@ -15,12 +15,12 @@ source: markup_fmt/tests/fmt.rs
 
 <!-- Should keep "" if quotes = "double" -->
 
-<div data-content="{% if status == "active" %}Yay{% endif %}"></div>
-<input value="{{ initial|default("True") }}" />
-<input value="{{ field.value|default("", true) }}" />
-<button class="{{ ["btn_class", "btn-expand"]|join(" ") }}"></button>
+<div data-content='{% if status == "active" %}Yay{% endif %}'></div>
+<input value='{{ initial|default("True") }}' />
+<input value='{{ field.value|default("", true) }}' />
+<button class='{{ ["btn_class", "btn-expand"]|join(" ") }}'></button>
 {% for row in [1,2] %}
-  <li class="{{ loop.cycle("odd", "even") }}">{{ row }}</li>
+  <li class='{{ loop.cycle("odd", "even") }}'>{{ row }}</li>
 {% endfor %}
 
 <!-- Should keep '' if quotes = "single" -->
diff --git a/markup_fmt/tests/fmt/jinja/attributes/mixed-quotes/mixed-quotes.single.snap b/markup_fmt/tests/fmt/jinja/attributes/mixed-quotes/mixed-quotes.single.snap
index 03a00d85..96817975 100644
--- a/markup_fmt/tests/fmt/jinja/attributes/mixed-quotes/mixed-quotes.single.snap
+++ b/markup_fmt/tests/fmt/jinja/attributes/mixed-quotes/mixed-quotes.single.snap
@@ -5,7 +5,7 @@ source: markup_fmt/tests/fmt.rs
 <div data-content='{% if status == 'active' %}I"d like it{% endif %}'></div>
 
 <div data-content='{% if status == "active" %}Id like it{% endif %}'></div>
-<div data-content='{% if status == 'active' %}Id like it{% endif %}'></div>
+<div data-content="{% if status == 'active' %}Id like it{% endif %}"></div>
 
 <!-- Unchanged (attr value contains both single and double quotes) -->
 
@@ -25,10 +25,10 @@ source: markup_fmt/tests/fmt.rs
 
 <!-- Should keep '' if quotes = "single" -->
 
-<div data-content='{% if status == 'active' %}Yay{% endif %}'></div>
-<input value='{{ initial|default('True') }}' />
-<input value='{{ field.value|default('', true) }}' />
-<button class='{{ ['btn_class', 'btn-expand']|join(' ') }}'></button>
+<div data-content="{% if status == 'active' %}Yay{% endif %}"></div>
+<input value="{{ initial|default('True') }}" />
+<input value="{{ field.value|default('', true) }}" />
+<button class="{{ ['btn_class', 'btn-expand']|join(' ') }}"></button>
 {% for row in [1,2] %}
-  <li class='{{ loop.cycle('odd', 'even') }}'>{{ row }}</li>
+  <li class="{{ loop.cycle('odd', 'even') }}">{{ row }}</li>
 {% endfor %}
diff --git a/markup_fmt/tests/fmt/jinja/attributes/tag-or-block-as-attr.snap b/markup_fmt/tests/fmt/jinja/attributes/tag-or-block-as-attr.snap
index 91985b57..9c72335e 100644
--- a/markup_fmt/tests/fmt/jinja/attributes/tag-or-block-as-attr.snap
+++ b/markup_fmt/tests/fmt/jinja/attributes/tag-or-block-as-attr.snap
@@ -76,7 +76,7 @@ source: markup_fmt/tests/fmt.rs
   {% else %}
     data-start="08:30:00"
     data-end="20:30:00"
-    data-start_day="{% now "Y-m-d" %}"
+    data-start_day='{% now "Y-m-d" %}'
     data-saturday_start="08:30:00"
     data-saturday_end="20:30:00"
   {% endif %}
diff --git a/markup_fmt/tests/fmt/jinja/attributes/tag-or-block-in-attr-value.snap b/markup_fmt/tests/fmt/jinja/attributes/tag-or-block-in-attr-value.snap
index 0c470ec1..5796d6b2 100644
--- a/markup_fmt/tests/fmt/jinja/attributes/tag-or-block-in-attr-value.snap
+++ b/markup_fmt/tests/fmt/jinja/attributes/tag-or-block-in-attr-value.snap
@@ -1,11 +1,11 @@
 ---
 source: markup_fmt/tests/fmt.rs
 ---
-<form class="form-control" action="{% url "my_app:subscribe" %}" method="post">
+<form class="form-control" action='{% url "my_app:subscribe" %}' method="post">
   {{ whatever }}
 </form>
 <a
-  href="https://{{ request.get_host }}{% url "newsletter_verify" uuid=subscription.verification_token %}"
+  href='https://{{ request.get_host }}{% url "newsletter_verify" uuid=subscription.verification_token %}'
 >Subscribe to the newsletter!</a>
 <div
   class="first-class {% block extra_classes %}{% endblock %} modal fade"
diff --git a/markup_fmt/tests/fmt/jinja/attributes/unquoted-assignment.snap b/markup_fmt/tests/fmt/jinja/attributes/unquoted-assignment.snap
index bffe7ddf..7a978ec7 100644
--- a/markup_fmt/tests/fmt/jinja/attributes/unquoted-assignment.snap
+++ b/markup_fmt/tests/fmt/jinja/attributes/unquoted-assignment.snap
@@ -12,6 +12,6 @@ source: markup_fmt/tests/fmt.rs
 
 <html alt="{% url ... %}"></html>
 
-<a id="{% include "url.html" %}">{% include 'url.html' %}</a>
+<a id='{% include "url.html" %}'>{% include 'url.html' %}</a>
 
 <input value="{% if initial_value %}{{ initial_value }}{% else %}''{% endif %}">

From d62c1a52b5e89e860453e732fb6ba4f912e596d0 Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Fri, 30 Jan 2026 01:17:45 +0100
Subject: [PATCH 26/67] feat: support old JSON content type (#194)

---
 markup_fmt/src/printer.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index d2baab76..fc936cc0 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -745,6 +745,7 @@ impl<'s> DocGen<'s> for Element<'s> {
                     Some(
                         "importmap"
                         | "application/json"
+                        | "text/json"
                         | "application/ld+json"
                         | "speculationrules",
                     ) => {

From 8714dca5c9966b6a7279b44954b527c44396b36b Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Fri, 30 Jan 2026 01:22:07 +0100
Subject: [PATCH 27/67] feat: format `accept` attr value as comma-separated
 string (#40)

Co-authored-by: Pig Fang <g-plane@hotmail.com>
---
 markup_fmt/src/helpers.rs                     | 11 +++
 markup_fmt/src/printer.rs                     | 18 +++++
 .../tests/fmt/html/attributes/accept.html     | 71 +++++++++++++++++++
 .../tests/fmt/html/attributes/accept.snap     | 55 ++++++++++++++
 .../tests/fmt/jinja/attributes/accept.jinja   | 16 +++++
 .../tests/fmt/jinja/attributes/accept.snap    | 22 ++++++
 6 files changed, 193 insertions(+)
 create mode 100644 markup_fmt/tests/fmt/html/attributes/accept.html
 create mode 100644 markup_fmt/tests/fmt/html/attributes/accept.snap
 create mode 100644 markup_fmt/tests/fmt/jinja/attributes/accept.jinja
 create mode 100644 markup_fmt/tests/fmt/jinja/attributes/accept.snap

diff --git a/markup_fmt/src/helpers.rs b/markup_fmt/src/helpers.rs
index 89d1e6af..3c933389 100644
--- a/markup_fmt/src/helpers.rs
+++ b/markup_fmt/src/helpers.rs
@@ -228,3 +228,14 @@ pub(crate) fn kebab2pascal(s: &'_ str) -> Cow<'_, str> {
         Cow::from(s)
     }
 }
+
+pub(crate) fn has_template_interpolation(s: &str, language: Language) -> bool {
+    match language {
+        Language::Html | Language::Xml => false,
+        Language::Svelte | Language::Astro => s.contains('{'),
+        Language::Vue | Language::Angular => s.contains("{{"),
+        Language::Jinja | Language::Vento | Language::Mustache => {
+            s.contains("{{") || s.contains("{%")
+        }
+    }
+}
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index fc936cc0..0e3dc78b 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -1233,6 +1233,24 @@ impl<'s> DocGen<'s> for NativeAttribute<'s> {
                         }))
                         .collect::<String>(),
                 ));
+            } else if self.name.eq_ignore_ascii_case("accept")
+                && !matches!(ctx.language, Language::Xml)
+                && state
+                    .current_tag_name
+                    .is_some_and(|name| name.eq_ignore_ascii_case("input"))
+            {
+                quote = compute_attr_value_quote(&value, self.quote, ctx);
+                if helpers::has_template_interpolation(&value, ctx.language) {
+                    docs.extend(reflow_owned(&value));
+                } else {
+                    docs.push(Doc::text(
+                        value
+                            .split(',')
+                            .map(|s| s.trim())
+                            .filter(|s| !s.is_empty())
+                            .join(", "),
+                    ));
+                }
             } else {
                 quote = compute_attr_value_quote(&value, self.quote, ctx);
                 docs.extend(reflow_owned(&value));
diff --git a/markup_fmt/tests/fmt/html/attributes/accept.html b/markup_fmt/tests/fmt/html/attributes/accept.html
new file mode 100644
index 00000000..aa5c9fcb
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/accept.html
@@ -0,0 +1,71 @@
+<label for="movie">Choose a movie to upload:</label>
+
+<input type="file" id="movie" name="movie" accept="video/*" />
+
+<label for="poster">Choose a poster:</label>
+
+<input type="file" id="poster" name="poster" accept="image/png, image/jpeg" />
+
+<input type="file" accept=".jpg,.jpeg,.png">
+<input type="file" accept="text/html,application/zip">
+<input type="file" accept="text/html ">
+<input type="file" accept=" ">
+
+<input type="file" accept=" image/gif
+                               , image/jpeg ">
+
+<input type="file" accept="
+
+
+ image/gif
+                               ,
+
+
+                               image/jpeg
+
+">
+
+
+
+<input type="file" accept="image/gif  image/jpeg">
+<div type="file" name="poster" accept="      image/png,    image/jpeg    " ></div>
+
+<!-- Wildcard types from MDN -->
+<input type="file" id="soundFile" accept="audio/*">
+<input type="file" id="videoFile" accept="video/*">
+<input type="file" id="imageFile" accept="image/*">
+
+<!-- MS Word document types from MDN -->
+<input
+  type="file"
+  id="docpicker"
+  accept=".doc,.docx,application/msword,application/vnd.openxmlformats-officedocument.wordprocessingml.document">
+
+<!-- Mixed extensions and MIME types -->
+<input type="file" accept="image/*,.pdf">
+<input type="file" accept=".jpg, .jpeg, .png">
+
+<!-- Edge cases -->
+<input type="file" accept="">
+<input type="file" accept="   ">
+<input type="file" accept=",,,">
+
+<!-- Multiple lines -->
+<input type="file" accept=".jpg,
+                           .png,
+                           .gif">
+<input
+    type="file"
+    id="file-upload"
+    multiple
+    accept="
+    .pdf,
+    .doc,
+    .docx,
+    .xml,
+    image/png,
+    image/jpeg
+  "
+>
+<!-- With spaces -->
+<input type="file" accept=".jpg, .png, .gif">
diff --git a/markup_fmt/tests/fmt/html/attributes/accept.snap b/markup_fmt/tests/fmt/html/attributes/accept.snap
new file mode 100644
index 00000000..efcde1c8
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/accept.snap
@@ -0,0 +1,55 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<label for="movie">Choose a movie to upload:</label>
+
+<input type="file" id="movie" name="movie" accept="video/*" />
+
+<label for="poster">Choose a poster:</label>
+
+<input type="file" id="poster" name="poster" accept="image/png, image/jpeg" />
+
+<input type="file" accept=".jpg, .jpeg, .png">
+<input type="file" accept="text/html, application/zip">
+<input type="file" accept="text/html">
+<input type="file" accept="">
+
+<input type="file" accept="image/gif, image/jpeg">
+
+<input type="file" accept="image/gif, image/jpeg">
+
+<input type="file" accept="image/gif  image/jpeg">
+<div type="file" name="poster" accept="      image/png,    image/jpeg    ">
+</div>
+
+<!-- Wildcard types from MDN -->
+<input type="file" id="soundFile" accept="audio/*">
+<input type="file" id="videoFile" accept="video/*">
+<input type="file" id="imageFile" accept="image/*">
+
+<!-- MS Word document types from MDN -->
+<input
+  type="file"
+  id="docpicker"
+  accept=".doc, .docx, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document"
+>
+
+<!-- Mixed extensions and MIME types -->
+<input type="file" accept="image/*, .pdf">
+<input type="file" accept=".jpg, .jpeg, .png">
+
+<!-- Edge cases -->
+<input type="file" accept="">
+<input type="file" accept="">
+<input type="file" accept="">
+
+<!-- Multiple lines -->
+<input type="file" accept=".jpg, .png, .gif">
+<input
+  type="file"
+  id="file-upload"
+  multiple
+  accept=".pdf, .doc, .docx, .xml, image/png, image/jpeg"
+>
+<!-- With spaces -->
+<input type="file" accept=".jpg, .png, .gif">
diff --git a/markup_fmt/tests/fmt/jinja/attributes/accept.jinja b/markup_fmt/tests/fmt/jinja/attributes/accept.jinja
new file mode 100644
index 00000000..7144df17
--- /dev/null
+++ b/markup_fmt/tests/fmt/jinja/attributes/accept.jinja
@@ -0,0 +1,16 @@
+<!-- accept with jinja interpolation - should preserve interpolation -->
+<input type="file" accept="{{ allowed_types }}">
+<input type="file" accept="image/*,{{ extra_types }}">
+<input type="file" accept="{{ type1 }},{{ type2 }}">
+<input type="file" accept="  {{ type1 }}  ,  {{ type2 }}  ">
+
+<!-- mixed static and dynamic -->
+<input type="file" accept=".jpg,.png,{{ dynamic_type }},.gif">
+<input type="file" accept="{{ prefix }}/*,application/pdf">
+
+<!-- jinja blocks in accept -->
+<input type="file" accept="{% if images %}image/*{% else %}*/*{% endif %}">
+<input type="file" accept="image/*{% if allow_pdf %},application/pdf{% endif %}">
+
+<!-- standard formatting should still work -->
+<input type="file" accept="  image/png  ,   image/jpeg  ">
diff --git a/markup_fmt/tests/fmt/jinja/attributes/accept.snap b/markup_fmt/tests/fmt/jinja/attributes/accept.snap
new file mode 100644
index 00000000..219622d3
--- /dev/null
+++ b/markup_fmt/tests/fmt/jinja/attributes/accept.snap
@@ -0,0 +1,22 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<!-- accept with jinja interpolation - should preserve interpolation -->
+<input type="file" accept="{{ allowed_types }}">
+<input type="file" accept="image/*,{{ extra_types }}">
+<input type="file" accept="{{ type1 }},{{ type2 }}">
+<input type="file" accept="  {{ type1 }}  ,  {{ type2 }}  ">
+
+<!-- mixed static and dynamic -->
+<input type="file" accept=".jpg,.png,{{ dynamic_type }},.gif">
+<input type="file" accept="{{ prefix }}/*,application/pdf">
+
+<!-- jinja blocks in accept -->
+<input type="file" accept="{% if images %}image/*{% else %}*/*{% endif %}">
+<input
+  type="file"
+  accept="image/*{% if allow_pdf %},application/pdf{% endif %}"
+>
+
+<!-- standard formatting should still work -->
+<input type="file" accept="image/png, image/jpeg">

From 9bd83e40a077d1a21946c3a6e4058af2ad61cb7e Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 7 Feb 2026 14:50:50 +0800
Subject: [PATCH 28/67] fix: fix empty script and style tags (close #176)

---
 markup_fmt/src/printer.rs                     | 282 +++++++++---------
 .../fmt/html/basics/html5-boilerplate.snap    |  10 +-
 markup_fmt/tests/fmt/html/case/case.snap      |   7 +-
 3 files changed, 153 insertions(+), 146 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 0e3dc78b..920ece15 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -658,165 +658,167 @@ impl<'s> DocGen<'s> for Element<'s> {
             )
         };
 
-        if tag_name.eq_ignore_ascii_case("script")
-            && let [
+        if tag_name.eq_ignore_ascii_case("script") && ctx.language != Language::Xml {
+            if let [
                 Node {
                     kind: NodeKind::Text(text_node),
                     ..
                 },
-            ] = &self.children[..]
-        {
-            if text_node.raw.chars().all(|c| c.is_ascii_whitespace()) {
-                docs.push(Doc::hard_line());
-            } else {
-                let type_attr = self.attrs.iter().find_map(|attr| match attr {
-                    Attribute::Native(native) if native.name.eq_ignore_ascii_case("type") => {
-                        native.value.map(|(value, _)| value.to_ascii_lowercase())
-                    }
-                    _ => None,
-                });
-                match type_attr.as_deref() {
-                    Some(
-                        "module"
-                        | "application/javascript"
-                        | "text/javascript"
-                        | "application/ecmascript"
-                        | "text/ecmascript"
-                        | "application/x-javascript"
-                        | "application/x-ecmascript"
-                        | "text/x-javascript"
-                        | "text/x-ecmascript"
-                        | "text/jsx"
-                        | "text/babel",
-                    )
-                    | None => {
-                        let is_script_indent = ctx.script_indent();
-                        if is_script_indent {
-                            state.indent_level += 1;
+            ] = &*self.children
+            {
+                if text_node.raw.chars().all(|c| c.is_ascii_whitespace()) {
+                    docs.push(Doc::hard_line());
+                } else {
+                    let type_attr = self.attrs.iter().find_map(|attr| match attr {
+                        Attribute::Native(native) if native.name.eq_ignore_ascii_case("type") => {
+                            native.value.map(|(value, _)| value.to_ascii_lowercase())
                         }
-                        let lang = self
-                            .attrs
-                            .iter()
-                            .find_map(|attr| match attr {
+                        _ => None,
+                    });
+                    match type_attr.as_deref() {
+                        Some(
+                            "module"
+                            | "application/javascript"
+                            | "text/javascript"
+                            | "application/ecmascript"
+                            | "text/ecmascript"
+                            | "application/x-javascript"
+                            | "application/x-ecmascript"
+                            | "text/x-javascript"
+                            | "text/x-ecmascript"
+                            | "text/jsx"
+                            | "text/babel",
+                        )
+                        | None => {
+                            let is_script_indent = ctx.script_indent();
+                            if is_script_indent {
+                                state.indent_level += 1;
+                            }
+                            let lang = self
+                                .attrs
+                                .iter()
+                                .find_map(|attr| match attr {
+                                    Attribute::Native(native)
+                                        if native.name.eq_ignore_ascii_case("lang") =>
+                                    {
+                                        native.value.map(|(value, _)| value)
+                                    }
+                                    _ => None,
+                                })
+                                .unwrap_or(if matches!(ctx.language, Language::Astro) {
+                                    "ts"
+                                } else {
+                                    "js"
+                                });
+                            let lang = if self.attrs.iter().any(|attr| match attr {
                                 Attribute::Native(native)
-                                    if native.name.eq_ignore_ascii_case("lang") =>
+                                    if native.name.eq_ignore_ascii_case("type") =>
                                 {
-                                    native.value.map(|(value, _)| value)
+                                    native.value.is_some_and(|(value, _)| value == "module")
+                                }
+                                _ => false,
+                            }) {
+                                match lang {
+                                    "ts" => "mts",
+                                    "js" => "mjs",
+                                    lang => lang,
                                 }
-                                _ => None,
-                            })
-                            .unwrap_or(if matches!(ctx.language, Language::Astro) {
-                                "ts"
                             } else {
-                                "js"
-                            });
-                        let lang = if self.attrs.iter().any(|attr| match attr {
-                            Attribute::Native(native)
-                                if native.name.eq_ignore_ascii_case("type") =>
-                            {
-                                native.value.is_some_and(|(value, _)| value == "module")
-                            }
-                            _ => false,
-                        }) {
-                            match lang {
-                                "ts" => "mts",
-                                "js" => "mjs",
-                                lang => lang,
+                                lang
+                            };
+                            let formatted =
+                                ctx.format_script(text_node.raw, lang, text_node.start, &state);
+                            let doc = if matches!(
+                                ctx.options.script_formatter,
+                                Some(ScriptFormatter::Dprint)
+                            ) {
+                                Doc::hard_line().concat(reflow_owned(formatted.trim()))
+                            } else {
+                                Doc::hard_line().concat(reflow_with_indent(formatted.trim(), true))
+                            };
+                            if is_script_indent {
+                                docs.push(doc.nest(ctx.indent_width));
+                            } else {
+                                docs.push(doc);
                             }
-                        } else {
-                            lang
-                        };
-                        let formatted =
-                            ctx.format_script(text_node.raw, lang, text_node.start, &state);
-                        let doc = if matches!(
-                            ctx.options.script_formatter,
-                            Some(ScriptFormatter::Dprint)
-                        ) {
-                            Doc::hard_line().concat(reflow_owned(formatted.trim()))
-                        } else {
-                            Doc::hard_line().concat(reflow_with_indent(formatted.trim(), true))
-                        };
-                        if is_script_indent {
-                            docs.push(doc.nest(ctx.indent_width));
-                        } else {
-                            docs.push(doc);
+                        }
+                        Some(
+                            "importmap"
+                            | "application/json"
+                            | "text/json"
+                            | "application/ld+json"
+                            | "speculationrules",
+                        ) => {
+                            let formatted = ctx.format_json(text_node.raw, text_node.start, &state);
+                            docs.push(
+                                Doc::hard_line().concat(reflow_with_indent(formatted.trim(), true)),
+                            );
+                        }
+                        Some(..) => {
+                            docs.push(Doc::hard_line());
+                            docs.extend(reflow_raw(text_node.raw.trim_matches('\n')));
                         }
                     }
-                    Some(
-                        "importmap"
-                        | "application/json"
-                        | "text/json"
-                        | "application/ld+json"
-                        | "speculationrules",
-                    ) => {
-                        let formatted = ctx.format_json(text_node.raw, text_node.start, &state);
-                        docs.push(
-                            Doc::hard_line().concat(reflow_with_indent(formatted.trim(), true)),
-                        );
-                    }
-                    Some(..) => {
-                        docs.push(Doc::hard_line());
-                        docs.extend(reflow_raw(text_node.raw.trim_matches('\n')));
-                    }
+                    docs.push(Doc::hard_line());
                 }
-                docs.push(Doc::hard_line());
             }
-        } else if tag_name.eq_ignore_ascii_case("style")
-            && let [
+        } else if tag_name.eq_ignore_ascii_case("style") && ctx.language != Language::Xml {
+            if let [
                 Node {
                     kind: NodeKind::Text(text_node),
                     ..
                 },
-            ] = &self.children[..]
-        {
-            if text_node.raw.chars().all(|c| c.is_ascii_whitespace()) {
-                docs.push(Doc::hard_line());
-            } else {
-                let lang = self
-                    .attrs
-                    .iter()
-                    .find_map(|attr| match attr {
-                        Attribute::Native(native_attribute)
-                            if native_attribute.name.eq_ignore_ascii_case("lang") =>
-                        {
-                            native_attribute.value.map(|(value, _)| value)
+            ] = &*self.children
+            {
+                if text_node.raw.chars().all(|c| c.is_ascii_whitespace()) {
+                    docs.push(Doc::hard_line());
+                } else {
+                    let lang = self
+                        .attrs
+                        .iter()
+                        .find_map(|attr| match attr {
+                            Attribute::Native(native_attribute)
+                                if native_attribute.name.eq_ignore_ascii_case("lang") =>
+                            {
+                                native_attribute.value.map(|(value, _)| value)
+                            }
+                            _ => None,
+                        })
+                        .unwrap_or("css");
+                    let (statics, dynamics) =
+                        parse_as_interpolated(text_node.raw, text_node.start, ctx.language, false);
+                    const PLACEHOLDER: &str = "_saya0909_";
+                    let masked = statics.join(PLACEHOLDER);
+                    let formatted = ctx.format_style(&masked, lang, text_node.start, &state);
+                    let doc = Doc::hard_line().concat(reflow_with_indent(
+                        formatted
+                            .split(PLACEHOLDER)
+                            .map(Cow::from)
+                            .interleave(dynamics.iter().map(|(expr, start)| match ctx.language {
+                                Language::Jinja => Cow::from(format!(
+                                    "{{{{ {} }}}}",
+                                    ctx.format_jinja(expr, *start, true, &state),
+                                )),
+                                Language::Vento => Cow::from(format!(
+                                    "{{{{ {} }}}}",
+                                    ctx.format_expr(expr, false, *start),
+                                )),
+                                Language::Mustache => Cow::from(format!("{{{{{expr}}}}}")),
+                                _ => unreachable!(),
+                            }))
+                            .collect::<String>()
+                            .trim(),
+                        lang != "sass",
+                    ));
+                    docs.push(
+                        if ctx.style_indent() {
+                            doc.nest(ctx.indent_width)
+                        } else {
+                            doc
                         }
-                        _ => None,
-                    })
-                    .unwrap_or("css");
-                let (statics, dynamics) =
-                    parse_as_interpolated(text_node.raw, text_node.start, ctx.language, false);
-                const PLACEHOLDER: &str = "_saya0909_";
-                let masked = statics.join(PLACEHOLDER);
-                let formatted = ctx.format_style(&masked, lang, text_node.start, &state);
-                let doc = Doc::hard_line().concat(reflow_with_indent(
-                    formatted
-                        .split(PLACEHOLDER)
-                        .map(Cow::from)
-                        .interleave(dynamics.iter().map(|(expr, start)| match ctx.language {
-                            Language::Jinja => Cow::from(format!(
-                                "{{{{ {} }}}}",
-                                ctx.format_jinja(expr, *start, true, &state),
-                            )),
-                            Language::Vento => Cow::from(format!(
-                                "{{{{ {} }}}}",
-                                ctx.format_expr(expr, false, *start),
-                            )),
-                            Language::Mustache => Cow::from(format!("{{{{{expr}}}}}")),
-                            _ => unreachable!(),
-                        }))
-                        .collect::<String>()
-                        .trim(),
-                    lang != "sass",
-                ));
-                docs.push(
-                    if ctx.style_indent() {
-                        doc.nest(ctx.indent_width)
-                    } else {
-                        doc
-                    }
-                    .append(Doc::hard_line()),
-                );
+                        .append(Doc::hard_line()),
+                    );
+                }
             }
         } else if tag_name.eq_ignore_ascii_case("pre") || tag_name.eq_ignore_ascii_case("textarea")
         {
diff --git a/markup_fmt/tests/fmt/html/basics/html5-boilerplate.snap b/markup_fmt/tests/fmt/html/basics/html5-boilerplate.snap
index c0bf3321..d70e81d7 100644
--- a/markup_fmt/tests/fmt/html/basics/html5-boilerplate.snap
+++ b/markup_fmt/tests/fmt/html/basics/html5-boilerplate.snap
@@ -33,8 +33,7 @@ source: markup_fmt/tests/fmt.rs
       src="https://code.jquery.com/jquery-3.3.1.min.js"
       integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8="
       crossorigin="anonymous"
-    >
-    </script>
+    ></script>
     <script>
     window.jQuery || document.write('<script src="js/vendor/jquery-3.3.1.min.js"><\/script>')
     </script>
@@ -46,7 +45,10 @@ source: markup_fmt/tests/fmt.rs
     window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
     ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
     </script>
-    <script src="https://www.google-analytics.com/analytics.js" async defer>
-    </script>
+    <script
+      src="https://www.google-analytics.com/analytics.js"
+      async
+      defer
+    ></script>
   </body>
 </html>
diff --git a/markup_fmt/tests/fmt/html/case/case.snap b/markup_fmt/tests/fmt/html/case/case.snap
index 3c5f0b16..f655d301 100644
--- a/markup_fmt/tests/fmt/html/case/case.snap
+++ b/markup_fmt/tests/fmt/html/case/case.snap
@@ -14,7 +14,10 @@ source: markup_fmt/tests/fmt.rs
     window.ga = function () { ga.q.push(arguments) }; ga.q = []; ga.l = +new Date;
     ga('create', 'UA-XXXXX-Y', 'auto'); ga('send', 'pageview')
     </script>
-    <script src="https://www.google-analytics.com/analytics.js" ASYNC DEFER>
-    </script>
+    <script
+      src="https://www.google-analytics.com/analytics.js"
+      ASYNC
+      DEFER
+    ></script>
   </body>
 </html>

From c662e23ba035d8cc19aa5d592ffc74219e55aa9f Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 7 Feb 2026 15:00:43 +0800
Subject: [PATCH 29/67] fix: fix multiline Svelte at-tags (fix #177)

---
 dprint_plugin/tests/integration/basic.svelte        | 13 +++++++++++++
 .../tests/integration/dprint_ts/basic.svelte.snap   | 13 +++++++++++++
 markup_fmt/src/printer.rs                           |  5 ++++-
 markup_fmt/tests/fmt/svelte/at-tags/at-tags.snap    |  2 +-
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/dprint_plugin/tests/integration/basic.svelte b/dprint_plugin/tests/integration/basic.svelte
index fe90835a..7134722a 100644
--- a/dprint_plugin/tests/integration/basic.svelte
+++ b/dprint_plugin/tests/integration/basic.svelte
@@ -54,3 +54,16 @@ function generateHtml(data:unknown) {
 <div style="background-color :{"w"+"h"+`${"i"+"t"}`}e;"></div>
 
 <div {...props}></div>
+
+<div>
+		{#if input}
+			{@render input({
+				value: ref.query,
+				oninput: handleInput,
+				onkeydown: handleKeydown,
+				placeholder,
+			})}
+		{:else}
+			<!-- ... -->
+		{/if}
+	</div>
diff --git a/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap b/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap
index 26f8e462..5c7e43a7 100644
--- a/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap
+++ b/dprint_plugin/tests/integration/dprint_ts/basic.svelte.snap
@@ -57,3 +57,16 @@ function generateHtml(data: unknown) {
 <div style="background-color: {'w' + 'h' + `${'i' + 't'}`}e"></div>
 
 <div {...props}></div>
+
+<div>
+  {#if input}
+    {@render input({
+      value: ref.query,
+      oninput: handleInput,
+      onkeydown: handleKeydown,
+      placeholder,
+    })}
+  {:else}
+    <!-- ... -->
+  {/if}
+</div>
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 920ece15..e2a24780 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -1376,7 +1376,10 @@ impl<'s> DocGen<'s> for SvelteAtTag<'s> {
         Doc::text("{@")
             .append(Doc::text(self.name))
             .append(Doc::space())
-            .append(Doc::text(ctx.format_expr(self.expr.0, false, self.expr.1)))
+            .concat(reflow_with_indent(
+                &ctx.format_expr(self.expr.0, false, self.expr.1),
+                true,
+            ))
             .append(Doc::text("}"))
     }
 }
diff --git a/markup_fmt/tests/fmt/svelte/at-tags/at-tags.snap b/markup_fmt/tests/fmt/svelte/at-tags/at-tags.snap
index 25b66854..b6cf88cf 100644
--- a/markup_fmt/tests/fmt/svelte/at-tags/at-tags.snap
+++ b/markup_fmt/tests/fmt/svelte/at-tags/at-tags.snap
@@ -3,7 +3,7 @@ source: markup_fmt/tests/fmt.rs
 ---
 {#each [1, 2] as foo}
   {@const bar =
-        foo}
+  foo}
   {foo}{bar}
 {/each}
 

From 3143eb6f5c5a1a267ef946d929b443350b532c99 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 7 Feb 2026 17:26:17 +0800
Subject: [PATCH 30/67] fix: fix XML whitespace sensitivity (fix #196)

---
 markup_fmt/src/ctx.rs                         |  1 +
 markup_fmt/src/helpers.rs                     |  2 +-
 markup_fmt/src/printer.rs                     |  1 +
 markup_fmt/tests/fmt/xml/svg/logo.snap        |  7 ++----
 .../tests/fmt/xml/whitespace/issue-196.snap   | 25 +++++++++++++++++++
 .../tests/fmt/xml/whitespace/issue-196.xml    |  4 +++
 6 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 markup_fmt/tests/fmt/xml/whitespace/issue-196.snap
 create mode 100644 markup_fmt/tests/fmt/xml/whitespace/issue-196.xml

diff --git a/markup_fmt/src/ctx.rs b/markup_fmt/src/ctx.rs
index 7184bfd4..0a441286 100644
--- a/markup_fmt/src/ctx.rs
+++ b/markup_fmt/src/ctx.rs
@@ -90,6 +90,7 @@ where
                     WhitespaceSensitivity::Css | WhitespaceSensitivity::Strict
                 )
             }
+            Language::Xml => false,
             _ => match self.options.whitespace_sensitivity {
                 WhitespaceSensitivity::Css => {
                     helpers::is_whitespace_sensitive_tag(tag_name, self.language)
diff --git a/markup_fmt/src/helpers.rs b/markup_fmt/src/helpers.rs
index 3c933389..65014a03 100644
--- a/markup_fmt/src/helpers.rs
+++ b/markup_fmt/src/helpers.rs
@@ -97,7 +97,7 @@ pub(crate) fn is_whitespace_sensitive_tag(name: &str, language: Language) -> boo
                         .iter()
                         .any(|tag| tag.eq_ignore_ascii_case(name))
         }
-        Language::Xml => true,
+        Language::Xml => false,
         _ => {
             name == "a"
                 || !NON_WS_SENSITIVE_TAGS.contains(&name)
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index e2a24780..2e8f89f0 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -1358,6 +1358,7 @@ impl<'s> DocGen<'s> for Root<'s> {
                 WhitespaceSensitivity::Strict
             )
             || !is_whitespace_sensitive && has_two_more_non_text_children
+            || ctx.language == Language::Xml
         {
             format_children_with_inserting_linebreak(&self.children, ctx, state)
                 .append(Doc::hard_line())
diff --git a/markup_fmt/tests/fmt/xml/svg/logo.snap b/markup_fmt/tests/fmt/xml/svg/logo.snap
index b8771923..ef6552ab 100644
--- a/markup_fmt/tests/fmt/xml/svg/logo.snap
+++ b/markup_fmt/tests/fmt/xml/svg/logo.snap
@@ -50,17 +50,14 @@ source: markup_fmt/tests/fmt.rs
   <metadata id="metadata1">
     <rdf:RDF>
       <cc:Work rdf:about="">
-        <cc:license
-          rdf:resource="http://creativecommons.org/licenses/by-nd/4.0/"
-        />
+        <cc:license rdf:resource="http://creativecommons.org/licenses/by-nd/4.0/" />
         <dc:title>Logo of WebAssembly Language Tools</dc:title>
         <dc:creator>
           <cc:Agent>
             <dc:title>Pig Fang</dc:title>
           </cc:Agent>
         </dc:creator>
-        <dc:description
-        >The main      figure of the logo is the &quot;&lt;=&quot; under Fantasque Sans Mono with ligatures enabled.</dc:description>
+        <dc:description>The main      figure of the logo is the &quot;&lt;=&quot; under Fantasque Sans Mono with ligatures enabled.</dc:description>
       </cc:Work>
       <cc:License rdf:about="http://creativecommons.org/licenses/by-nd/4.0/">
         <cc:permits rdf:resource="http://creativecommons.org/ns#Reproduction" />
diff --git a/markup_fmt/tests/fmt/xml/whitespace/issue-196.snap b/markup_fmt/tests/fmt/xml/whitespace/issue-196.snap
new file mode 100644
index 00000000..50495872
--- /dev/null
+++ b/markup_fmt/tests/fmt/xml/whitespace/issue-196.snap
@@ -0,0 +1,25 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<?xml version="1.0"?>
+<catalog>
+  <book id="bk101">
+    <author>Gambardella, Matthew</author>
+    <title>XML Developer's Guide</title>
+    <genre>Computer</genre>
+    <price>44.95</price>
+    <publish_date>2000-10-01</publish_date>
+    <description>An in-depth look at creating applications
+      with XML.</description>
+  </book>
+  <book id="bk102">
+    <author>Ralls, Kim</author>
+    <title>Midnight Rain</title>
+    <genre>Fantasy</genre>
+    <price>5.95</price>
+    <publish_date>2000-12-16</publish_date>
+    <description>A former architect battles corporate zombies,
+      an evil sorceress, and her own childhood to become queen
+      of the world.</description>
+  </book>
+</catalog>
diff --git a/markup_fmt/tests/fmt/xml/whitespace/issue-196.xml b/markup_fmt/tests/fmt/xml/whitespace/issue-196.xml
new file mode 100644
index 00000000..2d1aabe7
--- /dev/null
+++ b/markup_fmt/tests/fmt/xml/whitespace/issue-196.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0"?><catalog><book id="bk101"><author>Gambardella, Matthew</author><title>XML Developer's Guide</title><genre>Computer</genre><price>44.95</price><publish_date>2000-10-01</publish_date><description>An in-depth look at creating applications
+      with XML.</description></book><book id="bk102"><author>Ralls, Kim</author><title>Midnight Rain</title><genre>Fantasy</genre><price>5.95</price><publish_date>2000-12-16</publish_date><description>A former architect battles corporate zombies,
+      an evil sorceress, and her own childhood to become queen
+      of the world.</description></book></catalog>

From 4635e95548a9b526e77ae1d441d4cfd784552c64 Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Thu, 12 Feb 2026 01:00:10 +0100
Subject: [PATCH 31/67] refactor: refactor recognizing string literal (#189)

Co-authored-by: Pig Fang <g-plane@hotmail.com>
---
 markup_fmt/src/parser.rs | 329 +++++++++------------------------------
 1 file changed, 73 insertions(+), 256 deletions(-)

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 7d63ee4c..4217b6d7 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -107,6 +107,43 @@ impl<'s> Parser<'s> {
         {}
     }
 
+    /// Tries to consume the exact string.
+    /// If it fails halfway, the iterator is not advanced.
+    fn try_consume_str(&mut self, s: &str) -> Option<(usize, char)> {
+        let mut chars = self.chars.clone();
+        let mut last = None;
+
+        for expected in s.chars() {
+            match chars.next() {
+                Some((idx, c)) if c == expected => {
+                    last = Some((idx, c));
+                }
+                _ => return None,
+            }
+        }
+
+        self.chars = chars;
+        last
+    }
+    /// Tries to consume the string ignoring case.
+    /// If it fails halfway, the iterator is not advanced.
+    fn try_consume_str_ignore_case(&mut self, s: &str) -> Option<(usize, char)> {
+        let mut chars = self.chars.clone();
+        let mut last = None;
+
+        for expected in s.chars() {
+            match chars.next() {
+                Some((idx, c)) if c.eq_ignore_ascii_case(&expected) => {
+                    last = Some((idx, c));
+                }
+                _ => return None,
+            }
+        }
+
+        self.chars = chars;
+        last
+    }
+
     fn with_taken<T, F>(&mut self, parser: F) -> PResult<(T, &'s str)>
     where
         F: FnOnce(&mut Self) -> PResult<T>,
@@ -135,16 +172,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_angular_defer(&mut self) -> PResult<Vec<AngularGenericBlock<'s>>> {
-        if self
-            .chars
-            .next_if(|(_, c)| *c == '@')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'd'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'f'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'r'))
-            .is_none()
-        {
+        if self.try_consume_str("@defer").is_none() {
             return Err(self.emit_error(SyntaxErrorKind::ExpectAngularBlock("defer")));
         }
         self.skip_ws();
@@ -167,14 +195,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_angular_for(&mut self) -> PResult<AngularFor<'s>> {
-        if self
-            .chars
-            .next_if(|(_, c)| *c == '@')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'f'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'o'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'r'))
-            .is_none()
-        {
+        if self.try_consume_str("@for").is_none() {
             return Err(self.emit_error(SyntaxErrorKind::ExpectAngularBlock("for")));
         }
         self.skip_ws();
@@ -196,15 +217,7 @@ impl<'s> Parser<'s> {
         let mut track = None;
         if self.chars.next_if(|(_, c)| *c == ';').is_some() {
             self.skip_ws();
-            if self
-                .chars
-                .next_if(|(_, c)| *c == 't')
-                .and_then(|_| self.chars.next_if(|(_, c)| *c == 'r'))
-                .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-                .and_then(|_| self.chars.next_if(|(_, c)| *c == 'c'))
-                .and_then(|_| self.chars.next_if(|(_, c)| *c == 'k'))
-                .is_some()
-            {
+            if self.try_consume_str("track").is_some() {
                 self.skip_ws();
                 if let Some((start, _)) = self.chars.peek() {
                     let start = *start;
@@ -296,13 +309,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_angular_if(&mut self) -> PResult<AngularIf<'s>> {
-        if self
-            .chars
-            .next_if(|(_, c)| *c == '@')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'i'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'f'))
-            .is_none()
-        {
+        if self.try_consume_str("@if").is_none() {
             return Err(self.emit_error(SyntaxErrorKind::ExpectAngularBlock("if")));
         }
         self.skip_ws();
@@ -337,12 +344,7 @@ impl<'s> Parser<'s> {
             }
             self.skip_ws();
 
-            if self
-                .chars
-                .next_if(|(_, c)| *c == 'i')
-                .and_then(|_| self.chars.next_if(|(_, c)| *c == 'f'))
-                .is_some()
-            {
+            if self.try_consume_str("if").is_some() {
                 self.skip_ws();
                 let (expr, reference) = self.parse_angular_if_cond()?;
                 self.skip_ws();
@@ -377,12 +379,7 @@ impl<'s> Parser<'s> {
         let mut reference = None;
         if self.chars.next_if(|(_, c)| *c == ';').is_some() {
             self.skip_ws();
-            if self
-                .chars
-                .next_if(|(_, c)| *c == 'a')
-                .and_then(|_| self.chars.next_if(|(_, c)| *c == 's'))
-                .is_none()
-            {
+            if self.try_consume_str("as").is_none() {
                 return Err(self.emit_error(SyntaxErrorKind::ExpectKeyword("as")));
             }
             self.skip_ws();
@@ -442,14 +439,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_angular_let(&mut self) -> PResult<AngularLet<'s>> {
-        if self
-            .chars
-            .next_if(|(_, c)| *c == '@')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'l'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
-            .is_none()
-        {
+        if self.try_consume_str("@let").is_none() {
             return Err(self.emit_error(SyntaxErrorKind::ExpectAngularLet));
         }
         self.skip_ws();
@@ -470,17 +460,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_angular_switch(&mut self) -> PResult<AngularSwitch<'s>> {
-        if self
-            .chars
-            .next_if(|(_, c)| *c == '@')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 's'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'w'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'i'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'c'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'h'))
-            .is_none()
-        {
+        if self.try_consume_str("@switch").is_none() {
             return Err(self.emit_error(SyntaxErrorKind::ExpectAngularSwitch));
         }
         self.skip_ws();
@@ -504,14 +484,7 @@ impl<'s> Parser<'s> {
             self.chars.next();
             match self.chars.peek() {
                 Some((_, 'c')) => {
-                    if self
-                        .chars
-                        .next_if(|(_, c)| *c == 'c')
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 's'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-                        .is_none()
-                    {
+                    if self.try_consume_str("case").is_none() {
                         return Err(self.emit_error(SyntaxErrorKind::ExpectKeyword("case")));
                     }
                     self.skip_ws();
@@ -532,17 +505,7 @@ impl<'s> Parser<'s> {
                     self.skip_ws();
                 }
                 Some((_, 'd')) => {
-                    if self
-                        .chars
-                        .next_if(|(_, c)| *c == 'd')
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'f'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'u'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'l'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
-                        .is_none()
-                    {
+                    if self.try_consume_str("default").is_none() {
                         return Err(self.emit_error(SyntaxErrorKind::ExpectKeyword("default")));
                     }
                     self.skip_ws();
@@ -945,18 +908,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_cdata(&mut self) -> PResult<Cdata<'s>> {
-        let Some((start, _)) = self
-            .chars
-            .next_if(|(_, c)| *c == '<')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '!'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '['))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'C'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'D'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'A'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'T'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'A'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '['))
-        else {
+        let Some((start, _)) = self.try_consume_str("<![CDATA[") else {
             return Err(self.emit_error(SyntaxErrorKind::ExpectCdata));
         };
         let start = start + 1;
@@ -990,9 +942,7 @@ impl<'s> Parser<'s> {
         let Some((start, _)) = self
             .chars
             .next_if(|(_, c)| *c == '<')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '!'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '-'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '-'))
+            .and_then(|_| self.try_consume_str("!--"))
         else {
             return Err(self.emit_error(SyntaxErrorKind::ExpectComment));
         };
@@ -1024,25 +974,12 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_doctype(&mut self) -> PResult<Doctype<'s>> {
-        let keyword_start = if let Some((start, _)) = self
-            .chars
-            .next_if(|(_, c)| *c == '<')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '!'))
-        {
+        let keyword_start = if let Some((start, _)) = self.try_consume_str("<!") {
             start + 1
         } else {
             return Err(self.emit_error(SyntaxErrorKind::ExpectDoctype));
         };
-        let keyword = if let Some((end, _)) = self
-            .chars
-            .next_if(|(_, c)| c.eq_ignore_ascii_case(&'d'))
-            .and_then(|_| self.chars.next_if(|(_, c)| c.eq_ignore_ascii_case(&'o')))
-            .and_then(|_| self.chars.next_if(|(_, c)| c.eq_ignore_ascii_case(&'c')))
-            .and_then(|_| self.chars.next_if(|(_, c)| c.eq_ignore_ascii_case(&'t')))
-            .and_then(|_| self.chars.next_if(|(_, c)| c.eq_ignore_ascii_case(&'y')))
-            .and_then(|_| self.chars.next_if(|(_, c)| c.eq_ignore_ascii_case(&'p')))
-            .and_then(|_| self.chars.next_if(|(_, c)| c.eq_ignore_ascii_case(&'e')))
-        {
+        let keyword = if let Some((end, _)) = self.try_consume_str_ignore_case("doctype") {
             unsafe { self.source.get_unchecked(keyword_start..end + 1) }
         } else {
             return Err(self.emit_error(SyntaxErrorKind::ExpectDoctype));
@@ -1205,12 +1142,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_front_matter(&mut self) -> PResult<FrontMatter<'s>> {
-        let Some((start, _)) = self
-            .chars
-            .next_if(|(_, c)| *c == '-')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '-'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '-'))
-        else {
+        let Some((start, _)) = self.try_consume_str("---") else {
             return Err(self.emit_error(SyntaxErrorKind::ExpectFrontMatter));
         };
         let start = start + 1;
@@ -1354,11 +1286,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_jinja_comment(&mut self) -> PResult<JinjaComment<'s>> {
-        let Some((start, _)) = self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '#'))
-        else {
+        let Some((start, _)) = self.try_consume_str("{#") else {
             return Err(self.emit_error(SyntaxErrorKind::ExpectComment));
         };
         let start = start + 1;
@@ -1388,11 +1316,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_jinja_tag(&mut self) -> PResult<JinjaTag<'s>> {
-        let Some((start, _)) = self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '%'))
-        else {
+        let Some((start, _)) = self.try_consume_str("{%") else {
             return Err(self.emit_error(SyntaxErrorKind::ExpectJinjaTag));
         };
         let start = start + 1;
@@ -1575,11 +1499,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_mustache_interpolation(&mut self) -> PResult<(&'s str, usize)> {
-        let Some((start, _)) = self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '{'))
-        else {
+        let Some((start, _)) = self.try_consume_str("{{") else {
             return Err(self.emit_error(SyntaxErrorKind::ExpectMustacheInterpolation));
         };
         let start = start + 1;
@@ -1866,12 +1786,7 @@ impl<'s> Parser<'s> {
     }
 
     fn parse_svelte_at_tag(&mut self) -> PResult<SvelteAtTag<'s>> {
-        if self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '@'))
-            .is_none()
-        {
+        if self.try_consume_str("{@").is_none() {
             return Err(self.emit_error(SyntaxErrorKind::ExpectSvelteAtTag));
         };
         let name = self.parse_identifier()?;
@@ -1885,13 +1800,7 @@ impl<'s> Parser<'s> {
             .chars
             .next_if(|(_, c)| *c == '{')
             .map(|_| self.skip_ws())
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '@'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'c'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'h'))
+            .and_then(|_| self.try_consume_str("@attach"))
             .is_some()
         {
             self.parse_svelte_or_astro_expr()
@@ -1926,14 +1835,7 @@ impl<'s> Parser<'s> {
 
     fn parse_svelte_await_block(&mut self) -> PResult<Box<SvelteAwaitBlock<'s>>> {
         if self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '#'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'w'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'i'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
+            .try_consume_str("{#await")
             .and_then(|_| self.chars.next_if(|(_, c)| c.is_ascii_whitespace()))
             .is_none()
         {
@@ -2002,14 +1904,7 @@ impl<'s> Parser<'s> {
         };
 
         self.skip_ws();
-        let then_binding = if self
-            .chars
-            .next_if(|(_, c)| *c == 't')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'h'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'n'))
-            .is_some()
-        {
+        let then_binding = if self.try_consume_str("then").is_some() {
             self.skip_ws();
             Some(match self.chars.peek() {
                 Some((_, '}')) => None,
@@ -2020,15 +1915,7 @@ impl<'s> Parser<'s> {
         };
 
         self.skip_ws();
-        let catch_binding = if self
-            .chars
-            .next_if(|(_, c)| *c == 'c')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'c'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'h'))
-            .is_some()
-        {
+        let catch_binding = if self.try_consume_str("catch").is_some() {
             self.skip_ws();
             Some(match self.chars.peek() {
                 Some((_, '}')) => None,
@@ -2050,11 +1937,7 @@ impl<'s> Parser<'s> {
                 parser
                     .chars
                     .next_if(|(_, c)| *c == '{')
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == ':'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 't'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'h'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'e'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'n'))
+                    .and_then(|_| parser.try_consume_str(":then"))
                     .ok_or_else(|| parser.emit_error(SyntaxErrorKind::ExpectSvelteThenBlock))
             })
             .is_ok()
@@ -2082,12 +1965,7 @@ impl<'s> Parser<'s> {
                 parser
                     .chars
                     .next_if(|(_, c)| *c == '{')
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == ':'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'c'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'a'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 't'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'c'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'h'))
+                    .and_then(|_| parser.try_consume_str(":catch"))
                     .ok_or_else(|| parser.emit_error(SyntaxErrorKind::ExpectSvelteCatchBlock))
             })
             .is_ok()
@@ -2114,12 +1992,7 @@ impl<'s> Parser<'s> {
             .chars
             .next_if(|(_, c)| *c == '{')
             .map(|_| self.skip_ws())
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '/'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'w'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'i'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
+            .and_then(|_| self.try_consume_str("/await"))
             .map(|_| self.skip_ws())
             .and_then(|_| self.chars.next_if(|(_, c)| *c == '}'))
             .is_some()
@@ -2181,13 +2054,7 @@ impl<'s> Parser<'s> {
 
     fn parse_svelte_each_block(&mut self) -> PResult<SvelteEachBlock<'s>> {
         if self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '#'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'c'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'h'))
+            .try_consume_str("{#each")
             .and_then(|_| self.chars.next_if(|(_, c)| c.is_ascii_whitespace()))
             .is_none()
         {
@@ -2299,13 +2166,7 @@ impl<'s> Parser<'s> {
         let else_children = if self
             .try_parse(|parser| {
                 parser
-                    .chars
-                    .next_if(|(_, c)| *c == '{')
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == ':'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'e'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'l'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 's'))
-                    .and_then(|_| parser.chars.next_if(|(_, c)| *c == 'e'))
+                    .try_consume_str("{:else")
                     .and_then(|_| {
                         parser.skip_ws();
                         parser.chars.next_if(|(_, c)| *c == '}')
@@ -2323,11 +2184,7 @@ impl<'s> Parser<'s> {
             .chars
             .next_if(|(_, c)| *c == '{')
             .map(|_| self.skip_ws())
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '/'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'a'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'c'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'h'))
+            .and_then(|_| self.try_consume_str("/each"))
             .map(|_| self.skip_ws())
             .and_then(|_| self.chars.next_if(|(_, c)| *c == '}'))
             .is_some()
@@ -2347,11 +2204,7 @@ impl<'s> Parser<'s> {
 
     fn parse_svelte_if_block(&mut self) -> PResult<SvelteIfBlock<'s>> {
         if self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '#'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'i'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'f'))
+            .try_consume_str("{#if")
             .and_then(|_| self.chars.next_if(|(_, c)| c.is_ascii_whitespace()))
             .is_none()
         {
@@ -2370,14 +2223,7 @@ impl<'s> Parser<'s> {
             self.skip_ws();
             match self.chars.next() {
                 Some((_, ':')) => {
-                    if self
-                        .chars
-                        .next_if(|(_, c)| *c == 'e')
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'l'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 's'))
-                        .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-                        .is_none()
-                    {
+                    if self.try_consume_str("else").is_none() {
                         return Err(self.emit_error(SyntaxErrorKind::ExpectSvelteElseIfBlock));
                     }
                     self.skip_ws();
@@ -2433,12 +2279,7 @@ impl<'s> Parser<'s> {
 
     fn parse_svelte_key_block(&mut self) -> PResult<SvelteKeyBlock<'s>> {
         if self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '#'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'k'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'y'))
+            .try_consume_str("{#key")
             .and_then(|_| self.chars.next_if(|(_, c)| c.is_ascii_whitespace()))
             .is_none()
         {
@@ -2452,10 +2293,7 @@ impl<'s> Parser<'s> {
             .chars
             .next_if(|(_, c)| *c == '{')
             .map(|_| self.skip_ws())
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '/'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'k'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'y'))
+            .and_then(|_| self.try_consume_str("/key"))
             .map(|_| self.skip_ws())
             .and_then(|_| self.chars.next_if(|(_, c)| *c == '}'))
             .is_some()
@@ -2494,16 +2332,7 @@ impl<'s> Parser<'s> {
 
     fn parse_svelte_snippet_block(&mut self) -> PResult<SvelteSnippetBlock<'s>> {
         if self
-            .chars
-            .next_if(|(_, c)| *c == '{')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '#'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 's'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'n'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'i'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'p'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'p'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
+            .try_consume_str("{#snippet")
             .and_then(|_| self.chars.next_if(|(_, c)| c.is_ascii_whitespace()))
             .is_none()
         {
@@ -2517,14 +2346,7 @@ impl<'s> Parser<'s> {
             .chars
             .next_if(|(_, c)| *c == '{')
             .map(|_| self.skip_ws())
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '/'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 's'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'n'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'i'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'p'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'p'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'e'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 't'))
+            .and_then(|_| self.try_consume_str("/snippet"))
             .map(|_| self.skip_ws())
             .and_then(|_| self.chars.next_if(|(_, c)| *c == '}'))
             .is_some()
@@ -2889,12 +2711,7 @@ impl<'s> Parser<'s> {
 
     fn parse_xml_decl(&mut self) -> PResult<XmlDecl<'s>> {
         if self
-            .chars
-            .next_if(|(_, c)| *c == '<')
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == '?'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'x'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'm'))
-            .and_then(|_| self.chars.next_if(|(_, c)| *c == 'l'))
+            .try_consume_str("<?xml")
             .and_then(|_| self.chars.next_if(|(_, c)| c.is_ascii_whitespace()))
             .is_none()
         {

From 08b72001a97d4820ac2cb055f471ede1b78a0f91 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 13 Feb 2026 08:44:23 +0800
Subject: [PATCH 32/67] v0.26.0

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6ff0f8f7..504ed7e0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.25.3"
+version = "0.26.0"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -614,7 +614,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.25.3"
+version = "0.26.0"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index 9baa24f1..1eb7ab20 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.25.3.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.26.0.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index ff300b33..82ba9674 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.25.3"
+version = "0.26.0"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index 3361b6f3..c6a8cc78 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.25.3",
+  "version": "0.26.0",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index 4f5db005..92d57b0e 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.25.3/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.26.0/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 3ea98066..7468df1c 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.25.3"
+version = "0.26.0"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From a42688e218f012fef0ab51ed122d0b54eb772198 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 19 Feb 2026 17:50:11 +0800
Subject: [PATCH 33/67] feat: ignore syntax errors in Angular interpolation
 expressions

---
 markup_fmt/src/printer.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 2e8f89f0..4be696e9 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -181,7 +181,9 @@ impl<'s> DocGen<'s> for AngularInterpolation<'s> {
         Doc::text("{{")
             .append(Doc::line_or_space())
             .concat(reflow_with_indent(
-                &ctx.format_expr(self.expr, false, self.start),
+                ctx.try_format_expr(self.expr, false, self.start)
+                    .as_deref()
+                    .unwrap_or(self.expr),
                 true,
             ))
             .nest(ctx.indent_width)

From 84cfa233664e5a099bdd4f57dd24dccb4b35c4b8 Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Fri, 27 Feb 2026 16:57:51 +0100
Subject: [PATCH 34/67] ci: run Clippy (#203)

Co-authored-by: Pig Fang <g-plane@hotmail.com>
---
 .github/workflows/CI.yml           |  1 +
 dprint_plugin/examples/fmt_ext.rs  |  2 +-
 dprint_plugin/tests/integration.rs |  2 +-
 markup_fmt/tests/fmt.rs            | 10 ++++------
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 028c6ee8..e7b1da5e 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -16,4 +16,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+      - run: cargo clippy --all-targets --all-features
       - run: cargo test --all-features
diff --git a/dprint_plugin/examples/fmt_ext.rs b/dprint_plugin/examples/fmt_ext.rs
index 57916bc0..caf15b73 100644
--- a/dprint_plugin/examples/fmt_ext.rs
+++ b/dprint_plugin/examples/fmt_ext.rs
@@ -31,7 +31,7 @@ fn main() {
                 indent_width: Some(options.layout.indent_width as u8),
                 ..Default::default()
             };
-            if let Some(syntax) = malva::detect_syntax(&Path::new("file").with_extension(ext)) {
+            if let Some(syntax) = malva::detect_syntax(Path::new("file").with_extension(ext)) {
                 malva::format_text(
                     code,
                     syntax,
diff --git a/dprint_plugin/tests/integration.rs b/dprint_plugin/tests/integration.rs
index a047dd95..fc4ddf94 100644
--- a/dprint_plugin/tests/integration.rs
+++ b/dprint_plugin/tests/integration.rs
@@ -36,7 +36,7 @@ fn integration_with_dprint_ts_snapshot() {
                     indent_width: Some(options.layout.indent_width as u8),
                     ..Default::default()
                 };
-                if let Some(syntax) = malva::detect_syntax(&Path::new("file").with_extension(ext)) {
+                if let Some(syntax) = malva::detect_syntax(Path::new("file").with_extension(ext)) {
                     malva::format_text(
                         code,
                         syntax,
diff --git a/markup_fmt/tests/fmt.rs b/markup_fmt/tests/fmt.rs
index 28a383ca..c8ae7a25 100644
--- a/markup_fmt/tests/fmt.rs
+++ b/markup_fmt/tests/fmt.rs
@@ -39,12 +39,10 @@ fn run_format_test(
     options: &FormatOptions,
     language: Language,
 ) -> String {
-    let output = format_text(&input, language, &options, |code, _| {
-        Ok::<_, ()>(code.into())
-    })
-    .map_err(|err| format!("failed to format '{}': {:?}", path.display(), err))
-    .unwrap();
-    let regression_format = format_text(&output, language, &options, |code, _| {
+    let output = format_text(input, language, options, |code, _| Ok::<_, ()>(code.into()))
+        .map_err(|err| format!("failed to format '{}': {:?}", path.display(), err))
+        .unwrap();
+    let regression_format = format_text(&output, language, options, |code, _| {
         Ok::<_, ()>(code.into())
     })
     .map_err(|err| {

From 738afeaa66da9f7398f4cb25853c9fc901e96e2b Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 28 Feb 2026 00:01:27 +0800
Subject: [PATCH 35/67] test: use `Infallible`

---
 markup_fmt/tests/fmt.rs | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/markup_fmt/tests/fmt.rs b/markup_fmt/tests/fmt.rs
index c8ae7a25..cbdfefca 100644
--- a/markup_fmt/tests/fmt.rs
+++ b/markup_fmt/tests/fmt.rs
@@ -1,6 +1,6 @@
 use insta::{Settings, assert_snapshot, glob};
 use markup_fmt::{Language, config::FormatOptions, detect_language, format_text};
-use std::{collections::HashMap, fs, path::Path};
+use std::{collections::HashMap, convert::Infallible, fs, path::Path};
 
 #[test]
 fn fmt_snapshot() {
@@ -39,17 +39,18 @@ fn run_format_test(
     options: &FormatOptions,
     language: Language,
 ) -> String {
-    let output = format_text(input, language, options, |code, _| Ok::<_, ()>(code.into()))
-        .map_err(|err| format!("failed to format '{}': {:?}", path.display(), err))
-        .unwrap();
+    let output = format_text(input, language, options, |code, _| {
+        Ok::<_, Infallible>(code.into())
+    })
+    .map_err(|err| format!("failed to format '{}': {:?}", path.display(), err))
+    .unwrap();
     let regression_format = format_text(&output, language, options, |code, _| {
-        Ok::<_, ()>(code.into())
+        Ok::<_, Infallible>(code.into())
     })
     .map_err(|err| {
         format!(
-            "syntax error in stability test '{}': {:?}",
+            "syntax error in stability test '{}': {err:?}",
             path.display(),
-            err
         )
     })
     .unwrap();

From 89da234a0394ee838e159129b78180b863d5da56 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 5 Mar 2026 09:10:39 +0800
Subject: [PATCH 36/67] feat: support frontmatter in HTML (close #207)

---
 markup_fmt/src/parser.rs                                 | 6 +++++-
 markup_fmt/tests/fmt/html/front-matter/fake.html         | 3 +++
 markup_fmt/tests/fmt/html/front-matter/fake.snap         | 6 ++++++
 markup_fmt/tests/fmt/html/front-matter/front-matter.html | 5 +++++
 markup_fmt/tests/fmt/html/front-matter/front-matter.snap | 8 ++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 markup_fmt/tests/fmt/html/front-matter/fake.html
 create mode 100644 markup_fmt/tests/fmt/html/front-matter/fake.snap
 create mode 100644 markup_fmt/tests/fmt/html/front-matter/front-matter.html
 create mode 100644 markup_fmt/tests/fmt/html/front-matter/front-matter.snap

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 4217b6d7..bea23b30 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -1687,7 +1687,11 @@ impl<'s> Parser<'s> {
             Some((_, '-'))
                 if matches!(
                     self.language,
-                    Language::Astro | Language::Jinja | Language::Vento | Language::Mustache
+                    Language::Html
+                        | Language::Astro
+                        | Language::Jinja
+                        | Language::Vento
+                        | Language::Mustache
                 ) && !self.state.has_front_matter =>
             {
                 let mut chars = self.chars.clone();
diff --git a/markup_fmt/tests/fmt/html/front-matter/fake.html b/markup_fmt/tests/fmt/html/front-matter/fake.html
new file mode 100644
index 00000000..c162a2c5
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/front-matter/fake.html
@@ -0,0 +1,3 @@
+--- title: 'First page' ---
+
+<div>Hello world</div>
diff --git a/markup_fmt/tests/fmt/html/front-matter/fake.snap b/markup_fmt/tests/fmt/html/front-matter/fake.snap
new file mode 100644
index 00000000..76f1e0d0
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/front-matter/fake.snap
@@ -0,0 +1,6 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+--- title: 'First page' ---
+
+<div>Hello world</div>
diff --git a/markup_fmt/tests/fmt/html/front-matter/front-matter.html b/markup_fmt/tests/fmt/html/front-matter/front-matter.html
new file mode 100644
index 00000000..9a0743dc
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/front-matter/front-matter.html
@@ -0,0 +1,5 @@
+---
+title: 'First page'
+---
+
+<div>Hello world</div>
diff --git a/markup_fmt/tests/fmt/html/front-matter/front-matter.snap b/markup_fmt/tests/fmt/html/front-matter/front-matter.snap
new file mode 100644
index 00000000..e5e00a4c
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/front-matter/front-matter.snap
@@ -0,0 +1,8 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+---
+title: 'First page'
+---
+
+<div>Hello world</div>

From d21dd6fae8d89983cfab832dc5a09045629f04e8 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 10 Mar 2026 11:12:30 +0800
Subject: [PATCH 37/67] docs: add about Angular file extensions

---
 docs/src/SUMMARY.md         | 2 ++
 docs/src/recipes/angular.md | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 docs/src/recipes/angular.md

diff --git a/docs/src/SUMMARY.md b/docs/src/SUMMARY.md
index 067be984..9c64373b 100644
--- a/docs/src/SUMMARY.md
+++ b/docs/src/SUMMARY.md
@@ -31,3 +31,5 @@
   - [scriptFormatter](./config/script-formatter.md)
   - [ignoreCommentDirective](./config/ignore-comment-directive.md)
   - [ignoreFileCommentDirective](./config/ignore-file-comment-directive.md)
+- [Recipes]()
+  - [Angular](./recipes/angular.md)
diff --git a/docs/src/recipes/angular.md b/docs/src/recipes/angular.md
new file mode 100644
index 00000000..022f03b2
--- /dev/null
+++ b/docs/src/recipes/angular.md
@@ -0,0 +1,4 @@
+# Angular
+
+For Angular projects, Angular components must be suffixed with `.component.html`.
+`.html` will be formatted as normal HTML, not Angular components.

From f25ca0b8b0c753898b4f3d18063caa9c3b89811c Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Tue, 10 Mar 2026 04:22:57 +0100
Subject: [PATCH 38/67] feat: improve error message of Jinja end tag (#204)

---
 markup_fmt/src/error.rs  | 15 +++++++++++++--
 markup_fmt/src/parser.rs | 19 ++++++++++++++++---
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/markup_fmt/src/error.rs b/markup_fmt/src/error.rs
index 00a3f5aa..951f6f47 100644
--- a/markup_fmt/src/error.rs
+++ b/markup_fmt/src/error.rs
@@ -30,7 +30,11 @@ pub enum SyntaxErrorKind {
     ExpectElement,
     ExpectFrontMatter,
     ExpectIdentifier,
-    ExpectJinjaBlockEnd,
+    ExpectJinjaBlockEnd {
+        tag_name: String,
+        line: usize,
+        column: usize,
+    },
     ExpectJinjaTag,
     ExpectKeyword(&'static str),
     ExpectMustacheInterpolation,
@@ -82,7 +86,14 @@ impl fmt::Display for SyntaxErrorKind {
             SyntaxErrorKind::ExpectElement => "expected element".into(),
             SyntaxErrorKind::ExpectFrontMatter => "expected front matter".into(),
             SyntaxErrorKind::ExpectIdentifier => "expected identifier".into(),
-            SyntaxErrorKind::ExpectJinjaBlockEnd => "expected Jinja block end".into(),
+            SyntaxErrorKind::ExpectJinjaBlockEnd {
+                tag_name,
+                line,
+                column,
+            } => format!(
+                "expected end tag for opening Jinja block {{% {tag_name} %}} from line {line}, column {column}"
+            )
+            .into(),
             SyntaxErrorKind::ExpectJinjaTag => "expected Jinja tag".into(),
             SyntaxErrorKind::ExpectKeyword(keyword) => {
                 format!("expected keyword '{keyword}'").into()
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index bea23b30..2262f0d9 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -1260,7 +1260,12 @@ impl<'s> Parser<'s> {
         Ok(unsafe { self.source.get_unchecked(start..end) })
     }
 
-    fn parse_jinja_block_children<T, F>(&mut self, children_parser: &mut F) -> PResult<Vec<T>>
+    fn parse_jinja_block_children<T, F>(
+        &mut self,
+        tag_name: &str,
+        tag_start: usize,
+        children_parser: &mut F,
+    ) -> PResult<Vec<T>>
     where
         T: HasJinjaFlowControl<'s>,
         F: FnMut(&mut Self) -> PResult<T>,
@@ -1279,7 +1284,14 @@ impl<'s> Parser<'s> {
                 Some(..) => {
                     children.push(children_parser(self)?);
                 }
-                None => return Err(self.emit_error(SyntaxErrorKind::ExpectJinjaBlockEnd)),
+                None => {
+                    let (line, column) = self.pos_to_line_col(tag_start);
+                    return Err(self.emit_error(SyntaxErrorKind::ExpectJinjaBlockEnd {
+                        tag_name: tag_name.into(),
+                        line,
+                        column,
+                    }));
+                }
             }
         }
         Ok(children)
@@ -1373,10 +1385,11 @@ impl<'s> Parser<'s> {
                 | "raw"
         ) || tag_name == "set" && !first_tag.content.contains('=')
         {
+            let tag_start = first_tag.start;
             let mut body = vec![JinjaTagOrChildren::Tag(first_tag)];
 
             loop {
-                let mut children = self.parse_jinja_block_children(children_parser)?;
+                let mut children = self.parse_jinja_block_children(tag_name, tag_start, children_parser)?;
                 if !children.is_empty() {
                     if let Some(JinjaTagOrChildren::Children(nodes)) = body.last_mut() {
                         nodes.append(&mut children);

From 204bcc6e8aee5abb62c8c39cac0560dbf33d34ca Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Thu, 12 Mar 2026 14:03:07 +0100
Subject: [PATCH 39/67] fix: fix parsing nested Jinja blocks in attributes
 (#201)

---
 markup_fmt/src/parser.rs                      | 13 +++++
 .../fmt/jinja/attributes/single-attr.jinja    | 47 ++++++++++++++++++-
 .../fmt/jinja/attributes/single-attr.snap     | 45 ++++++++++++++++++
 3 files changed, 104 insertions(+), 1 deletion(-)

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 2262f0d9..16abf6bf 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -1281,6 +1281,9 @@ impl<'s> Parser<'s> {
                     }
                     children.push(children_parser(self)?);
                 }
+                Some((_, c)) if c.is_ascii_whitespace() && T::skip_ws_before_jinja_block_end() => {
+                    self.chars.next();
+                }
                 Some(..) => {
                     children.push(children_parser(self)?);
                 }
@@ -2831,6 +2834,8 @@ trait HasJinjaFlowControl<'s>: Sized {
     fn build(intermediate: Self::Intermediate, raw: &'s str) -> Self;
     fn from_tag(tag: JinjaTag<'s>) -> Self::Intermediate;
     fn from_block(block: JinjaBlock<'s, Self>) -> Self::Intermediate;
+
+    fn skip_ws_before_jinja_block_end() -> bool;
 }
 
 impl<'s> HasJinjaFlowControl<'s> for Node<'s> {
@@ -2850,6 +2855,10 @@ impl<'s> HasJinjaFlowControl<'s> for Node<'s> {
     fn from_block(block: JinjaBlock<'s, Self>) -> Self::Intermediate {
         NodeKind::JinjaBlock(block)
     }
+
+    fn skip_ws_before_jinja_block_end() -> bool {
+        false
+    }
 }
 
 impl<'s> HasJinjaFlowControl<'s> for Attribute<'s> {
@@ -2866,6 +2875,10 @@ impl<'s> HasJinjaFlowControl<'s> for Attribute<'s> {
     fn from_block(block: JinjaBlock<'s, Self>) -> Self::Intermediate {
         Attribute::JinjaBlock(block)
     }
+
+    fn skip_ws_before_jinja_block_end() -> bool {
+        true
+    }
 }
 
 pub fn parse_as_interpolated(
diff --git a/markup_fmt/tests/fmt/jinja/attributes/single-attr.jinja b/markup_fmt/tests/fmt/jinja/attributes/single-attr.jinja
index b5f1e053..887a29ce 100644
--- a/markup_fmt/tests/fmt/jinja/attributes/single-attr.jinja
+++ b/markup_fmt/tests/fmt/jinja/attributes/single-attr.jinja
@@ -20,4 +20,49 @@
     {% if field.field.causes_red_card %}data-red-card{%
         elif field.field.causes_yellow_card
     %}data-yellow-card{% endif %}
-></div>
\ No newline at end of file
+></div>
+
+<div
+    {% if first_condition %}
+        {% if second_condition %}
+            data-second-condition="true"
+        {% endif %}
+    {% endif %}
+>
+</div>
+
+<div
+    {% if first_condition %}
+        {% if second_condition %}
+            data-second-condition="true"
+        {% endif %}
+        data-first-condition="true"
+    {% endif %}
+>
+</div>
+
+# regression test for https://github.com/g-plane/markup_fmt/issues/199
+<div
+    {% if first_condition %}
+        data-first-condition="true"
+        {% if second_condition %}
+            data-second-condition="true"
+        {% endif %}
+    {% endif %}
+>
+</div>
+
+# regression test for https://github.com/g-plane/markup_fmt/issues/198
+<div
+    {% if first_condition %}
+        {% for key, value in my_dict.items %}
+            data-{{key}}="{{value}}"
+        {% endfor %}
+        {% if second_condition %}
+            data-second_condition="true"
+        {% endif %}
+    {% else %}
+        data-else="true"
+    {% endif %}
+>
+</div>
diff --git a/markup_fmt/tests/fmt/jinja/attributes/single-attr.snap b/markup_fmt/tests/fmt/jinja/attributes/single-attr.snap
index 18a36f44..2f49386a 100644
--- a/markup_fmt/tests/fmt/jinja/attributes/single-attr.snap
+++ b/markup_fmt/tests/fmt/jinja/attributes/single-attr.snap
@@ -37,3 +37,48 @@ source: markup_fmt/tests/fmt.rs
   {% endif %}
 >
 </div>
+
+<div
+  {% if first_condition %}
+    {% if second_condition %}
+      data-second-condition="true"
+    {% endif %}
+  {% endif %}
+>
+</div>
+
+<div
+  {% if first_condition %}
+    {% if second_condition %}
+      data-second-condition="true"
+    {% endif %}
+    data-first-condition="true"
+  {% endif %}
+>
+</div>
+
+# regression test for https://github.com/g-plane/markup_fmt/issues/199
+<div
+  {% if first_condition %}
+    data-first-condition="true"
+    {% if second_condition %}
+      data-second-condition="true"
+    {% endif %}
+  {% endif %}
+>
+</div>
+
+# regression test for https://github.com/g-plane/markup_fmt/issues/198
+<div
+  {% if first_condition %}
+    {% for key, value in my_dict.items %}
+      data-{{key}}="{{value}}"
+    {% endfor %}
+    {% if second_condition %}
+      data-second_condition="true"
+    {% endif %}
+  {% else %}
+    data-else="true"
+  {% endif %}
+>
+</div>

From 3eb974b40da689c139fb8b23c137516ddbf09a2b Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 16 Mar 2026 23:56:09 +0800
Subject: [PATCH 40/67] feat: ignore script syntax errors for template
 languages (close #210)

---
 dprint_plugin/tests/integration/basic.vto      |  9 +++++++++
 .../tests/integration/dprint_ts/basic.vto.snap |  9 +++++++++
 markup_fmt/src/ctx.rs                          | 18 +++++++++++++++++-
 markup_fmt/src/printer.rs                      | 11 +++++++++--
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/dprint_plugin/tests/integration/basic.vto b/dprint_plugin/tests/integration/basic.vto
index a917e6b3..15d9ea08 100644
--- a/dprint_plugin/tests/integration/basic.vto
+++ b/dprint_plugin/tests/integration/basic.vto
@@ -24,3 +24,12 @@
     background-color:{{colors . white}};
   }
 </style>
+
+<!-- script tag with interpolation -->
+<script>
+			let spreads = [
+			{{ for image of wkunzImages }}
+			'{{ image }}',
+			{{/for}}
+			]
+		</script>
diff --git a/dprint_plugin/tests/integration/dprint_ts/basic.vto.snap b/dprint_plugin/tests/integration/dprint_ts/basic.vto.snap
index eb9a94f4..4d98c30b 100644
--- a/dprint_plugin/tests/integration/dprint_ts/basic.vto.snap
+++ b/dprint_plugin/tests/integration/dprint_ts/basic.vto.snap
@@ -27,3 +27,12 @@ body {
   background-color: {{ colors.white }};
 }
 </style>
+
+<!-- script tag with interpolation -->
+<script>
+let spreads = [
+			{{ for image of wkunzImages }}
+			'{{ image }}',
+			{{/for}}
+			]
+</script>
diff --git a/markup_fmt/src/ctx.rs b/markup_fmt/src/ctx.rs
index 0a441286..a6934861 100644
--- a/markup_fmt/src/ctx.rs
+++ b/markup_fmt/src/ctx.rs
@@ -275,7 +275,23 @@ where
         start: usize,
         state: &State,
     ) -> Cow<'a, str> {
-        self.format_with_external_formatter(
+        match self.try_format_script(code, lang, start, state) {
+            Ok(formatted) => formatted,
+            Err(e) => {
+                self.external_formatter_errors.push(e);
+                Cow::from(code)
+            }
+        }
+    }
+
+    pub(crate) fn try_format_script<'a>(
+        &mut self,
+        code: &'a str,
+        lang: &'b str,
+        start: usize,
+        state: &State,
+    ) -> Result<Cow<'a, str>, E> {
+        self.try_format_with_external_formatter(
             self.source
                 .get(0..start)
                 .unwrap_or_default()
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 4be696e9..14d94b27 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -728,8 +728,15 @@ impl<'s> DocGen<'s> for Element<'s> {
                             } else {
                                 lang
                             };
-                            let formatted =
-                                ctx.format_script(text_node.raw, lang, text_node.start, &state);
+                            let formatted = if matches!(
+                                ctx.language,
+                                Language::Jinja | Language::Mustache | Language::Vento
+                            ) {
+                                ctx.try_format_script(text_node.raw, lang, text_node.start, &state)
+                                    .unwrap_or_else(|_| Cow::from(text_node.raw))
+                            } else {
+                                ctx.format_script(text_node.raw, lang, text_node.start, &state)
+                            };
                             let doc = if matches!(
                                 ctx.options.script_formatter,
                                 Some(ScriptFormatter::Dprint)

From f64cc1abdf090d30a0356bd95d00e5785d177f0d Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 16 Mar 2026 23:59:45 +0800
Subject: [PATCH 41/67] fix: fix unterminated comment

---
 markup_fmt/src/parser.rs                               | 10 +++++++---
 .../fmt/html/format-comments/unterminated.enabled.snap |  4 ++++
 .../tests/fmt/html/format-comments/unterminated.html   |  1 +
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 markup_fmt/tests/fmt/html/format-comments/unterminated.enabled.snap
 create mode 100644 markup_fmt/tests/fmt/html/format-comments/unterminated.html

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 16abf6bf..a27ce95f 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -948,7 +948,7 @@ impl<'s> Parser<'s> {
         };
         let start = start + 1;
 
-        let mut end = start;
+        let end;
         loop {
             match self.chars.next() {
                 Some((i, '-')) => {
@@ -964,7 +964,10 @@ impl<'s> Parser<'s> {
                     }
                 }
                 Some(..) => continue,
-                None => break,
+                None => {
+                    end = self.source.len();
+                    break;
+                }
             }
         }
 
@@ -1392,7 +1395,8 @@ impl<'s> Parser<'s> {
             let mut body = vec![JinjaTagOrChildren::Tag(first_tag)];
 
             loop {
-                let mut children = self.parse_jinja_block_children(tag_name, tag_start, children_parser)?;
+                let mut children =
+                    self.parse_jinja_block_children(tag_name, tag_start, children_parser)?;
                 if !children.is_empty() {
                     if let Some(JinjaTagOrChildren::Children(nodes)) = body.last_mut() {
                         nodes.append(&mut children);
diff --git a/markup_fmt/tests/fmt/html/format-comments/unterminated.enabled.snap b/markup_fmt/tests/fmt/html/format-comments/unterminated.enabled.snap
new file mode 100644
index 00000000..8019fa18
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/format-comments/unterminated.enabled.snap
@@ -0,0 +1,4 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<!-- comment-> -->
diff --git a/markup_fmt/tests/fmt/html/format-comments/unterminated.html b/markup_fmt/tests/fmt/html/format-comments/unterminated.html
new file mode 100644
index 00000000..f63eda6c
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/format-comments/unterminated.html
@@ -0,0 +1 @@
+<!--comment->

From 92e0dee0c8b43efc54079aa3e5310f5b806237f1 Mon Sep 17 00:00:00 2001
From: Thibaut Decombe <68703331+UnknownPlatypus@users.noreply.github.com>
Date: Wed, 18 Mar 2026 01:50:48 +0100
Subject: [PATCH 42/67] feat: normalize HTML attribute that can be space
 separated (#202)

---
 markup_fmt/src/helpers.rs                     | 73 +++++++++++++++++++
 markup_fmt/src/printer.rs                     |  2 +-
 .../fmt/html/attributes/accept-charset.html   | 27 +++++++
 .../fmt/html/attributes/accept-charset.snap   | 32 ++++++++
 .../tests/fmt/html/attributes/aria-attrs.html | 28 +++++++
 .../tests/fmt/html/attributes/aria-attrs.snap | 36 +++++++++
 .../fmt/html/attributes/autocomplete.html     | 39 ++++++++++
 .../fmt/html/attributes/autocomplete.snap     | 62 ++++++++++++++++
 .../tests/fmt/html/attributes/iframe.html     | 19 +++++
 .../tests/fmt/html/attributes/iframe.snap     | 24 ++++++
 markup_fmt/tests/fmt/html/attributes/rel.html | 31 ++++++++
 markup_fmt/tests/fmt/html/attributes/rel.snap | 33 +++++++++
 12 files changed, 405 insertions(+), 1 deletion(-)
 create mode 100644 markup_fmt/tests/fmt/html/attributes/accept-charset.html
 create mode 100644 markup_fmt/tests/fmt/html/attributes/accept-charset.snap
 create mode 100644 markup_fmt/tests/fmt/html/attributes/aria-attrs.html
 create mode 100644 markup_fmt/tests/fmt/html/attributes/aria-attrs.snap
 create mode 100644 markup_fmt/tests/fmt/html/attributes/autocomplete.html
 create mode 100644 markup_fmt/tests/fmt/html/attributes/autocomplete.snap
 create mode 100644 markup_fmt/tests/fmt/html/attributes/iframe.html
 create mode 100644 markup_fmt/tests/fmt/html/attributes/iframe.snap
 create mode 100644 markup_fmt/tests/fmt/html/attributes/rel.html
 create mode 100644 markup_fmt/tests/fmt/html/attributes/rel.snap

diff --git a/markup_fmt/src/helpers.rs b/markup_fmt/src/helpers.rs
index 65014a03..88282d4d 100644
--- a/markup_fmt/src/helpers.rs
+++ b/markup_fmt/src/helpers.rs
@@ -239,3 +239,76 @@ pub(crate) fn has_template_interpolation(s: &str, language: Language) -> bool {
         }
     }
 }
+
+static SPACE_SEPARATED_GLOBAL_ATTRIBUTES: [&str; 11] = [
+    "class",
+    "aria-labelledby",
+    "aria-describedby",
+    "aria-controls",
+    "aria-owns",
+    "aria-flowto",
+    "accesskey",
+    "itemtype",
+    "itemprop",
+    "itemref",
+    "accesskey",
+];
+/// Checks if the given attribute name content should be space-separated.
+///
+/// These were found using the HTML attribute list from the spec, cross-referencing MDN:
+/// - <https://html.spec.whatwg.org/multipage/indices.html#attributes-3>
+/// - <https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes>
+pub(crate) fn should_be_space_separated(attr_name: &str, tag_name: Option<&str>) -> bool {
+    if SPACE_SEPARATED_GLOBAL_ATTRIBUTES
+        .iter()
+        .any(|tag| tag.eq_ignore_ascii_case(attr_name))
+    {
+        true
+    } else if attr_name.eq_ignore_ascii_case("rel") {
+        tag_name
+            .is_some_and(|name| {
+                ["form", "a", "area", "link"]
+                    .iter()
+                    .any(|tag| tag.eq_ignore_ascii_case(name))
+            })
+    } else if attr_name.eq_ignore_ascii_case("blocking") {
+        tag_name
+            .is_some_and(|name| {
+                ["link", "script", "style"]
+                    .iter()
+                    .any(|tag| tag.eq_ignore_ascii_case(name))
+            })
+    } else if attr_name.eq_ignore_ascii_case("for") {
+        tag_name
+            .is_some_and(|name| name.eq_ignore_ascii_case("output"))
+    } else if attr_name.eq_ignore_ascii_case("headers") {
+        tag_name
+            .is_some_and(|name| {
+                ["td", "th"]
+                    .iter()
+                    .any(|tag| tag.eq_ignore_ascii_case(name))
+            })
+    } else if attr_name.eq_ignore_ascii_case("autocomplete") {
+        tag_name
+            .is_some_and(|name| {
+                ["form", "input", "select", "textarea"]
+                    .iter()
+                    .any(|tag| tag.eq_ignore_ascii_case(name))
+            })
+    } else if attr_name.eq_ignore_ascii_case("sandbox") {
+        tag_name
+            .is_some_and(|name| name.eq_ignore_ascii_case("iframe"))
+    } else if attr_name.eq_ignore_ascii_case("accept-charset") {
+        tag_name
+            .is_some_and(|name| name.eq_ignore_ascii_case("form"))
+    } else if attr_name.eq_ignore_ascii_case("ping") {
+        tag_name
+            .is_some_and(|name| {
+                ["a", "area"]
+                    .iter()
+                    .any(|tag| tag.eq_ignore_ascii_case(name))
+            })
+    } else {
+        false
+    }
+}
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 14d94b27..43e15914 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -1194,7 +1194,7 @@ impl<'s> DocGen<'s> for NativeAttribute<'s> {
             let mut docs = Vec::with_capacity(5);
             docs.push(name);
             docs.push(Doc::text("="));
-            if self.name.eq_ignore_ascii_case("class") {
+            if helpers::should_be_space_separated(self.name, state.current_tag_name) {
                 quote = compute_attr_value_quote(&value, self.quote, ctx);
                 let value = value.trim();
                 let maybe_line_break = if value.contains('\n') {
diff --git a/markup_fmt/tests/fmt/html/attributes/accept-charset.html b/markup_fmt/tests/fmt/html/attributes/accept-charset.html
new file mode 100644
index 00000000..a3dfe686
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/accept-charset.html
@@ -0,0 +1,27 @@
+<!-- single value -->
+<form id="form" action="d.html" method="post" accept-charset="utf-8">
+    <p><input type="submit" value="submit"></p>
+</form>
+<form id="dff" action="d.html" method="post" accept-charset="   utf-8  ">
+    <p><input type="submit" value="submit"></p>
+</form>
+
+
+<!-- space separated -->
+<form action="#" accept-charset=" US-ASCII    UTF-8    ">
+    First name:
+    <input type="text" name="fname">
+    <br> Last name:
+    <input type="text" name="lname">
+    <br>
+    <input type="submit" value="Submit">
+</form>
+
+
+<!-- comma separated (was previously supported https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form#accept-charset) -->
+<form name="multi-charset" accept-charset="EUC-JP, UTF-8, Shift_JIS" action="/~info">
+    <input type="text" name="q" value="こ">
+    <input type="submit" value="検索">
+</form>
+<form name="form3" action="/" method="GET" accept-charset="koi8-r, cp850">
+</form>
diff --git a/markup_fmt/tests/fmt/html/attributes/accept-charset.snap b/markup_fmt/tests/fmt/html/attributes/accept-charset.snap
new file mode 100644
index 00000000..95bbc8d4
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/accept-charset.snap
@@ -0,0 +1,32 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<!-- single value -->
+<form id="form" action="d.html" method="post" accept-charset="utf-8">
+  <p><input type="submit" value="submit"></p>
+</form>
+<form id="dff" action="d.html" method="post" accept-charset="utf-8">
+  <p><input type="submit" value="submit"></p>
+</form>
+
+<!-- space separated -->
+<form action="#" accept-charset="US-ASCII UTF-8">
+  First name:
+  <input type="text" name="fname">
+  <br> Last name:
+  <input type="text" name="lname">
+  <br>
+  <input type="submit" value="Submit">
+</form>
+
+<!-- comma separated (was previously supported https://developer.mozilla.org/en-US/docs/Web/HTML/Element/form#accept-charset) -->
+<form
+  name="multi-charset"
+  accept-charset="EUC-JP, UTF-8, Shift_JIS"
+  action="/~info"
+>
+  <input type="text" name="q" value="こ">
+  <input type="submit" value="検索">
+</form>
+<form name="form3" action="/" method="GET" accept-charset="koi8-r, cp850">
+</form>
diff --git a/markup_fmt/tests/fmt/html/attributes/aria-attrs.html b/markup_fmt/tests/fmt/html/attributes/aria-attrs.html
new file mode 100644
index 00000000..16107e82
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/aria-attrs.html
@@ -0,0 +1,28 @@
+<!-- Elements with aria-labelledby -->
+<h1 id="main-heading">Welcome to Our Website</h1>
+<p id="intro">This website is designed to be accessible for everyone.</p>
+<div aria-labelledby="main-heading   intro">
+    <p>Here you will find various resources and information.</p>
+</div>
+
+<!-- Elements with aria-describedby -->
+<button id="subscribe-button" aria-describedby=" subscribe-info ">Subscribe</button>
+<p id="subscribe-info">Click the button to subscribe to our newsletter.</p>
+
+<!-- Elements with aria-controls -->
+<button id="show-more-button" aria-controls="more-info  ">Show More Information</button>
+<div id="more-info" hidden>
+    <p>Here is some additional information that you can show or hide.</p>
+</div>
+
+<!-- Elements with aria-owns -->
+<div id="menu-container" aria-owns="   menu1   menu2 ">
+    <ul id="menu1">
+        <li>Home</li>
+        <li>About</li>
+    </ul>
+    <ul id="menu2">
+        <li>Services</li>
+        <li>Contact</li>
+    </ul>
+</div>
diff --git a/markup_fmt/tests/fmt/html/attributes/aria-attrs.snap b/markup_fmt/tests/fmt/html/attributes/aria-attrs.snap
new file mode 100644
index 00000000..317e1115
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/aria-attrs.snap
@@ -0,0 +1,36 @@
+---
+source: markup_fmt/tests/fmt.rs
+snapshot_kind: text
+---
+<!-- Elements with aria-labelledby -->
+<h1 id="main-heading">Welcome to Our Website</h1>
+<p id="intro">This website is designed to be accessible for everyone.</p>
+<div aria-labelledby="main-heading intro">
+  <p>Here you will find various resources and information.</p>
+</div>
+
+<!-- Elements with aria-describedby -->
+<button id="subscribe-button" aria-describedby="subscribe-info">
+  Subscribe
+</button>
+<p id="subscribe-info">Click the button to subscribe to our newsletter.</p>
+
+<!-- Elements with aria-controls -->
+<button id="show-more-button" aria-controls="more-info">
+  Show More Information
+</button>
+<div id="more-info" hidden>
+  <p>Here is some additional information that you can show or hide.</p>
+</div>
+
+<!-- Elements with aria-owns -->
+<div id="menu-container" aria-owns="menu1 menu2">
+  <ul id="menu1">
+    <li>Home</li>
+    <li>About</li>
+  </ul>
+  <ul id="menu2">
+    <li>Services</li>
+    <li>Contact</li>
+  </ul>
+</div>
diff --git a/markup_fmt/tests/fmt/html/attributes/autocomplete.html b/markup_fmt/tests/fmt/html/attributes/autocomplete.html
new file mode 100644
index 00000000..957d1d8a
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/autocomplete.html
@@ -0,0 +1,39 @@
+<select autocomplete="    billing country">
+    <option>US</option>
+    <option>France</option>
+    <option>UK</option>
+    <option>Japan</option>
+</select>
+<select autocomplete="    cc-type">
+    <option>Visa</option>
+    <option>Mastercard</option>
+</select>
+<select autocomplete="    section-blue
+billing cc-type">
+    <option>Visa</option>
+    <option>Mastercard</option>
+</select>
+
+
+<textarea autocomplete=" billing country ">
+</textarea>
+
+
+<input autocomplete="     country">
+<input autocomplete="     billing country">
+<input autocomplete="     section-blue
+country">
+<input autocomplete="     section-blue
+billing
+country">
+
+<form autocomplete="     country"></form>
+<form autocomplete="     billing country"></form>
+<form autocomplete="     section-blue
+country"></form>
+<form autocomplete="     section-blue
+billing
+country"></form>
+
+
+<div autocomplete="    billing country"></div>
diff --git a/markup_fmt/tests/fmt/html/attributes/autocomplete.snap b/markup_fmt/tests/fmt/html/attributes/autocomplete.snap
new file mode 100644
index 00000000..fbd1715d
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/autocomplete.snap
@@ -0,0 +1,62 @@
+---
+source: markup_fmt/tests/fmt.rs
+snapshot_kind: text
+---
+<select autocomplete="billing country">
+  <option>US</option>
+  <option>France</option>
+  <option>UK</option>
+  <option>Japan</option>
+</select>
+<select autocomplete="cc-type">
+  <option>Visa</option>
+  <option>Mastercard</option>
+</select>
+<select
+  autocomplete="
+    section-blue
+    billing cc-type
+  "
+>
+  <option>Visa</option>
+  <option>Mastercard</option>
+</select>
+
+<textarea autocomplete="billing country">
+</textarea>
+
+<input autocomplete="country">
+<input autocomplete="billing country">
+<input
+  autocomplete="
+    section-blue
+    country
+  "
+>
+<input
+  autocomplete="
+    section-blue
+    billing
+    country
+  "
+>
+
+<form autocomplete="country"></form>
+<form autocomplete="billing country"></form>
+<form
+  autocomplete="
+    section-blue
+    country
+  "
+>
+</form>
+<form
+  autocomplete="
+    section-blue
+    billing
+    country
+  "
+>
+</form>
+
+<div autocomplete="    billing country"></div>
diff --git a/markup_fmt/tests/fmt/html/attributes/iframe.html b/markup_fmt/tests/fmt/html/attributes/iframe.html
new file mode 100644
index 00000000..c8d04084
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/iframe.html
@@ -0,0 +1,19 @@
+<iframe style="display:none"  sandbox="    allow-scripts        allow-same-origin      "></iframe>
+<iframe style="display:none" sandbox="				Allow-Scripts	Allow-Same-Origin				"></iframe>
+<iframe sandbox="allow-same-origin allow-scripts" ></iframe>
+<iframe sandbox="aLlOw-SAME-oRiGin ALLOW-sCrIpTs" ></iframe>
+<iframe sandbox="" ></iframe>
+<iframe sandbox="allow-forms allow-scripts" ></iframe>
+<iframe sandbox="allow-same-origin allow-scripts" ></iframe>
+<iframe sandbox="allow-same-origin" ></iframe>
+<iframe sandbox="  allow-same-origin  allow-scripts  " ></iframe>
+<iframe sandbox="allow-same-origin" ></iframe>
+<iframe sandbox="allow-same-origin allow-scripts" ></iframe>
+<iframe sandbox="allow-same-origin" ></iframe>
+<iframe sandbox="allow-same-origin allow-scripts"  ></iframe>
+<iframe sandbox="allow-scripts" ></iframe>
+<iframe sandbox="allow-same-origin allow-scripts" ></iframe>
+<iframe sandbox="allow-forms allow-pointer-lock allow-popups allow-same-origin allow-scripts allow-top-navigation " ></iframe>
+<iframe sandbox="" ></iframe>
+
+<div sandbox="          allow-same-origin           allow-scripts"       ></div>
diff --git a/markup_fmt/tests/fmt/html/attributes/iframe.snap b/markup_fmt/tests/fmt/html/attributes/iframe.snap
new file mode 100644
index 00000000..daaeb952
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/iframe.snap
@@ -0,0 +1,24 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<iframe style="display:none" sandbox="allow-scripts allow-same-origin"></iframe>
+<iframe style="display:none" sandbox="Allow-Scripts Allow-Same-Origin"></iframe>
+<iframe sandbox="allow-same-origin allow-scripts"></iframe>
+<iframe sandbox="aLlOw-SAME-oRiGin ALLOW-sCrIpTs"></iframe>
+<iframe sandbox=""></iframe>
+<iframe sandbox="allow-forms allow-scripts"></iframe>
+<iframe sandbox="allow-same-origin allow-scripts"></iframe>
+<iframe sandbox="allow-same-origin"></iframe>
+<iframe sandbox="allow-same-origin allow-scripts"></iframe>
+<iframe sandbox="allow-same-origin"></iframe>
+<iframe sandbox="allow-same-origin allow-scripts"></iframe>
+<iframe sandbox="allow-same-origin"></iframe>
+<iframe sandbox="allow-same-origin allow-scripts"></iframe>
+<iframe sandbox="allow-scripts"></iframe>
+<iframe sandbox="allow-same-origin allow-scripts"></iframe>
+<iframe
+  sandbox="allow-forms allow-pointer-lock allow-popups allow-same-origin allow-scripts allow-top-navigation"
+></iframe>
+<iframe sandbox=""></iframe>
+
+<div sandbox="          allow-same-origin           allow-scripts"></div>
diff --git a/markup_fmt/tests/fmt/html/attributes/rel.html b/markup_fmt/tests/fmt/html/attributes/rel.html
new file mode 100644
index 00000000..e8e43d59
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/rel.html
@@ -0,0 +1,31 @@
+<a href="#" rel="value1 nofollow">Link</a>
+<a href="#" rel="   value1    nofollow   ">Link</a>
+<a href="#" rel=" nofollow ">Link</a>
+
+<form rel="noreferrer nofollow" action="/">
+    <input type="search" placeholder="search here" />
+    <input type="button" value="search" />
+</form>
+
+<link rel="meat feed cake" title="foo" />
+<link rel=" stylesheet" href="/">
+<link rel="stylesheet " href="/">
+<LINK REL=" stylesheet " type="text/css" />
+
+<link rel="
+      stylesheet" href="/">
+
+
+<a href="#" rel="
+value1    nofollow
+">Link</a>
+<form rel="
+noreferrer
+nofollow
+" action="/">
+    <input type="search" placeholder="search here" />
+    <input type="button" value="search" />
+</form>
+
+
+<div href="#" rel="   value1    nofollow   ">Link</div>
diff --git a/markup_fmt/tests/fmt/html/attributes/rel.snap b/markup_fmt/tests/fmt/html/attributes/rel.snap
new file mode 100644
index 00000000..e70a2497
--- /dev/null
+++ b/markup_fmt/tests/fmt/html/attributes/rel.snap
@@ -0,0 +1,33 @@
+---
+source: markup_fmt/tests/fmt.rs
+snapshot_kind: text
+---
+<a href="#" rel="value1 nofollow">Link</a>
+<a href="#" rel="value1 nofollow">Link</a>
+<a href="#" rel="nofollow">Link</a>
+
+<form rel="noreferrer nofollow" action="/">
+  <input type="search" placeholder="search here" />
+  <input type="button" value="search" />
+</form>
+
+<link rel="meat feed cake" title="foo" />
+<link rel="stylesheet" href="/">
+<link rel="stylesheet" href="/">
+<link REL="stylesheet" type="text/css" />
+
+<link rel="stylesheet" href="/">
+
+<a href="#" rel="value1 nofollow">Link</a>
+<form
+  rel="
+    noreferrer
+    nofollow
+  "
+  action="/"
+>
+  <input type="search" placeholder="search here" />
+  <input type="button" value="search" />
+</form>
+
+<div href="#" rel="   value1    nofollow   ">Link</div>

From d993880fcfab19f6799d7580b4e238ead0f96386 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 19 Mar 2026 09:48:22 +0800
Subject: [PATCH 43/67] chore: rustfmt

---
 markup_fmt/src/helpers.rs | 64 +++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 36 deletions(-)

diff --git a/markup_fmt/src/helpers.rs b/markup_fmt/src/helpers.rs
index 88282d4d..20fe2d7f 100644
--- a/markup_fmt/src/helpers.rs
+++ b/markup_fmt/src/helpers.rs
@@ -265,49 +265,41 @@ pub(crate) fn should_be_space_separated(attr_name: &str, tag_name: Option<&str>)
     {
         true
     } else if attr_name.eq_ignore_ascii_case("rel") {
-        tag_name
-            .is_some_and(|name| {
-                ["form", "a", "area", "link"]
-                    .iter()
-                    .any(|tag| tag.eq_ignore_ascii_case(name))
-            })
+        tag_name.is_some_and(|name| {
+            ["form", "a", "area", "link"]
+                .iter()
+                .any(|tag| tag.eq_ignore_ascii_case(name))
+        })
     } else if attr_name.eq_ignore_ascii_case("blocking") {
-        tag_name
-            .is_some_and(|name| {
-                ["link", "script", "style"]
-                    .iter()
-                    .any(|tag| tag.eq_ignore_ascii_case(name))
-            })
+        tag_name.is_some_and(|name| {
+            ["link", "script", "style"]
+                .iter()
+                .any(|tag| tag.eq_ignore_ascii_case(name))
+        })
     } else if attr_name.eq_ignore_ascii_case("for") {
-        tag_name
-            .is_some_and(|name| name.eq_ignore_ascii_case("output"))
+        tag_name.is_some_and(|name| name.eq_ignore_ascii_case("output"))
     } else if attr_name.eq_ignore_ascii_case("headers") {
-        tag_name
-            .is_some_and(|name| {
-                ["td", "th"]
-                    .iter()
-                    .any(|tag| tag.eq_ignore_ascii_case(name))
-            })
+        tag_name.is_some_and(|name| {
+            ["td", "th"]
+                .iter()
+                .any(|tag| tag.eq_ignore_ascii_case(name))
+        })
     } else if attr_name.eq_ignore_ascii_case("autocomplete") {
-        tag_name
-            .is_some_and(|name| {
-                ["form", "input", "select", "textarea"]
-                    .iter()
-                    .any(|tag| tag.eq_ignore_ascii_case(name))
-            })
+        tag_name.is_some_and(|name| {
+            ["form", "input", "select", "textarea"]
+                .iter()
+                .any(|tag| tag.eq_ignore_ascii_case(name))
+        })
     } else if attr_name.eq_ignore_ascii_case("sandbox") {
-        tag_name
-            .is_some_and(|name| name.eq_ignore_ascii_case("iframe"))
+        tag_name.is_some_and(|name| name.eq_ignore_ascii_case("iframe"))
     } else if attr_name.eq_ignore_ascii_case("accept-charset") {
-        tag_name
-            .is_some_and(|name| name.eq_ignore_ascii_case("form"))
+        tag_name.is_some_and(|name| name.eq_ignore_ascii_case("form"))
     } else if attr_name.eq_ignore_ascii_case("ping") {
-        tag_name
-            .is_some_and(|name| {
-                ["a", "area"]
-                    .iter()
-                    .any(|tag| tag.eq_ignore_ascii_case(name))
-            })
+        tag_name.is_some_and(|name| {
+            ["a", "area"]
+                .iter()
+                .any(|tag| tag.eq_ignore_ascii_case(name))
+        })
     } else {
         false
     }

From c56e88d9267c70556d86df54f48bf96ec442fac1 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 19 Mar 2026 09:50:52 +0800
Subject: [PATCH 44/67] ci: check formatting

---
 .github/workflows/CI.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index e7b1da5e..71e277cf 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -16,5 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v6
+      - run: cargo fmt --check
       - run: cargo clippy --all-targets --all-features
       - run: cargo test --all-features

From 377a9c707e4fbd75ae3a8239bbd28d07dfcb72c9 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Thu, 19 Mar 2026 09:52:35 +0800
Subject: [PATCH 45/67] fix: fix converting pascal case to kebab case (fix
 #213)

---
 markup_fmt/src/helpers.rs                                 | 2 +-
 markup_fmt/tests/fmt/vue/component-case/case.default.snap | 1 +
 markup_fmt/tests/fmt/vue/component-case/case.kebab.snap   | 1 +
 markup_fmt/tests/fmt/vue/component-case/case.pascal.snap  | 1 +
 markup_fmt/tests/fmt/vue/component-case/case.vue          | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/markup_fmt/src/helpers.rs b/markup_fmt/src/helpers.rs
index 20fe2d7f..b020e2a1 100644
--- a/markup_fmt/src/helpers.rs
+++ b/markup_fmt/src/helpers.rs
@@ -196,7 +196,7 @@ pub(crate) fn pascal2kebab(s: &'_ str) -> Cow<'_, str> {
     {
         let mut result = String::with_capacity(s.len() + uppers);
         s.chars().fold('<', |prev, c| {
-            if c.is_ascii_uppercase() && prev.is_ascii_lowercase() {
+            if c.is_ascii_uppercase() && prev.is_ascii_alphanumeric() {
                 result.push('-');
             }
             result.push(c.to_ascii_lowercase());
diff --git a/markup_fmt/tests/fmt/vue/component-case/case.default.snap b/markup_fmt/tests/fmt/vue/component-case/case.default.snap
index 7c3a1a6f..b853e0fd 100644
--- a/markup_fmt/tests/fmt/vue/component-case/case.default.snap
+++ b/markup_fmt/tests/fmt/vue/component-case/case.default.snap
@@ -17,4 +17,5 @@ source: markup_fmt/tests/fmt.rs
     </defs>
     <rect width="200" height="200" fill="url(#grad1)" />
   </svg>
+  <UApp></UApp>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/component-case/case.kebab.snap b/markup_fmt/tests/fmt/vue/component-case/case.kebab.snap
index e930c3b5..ea913931 100644
--- a/markup_fmt/tests/fmt/vue/component-case/case.kebab.snap
+++ b/markup_fmt/tests/fmt/vue/component-case/case.kebab.snap
@@ -17,4 +17,5 @@ source: markup_fmt/tests/fmt.rs
     </defs>
     <rect width="200" height="200" fill="url(#grad1)" />
   </svg>
+  <u-app></u-app>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/component-case/case.pascal.snap b/markup_fmt/tests/fmt/vue/component-case/case.pascal.snap
index 00c10fec..f2696684 100644
--- a/markup_fmt/tests/fmt/vue/component-case/case.pascal.snap
+++ b/markup_fmt/tests/fmt/vue/component-case/case.pascal.snap
@@ -17,4 +17,5 @@ source: markup_fmt/tests/fmt.rs
     </defs>
     <rect width="200" height="200" fill="url(#grad1)" />
   </svg>
+  <UApp></UApp>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/component-case/case.vue b/markup_fmt/tests/fmt/vue/component-case/case.vue
index e0735fd9..043f798c 100644
--- a/markup_fmt/tests/fmt/vue/component-case/case.vue
+++ b/markup_fmt/tests/fmt/vue/component-case/case.vue
@@ -14,4 +14,5 @@
     </defs>
     <rect width="200" height="200" fill="url(#grad1)" />
   </svg>
+  <UApp></UApp>
 </template>

From 60d3c4606993f2facb5c49085e42895d30aba9e3 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 24 Mar 2026 16:11:35 +0800
Subject: [PATCH 46/67] feat: support comments in Svelte attributes

---
 markup_fmt/src/ast.rs                         |  7 ++
 markup_fmt/src/parser.rs                      | 65 ++++++++++++++++---
 markup_fmt/src/printer.rs                     | 17 +++++
 .../tests/fmt/svelte/comments/attrs.snap      | 26 ++++++++
 .../tests/fmt/svelte/comments/attrs.svelte    | 22 +++++++
 5 files changed, 127 insertions(+), 10 deletions(-)
 create mode 100644 markup_fmt/tests/fmt/svelte/comments/attrs.snap
 create mode 100644 markup_fmt/tests/fmt/svelte/comments/attrs.svelte

diff --git a/markup_fmt/src/ast.rs b/markup_fmt/src/ast.rs
index b5764216..8f4c7e0a 100644
--- a/markup_fmt/src/ast.rs
+++ b/markup_fmt/src/ast.rs
@@ -109,6 +109,7 @@ pub enum Attribute<'s> {
     JinjaBlock(JinjaBlock<'s, Attribute<'s>>),
     JinjaComment(JinjaComment<'s>),
     JinjaTag(JinjaTag<'s>),
+    JsComment(JsComment<'s>),
     Native(NativeAttribute<'s>),
     Svelte(SvelteAttribute<'s>),
     SvelteAttachment(SvelteAttachment<'s>),
@@ -205,6 +206,12 @@ pub enum JinjaTagOrChildren<'s, T> {
     Children(Vec<T>),
 }
 
+#[derive(Debug)]
+pub struct JsComment<'s> {
+    pub block: bool,
+    pub raw: &'s str,
+}
+
 #[derive(Debug)]
 /// Mustache block: `{{#variable}}{{/variable}}`.
 ///
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index a27ce95f..c65055c9 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -1019,17 +1019,23 @@ impl<'s> Parser<'s> {
             match self.chars.peek() {
                 Some((_, '/')) => {
                     self.chars.next();
-                    if self.chars.next_if(|(_, c)| *c == '>').is_some() {
-                        return Ok(Element {
-                            tag_name,
-                            attrs,
-                            first_attr_same_line,
-                            children: vec![],
-                            self_closing: true,
-                            void_element,
-                        });
+                    match self.chars.peek() {
+                        Some((_, '>')) => {
+                            self.chars.next();
+                            return Ok(Element {
+                                tag_name,
+                                attrs,
+                                first_attr_same_line,
+                                children: vec![],
+                                self_closing: true,
+                                void_element,
+                            });
+                        }
+                        Some((_, '/' | '*')) if self.language == Language::Svelte => {
+                            attrs.push(Attribute::JsComment(self.parse_js_comment()?));
+                        }
+                        _ => return Err(self.emit_error(SyntaxErrorKind::ExpectSelfCloseTag)),
                     }
-                    return Err(self.emit_error(SyntaxErrorKind::ExpectSelfCloseTag));
                 }
                 Some((_, '>')) => {
                     self.chars.next();
@@ -1442,6 +1448,45 @@ impl<'s> Parser<'s> {
         }
     }
 
+    // former `/` has been consumed
+    fn parse_js_comment(&mut self) -> PResult<JsComment<'s>> {
+        let Some((start, first_char)) = self.chars.next_if(|(_, c)| matches!(c, '/' | '*')) else {
+            return Err(self.emit_error(SyntaxErrorKind::ExpectChar('/')));
+        };
+        let start = start + 1;
+        if first_char == '/' {
+            let mut end = start;
+            loop {
+                match self.chars.next() {
+                    Some((_, '\n')) | None => break,
+                    Some((i, _)) => end = i,
+                }
+            }
+            Ok(JsComment {
+                block: false,
+                raw: unsafe { self.source.get_unchecked(start..=end) },
+            })
+        } else {
+            let mut end = start;
+            loop {
+                match self.chars.next() {
+                    Some((i, '*')) => {
+                        end = i;
+                        if self.chars.next_if(|(_, c)| *c == '/').is_some() {
+                            break;
+                        }
+                    }
+                    Some((i, _)) => end = i,
+                    None => break,
+                }
+            }
+            Ok(JsComment {
+                block: true,
+                raw: unsafe { self.source.get_unchecked(start..end) },
+            })
+        }
+    }
+
     fn parse_mustache_block_or_interpolation(&mut self) -> PResult<NodeKind<'s>> {
         let mut controls = vec![];
         let (raw, _) = self.parse_mustache_interpolation()?;
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 43e15914..3b807e77 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -370,6 +370,7 @@ impl<'s> DocGen<'s> for Attribute<'s> {
             Attribute::JinjaComment(jinja_comment) => jinja_comment.doc(ctx, state),
             Attribute::JinjaTag(jinja_tag) => jinja_tag.doc(ctx, state),
             Attribute::VentoTagOrBlock(vento_tag_or_block) => vento_tag_or_block.doc(ctx, state),
+            Attribute::JsComment(js_comment) => js_comment.doc(ctx, state),
         }
     }
 }
@@ -1051,6 +1052,21 @@ impl<'s> DocGen<'s> for JinjaTag<'s> {
     }
 }
 
+impl<'s> DocGen<'s> for JsComment<'s> {
+    fn doc<E, F>(&self, _: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    where
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    {
+        if self.block {
+            Doc::text("/*")
+                .concat(reflow_raw(self.raw))
+                .append(Doc::text("*/"))
+        } else {
+            Doc::text(format!("//{}", self.raw.trim_ascii_end()))
+        }
+    }
+}
+
 impl<'s> DocGen<'s> for MustacheBlock<'s> {
     fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
     where
@@ -2273,6 +2289,7 @@ fn is_multi_line_attr(attr: &Attribute) -> bool {
         | Attribute::JinjaTag(JinjaTag { content: value, .. }) => value.contains('\n'),
         // Templating blocks usually span across multiple lines so let's just assume true.
         Attribute::JinjaBlock(..) | Attribute::VentoTagOrBlock(..) => true,
+        Attribute::JsComment(comment) => comment.raw.contains('\n'),
     }
 }
 
diff --git a/markup_fmt/tests/fmt/svelte/comments/attrs.snap b/markup_fmt/tests/fmt/svelte/comments/attrs.snap
new file mode 100644
index 00000000..89608eea
--- /dev/null
+++ b/markup_fmt/tests/fmt/svelte/comments/attrs.snap
@@ -0,0 +1,26 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<div
+  data-one="1"
+  // this is a line comment
+  data-two="2"
+  /* this is a
+    m
+    u
+    l
+    t
+    i
+    l
+    i
+    n
+    e
+    comment
+  */
+  // oh look another line comment
+  // (two, in fact)
+  data-three="3"
+>
+</div>
+
+<span /* inline */ /* another inline */ data-one="1"></span>
diff --git a/markup_fmt/tests/fmt/svelte/comments/attrs.svelte b/markup_fmt/tests/fmt/svelte/comments/attrs.svelte
new file mode 100644
index 00000000..ae83ed5e
--- /dev/null
+++ b/markup_fmt/tests/fmt/svelte/comments/attrs.svelte
@@ -0,0 +1,22 @@
+<div
+  data-one="1"
+  // this is a line comment
+  data-two="2"
+  /* this is a
+    m
+    u
+    l
+    t
+    i
+    l
+    i
+    n
+    e
+    comment
+  */
+  // oh look another line comment
+  // (two, in fact)
+  data-three="3"
+></div>
+
+<span   /* inline */    /* another inline */   data-one="1"></span>

From 40a8bf949264e26928ce9b0da7e27bea868fb25d Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 24 Mar 2026 16:15:45 +0800
Subject: [PATCH 47/67] v0.27.0

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 504ed7e0..299b86b2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.26.0"
+version = "0.27.0"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -614,7 +614,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.26.0"
+version = "0.27.0"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index 1eb7ab20..e0d71fbe 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.26.0.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.27.0.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index 82ba9674..4a96cefd 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.26.0"
+version = "0.27.0"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index c6a8cc78..d68e32f0 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index 92d57b0e..75f1ef3d 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.26.0/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.27.0/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 7468df1c..cbfde03c 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.26.0"
+version = "0.27.0"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From 46b49f11ba91bf725ec62cb1d2a2fd60ff341e3d Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 21 Apr 2026 10:31:51 +0800
Subject: [PATCH 48/67] docs: update about `scriptFormatter` option

---
 docs/src/config/script-formatter.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/src/config/script-formatter.md b/docs/src/config/script-formatter.md
index 2bf82475..1d1235c7 100644
--- a/docs/src/config/script-formatter.md
+++ b/docs/src/config/script-formatter.md
@@ -5,6 +5,6 @@ Tell markup_fmt what script formatter you are using.
 Possible options:
 
 - `"dprint"`: Use this if you're using dprint-plugin-typescript.
-- `"biome"`: Use this if you're using Biome or dprint-plugin-biome.
+- `"biome"`: Use this if you're using Biome (dprint-plugin-biome) or Oxc (dprint-plugin-oxc).
 
 In dprint, default option is `"dprint"`; otherwise, default option is `null`.

From c05139af7b16effcb757c26aa0a92a00afc65c52 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 28 Apr 2026 09:51:20 +0800
Subject: [PATCH 49/67] fix: allow JS keywords in Vue binding (fix #217)

---
 markup_fmt/src/printer.rs                     | 45 +++++++++++--------
 .../tests/fmt/vue/v-bind/fixture.default.snap |  1 +
 .../tests/fmt/vue/v-bind/fixture.long.snap    |  1 +
 .../tests/fmt/vue/v-bind/fixture.short.snap   |  1 +
 markup_fmt/tests/fmt/vue/v-bind/fixture.vue   |  1 +
 5 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 3b807e77..9031c91b 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -2068,7 +2068,7 @@ impl<'s> DocGen<'s> for VueDirective<'s> {
                         } else {
                             "in"
                         };
-                        format_v_for(left, delimiter, right, value_start, ctx)
+                        Cow::from(format_v_for(left, delimiter, right, value_start, ctx))
                     } else if let Some((left, right)) = value.split_once(" of ") {
                         let delimiter = if let Some(VForDelimiterStyle::In) =
                             ctx.options.v_for_delimiter_style
@@ -2077,28 +2077,35 @@ impl<'s> DocGen<'s> for VueDirective<'s> {
                         } else {
                             "of"
                         };
-                        format_v_for(left, delimiter, right, value_start, ctx)
+                        Cow::from(format_v_for(left, delimiter, right, value_start, ctx))
                     } else {
-                        ctx.with_escaping_quotes(value, |code, ctx| {
+                        Cow::from(ctx.with_escaping_quotes(value, |code, ctx| {
                             ctx.format_expr(&code, true, value_start)
-                        })
+                        }))
+                    }
+                }
+                "#" | "slot" => Cow::from(ctx.format_binding(value, value_start)),
+                _ => {
+                    if value.bytes().all(|b| b.is_ascii_alphanumeric()) {
+                        // not only a shorthand but also allowing JavaScript keywords
+                        Cow::from(value)
+                    } else {
+                        Cow::from(ctx.with_escaping_quotes(value, |code, ctx| {
+                            ctx.try_format_expr(&code, true, value_start)
+                                .unwrap_or_else(|_| {
+                                    let formatted = ctx
+                                        .format_script(&code, "ts", value_start, state)
+                                        .trim()
+                                        .to_owned();
+                                    if formatted.contains('\n') {
+                                        formatted
+                                    } else {
+                                        formatted.trim_end_matches(';').to_owned()
+                                    }
+                                })
+                        }))
                     }
                 }
-                "#" | "slot" => ctx.format_binding(value, value_start),
-                _ => ctx.with_escaping_quotes(value, |code, ctx| {
-                    ctx.try_format_expr(&code, true, value_start)
-                        .unwrap_or_else(|_| {
-                            let formatted = ctx
-                                .format_script(&code, "ts", value_start, state)
-                                .trim()
-                                .to_owned();
-                            if formatted.contains('\n') {
-                                formatted
-                            } else {
-                                formatted.trim_end_matches(';').to_owned()
-                            }
-                        })
-                }),
             };
             if !(matches!(ctx.options.v_bind_same_name_short_hand, Some(true))
                 && is_v_bind
diff --git a/markup_fmt/tests/fmt/vue/v-bind/fixture.default.snap b/markup_fmt/tests/fmt/vue/v-bind/fixture.default.snap
index a8c4019f..6579dd58 100644
--- a/markup_fmt/tests/fmt/vue/v-bind/fixture.default.snap
+++ b/markup_fmt/tests/fmt/vue/v-bind/fixture.default.snap
@@ -8,4 +8,5 @@ source: markup_fmt/tests/fmt.rs
   <button v-bind:type.sync=""></button>
   <button v-bind></button>
   <button v-bind.sync></button>
+  <label :for="for"></label>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/v-bind/fixture.long.snap b/markup_fmt/tests/fmt/vue/v-bind/fixture.long.snap
index e9ef1ddd..371dd09e 100644
--- a/markup_fmt/tests/fmt/vue/v-bind/fixture.long.snap
+++ b/markup_fmt/tests/fmt/vue/v-bind/fixture.long.snap
@@ -8,4 +8,5 @@ source: markup_fmt/tests/fmt.rs
   <button v-bind:type.sync=""></button>
   <button v-bind></button>
   <button v-bind.sync></button>
+  <label v-bind:for="for"></label>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/v-bind/fixture.short.snap b/markup_fmt/tests/fmt/vue/v-bind/fixture.short.snap
index debb478e..78cebe99 100644
--- a/markup_fmt/tests/fmt/vue/v-bind/fixture.short.snap
+++ b/markup_fmt/tests/fmt/vue/v-bind/fixture.short.snap
@@ -8,4 +8,5 @@ source: markup_fmt/tests/fmt.rs
   <button :type.sync=""></button>
   <button v-bind></button>
   <button v-bind.sync></button>
+  <label :for="for"></label>
 </template>
diff --git a/markup_fmt/tests/fmt/vue/v-bind/fixture.vue b/markup_fmt/tests/fmt/vue/v-bind/fixture.vue
index 5f29afc5..c603b77d 100644
--- a/markup_fmt/tests/fmt/vue/v-bind/fixture.vue
+++ b/markup_fmt/tests/fmt/vue/v-bind/fixture.vue
@@ -5,4 +5,5 @@
   <button v-bind:type.sync=""></button>
   <button v-bind></button>
   <button v-bind.sync></button>
+  <label :for="for"></label>
 </template>

From e76c7beb698843257721a28ab97bcade86006a39 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 8 May 2026 10:46:07 +0800
Subject: [PATCH 50/67] fix: fix broken Astro front matter (fix #220)

---
 markup_fmt/src/parser.rs                                | 2 +-
 markup_fmt/tests/fmt/astro/front-matter/issue-220.astro | 3 +++
 markup_fmt/tests/fmt/astro/front-matter/issue-220.snap  | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 markup_fmt/tests/fmt/astro/front-matter/issue-220.astro
 create mode 100644 markup_fmt/tests/fmt/astro/front-matter/issue-220.snap

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index c65055c9..70c120f1 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -1192,7 +1192,7 @@ impl<'s> Parser<'s> {
                     pair_stack.pop();
                 }
                 Some((_, '/'))
-                    if !matches!(pair_stack.last(), Some('\'' | '"' | '`' | '/' | '*')) =>
+                    if !matches!(pair_stack.last(), Some('\'' | '"' | '`' | '/' | '*' | '$')) =>
                 {
                     if let Some((_, c)) = self.chars.next_if(|(_, c)| *c == '/' || *c == '*') {
                         pair_stack.push(c);
diff --git a/markup_fmt/tests/fmt/astro/front-matter/issue-220.astro b/markup_fmt/tests/fmt/astro/front-matter/issue-220.astro
new file mode 100644
index 00000000..815adeea
--- /dev/null
+++ b/markup_fmt/tests/fmt/astro/front-matter/issue-220.astro
@@ -0,0 +1,3 @@
+---
+`${/\//}`
+---
diff --git a/markup_fmt/tests/fmt/astro/front-matter/issue-220.snap b/markup_fmt/tests/fmt/astro/front-matter/issue-220.snap
new file mode 100644
index 00000000..eb6edad9
--- /dev/null
+++ b/markup_fmt/tests/fmt/astro/front-matter/issue-220.snap
@@ -0,0 +1,6 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+---
+`${/\//}`
+---

From 0a858d52b9dac9af779ba403291dc5d3da201577 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 8 May 2026 11:33:06 +0800
Subject: [PATCH 51/67] ci: release with GitHub CLI

---
 .github/workflows/release.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bf034b6f..265c5850 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,24 +14,23 @@ jobs:
     name: Release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - run: rustup target add wasm32-unknown-unknown
       - run: |
           cargo build --release -p dprint_plugin_markup --target wasm32-unknown-unknown
           cp target/wasm32-unknown-unknown/release/dprint_plugin_markup.wasm dprint_plugin/deployment/plugin.wasm
       - name: Publish dprint plugin
-        uses: softprops/action-gh-release@v2
-        with:
-          files: |
-            dprint_plugin/deployment/plugin.wasm
-            dprint_plugin/deployment/schema.json
-      - uses: rust-lang/crates-io-auth-action@v1
+        run: |
+          gh release create ${{ github.ref_name }} dprint_plugin/deployment/plugin.wasm dprint_plugin/deployment/schema.json
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: rust-lang/crates-io-auth-action@v1.0.4
         id: cratesio-auth
       - name: Publish crates
         run: cargo publish -p markup_fmt
         env:
           CARGO_REGISTRY_TOKEN: ${{ steps.cratesio-auth.outputs.token }}
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v6
         with:
           registry-url: "https://registry.npmjs.org"
       - name: Publish npm package

From 99fd96bddd32fa0e42bd71bf5fd781db36f0e1ce Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 8 May 2026 11:35:05 +0800
Subject: [PATCH 52/67] v0.27.1

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 299b86b2..3f577981 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -306,7 +306,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -614,7 +614,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.27.0"
+version = "0.27.1"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index e0d71fbe..a7163e06 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.27.0.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.27.1.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index 4a96cefd..0f3fe35a 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index d68e32f0..2e8f9613 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.27.0",
+  "version": "0.27.1",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index 75f1ef3d..3a321041 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.27.0/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.27.1/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index cbfde03c..92f28b9f 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.27.0"
+version = "0.27.1"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From 65bfac66ec40a73165b75eccbb24d75769a3fcf1 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 10 May 2026 10:01:38 +0800
Subject: [PATCH 53/67] fix: fix parsing Jinja tag name with args (fix #222)

---
 markup_fmt/src/parser.rs                                  | 2 +-
 .../tests/fmt/jinja/control-structure/fixture.jinja       | 8 +++++++-
 markup_fmt/tests/fmt/jinja/control-structure/fixture.snap | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 70c120f1..0879cc4c 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -2840,7 +2840,7 @@ fn is_attr_name_char(c: char) -> bool {
 fn parse_jinja_tag_name<'s>(tag: &JinjaTag<'s>) -> &'s str {
     let trimmed = tag.content.trim_start_matches(['+', '-']).trim_start();
     trimmed
-        .split_once(|c: char| c.is_ascii_whitespace())
+        .split_once(|c: char| !c.is_ascii_alphanumeric() && c != '_')
         .map(|(name, _)| name)
         .unwrap_or(trimmed)
 }
diff --git a/markup_fmt/tests/fmt/jinja/control-structure/fixture.jinja b/markup_fmt/tests/fmt/jinja/control-structure/fixture.jinja
index a200e65d..0c35d34b 100644
--- a/markup_fmt/tests/fmt/jinja/control-structure/fixture.jinja
+++ b/markup_fmt/tests/fmt/jinja/control-structure/fixture.jinja
@@ -75,4 +75,10 @@ There are {{ count }} {{ name }} objects.
     <li>{{ item }}</li>
 {% endfor %}
 </ul>
-{% endraw %}
\ No newline at end of file
+{% endraw %}
+
+{% call(user) dump_users(list_of_user) %}
+    <dl>
+        <dt>Realname</dt>
+    </dl>
+{% endcall %}
diff --git a/markup_fmt/tests/fmt/jinja/control-structure/fixture.snap b/markup_fmt/tests/fmt/jinja/control-structure/fixture.snap
index 5c97eeea..52297abd 100644
--- a/markup_fmt/tests/fmt/jinja/control-structure/fixture.snap
+++ b/markup_fmt/tests/fmt/jinja/control-structure/fixture.snap
@@ -84,3 +84,9 @@ source: markup_fmt/tests/fmt.rs
     {% endfor %}
   </ul>
 {% endraw %}
+
+{% call(user) dump_users(list_of_user) %}
+  <dl>
+    <dt>Realname</dt>
+  </dl>
+{% endcall %}

From 360ae53fcd7bde0cc4f45c445a706f0d0f583413 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 11 May 2026 11:56:34 +0800
Subject: [PATCH 54/67] feat: support Vento `slot` and `default` tags (close
 #215)

---
 markup_fmt/src/parser.rs                       | 2 +-
 markup_fmt/tests/fmt/vento/layout/fixture.snap | 8 ++++++++
 markup_fmt/tests/fmt/vento/layout/fixture.vto  | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 0879cc4c..bff0036b 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -2636,7 +2636,7 @@ impl<'s> Parser<'s> {
 
         let is_function = tag_name == "function"
             || matches!(tag_name, "async" | "export") && tag_rest.starts_with("function");
-        if matches!(tag_name, "for" | "if" | "layout")
+        if matches!(tag_name, "for" | "if" | "layout" | "slot" | "default")
             || matches!(tag_name, "set" | "export") && !first_tag.contains('=')
             || is_function
         {
diff --git a/markup_fmt/tests/fmt/vento/layout/fixture.snap b/markup_fmt/tests/fmt/vento/layout/fixture.snap
index 04519c6d..c929e22a 100644
--- a/markup_fmt/tests/fmt/vento/layout/fixture.snap
+++ b/markup_fmt/tests/fmt/vento/layout/fixture.snap
@@ -8,3 +8,11 @@ source: markup_fmt/tests/fmt.rs
 {{ layout 'container.vto' {size:'big'} }}
   <h1>Hello, world!</h1>
 {{ /layout }}
+
+{{ slot foo }}
+  Slot content
+{{ /slot }}
+
+{{ default bar }}
+  Default content for bar
+{{ /default }}
diff --git a/markup_fmt/tests/fmt/vento/layout/fixture.vto b/markup_fmt/tests/fmt/vento/layout/fixture.vto
index b3519be9..914b3755 100644
--- a/markup_fmt/tests/fmt/vento/layout/fixture.vto
+++ b/markup_fmt/tests/fmt/vento/layout/fixture.vto
@@ -5,3 +5,11 @@
 {{layout 'container.vto'{size:'big'}}}
 <h1>Hello, world!</h1>
 {{/layout}}
+
+{{ slot foo }}
+Slot content
+{{ /slot }}
+
+{{ default bar }}
+Default content for bar
+{{ /default }}

From 4acca03cc81a04e247e8dac1a32627130a019ecc Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 11 May 2026 12:02:55 +0800
Subject: [PATCH 55/67] chore: apply Clippy suggestions

---
 markup_fmt/src/parser.rs  | 68 ++++++++++++++++++---------------------
 markup_fmt/src/printer.rs | 22 ++++++-------
 2 files changed, 40 insertions(+), 50 deletions(-)

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index bff0036b..bbbf22df 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -870,18 +870,14 @@ impl<'s> Parser<'s> {
                         let mut chars = self.chars.clone();
                         chars.next();
                         match chars.peek() {
-                            Some((_, '%')) => {
+                            Some((_, '%'))
                                 if self
                                     .parse_jinja_tag_or_block(None, &mut Parser::parse_node)
-                                    .is_ok()
-                                {
-                                    end =
-                                        self.chars.peek().map(|(i, _)| i - 1).ok_or_else(|| {
-                                            self.emit_error(SyntaxErrorKind::ExpectAttrValue)
-                                        })?;
-                                } else {
-                                    self.chars.next();
-                                }
+                                    .is_ok() =>
+                            {
+                                end = self.chars.peek().map(|(i, _)| i - 1).ok_or_else(|| {
+                                    self.emit_error(SyntaxErrorKind::ExpectAttrValue)
+                                })?;
                             }
                             Some((_, '{')) => {
                                 chars.next();
@@ -1923,28 +1919,26 @@ impl<'s> Parser<'s> {
                         self.skip_ws();
                         let mut chars = self.chars.clone();
                         match chars.next() {
-                            Some((_, 't')) => {
+                            Some((_, 't'))
                                 if chars
                                     .next_if(|(_, c)| *c == 'h')
                                     .and_then(|_| chars.next_if(|(_, c)| *c == 'e'))
                                     .and_then(|_| chars.next_if(|(_, c)| *c == 'n'))
-                                    .is_some()
-                                {
-                                    end = i;
-                                    break;
-                                }
+                                    .is_some() =>
+                            {
+                                end = i;
+                                break;
                             }
-                            Some((_, 'c')) => {
+                            Some((_, 'c'))
                                 if chars
                                     .next_if(|(_, c)| *c == 'a')
                                     .and_then(|_| chars.next_if(|(_, c)| *c == 't'))
                                     .and_then(|_| chars.next_if(|(_, c)| *c == 'c'))
                                     .and_then(|_| chars.next_if(|(_, c)| *c == 'h'))
-                                    .is_some()
-                                {
-                                    end = i;
-                                    break;
-                                }
+                                    .is_some() =>
+                            {
+                                end = i;
+                                break;
                             }
                             _ => {}
                         }
@@ -2954,12 +2948,12 @@ pub fn parse_as_interpolated(
                         pos = i;
                         brace_stack += 1;
                     }
-                    Language::Jinja | Language::Vento | Language::Mustache => {
-                        if chars.next_if(|(_, c)| *c == '{').is_some() {
-                            statics.push(unsafe { text.get_unchecked(pos..i) });
-                            pos = i;
-                            brace_stack += 1;
-                        }
+                    Language::Jinja | Language::Vento | Language::Mustache
+                        if chars.next_if(|(_, c)| *c == '{').is_some() =>
+                    {
+                        statics.push(unsafe { text.get_unchecked(pos..i) });
+                        pos = i;
+                        brace_stack += 1;
                     }
                     _ => {}
                 }
@@ -2978,15 +2972,15 @@ pub fn parse_as_interpolated(
                         pos = i + 1;
                         brace_stack = 0;
                     }
-                    Language::Jinja | Language::Vento | Language::Mustache => {
-                        if chars.next_if(|(_, c)| *c == '}').is_some() {
-                            dynamics.push((
-                                unsafe { text.get_unchecked(pos + 2..i) },
-                                base_start + pos + 2,
-                            ));
-                            pos = i + 2;
-                            brace_stack = 0;
-                        }
+                    Language::Jinja | Language::Vento | Language::Mustache
+                        if chars.next_if(|(_, c)| *c == '}').is_some() =>
+                    {
+                        dynamics.push((
+                            unsafe { text.get_unchecked(pos + 2..i) },
+                            base_start + pos + 2,
+                        ));
+                        pos = i + 2;
+                        brace_stack = 0;
                     }
                     _ => {}
                 }
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 9031c91b..37f22c1a 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -1884,11 +1884,9 @@ impl<'s> DocGen<'s> for VentoTag<'s> {
                                         quotes_stack.push(char);
                                     }
                                 }
-                                '{' => {
-                                    if quotes_stack.is_empty() {
-                                        brace_index = Some(index);
-                                        break;
-                                    }
+                                '{' if quotes_stack.is_empty() => {
+                                    brace_index = Some(index);
+                                    break;
                                 }
                                 _ => {}
                             }
@@ -2207,10 +2205,10 @@ fn reflow_with_indent<'i, 'o: 'i>(
                         pair_stack.push(c);
                     }
                 }
-                '$' if matches!(pair_stack.last(), Some('`')) => {
-                    if chars.next_if(|next| *next == '{').is_some() {
-                        pair_stack.push('$');
-                    }
+                '$' if matches!(pair_stack.last(), Some('`'))
+                    && chars.next_if(|next| *next == '{').is_some() =>
+                {
+                    pair_stack.push('$');
                 }
                 '{' if !matches!(pair_stack.last(), Some('`' | '\'' | '"' | '/')) => {
                     pair_stack.push('{');
@@ -2225,10 +2223,8 @@ fn reflow_with_indent<'i, 'o: 'i>(
                         break;
                     }
                 }
-                '*' => {
-                    if chars.next_if(|next| *next == '/').is_some() {
-                        pair_stack.pop();
-                    }
+                '*' if chars.next_if(|next| *next == '/').is_some() => {
+                    pair_stack.pop();
                 }
                 '\\' if matches!(pair_stack.last(), Some('\'' | '"' | '`')) => {
                     chars.next();

From d6e4aabc17b168a3bf44183b47bd6e827abd9c7f Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Mon, 11 May 2026 17:30:20 +0800
Subject: [PATCH 56/67] refactor: move position conversion to helpers

---
 markup_fmt/src/helpers.rs | 17 ++++++++++++++++-
 markup_fmt/src/parser.rs  | 27 +++++++--------------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/markup_fmt/src/helpers.rs b/markup_fmt/src/helpers.rs
index b020e2a1..3c22d3a3 100644
--- a/markup_fmt/src/helpers.rs
+++ b/markup_fmt/src/helpers.rs
@@ -1,6 +1,6 @@
 use crate::Language;
 use aho_corasick::AhoCorasick;
-use std::{borrow::Cow, sync::LazyLock};
+use std::{borrow::Cow, cmp::Ordering, ops::ControlFlow, sync::LazyLock};
 
 pub(crate) fn is_component(name: &str) -> bool {
     name.contains('-') || name.contains(|c: char| c.is_ascii_uppercase())
@@ -304,3 +304,18 @@ pub(crate) fn should_be_space_separated(attr_name: &str, tag_name: Option<&str>)
         false
     }
 }
+
+pub(crate) fn pos_to_line_col(source: &str, pos: usize) -> (usize, usize) {
+    let search = memchr::memchr_iter(b'\n', source.as_bytes()).try_fold(
+        (1, 0),
+        |(line, prev_offset), offset| match pos.cmp(&offset) {
+            Ordering::Less => ControlFlow::Break((line, prev_offset)),
+            Ordering::Equal => ControlFlow::Break((line, prev_offset)),
+            Ordering::Greater => ControlFlow::Continue((line + 1, offset)),
+        },
+    );
+    match search {
+        ControlFlow::Break((line, offset)) => (line, pos - offset + 1),
+        ControlFlow::Continue((line, _)) => (line, 0),
+    }
+}
diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index bbbf22df..65876500 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -12,7 +12,7 @@ use crate::{
     error::{SyntaxError, SyntaxErrorKind},
     helpers,
 };
-use std::{cmp::Ordering, iter::Peekable, ops::ControlFlow, str::CharIndices};
+use std::{iter::Peekable, str::CharIndices};
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 /// Supported languages.
@@ -76,7 +76,7 @@ impl<'s> Parser<'s> {
     }
 
     fn emit_error_with_pos(&self, kind: SyntaxErrorKind, pos: usize) -> SyntaxError {
-        let (line, column) = self.pos_to_line_col(pos);
+        let (line, column) = helpers::pos_to_line_col(self.source, pos);
         SyntaxError {
             kind,
             pos,
@@ -84,20 +84,6 @@ impl<'s> Parser<'s> {
             column,
         }
     }
-    fn pos_to_line_col(&self, pos: usize) -> (usize, usize) {
-        let search = memchr::memchr_iter(b'\n', self.source.as_bytes()).try_fold(
-            (1, 0),
-            |(line, prev_offset), offset| match pos.cmp(&offset) {
-                Ordering::Less => ControlFlow::Break((line, prev_offset)),
-                Ordering::Equal => ControlFlow::Break((line, prev_offset)),
-                Ordering::Greater => ControlFlow::Continue((line + 1, offset)),
-            },
-        );
-        match search {
-            ControlFlow::Break((line, offset)) => (line, pos - offset + 1),
-            ControlFlow::Continue((line, _)) => (line, 0),
-        }
-    }
 
     fn skip_ws(&mut self) {
         while self
@@ -1088,7 +1074,8 @@ impl<'s> Parser<'s> {
                         self.chars = chars;
                         let close_tag_name = self.parse_tag_name()?;
                         if !close_tag_name.eq_ignore_ascii_case(tag_name) {
-                            let (line, column) = self.pos_to_line_col(element_start);
+                            let (line, column) =
+                                helpers::pos_to_line_col(self.source, element_start);
                             return Err(self.emit_error_with_pos(
                                 SyntaxErrorKind::ExpectCloseTag {
                                     tag_name: tag_name.into(),
@@ -1102,7 +1089,7 @@ impl<'s> Parser<'s> {
                         if self.chars.next_if(|(_, c)| *c == '>').is_some() {
                             break;
                         }
-                        let (line, column) = self.pos_to_line_col(element_start);
+                        let (line, column) = helpers::pos_to_line_col(self.source, element_start);
                         return Err(self.emit_error(SyntaxErrorKind::ExpectCloseTag {
                             tag_name: tag_name.into(),
                             line,
@@ -1126,7 +1113,7 @@ impl<'s> Parser<'s> {
                     }
                 }
                 None => {
-                    let (line, column) = self.pos_to_line_col(element_start);
+                    let (line, column) = helpers::pos_to_line_col(self.source, element_start);
                     return Err(self.emit_error(SyntaxErrorKind::ExpectCloseTag {
                         tag_name: tag_name.into(),
                         line,
@@ -1293,7 +1280,7 @@ impl<'s> Parser<'s> {
                     children.push(children_parser(self)?);
                 }
                 None => {
-                    let (line, column) = self.pos_to_line_col(tag_start);
+                    let (line, column) = helpers::pos_to_line_col(self.source, tag_start);
                     return Err(self.emit_error(SyntaxErrorKind::ExpectJinjaBlockEnd {
                         tag_name: tag_name.into(),
                         line,

From bc91cad29c0525bb1a64a93680b6164993ed73b1 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 12 May 2026 17:14:32 +0800
Subject: [PATCH 57/67] chore: optimize displaying errors

---
 dprint_plugin/examples/fmt_ext.rs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/dprint_plugin/examples/fmt_ext.rs b/dprint_plugin/examples/fmt_ext.rs
index caf15b73..a4531f7a 100644
--- a/dprint_plugin/examples/fmt_ext.rs
+++ b/dprint_plugin/examples/fmt_ext.rs
@@ -1,6 +1,6 @@
 use anyhow::Error;
 use dprint_core::configuration::GlobalConfiguration;
-use markup_fmt::{config::FormatOptions, detect_language, format_text};
+use markup_fmt::{FormatError, config::FormatOptions, detect_language, format_text};
 use std::{borrow::Cow, env, fs, io, path::Path};
 
 fn main() {
@@ -79,7 +79,18 @@ fn main() {
                 Ok(Cow::from(code))
             }
         },
-    )
-    .unwrap();
-    print!("{formatted}");
+    );
+    match formatted {
+        Ok(formatted) => {
+            print!("{formatted}");
+        }
+        Err(FormatError::Syntax(error)) => {
+            eprintln!("{error}");
+        }
+        Err(FormatError::External(errors)) => {
+            errors.into_iter().for_each(|error| {
+                eprintln!("{error}");
+            });
+        }
+    }
 }

From e88e271f47b3f1e13021eeddc24f61bb2e5cab54 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 15 May 2026 11:52:15 +0800
Subject: [PATCH 58/67] feat: replace external syntax error position manually
 (#223)

---
 Cargo.lock                         |  17 +-
 dprint_plugin/tests/integration.rs |   2 +-
 markup_fmt/Cargo.toml              |   2 +
 markup_fmt/README.md               |  11 +-
 markup_fmt/examples/fmt.rs         |   6 +-
 markup_fmt/src/ctx.rs              | 170 +++++++++----------
 markup_fmt/src/error.rs            |  16 +-
 markup_fmt/src/helpers.rs          |   2 +-
 markup_fmt/src/lib.rs              |  18 +-
 markup_fmt/src/printer.rs          | 255 +++++++++++++++--------------
 markup_fmt/tests/fmt.rs            |  28 ++--
 11 files changed, 268 insertions(+), 259 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f577981..11fd798c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -622,6 +622,7 @@ dependencies = [
  "insta",
  "itertools",
  "memchr",
+ "regex",
  "serde",
  "similar-asserts",
  "tiny_pretty",
@@ -802,11 +803,23 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 
+[[package]]
+name = "regex"
+version = "1.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
 [[package]]
 name = "regex-automata"
-version = "0.4.9"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
diff --git a/dprint_plugin/tests/integration.rs b/dprint_plugin/tests/integration.rs
index fc4ddf94..9024197a 100644
--- a/dprint_plugin/tests/integration.rs
+++ b/dprint_plugin/tests/integration.rs
@@ -10,7 +10,7 @@ use std::{borrow::Cow, fs, io, path::Path};
 
 #[test]
 fn integration_with_dprint_ts_snapshot() {
-    fn format_with_dprint_ts(input: &str, path: &Path) -> Result<String, FormatError<Error>> {
+    fn format_with_dprint_ts(input: &str, path: &Path) -> Result<String, FormatError> {
         let mut options = match fs::read_to_string(path.with_extension("toml")) {
             Ok(file) => toml::from_str::<FormatOptions>(&file).unwrap(),
             Err(e) if e.kind() == io::ErrorKind::NotFound => Default::default(),
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 92f28b9f..c6297a86 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -10,9 +10,11 @@ exclude = ["/tests"]
 
 [dependencies]
 aho-corasick = "1.1"
+anyhow = "1.0"
 css_dataset = { version = "0.4", default-features = false, features = ["tags"] }
 itertools = "0.14"
 memchr = "2.7"
+regex = "1.12"
 serde = { version = "1.0", optional = true }
 tiny_pretty = { version = "0.2", features = ["unicode-width"] }
 
diff --git a/markup_fmt/README.md b/markup_fmt/README.md
index c8ce696e..1a432160 100644
--- a/markup_fmt/README.md
+++ b/markup_fmt/README.md
@@ -12,7 +12,7 @@ assert_eq!("<div class=\"container\"></div>\n", &format_text(
     "<div class=container></div>",
     Language::Html,
     &options,
-    |code, _| Ok::<_, std::convert::Infallible>(code.into()),
+    |code, _| Ok(code.into()),
 ).unwrap());
 ```
 
@@ -30,27 +30,26 @@ assert!(matches!(
         "<div>",
         Language::Html,
         &options,
-        |code, _| Ok::<_, std::convert::Infallible>(code.into()),
+        |code, _| Ok(code.into()),
     ).unwrap_err(),
     FormatError::Syntax(SyntaxError { .. })
 ));
 ```
 
-External formatter can return [`Err`] as well.
+External formatter can return `anyhow::Error`.
 This error will be aggregated and returned in [`FormatError::External`]:
 
 ```rust
+use anyhow::Error;
 use markup_fmt::{config::FormatOptions, format_text, FormatError, Language};
 
-struct ExternalFormatterError;
-
 let options = FormatOptions::default();
 assert!(matches!(
     format_text(
         "<script>a</script>",
         Language::Html,
         &options,
-        |_, _| Err(ExternalFormatterError),
+        |_, _| Err(Error::msg("external formatter error")),
     ).unwrap_err(),
     FormatError::External(errors) if !errors.is_empty()
 ));
diff --git a/markup_fmt/examples/fmt.rs b/markup_fmt/examples/fmt.rs
index a3dd4e7b..1d18a4c1 100644
--- a/markup_fmt/examples/fmt.rs
+++ b/markup_fmt/examples/fmt.rs
@@ -1,5 +1,5 @@
 use markup_fmt::{config::FormatOptions, detect_language, format_text};
-use std::{convert::Infallible, env, fs, io};
+use std::{env, fs, io};
 
 fn main() -> anyhow::Result<()> {
     let file_path = env::args().nth(1).unwrap();
@@ -16,9 +16,7 @@ fn main() -> anyhow::Result<()> {
         }
     };
 
-    let formatted = format_text(&code, language, &options, |code, _| {
-        Ok::<_, Infallible>(code.into())
-    })?;
+    let formatted = format_text(&code, language, &options, |code, _| Ok(code.into()))?;
     print!("{formatted}");
     Ok(())
 }
diff --git a/markup_fmt/src/ctx.rs b/markup_fmt/src/ctx.rs
index a6934861..6f1930e2 100644
--- a/markup_fmt/src/ctx.rs
+++ b/markup_fmt/src/ctx.rs
@@ -4,14 +4,20 @@ use crate::{
     helpers,
     state::State,
 };
+use anyhow::Error;
 use memchr::memchr;
-use std::borrow::Cow;
+use regex::{Captures, Regex};
+use std::{borrow::Cow, sync::LazyLock};
 
 const QUOTES: [&str; 3] = ["\"", "\"", "'"];
 
-pub(crate) struct Ctx<'b, E, F>
+static RE_LINE_COLUMN: LazyLock<Regex> = LazyLock::new(|| {
+    Regex::new(r"(?:[Ll]ine\s*(\d+),?\s*[Cc]ol(?:umn)?\s*(\d+))|:(\d+):(\d+)").unwrap()
+});
+
+pub(crate) struct Ctx<'b, F>
 where
-    F: for<'a> FnMut(&'a str, Hints<'b>) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints<'b>) -> Result<Cow<'a, str>, Error>,
 {
     pub(crate) source: &'b str,
     pub(crate) language: Language,
@@ -19,12 +25,12 @@ where
     pub(crate) print_width: usize,
     pub(crate) options: &'b LanguageOptions,
     pub(crate) external_formatter: F,
-    pub(crate) external_formatter_errors: Vec<E>,
+    pub(crate) external_formatter_errors: Vec<Error>,
 }
 
-impl<'b, E, F> Ctx<'b, E, F>
+impl<'b, F> Ctx<'b, F>
 where
-    F: for<'a> FnMut(&'a str, Hints<'b>) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints<'b>) -> Result<Cow<'a, str>, Error>,
 {
     pub(crate) fn script_indent(&self) -> bool {
         match self.language {
@@ -135,30 +141,19 @@ where
         code: &str,
         attr: bool,
         start: usize,
-    ) -> Result<String, E> {
-        if code.trim().is_empty() {
+    ) -> Result<String, Error> {
+        let code = code.trim_ascii();
+        if code.is_empty() {
             Ok(String::new())
         } else {
             // Trim original code before sending it to the external formatter.
             // This makes sure the code will be trimmed
             // though external formatter isn't available.
-            let preprocessed = code.trim_start();
-            let will_add_brackets =
-                preprocessed.starts_with('{') || preprocessed.starts_with("...");
+            let will_add_brackets = code.starts_with('{') || code.starts_with("...");
             let wrapped = if will_add_brackets {
-                self.source
-                    .get(0..start.saturating_sub(1))
-                    .unwrap_or_default()
-                    .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                    + "["
-                    + code.trim()
-                    + "]"
+                &format!("[{code}]")
             } else {
-                self.source
-                    .get(0..start)
-                    .unwrap_or_default()
-                    .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                    + code
+                code
             };
             let formatted = self.try_format_with_external_formatter(
                 wrapped,
@@ -168,11 +163,12 @@ where
                     attr,
                     ext: "tsx",
                 },
+                start,
             )?;
             let mut formatted =
                 formatted.trim_matches(|c: char| c.is_ascii_whitespace() || c == ';');
-            formatted = trim_delim(preprocessed, formatted, '[', ']');
-            formatted = trim_delim(preprocessed, formatted, '(', ')');
+            formatted = trim_delim(code, formatted, '[', ']');
+            formatted = trim_delim(code, formatted, '(', ')');
             if will_add_brackets {
                 formatted = formatted.trim_ascii_end().trim_end_matches(',');
             }
@@ -181,25 +177,20 @@ where
     }
 
     pub(crate) fn format_binding(&mut self, code: &str, start: usize) -> String {
-        if code.trim().is_empty() {
+        let code = code.trim_ascii();
+        if code.is_empty() {
             String::new()
         } else {
-            let wrapped = self
-                .source
-                .get(0..start.saturating_sub(4))
-                .unwrap_or_default()
-                .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                + "let "
-                + code.trim()
-                + " = 0";
+            let wrapped = format!("let {code} = 0");
             let formatted = self.format_with_external_formatter(
-                wrapped,
+                &wrapped,
                 Hints {
                     print_width: self.print_width,
                     indent_level: 0,
                     attr: false,
                     ext: "ts",
                 },
+                start,
             );
             let formatted = formatted.trim_matches(|c: char| c.is_ascii_whitespace() || c == ';');
             formatted
@@ -211,25 +202,20 @@ where
     }
 
     pub(crate) fn format_type_params(&mut self, code: &str, start: usize) -> String {
-        if code.trim().is_empty() {
+        let code = code.trim_ascii();
+        if code.is_empty() {
             String::new()
         } else {
-            let wrapped = self
-                .source
-                .get(0..start.saturating_sub(7))
-                .unwrap_or_default()
-                .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                + "type T<"
-                + code.trim()
-                + "> = 0";
+            let wrapped = format!("type T<{code}> = 0");
             let formatted = self.format_with_external_formatter(
-                wrapped,
+                &wrapped,
                 Hints {
                     print_width: self.print_width,
                     indent_level: 0,
                     attr: true,
                     ext: "ts",
                 },
+                start,
             );
             let formatted = formatted.trim_matches(|c: char| c.is_ascii_whitespace() || c == ';');
             formatted
@@ -243,18 +229,20 @@ where
     }
 
     pub(crate) fn format_stmt_header(&mut self, keyword: &str, code: &str) -> String {
-        if code.trim().is_empty() {
+        let code = code.trim_ascii();
+        if code.is_empty() {
             String::new()
         } else {
             let wrapped = format!("{keyword} ({code}) {{}}");
             let formatted = self.format_with_external_formatter(
-                wrapped,
+                &wrapped,
                 Hints {
                     print_width: self.print_width,
                     indent_level: 0,
                     attr: false,
                     ext: "js",
                 },
+                0,
             );
             formatted
                 .strip_prefix(keyword)
@@ -290,19 +278,16 @@ where
         lang: &'b str,
         start: usize,
         state: &State,
-    ) -> Result<Cow<'a, str>, E> {
+    ) -> Result<Cow<'a, str>, Error> {
         self.try_format_with_external_formatter(
-            self.source
-                .get(0..start)
-                .unwrap_or_default()
-                .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                + code,
+            code,
             Hints {
                 print_width: self.print_width,
                 indent_level: state.indent_level,
                 attr: false,
                 ext: lang,
             },
+            start,
         )
     }
 
@@ -314,14 +299,7 @@ where
         state: &State,
     ) -> Cow<'a, str> {
         self.format_with_external_formatter(
-            "\n".repeat(
-                self.source
-                    .get(0..start)
-                    .unwrap_or_default()
-                    .lines()
-                    .count()
-                    .saturating_sub(1),
-            ) + code,
+            code,
             Hints {
                 print_width: self
                     .print_width
@@ -335,22 +313,20 @@ where
                 attr: false,
                 ext: if lang == "postcss" { "css" } else { lang },
             },
+            start,
         )
     }
 
     pub(crate) fn format_style_attr(&mut self, code: &str, start: usize, state: &State) -> String {
         self.format_with_external_formatter(
-            self.source
-                .get(0..start)
-                .unwrap_or_default()
-                .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                + code,
+            code,
             Hints {
                 print_width: u16::MAX as usize,
                 indent_level: state.indent_level,
                 attr: true,
                 ext: "css",
             },
+            start,
         )
         .trim()
         .to_owned()
@@ -363,11 +339,7 @@ where
         state: &State,
     ) -> Cow<'a, str> {
         self.format_with_external_formatter(
-            self.source
-                .get(0..start)
-                .unwrap_or_default()
-                .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                + code,
+            code,
             Hints {
                 print_width: self
                     .print_width
@@ -381,6 +353,7 @@ where
                 attr: false,
                 ext: "json",
             },
+            start,
         )
     }
 
@@ -392,11 +365,7 @@ where
         state: &State,
     ) -> String {
         self.format_with_external_formatter(
-            self.source
-                .get(0..start)
-                .unwrap_or_default()
-                .replace(|c: char| !c.is_ascii_whitespace(), " ")
-                + code,
+            code,
             Hints {
                 print_width: self
                     .print_width
@@ -409,6 +378,7 @@ where
                     "markup-fmt-jinja-stmt"
                 },
             },
+            start,
         )
         .trim_ascii()
         .to_owned()
@@ -416,12 +386,12 @@ where
 
     fn format_with_external_formatter<'a>(
         &mut self,
-        code: String,
+        code: &'a str,
         hints: Hints<'b>,
+        start: usize,
     ) -> Cow<'a, str> {
-        match (self.external_formatter)(&code, hints) {
-            Ok(Cow::Owned(formatted)) => Cow::from(formatted),
-            Ok(Cow::Borrowed(..)) => Cow::from(code),
+        match self.try_format_with_external_formatter(code, hints, start) {
+            Ok(formatted) => formatted,
             Err(e) => {
                 self.external_formatter_errors.push(e);
                 code.into()
@@ -431,13 +401,45 @@ where
 
     fn try_format_with_external_formatter<'a>(
         &mut self,
-        code: String,
+        code: &'a str,
         hints: Hints<'b>,
-    ) -> Result<Cow<'a, str>, E> {
-        match (self.external_formatter)(&code, hints) {
+        start: usize,
+    ) -> Result<Cow<'a, str>, Error> {
+        match (self.external_formatter)(code, hints) {
             Ok(Cow::Owned(formatted)) => Ok(Cow::from(formatted)),
             Ok(Cow::Borrowed(..)) => Ok(Cow::from(code)),
-            Err(e) => Err(e),
+            Err(e) => {
+                let msg = e.to_string();
+                let (start_line, start_col) = helpers::pos_to_line_col(self.source, start);
+                let msg = RE_LINE_COLUMN
+                    .replace_all(&msg, |captures: &Captures| {
+                        captures
+                            .get(1)
+                            .or_else(|| captures.get(3))
+                            .zip(captures.get(2).or_else(|| captures.get(4)))
+                            .and_then(|(line, col)| {
+                                Some((
+                                    msg.get(..line.start())?,
+                                    msg.get(line.range())
+                                        .and_then(|line| line.parse::<usize>().ok())?,
+                                    msg.get(line.end()..col.start())?,
+                                    msg.get(col.range())
+                                        .and_then(|col| col.parse::<usize>().ok())?,
+                                    msg.get(col.end()..)?,
+                                ))
+                            })
+                            .map(|(prefix, line, mid, col, suffix)| {
+                                format!(
+                                    "{prefix}{}{mid}{}{suffix}",
+                                    (start_line + line).saturating_sub(1),
+                                    start_col + col
+                                )
+                            })
+                            .unwrap_or_else(|| msg.clone())
+                    })
+                    .to_string();
+                Err(Error::msg(msg))
+            }
         }
     }
 }
diff --git a/markup_fmt/src/error.rs b/markup_fmt/src/error.rs
index 951f6f47..9cdecc56 100644
--- a/markup_fmt/src/error.rs
+++ b/markup_fmt/src/error.rs
@@ -1,4 +1,5 @@
-use std::{borrow::Cow, error::Error, fmt};
+use anyhow::Error;
+use std::{borrow::Cow, fmt};
 
 #[derive(Clone, Debug)]
 /// Syntax error when parsing tags, not `<script>` or `<style>` tag.
@@ -136,22 +137,19 @@ impl fmt::Display for SyntaxError {
     }
 }
 
-impl Error for SyntaxError {}
+impl std::error::Error for SyntaxError {}
 
 #[derive(Debug)]
 /// The error type for markup_fmt.
-pub enum FormatError<E> {
+pub enum FormatError {
     /// Syntax error when parsing tags.
     Syntax(SyntaxError),
     /// Error from external formatter, for example,
     /// there're errors when formatting the `<script>` or `<style>` tag.
-    External(Vec<E>),
+    External(Vec<Error>),
 }
 
-impl<E> fmt::Display for FormatError<E>
-where
-    E: fmt::Display,
-{
+impl fmt::Display for FormatError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             FormatError::Syntax(e) => e.fmt(f),
@@ -166,4 +164,4 @@ where
     }
 }
 
-impl<E> Error for FormatError<E> where E: Error {}
+impl std::error::Error for FormatError {}
diff --git a/markup_fmt/src/helpers.rs b/markup_fmt/src/helpers.rs
index 3c22d3a3..2ef21985 100644
--- a/markup_fmt/src/helpers.rs
+++ b/markup_fmt/src/helpers.rs
@@ -315,7 +315,7 @@ pub(crate) fn pos_to_line_col(source: &str, pos: usize) -> (usize, usize) {
         },
     );
     match search {
-        ControlFlow::Break((line, offset)) => (line, pos - offset + 1),
+        ControlFlow::Break((line, offset)) => (line, pos - offset.max(pos)),
         ControlFlow::Continue((line, _)) => (line, 0),
     }
 }
diff --git a/markup_fmt/src/lib.rs b/markup_fmt/src/lib.rs
index ede68f1b..4f097433 100644
--- a/markup_fmt/src/lib.rs
+++ b/markup_fmt/src/lib.rs
@@ -11,6 +11,7 @@ mod state;
 
 use crate::{config::FormatOptions, ctx::Ctx, parser::Parser, printer::DocGen, state::State};
 pub use crate::{ctx::Hints, error::*, parser::Language};
+use anyhow::Error;
 use std::{borrow::Cow, path::Path};
 use tiny_pretty::{IndentKind, PrintOptions};
 
@@ -37,7 +38,7 @@ use tiny_pretty::{IndentKind, PrintOptions};
 ///     code,
 ///     Language::Html,
 ///     &Default::default(),
-///     |code, _| Ok::<_, std::convert::Infallible>(code.into()),
+///     |code, _| Ok(code.into()),
 /// ).unwrap();
 /// ```
 ///
@@ -46,14 +47,14 @@ use tiny_pretty::{IndentKind, PrintOptions};
 /// - The first argument is code that needs formatting.
 /// - The second argument is hints which contains useful information for external formatters,
 ///   such as file extension and print width.
-pub fn format_text<E, F>(
+pub fn format_text<F>(
     code: &str,
     language: Language,
     options: &FormatOptions,
     external_formatter: F,
-) -> Result<String, FormatError<E>>
+) -> Result<String, FormatError>
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     let mut parser = Parser::new(code, language);
     let ast = parser.parse_root().map_err(FormatError::Syntax)?;
@@ -142,7 +143,6 @@ pub fn detect_language(path: impl AsRef<Path>) -> Option<Language> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::convert::Infallible;
 
     #[test]
     fn mjs() {
@@ -153,7 +153,7 @@ mod tests {
             &Default::default(),
             |code, hints| {
                 ext = Some(hints.ext.to_owned());
-                Ok::<_, Infallible>(Cow::from(code))
+                Ok(Cow::from(code))
             },
         );
         assert_eq!(ext.as_deref(), Some("mjs"));
@@ -168,7 +168,7 @@ mod tests {
             &Default::default(),
             |code, hints| {
                 ext = Some(hints.ext.to_owned());
-                Ok::<_, Infallible>(Cow::from(code))
+                Ok(Cow::from(code))
             },
         );
         assert_eq!(ext.as_deref(), Some("mts"));
@@ -183,7 +183,7 @@ mod tests {
             &Default::default(),
             |code, hints| {
                 ext = Some(hints.ext.to_owned());
-                Ok::<_, Infallible>(Cow::from(code))
+                Ok(Cow::from(code))
             },
         );
         assert_eq!(ext.as_deref(), Some("jsx"));
@@ -198,7 +198,7 @@ mod tests {
             &Default::default(),
             |code, hints| {
                 ext = Some(hints.ext.to_owned());
-                Ok::<_, Infallible>(Cow::from(code))
+                Ok(Cow::from(code))
             },
         );
         assert_eq!(ext.as_deref(), Some("tsx"));
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 37f22c1a..0608a3cb 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -7,20 +7,21 @@ use crate::{
     parser::parse_as_interpolated,
     state::State,
 };
+use anyhow::Error;
 use itertools::{EitherOrBoth, Itertools};
 use std::borrow::Cow;
 use tiny_pretty::Doc;
 
 pub(super) trait DocGen<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>;
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>;
 }
 
 impl<'s> DocGen<'s> for AngularElseIf<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text("@else if ("));
@@ -41,9 +42,9 @@ impl<'s> DocGen<'s> for AngularElseIf<'s> {
 }
 
 impl<'s> DocGen<'s> for AngularFor<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text("@for ("));
@@ -86,9 +87,9 @@ impl<'s> DocGen<'s> for AngularFor<'s> {
 }
 
 impl<'s> DocGen<'s> for AngularGenericBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text("@"));
@@ -109,9 +110,9 @@ impl<'s> DocGen<'s> for AngularGenericBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for Vec<AngularGenericBlock<'s>> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let next_block_ws = if ctx.options.angular_next_control_flow_same_line {
             Doc::space()
@@ -129,9 +130,9 @@ impl<'s> DocGen<'s> for Vec<AngularGenericBlock<'s>> {
 }
 
 impl<'s> DocGen<'s> for AngularIf<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let next_cf_ws = if ctx.options.angular_next_control_flow_same_line {
             Doc::space()
@@ -174,9 +175,9 @@ impl<'s> DocGen<'s> for AngularIf<'s> {
 }
 
 impl<'s> DocGen<'s> for AngularInterpolation<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{{")
             .append(Doc::line_or_space())
@@ -194,9 +195,9 @@ impl<'s> DocGen<'s> for AngularInterpolation<'s> {
 }
 
 impl<'s> DocGen<'s> for AngularLet<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("@let ")
             .append(Doc::text(self.name))
@@ -207,9 +208,9 @@ impl<'s> DocGen<'s> for AngularLet<'s> {
 }
 
 impl<'s> DocGen<'s> for AngularSwitch<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text("@switch ("));
@@ -228,9 +229,9 @@ impl<'s> DocGen<'s> for AngularSwitch<'s> {
 }
 
 impl<'s> DocGen<'s> for AngularSwitchArm<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text(format!("@{}", self.keyword)));
@@ -251,9 +252,9 @@ impl<'s> DocGen<'s> for AngularSwitchArm<'s> {
 }
 
 impl<'s> DocGen<'s> for AstroAttribute<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let expr_code = ctx.format_expr(self.expr.0, false, self.expr.1);
         let expr = Doc::text("{")
@@ -278,9 +279,9 @@ impl<'s> DocGen<'s> for AstroAttribute<'s> {
 }
 
 impl<'s> DocGen<'s> for AstroExpr<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let indent_width = ctx.indent_width;
 
@@ -356,9 +357,9 @@ impl<'s> DocGen<'s> for AstroExpr<'s> {
 }
 
 impl<'s> DocGen<'s> for Attribute<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         match self {
             Attribute::Native(native_attribute) => native_attribute.doc(ctx, state),
@@ -376,9 +377,9 @@ impl<'s> DocGen<'s> for Attribute<'s> {
 }
 
 impl<'s> DocGen<'s> for Cdata<'s> {
-    fn doc<E, F>(&self, _: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, _: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("<![CDATA[")
             .concat(reflow_raw(self.raw))
@@ -387,9 +388,9 @@ impl<'s> DocGen<'s> for Cdata<'s> {
 }
 
 impl<'s> DocGen<'s> for Comment<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         if ctx.options.format_comments {
             Doc::text("<!--")
@@ -408,9 +409,9 @@ impl<'s> DocGen<'s> for Comment<'s> {
 }
 
 impl<'s> DocGen<'s> for Doctype<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         use crate::config::DoctypeKeywordCase;
 
@@ -431,9 +432,9 @@ impl<'s> DocGen<'s> for Doctype<'s> {
 }
 
 impl<'s> DocGen<'s> for Element<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let tag_name = self
             .tag_name
@@ -904,9 +905,9 @@ impl<'s> DocGen<'s> for Element<'s> {
 }
 
 impl<'s> DocGen<'s> for FrontMatter<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         if matches!(ctx.language, Language::Astro) {
             let formatted = ctx.format_script(self.raw, "tsx", self.start, state);
@@ -924,9 +925,9 @@ impl<'s> DocGen<'s> for FrontMatter<'s> {
 }
 
 impl<'s> DocGen<'s> for JinjaBlock<'s, Attribute<'s>> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::list(
             self.body
@@ -947,9 +948,9 @@ impl<'s> DocGen<'s> for JinjaBlock<'s, Attribute<'s>> {
 }
 
 impl<'s> DocGen<'s> for JinjaBlock<'s, Node<'s>> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::list(
             self.body
@@ -966,9 +967,9 @@ impl<'s> DocGen<'s> for JinjaBlock<'s, Node<'s>> {
 }
 
 impl<'s> DocGen<'s> for JinjaComment<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         if ctx.options.format_comments {
             Doc::text("{#")
@@ -987,9 +988,9 @@ impl<'s> DocGen<'s> for JinjaComment<'s> {
 }
 
 impl<'s> DocGen<'s> for JinjaInterpolation<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{{")
             .append(if self.trim_prev {
@@ -1015,9 +1016,9 @@ impl<'s> DocGen<'s> for JinjaInterpolation<'s> {
 }
 
 impl<'s> DocGen<'s> for JinjaTag<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let (prefix, content) = if let Some(content) = self.content.strip_prefix('-') {
             ("-", content)
@@ -1053,9 +1054,9 @@ impl<'s> DocGen<'s> for JinjaTag<'s> {
 }
 
 impl<'s> DocGen<'s> for JsComment<'s> {
-    fn doc<E, F>(&self, _: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, _: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         if self.block {
             Doc::text("/*")
@@ -1068,9 +1069,9 @@ impl<'s> DocGen<'s> for JsComment<'s> {
 }
 
 impl<'s> DocGen<'s> for MustacheBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::list(
             self.controls
@@ -1104,9 +1105,9 @@ impl<'s> DocGen<'s> for MustacheBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for MustacheInterpolation<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         if self.content.starts_with('!') {
             Doc::text("{{")
@@ -1134,9 +1135,9 @@ impl<'s> DocGen<'s> for MustacheInterpolation<'s> {
 }
 
 impl<'s> DocGen<'s> for NativeAttribute<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let name = Doc::text(self.name);
         if let Some((value, value_start)) = self.value {
@@ -1306,9 +1307,9 @@ impl<'s> DocGen<'s> for NativeAttribute<'s> {
 }
 
 impl<'s> DocGen<'s> for NodeKind<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         match self {
             NodeKind::AngularFor(angular_for) => angular_for.doc(ctx, state),
@@ -1361,9 +1362,9 @@ impl<'s> DocGen<'s> for NodeKind<'s> {
 }
 
 impl<'s> DocGen<'s> for Root<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let is_whole_document_like = self.children.iter().any(|child| match &child.kind {
             NodeKind::Doctype(..) => true,
@@ -1395,9 +1396,9 @@ impl<'s> DocGen<'s> for Root<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteAtTag<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{@")
             .append(Doc::text(self.name))
@@ -1411,9 +1412,9 @@ impl<'s> DocGen<'s> for SvelteAtTag<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteAttribute<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let expr_code = ctx.format_expr(self.expr.0, false, self.expr.1);
         let expr = Doc::text("{")
@@ -1461,9 +1462,9 @@ impl<'s> DocGen<'s> for SvelteAttribute<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteAttachment<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let expr_code = ctx.format_expr(self.expr.0, false, self.expr.1);
         Doc::text("{@attach ")
@@ -1473,9 +1474,9 @@ impl<'s> DocGen<'s> for SvelteAttachment<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteAwaitBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut head = Vec::with_capacity(5);
         head.push(Doc::text("{#await "));
@@ -1527,9 +1528,9 @@ impl<'s> DocGen<'s> for SvelteAwaitBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteCatchBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let children = format_control_structure_block_children(&self.children, ctx, state);
         if let Some((binding, start)) = self.binding {
@@ -1544,9 +1545,9 @@ impl<'s> DocGen<'s> for SvelteCatchBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteEachBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text("{#each "));
@@ -1590,9 +1591,9 @@ impl<'s> DocGen<'s> for SvelteEachBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteElseIfBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{:else if ")
             .append(Doc::text(ctx.format_expr(self.expr.0, false, self.expr.1)))
@@ -1606,9 +1607,9 @@ impl<'s> DocGen<'s> for SvelteElseIfBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteIfBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text("{#if "));
@@ -1639,9 +1640,9 @@ impl<'s> DocGen<'s> for SvelteIfBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteInterpolation<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{")
             .append(Doc::line_or_nil())
@@ -1657,9 +1658,9 @@ impl<'s> DocGen<'s> for SvelteInterpolation<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteKeyBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{#key ")
             .append(Doc::text(ctx.format_expr(self.expr.0, false, self.expr.1)))
@@ -1674,9 +1675,9 @@ impl<'s> DocGen<'s> for SvelteKeyBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteSnippetBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let wrapped = format!("function {}{{}}", self.signature.0);
         let formatted = ctx.format_script(&wrapped, "ts", self.signature.1, state);
@@ -1702,9 +1703,9 @@ impl<'s> DocGen<'s> for SvelteSnippetBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for SvelteThenBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text("{:then"));
@@ -1723,9 +1724,9 @@ impl<'s> DocGen<'s> for SvelteThenBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for TextNode<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         if ctx.language == Language::Xml {
             if self.raw.chars().all(|c| c.is_ascii_whitespace()) {
@@ -1752,9 +1753,9 @@ impl<'s> DocGen<'s> for TextNode<'s> {
 }
 
 impl<'s> DocGen<'s> for VentoBlock<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::list(
             self.body
@@ -1766,9 +1767,9 @@ impl<'s> DocGen<'s> for VentoBlock<'s> {
 }
 
 impl<'s> DocGen<'s> for VentoComment<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         if ctx.options.format_comments {
             Doc::text("{{#")
@@ -1787,9 +1788,9 @@ impl<'s> DocGen<'s> for VentoComment<'s> {
 }
 
 impl<'s> DocGen<'s> for VentoEval<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{{>")
             .append(Doc::line_or_space())
@@ -1807,9 +1808,9 @@ impl<'s> DocGen<'s> for VentoEval<'s> {
 }
 
 impl<'s> DocGen<'s> for VentoInterpolation<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{{")
             .append(if self.trim_prev {
@@ -1842,9 +1843,9 @@ impl<'s> DocGen<'s> for VentoInterpolation<'s> {
 }
 
 impl<'s> DocGen<'s> for VentoTag<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{{")
             .append(if self.trim_prev {
@@ -1952,9 +1953,9 @@ impl<'s> DocGen<'s> for VentoTag<'s> {
 }
 
 impl<'s> DocGen<'s> for VentoTagOrChildren<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         match self {
             VentoTagOrChildren::Tag(tag) => tag.doc(ctx, state),
@@ -1966,9 +1967,9 @@ impl<'s> DocGen<'s> for VentoTagOrChildren<'s> {
 }
 
 impl<'s> DocGen<'s> for VueDirective<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         use crate::config::{VBindStyle, VOnStyle};
 
@@ -2125,9 +2126,9 @@ impl<'s> DocGen<'s> for VueDirective<'s> {
 }
 
 impl<'s> DocGen<'s> for VueInterpolation<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, _: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, _: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("{{")
             .append(Doc::line_or_space())
@@ -2143,9 +2144,9 @@ impl<'s> DocGen<'s> for VueInterpolation<'s> {
 }
 
 impl<'s> DocGen<'s> for XmlDecl<'s> {
-    fn doc<E, F>(&self, ctx: &mut Ctx<'s, E, F>, state: &State<'s>) -> Doc<'s>
+    fn doc<F>(&self, ctx: &mut Ctx<'s, F>, state: &State<'s>) -> Doc<'s>
     where
-        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+        F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         Doc::text("<?xml")
             .concat(
@@ -2296,9 +2297,9 @@ fn is_multi_line_attr(attr: &Attribute) -> bool {
     }
 }
 
-fn should_ignore_node<'s, E, F>(index: usize, nodes: &[Node], ctx: &Ctx<'s, E, F>) -> bool
+fn should_ignore_node<'s, F>(index: usize, nodes: &[Node], ctx: &Ctx<'s, F>) -> bool
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     match index.checked_sub(1).and_then(|i| nodes.get(i)) {
         Some(Node {
@@ -2322,9 +2323,9 @@ where
         _ => false,
     }
 }
-fn has_ignore_directive<'s, E, F>(comment: &Comment, ctx: &Ctx<'s, E, F>) -> bool
+fn has_ignore_directive<'s, F>(comment: &Comment, ctx: &Ctx<'s, F>) -> bool
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     comment
         .raw
@@ -2407,13 +2408,13 @@ fn format_attr_value(value: impl AsRef<str>, quotes: &Quotes) -> Doc<'_> {
         .append(quote)
 }
 
-fn format_children_with_inserting_linebreak<'s, E, F>(
+fn format_children_with_inserting_linebreak<'s, F>(
     children: &[Node<'s>],
-    ctx: &mut Ctx<'s, E, F>,
+    ctx: &mut Ctx<'s, F>,
     state: &State<'s>,
 ) -> Doc<'s>
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     Doc::list(
         children
@@ -2496,13 +2497,13 @@ fn is_text_like(node: &Node, language: Language) -> bool {
     }
 }
 
-fn format_children_without_inserting_linebreak<'s, E, F>(
+fn format_children_without_inserting_linebreak<'s, F>(
     children: &[Node<'s>],
-    ctx: &mut Ctx<'s, E, F>,
+    ctx: &mut Ctx<'s, F>,
     state: &State<'s>,
 ) -> Doc<'s>
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     Doc::list(
         children
@@ -2570,13 +2571,13 @@ fn extract_slot_name(arg_and_modifiers: Option<&str>) -> &str {
         .unwrap_or("default")
 }
 
-fn get_v_slot_style_option<'s, E, F>(
+fn get_v_slot_style_option<'s, F>(
     slot: &'s str,
-    ctx: &Ctx<'s, E, F>,
+    ctx: &Ctx<'s, F>,
     state: &State<'s>,
 ) -> Option<VSlotStyle>
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     let option = if state
         .current_tag_name
@@ -2658,15 +2659,15 @@ fn format_ws_insensitive_trailing_ws<'s>(children: &[Node<'s>]) -> Doc<'s> {
         _ => Doc::line_or_nil(),
     }
 }
-fn format_v_for<'s, E, F>(
+fn format_v_for<'s, F>(
     left: &str,
     delimiter: &'static str,
     right: &str,
     start: usize,
-    ctx: &mut Ctx<'s, E, F>,
+    ctx: &mut Ctx<'s, F>,
 ) -> String
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     let left = ctx.format_expr(left, false, start);
     let right = ctx.format_expr(right, false, start + 4);
@@ -2680,13 +2681,13 @@ where
     }
 }
 
-fn format_control_structure_block_children<'s, E, F>(
+fn format_control_structure_block_children<'s, F>(
     children: &[Node<'s>],
-    ctx: &mut Ctx<'s, E, F>,
+    ctx: &mut Ctx<'s, F>,
     state: &State<'s>,
 ) -> Doc<'s>
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     match children {
         [
@@ -2704,14 +2705,14 @@ where
     }
 }
 
-fn format_vento_stmt_header<'s, E, F>(
+fn format_vento_stmt_header<'s, F>(
     tag_keyword: &'static str,
     fake_keyword: &'static str,
     code: &'s str,
-    ctx: &mut Ctx<'s, E, F>,
+    ctx: &mut Ctx<'s, F>,
 ) -> Doc<'s>
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     Doc::text(tag_keyword)
         .append(Doc::space())
@@ -2725,13 +2726,13 @@ where
 ///
 /// This will try to respect the configured `quotes` but might change it
 /// to ensure the result is valid html.
-fn compute_attr_value_quote<'s, E, F>(
+fn compute_attr_value_quote<'s, F>(
     attr_value: &str,
     initial_quote: Option<char>,
-    ctx: &mut Ctx<'s, E, F>,
+    ctx: &mut Ctx<'s, F>,
 ) -> Doc<'s>
 where
-    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, E>,
+    F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
 {
     let has_single = attr_value.contains('\'');
     let has_double = attr_value.contains('"');
diff --git a/markup_fmt/tests/fmt.rs b/markup_fmt/tests/fmt.rs
index cbdfefca..a08e2613 100644
--- a/markup_fmt/tests/fmt.rs
+++ b/markup_fmt/tests/fmt.rs
@@ -1,6 +1,6 @@
 use insta::{Settings, assert_snapshot, glob};
 use markup_fmt::{Language, config::FormatOptions, detect_language, format_text};
-use std::{collections::HashMap, convert::Infallible, fs, path::Path};
+use std::{collections::HashMap, fs, path::Path};
 
 #[test]
 fn fmt_snapshot() {
@@ -39,21 +39,17 @@ fn run_format_test(
     options: &FormatOptions,
     language: Language,
 ) -> String {
-    let output = format_text(input, language, options, |code, _| {
-        Ok::<_, Infallible>(code.into())
-    })
-    .map_err(|err| format!("failed to format '{}': {:?}", path.display(), err))
-    .unwrap();
-    let regression_format = format_text(&output, language, options, |code, _| {
-        Ok::<_, Infallible>(code.into())
-    })
-    .map_err(|err| {
-        format!(
-            "syntax error in stability test '{}': {err:?}",
-            path.display(),
-        )
-    })
-    .unwrap();
+    let output = format_text(input, language, options, |code, _| Ok(code.into()))
+        .map_err(|err| format!("failed to format '{}': {:?}", path.display(), err))
+        .unwrap();
+    let regression_format = format_text(&output, language, options, |code, _| Ok(code.into()))
+        .map_err(|err| {
+            format!(
+                "syntax error in stability test '{}': {err:?}",
+                path.display(),
+            )
+        })
+        .unwrap();
     similar_asserts::assert_eq!(
         output,
         regression_format,

From 0fb8a09d1beea5375584dea52be3648446d06967 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 19 May 2026 08:00:51 +0800
Subject: [PATCH 59/67] feat: support Lume's Vento `comp` tag (close #224)

---
 markup_fmt/src/parser.rs                       | 6 ++++--
 markup_fmt/tests/fmt/vento/layout/fixture.snap | 3 +++
 markup_fmt/tests/fmt/vento/layout/fixture.vto  | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/markup_fmt/src/parser.rs b/markup_fmt/src/parser.rs
index 65876500..b34dc909 100644
--- a/markup_fmt/src/parser.rs
+++ b/markup_fmt/src/parser.rs
@@ -2617,8 +2617,10 @@ impl<'s> Parser<'s> {
 
         let is_function = tag_name == "function"
             || matches!(tag_name, "async" | "export") && tag_rest.starts_with("function");
-        if matches!(tag_name, "for" | "if" | "layout" | "slot" | "default")
-            || matches!(tag_name, "set" | "export") && !first_tag.contains('=')
+        if matches!(
+            tag_name,
+            "for" | "if" | "layout" | "slot" | "default" | "comp"
+        ) || matches!(tag_name, "set" | "export") && !first_tag.contains('=')
             || is_function
         {
             let mut body = vec![VentoTagOrChildren::Tag(VentoTag {
diff --git a/markup_fmt/tests/fmt/vento/layout/fixture.snap b/markup_fmt/tests/fmt/vento/layout/fixture.snap
index c929e22a..1277b331 100644
--- a/markup_fmt/tests/fmt/vento/layout/fixture.snap
+++ b/markup_fmt/tests/fmt/vento/layout/fixture.snap
@@ -16,3 +16,6 @@ source: markup_fmt/tests/fmt.rs
 {{ default bar }}
   Default content for bar
 {{ /default }}
+
+{{ comp }}
+{{ /comp }}
diff --git a/markup_fmt/tests/fmt/vento/layout/fixture.vto b/markup_fmt/tests/fmt/vento/layout/fixture.vto
index 914b3755..11e71116 100644
--- a/markup_fmt/tests/fmt/vento/layout/fixture.vto
+++ b/markup_fmt/tests/fmt/vento/layout/fixture.vto
@@ -13,3 +13,6 @@ Slot content
 {{ default bar }}
 Default content for bar
 {{ /default }}
+
+{{ comp }}
+{{ /comp }}

From 1298a5fb26cea17a0b888991b5680ed43a365384 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sat, 23 May 2026 22:55:27 +0800
Subject: [PATCH 60/67] build: update tiny_pretty

---
 Cargo.lock            | 10 ++++++++--
 markup_fmt/Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 11fd798c..ba25776f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -609,7 +609,7 @@ dependencies = [
  "memchr",
  "raffia",
  "serde",
- "tiny_pretty",
+ "tiny_pretty 0.2.1",
 ]
 
 [[package]]
@@ -625,7 +625,7 @@ dependencies = [
  "regex",
  "serde",
  "similar-asserts",
- "tiny_pretty",
+ "tiny_pretty 0.3.1",
  "toml",
 ]
 
@@ -1222,6 +1222,12 @@ name = "tiny_pretty"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "650d82e943da333637be9f1567d33d605e76810a26464edfd7ae74f7ef181e95"
+
+[[package]]
+name = "tiny_pretty"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04eee220e23d20da16daeac8f8e8c4a3ae5e12640758c1fddb91be2e34e71f67"
 dependencies = [
  "unicode-width 0.2.1",
 ]
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index c6297a86..e096a20b 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -16,7 +16,7 @@ itertools = "0.14"
 memchr = "2.7"
 regex = "1.12"
 serde = { version = "1.0", optional = true }
-tiny_pretty = { version = "0.2", features = ["unicode-width"] }
+tiny_pretty = { version = "0.3", features = ["unicode-width"] }
 
 [dev-dependencies]
 anyhow.workspace = true

From a8bfae62ce478ac90ff2dda89aba9fa3f493f396 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 26 May 2026 17:34:38 +0800
Subject: [PATCH 61/67] docs: add note about key name to website (close #225)

---
 docs/src/config/README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/src/config/README.md b/docs/src/config/README.md
index a82d77e4..25b1bdcc 100644
--- a/docs/src/config/README.md
+++ b/docs/src/config/README.md
@@ -1,3 +1,14 @@
 # Configuration
 
 Options name in this page are in camel case. If you're using markup_fmt as a Rust crate, please use snake case instead.
+
+If you're using in dprint, please note that the key name for configuration is `"markup"`, not `"markup_fmt"`:
+
+```jsonc
+{
+  // ...
+  "markup": { // <-- the key name here is "markup", not "markup_fmt"
+    // config comes here
+  }
+}
+```

From 1e254d5b66e3d06a632a642cba25986215596a33 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 27 May 2026 16:28:20 +0800
Subject: [PATCH 62/67] build: update dependencies

---
 Cargo.lock                                    | 900 ++++++++++--------
 Cargo.toml                                    |   6 +-
 dprint_plugin/Cargo.toml                      |   2 +-
 markup_fmt/Cargo.toml                         |   4 +-
 .../tests/fmt/html/attributes/srcset.snap     |   6 +-
 ...rounding-empty-line.strict-whitespace.snap |   6 +-
 markup_fmt/tests/fmt/html/srcset/invalid.snap |   8 +-
 .../fmt/html/tags/pre.strict-whitespace.snap  |   9 +-
 .../tests/fmt/html/tags/textarea.default.snap |   6 +-
 .../html/tags/textarea.ignore-whitespace.snap |   6 +-
 .../html/tags/textarea.strict-whitespace.snap |   6 +-
 .../fmt/jinja/whitespace-control/fixture.snap |   5 +-
 .../tests/fmt/mustache/comments/comments.snap |   3 +-
 13 files changed, 549 insertions(+), 418 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba25776f..ad26b49b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -16,9 +16,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.3"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 dependencies = [
  "memchr",
 ]
@@ -31,32 +31,35 @@ checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "anyhow"
-version = "1.0.99"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
+checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
 
 [[package]]
-name = "arrayvec"
-version = "0.7.6"
+name = "ar_archive_writer"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "7eb93bbb63b9c227414f6eb3a0adfddca591a8ce1e9b60661bb08969b87e340b"
+dependencies = [
+ "object",
+]
 
 [[package]]
 name = "ast_node"
-version = "3.0.3"
+version = "5.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1e2cddd48eafd883890770673b1971faceaf80a185445671abc3ea0c00593ee"
+checksum = "2eb025ef00a6da925cf40870b9c8d008526b6004ece399cb0974209720f0b194"
 dependencies = [
  "quote",
  "swc_macros_common",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "better_scoped_tls"
@@ -69,15 +72,15 @@ dependencies = [
 
 [[package]]
 name = "bitflags"
-version = "2.9.3"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34efbcccd345379ca2868b2b2c9d3782e9cc58ba87bc7d79d5b53d9c9ae6f25d"
+checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3"
 
 [[package]]
 name = "bstr"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4"
+checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab"
 dependencies = [
  "memchr",
  "regex-automata",
@@ -86,13 +89,29 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649"
 dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "bytes"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
+
+[[package]]
+name = "bytes-str"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c60b5ce37e0b883c37eb89f79a1e26fbe9c1081945d024eee93e8d91a7e18b3"
+dependencies = [
+ "bytes",
+ "serde",
+]
+
 [[package]]
 name = "capacity_builder"
 version = "0.5.0"
@@ -110,34 +129,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b4a6cae9efc04cc6cbb8faf338d2c497c165c83e74509cf4dbedea948bbf6e5"
 dependencies = [
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.34"
+version = "1.2.62"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42bc4aea80032b7bf409b0bc7ccad88853858911b7713a8062fdc0623867bedc"
+checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98"
 dependencies = [
+ "find-msvc-tools",
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "console"
-version = "0.15.11"
+version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87"
 dependencies = [
  "encode_unicode",
  "libc",
- "once_cell",
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -154,9 +173,9 @@ checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376"
 
 [[package]]
 name = "deno_ast"
-version = "0.49.0"
+version = "0.53.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24158ccf7def38c00fd253fd1b48c8c6207214078fe499f47168763fa2445bf2"
+checksum = "05792fb2b77938767ffeb0853289e86501fddc84b1cdba9e5dc860c52baa2ff7"
 dependencies = [
  "capacity_builder",
  "deno_error",
@@ -168,19 +187,20 @@ dependencies = [
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
+ "swc_ecma_lexer",
  "swc_ecma_parser",
  "swc_eq_ignore_macros",
  "text_lines",
  "thiserror",
- "unicode-width 0.2.1",
+ "unicode-width",
  "url",
 ]
 
 [[package]]
 name = "deno_error"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde60bd153886964234c5012d3d9caf788287f28d81fb24a884436904101ef10"
+checksum = "3007d3f1ea92ea503324ae15883aac0c2de2b8cf6fead62203ff6a67161007ab"
 dependencies = [
  "deno_error_macro",
  "libc",
@@ -188,20 +208,20 @@ dependencies = [
 
 [[package]]
 name = "deno_error_macro"
-version = "0.7.0"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "409f265785bd946d3006756955aaf40b0e4deb25752eae6a990afe54a31cfd83"
+checksum = "9b565e60a9685cdf312c888665b5f8647ac692a7da7e058a5e2268a466da8eaf"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "deno_media_type"
-version = "0.2.9"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ec0dada9dc5ac4733b4175d36f6a150b7dd68fab46db35cb1ef00dd7366acb"
+checksum = "debab24ecd9f4fd64aa42fb18a02dff20a97d5830b2b85b98ce70b509f790763"
 dependencies = [
  "data-url",
  "serde",
@@ -210,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "deno_terminal"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23f71c27009e0141dedd315f1dfa3ebb0a6ca4acce7c080fac576ea415a465f6"
+checksum = "f3ba8041ae7319b3ca6a64c399df4112badcbbe0868b4517637647614bede4be"
 dependencies = [
  "once_cell",
  "termcolor",
@@ -220,13 +240,13 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -242,7 +262,7 @@ dependencies = [
  "rustc-hash",
  "serde",
  "serde_json",
- "unicode-width 0.2.1",
+ "unicode-width",
 ]
 
 [[package]]
@@ -257,9 +277,9 @@ dependencies = [
 
 [[package]]
 name = "dprint-plugin-json"
-version = "0.21.0"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44eda084193a0bfff508f408db288d6d7dc889d56aa3ecbbe8ac47f005b35cb3"
+checksum = "a2fe735acd073034b25ca9868f49b5265ff01a831dff89a2302dbe70178ca1db"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -272,9 +292,9 @@ dependencies = [
 
 [[package]]
 name = "dprint-plugin-typescript"
-version = "0.95.10"
+version = "0.95.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83cbb60779bfcb1f133387838bfa06dc5362576270d67857de225e453b587ae2"
+checksum = "82a9955c99ac8e2c0780e14af209c7fff8833b1b58a963f4525c5f3efe3080ed"
 dependencies = [
  "anyhow",
  "capacity_builder",
@@ -289,9 +309,9 @@ dependencies = [
 
 [[package]]
 name = "dprint-swc-ext"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a09827d6db1a3af25e105553d674ee9019be58fa3d6745c2a2803f8ce8e3eb8"
+checksum = "33175ddb7a6d418589cab2966bd14a710b3b1139459d3d5ca9edf783c4833f4c"
 dependencies = [
  "allocator-api2",
  "bumpalo",
@@ -300,6 +320,7 @@ dependencies = [
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
+ "swc_ecma_lexer",
  "swc_ecma_parser",
  "text_lines",
 ]
@@ -322,9 +343,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "encode_unicode"
@@ -338,6 +359,28 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
+
 [[package]]
 name = "foldhash"
 version = "0.1.5"
@@ -355,19 +398,32 @@ dependencies = [
 
 [[package]]
 name = "from_variant"
-version = "2.0.2"
+version = "3.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "308530a56b099da144ebc5d8e179f343ad928fa2b3558d1eb3db9af18d6eff43"
+checksum = "e5ff35a391aef949120a0340d690269b3d9f63460a6106e99bd07b961f345ea9"
 dependencies = [
  "swc_macros_common",
- "syn 2.0.106",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasip3",
 ]
 
 [[package]]
 name = "globset"
-version = "0.4.16"
+version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5"
+checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3"
 dependencies = [
  "aho-corasick",
  "bstr",
@@ -397,6 +453,12 @@ dependencies = [
  "foldhash",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.17.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
+
 [[package]]
 name = "heck"
 version = "0.5.0"
@@ -405,25 +467,27 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "hstr"
-version = "1.1.6"
+version = "3.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b85186bc48d3c611ead052cc3f907748e40b63d73a99e4ed34d18063e2baaf1b"
+checksum = "c1b94e40256e78ddd4e30490aa931bec17e65e9413a6ad11f64ec67815da9323"
 dependencies = [
  "hashbrown 0.14.5",
  "new_debug_unreachable",
  "once_cell",
  "rustc-hash",
+ "serde",
  "triomphe",
 ]
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c"
 dependencies = [
  "displaydoc",
  "potential_utf",
+ "utf8_iter",
  "yoke",
  "zerofrom",
  "zerovec",
@@ -431,9 +495,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -444,11 +508,10 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
@@ -459,42 +522,38 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
  "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
@@ -502,6 +561,12 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "id-arena"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
+
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -515,9 +580,9 @@ dependencies = [
 
 [[package]]
 name = "idna_adapter"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714"
 dependencies = [
  "icu_normalizer",
  "icu_properties",
@@ -525,25 +590,27 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.5",
+ "hashbrown 0.17.1",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "insta"
-version = "1.44.1"
+version = "1.47.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8732d3774162a0851e3f2b150eb98f31a9885dd75985099421d393385a01dfd"
+checksum = "7b4a6248eb93a4401ed2f37dfe8ea592d3cf05b7cf4f8efa867b6895af7e094e"
 dependencies = [
  "console",
  "globset",
  "once_cell",
- "similar",
+ "similar 2.7.0",
+ "tempfile",
  "walkdir",
 ]
 
@@ -556,7 +623,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -570,39 +637,54 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
 
 [[package]]
 name = "jsonc-parser"
-version = "0.27.1"
+version = "0.32.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "840785e1a8b4fdb27be18440a35a81af64820dc185c3973ff8b012d4c6282512"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01958dcb05b69d9612853b47df8f7881810e4f61b5cedd8894be04291f28ccb9"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.186"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53"
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0"
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
 
 [[package]]
 name = "malva"
-version = "0.14.2"
+version = "0.15.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d4489f0a5fba19d60c9e9b1fb03bfe3a31cc5ef8abd055692226dd006ee02af"
+checksum = "7b5322f15714c4c20d0daa53813d648f5ef660556c728fdc10a79b8754bb046d"
 dependencies = [
  "aho-corasick",
  "itertools",
@@ -625,15 +707,15 @@ dependencies = [
  "regex",
  "serde",
  "similar-asserts",
- "tiny_pretty 0.3.1",
+ "tiny_pretty 0.4.2",
  "toml",
 ]
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "6b947ae49db0d222b1dbc6b113ce7248a3fc3a6ca21b696717bfc000ba4484d8"
 
 [[package]]
 name = "new_debug_unreachable"
@@ -670,11 +752,20 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "object"
+version = "0.37.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
-version = "1.21.3"
+version = "1.21.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50"
 
 [[package]]
 name = "percent-encoding"
@@ -712,7 +803,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -721,56 +812,73 @@ version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
- "siphasher 1.0.1",
+ "siphasher 1.0.3",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564"
 dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "psm"
-version = "0.1.26"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e944464ec8536cd1beb0bbfd96987eb5e3b72f2ecdafdc5c769a37f1fa2ae1f"
+checksum = "645dbe486e346d9b5de3ef16ede18c26e6c70ad97418f4874b8b1889d6e761ea"
 dependencies = [
+ "ar_archive_writer",
  "cc",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf"
+
 [[package]]
 name = "raffia"
-version = "0.11.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "835acd953484875b38912e6b9b2813682329f3912992bf5fc3109f7197add098"
+checksum = "a589c5611a5f7713bf0c13e949c4c791a359ff517a9f27552475b470e8873229"
 dependencies = [
  "raffia_macro",
  "serde",
@@ -779,20 +887,20 @@ dependencies = [
 
 [[package]]
 name = "raffia_macro"
-version = "0.1.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fdb50eb5bf734fa5a770680a61876a6ec77b99c1e0e52d1f18ad6ebfa85759f"
+checksum = "8ac21f5e4bc6b29ea5d5e691a9aa08b2b9fd8891f48a99157b9f02d8a48e1318"
 dependencies = [
  "heck",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "rand"
-version = "0.8.5"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a"
 dependencies = [
  "rand_core",
 ]
@@ -828,21 +936,28 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.5"
+version = "0.8.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a"
 
 [[package]]
 name = "rustc-hash"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe"
 
 [[package]]
-name = "ryu"
-version = "1.0.20"
+name = "rustix"
+version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
 
 [[package]]
 name = "same-file"
@@ -859,46 +974,69 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
+[[package]]
+name = "semver"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd"
+
+[[package]]
+name = "seq-macro"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
+
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.143"
+version = "1.0.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a"
+checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9"
 dependencies = [
  "indexmap",
  "itoa",
  "memchr",
- "ryu",
  "serde",
+ "serde_core",
+ "zmij",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "1.0.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -912,6 +1050,12 @@ name = "similar"
 version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa"
+
+[[package]]
+name = "similar"
+version = "3.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6505efef05804732ed8a3f2d4f279429eb485bd69d5b0cc6b19cc02005cda16"
 dependencies = [
  "bstr",
  "unicode-segmentation",
@@ -919,12 +1063,12 @@ dependencies = [
 
 [[package]]
 name = "similar-asserts"
-version = "1.7.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b441962c817e33508847a22bd82f03a30cff43642dc2fae8b050566121eb9a"
+checksum = "997e6ca38e97437973fc9f7f50a50d1274cacd874341a4960fea90067291038c"
 dependencies = [
  "console",
- "similar",
+ "similar 3.1.1",
 ]
 
 [[package]]
@@ -935,9 +1079,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "siphasher"
-version = "1.0.1"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649"
 
 [[package]]
 name = "smallvec"
@@ -958,21 +1102,21 @@ dependencies = [
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "stacker"
-version = "0.1.21"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cddb07e32ddb770749da91081d8d0ac3a16f1a569a18b20348cd371f5dead06b"
+checksum = "640c8cdd92b6b12f5bcb1803ca3bbf5ab96e5e6b6b96b9ab77dabe9e880b3190"
 dependencies = [
  "cc",
  "cfg-if",
  "libc",
  "psm",
- "windows-sys 0.59.0",
+ "windows-sys",
 ]
 
 [[package]]
@@ -989,42 +1133,30 @@ checksum = "ae36a4951ca7bd1cfd991c241584a9824a70f6aff1e7d4f693fb3f2465e4030e"
 dependencies = [
  "quote",
  "swc_macros_common",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "swc_allocator"
-version = "4.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d7eefd2c8b228a8c73056482b2ae4b3a1071fbe07638e3b55ceca8570cc48bb"
-dependencies = [
- "allocator-api2",
- "bumpalo",
- "rustc-hash",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "swc_atoms"
-version = "5.0.0"
+version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d7077ba879f95406459bc0c81f3141c529b34580bc64d7ab7bd15e7118a0391"
+checksum = "d4ccbe2ecad10ad7432100f878a107b1d972a8aee83ca53184d00c23a078bb8a"
 dependencies = [
  "hstr",
  "once_cell",
- "rustc-hash",
  "serde",
 ]
 
 [[package]]
 name = "swc_common"
-version = "9.2.0"
+version = "17.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56b6f5a8e5affa271b56757a93badee6f44defcd28f3ba106bb2603afe40d3d"
+checksum = "259b675d633a26d24efe3802a9d88858c918e6e8f062d3222d3aa02d56a2cf4c"
 dependencies = [
  "anyhow",
  "ast_node",
  "better_scoped_tls",
- "cfg-if",
+ "bytes-str",
  "either",
  "from_variant",
  "new_debug_unreachable",
@@ -1033,20 +1165,19 @@ dependencies = [
  "rustc-hash",
  "serde",
  "siphasher 0.3.11",
- "swc_allocator",
  "swc_atoms",
  "swc_eq_ignore_macros",
  "swc_visit",
  "tracing",
- "unicode-width 0.1.14",
+ "unicode-width",
  "url",
 ]
 
 [[package]]
 name = "swc_ecma_ast"
-version = "9.0.0"
+version = "18.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0613d84468a6bb6d45d13c5a3368b37bd21f3067a089f69adac630dcb462a018"
+checksum = "a573a0c72850dec8d4d8085f152d5778af35a2520c3093b242d2d1d50776da7c"
 dependencies = [
  "bitflags",
  "is-macro",
@@ -1054,7 +1185,6 @@ dependencies = [
  "once_cell",
  "phf",
  "rustc-hash",
- "scoped-tls",
  "serde",
  "string_enum",
  "swc_atoms",
@@ -1065,18 +1195,15 @@ dependencies = [
 
 [[package]]
 name = "swc_ecma_lexer"
-version = "12.0.0"
+version = "26.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d11c8e71901401b9aae2ece4946eeb7674b14b8301a53768afbbeeb0e48b599"
+checksum = "5e82f7747e052c6ff6e111fa4adeb14e33b46ee6e94fe5ef717601f651db48fc"
 dependencies = [
- "arrayvec",
  "bitflags",
  "either",
- "new_debug_unreachable",
  "num-bigint",
- "num-traits",
- "phf",
  "rustc-hash",
+ "seq-macro",
  "serde",
  "smallvec",
  "smartstring",
@@ -1084,45 +1211,40 @@ dependencies = [
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
+ "swc_ecma_parser",
  "tracing",
- "typed-arena",
 ]
 
 [[package]]
 name = "swc_ecma_parser"
-version = "12.0.0"
+version = "27.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "250786944fbc05f6484eda9213df129ccfe17226ae9ad51b62fce2f72135dbee"
+checksum = "7f1a51af1a92cd4904c073b293e491bbc0918400a45d58227b34c961dd6f52d7"
 dependencies = [
- "arrayvec",
  "bitflags",
  "either",
- "new_debug_unreachable",
  "num-bigint",
- "num-traits",
  "phf",
  "rustc-hash",
+ "seq-macro",
  "serde",
- "smallvec",
  "smartstring",
  "stacker",
  "swc_atoms",
  "swc_common",
  "swc_ecma_ast",
- "swc_ecma_lexer",
  "tracing",
- "typed-arena",
 ]
 
 [[package]]
 name = "swc_eq_ignore_macros"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e96e15288bf385ab85eb83cff7f9e2d834348da58d0a31b33bdb572e66ee413e"
+checksum = "c16ce73424a6316e95e09065ba6a207eba7765496fed113702278b7711d4b632"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1133,7 +1255,7 @@ checksum = "aae1efbaa74943dc5ad2a2fb16cbd78b77d7e4d63188f3c5b4df2b4dcd2faaae"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1159,9 +1281,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1176,7 +1298,20 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
+dependencies = [
+ "fastrand",
+ "getrandom",
+ "once_cell",
+ "rustix",
+ "windows-sys",
 ]
 
 [[package]]
@@ -1199,22 +1334,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.16"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3467d614147380f2e4e374161426ff399c91084acd2363eaf549172b3d5e60c0"
+checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.16"
+version = "2.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5e1be1c48b9172ee610da68fd9cd2770e7a4056cb3fc98710ee6906f0c7960"
+checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
@@ -1225,18 +1360,15 @@ checksum = "650d82e943da333637be9f1567d33d605e76810a26464edfd7ae74f7ef181e95"
 
 [[package]]
 name = "tiny_pretty"
-version = "0.3.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04eee220e23d20da16daeac8f8e8c4a3ae5e12640758c1fddb91be2e34e71f67"
-dependencies = [
- "unicode-width 0.2.1",
-]
+checksum = "5c6f118a569adc26e8a9a377130f181a461770225e588c73a00c8636b8680b6c"
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -1244,12 +1376,12 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.9.5"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
  "indexmap",
- "serde",
+ "serde_core",
  "serde_spanned",
  "toml_datetime",
  "toml_parser",
@@ -1259,33 +1391,33 @@ dependencies = [
 
 [[package]]
 name = "toml_datetime"
-version = "0.7.0"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.2"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
  "winnow",
 ]
 
 [[package]]
 name = "toml_writer"
-version = "1.0.2"
+version = "1.1.1+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db"
 
 [[package]]
 name = "tracing"
-version = "0.1.41"
+version = "0.1.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100"
 dependencies = [
  "pin-project-lite",
  "tracing-attributes",
@@ -1294,80 +1426,75 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a"
 dependencies = [
  "once_cell",
 ]
 
 [[package]]
 name = "triomphe"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8f7726da4807b58ea5c96fdc122f80702030edc33b35aff9190a51148ccc85"
+checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39"
 dependencies = [
  "serde",
  "stable_deref_trait",
 ]
 
-[[package]]
-name = "typed-arena"
-version = "2.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a"
-
 [[package]]
 name = "unicode-id-start"
-version = "1.3.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f322b60f6b9736017344fa0635d64be2f458fbc04eef65f6be22976dd1ffd5b"
+checksum = "81b79ad29b5e19de4260020f8919b443b2ef0277d242ce532ec7b7a2cc8b6007"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "9629274872b2bfaf8d66f5f15725007f635594914870f65218920345aa11aa8c"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
-name = "unicode-width"
-version = "0.2.1"
+name = "unicode-xid"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "url"
-version = "2.5.6"
+version = "2.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "137a3c834eaf7139b73688502f3f1141a0337c5d8e4d9b536f9b8c796e26a7c4"
+checksum = "ff67a8a4397373c3ef660812acab3268222035010ab8680ec4215f38ba3d0eed"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
  "serde",
+ "serde_derive",
 ]
 
 [[package]]
@@ -1393,186 +1520,193 @@ dependencies = [
 ]
 
 [[package]]
-name = "winapi-util"
-version = "0.1.10"
+name = "wasip2"
+version = "1.0.3+wasi-0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
+checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6"
 dependencies = [
- "windows-sys 0.60.2",
+ "wit-bindgen 0.57.1",
 ]
 
 [[package]]
-name = "windows-link"
-version = "0.1.3"
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
 dependencies = [
- "windows-targets 0.52.6",
+ "wit-bindgen 0.51.0",
 ]
 
 [[package]]
-name = "windows-sys"
-version = "0.60.2"
+name = "wasm-encoder"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
 dependencies = [
- "windows-targets 0.53.3",
+ "leb128fmt",
+ "wasmparser",
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.52.6"
+name = "wasm-metadata"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
+ "anyhow",
+ "indexmap",
+ "wasm-encoder",
+ "wasmparser",
 ]
 
 [[package]]
-name = "windows-targets"
-version = "0.53.3"
+name = "wasmparser"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "windows-link",
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
+ "bitflags",
+ "hashbrown 0.15.5",
+ "indexmap",
+ "semver",
 ]
 
 [[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
+name = "winapi-util"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys",
+]
 
 [[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
+name = "windows-link"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
+name = "windows-sys"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
 
 [[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
+name = "winnow"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
+name = "wit-bindgen"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
 
 [[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
+name = "wit-bindgen"
+version = "0.57.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
 
 [[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
+name = "wit-bindgen-core"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
 
 [[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
+name = "wit-bindgen-rust"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap",
+ "prettyplease",
+ "syn 2.0.117",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
 
 [[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
+name = "wit-component"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags",
+ "indexmap",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
 
 [[package]]
-name = "winnow"
-version = "0.7.12"
+name = "wit-parser"
+version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap",
+ "log",
+ "semver",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
 
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -1580,62 +1714,62 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
  "synstructure",
 ]
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
 
 [[package]]
 name = "zerofrom"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272"
 dependencies = [
  "zerofrom-derive",
 ]
 
 [[package]]
 name = "zerofrom-derive"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
  "synstructure",
 ]
 
 [[package]]
 name = "zerotrie"
-version = "0.2.2"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -1644,9 +1778,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.4"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -1655,11 +1789,17 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn 2.0.117",
 ]
+
+[[package]]
+name = "zmij"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
diff --git a/Cargo.toml b/Cargo.toml
index 4a36ef3f..2865e397 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,9 +4,9 @@ resolver = "3"
 
 [workspace.dependencies]
 anyhow = "1.0"
-insta = { version = "1.44", features = ["glob"] }
-similar-asserts = "1.7"
-toml = "0.9"
+insta = { version = "1.47", features = ["glob"] }
+similar-asserts = "2.0"
+toml = "1.1"
 
 [profile.release]
 lto = true
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index 0f3fe35a..46e45a38 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -23,6 +23,6 @@ serde_json = "1.0"
 dprint-plugin-json = { version = "0.21", features = ["wasm"] }
 dprint-plugin-typescript = { version = "0.95", features = ["wasm"] }
 insta.workspace = true
-malva = { version = "0.14", features = ["config_serde"] }
+malva = { version = "0.15", features = ["config_serde"] }
 similar-asserts.workspace = true
 toml.workspace = true
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index e096a20b..2a544fc2 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -13,10 +13,10 @@ aho-corasick = "1.1"
 anyhow = "1.0"
 css_dataset = { version = "0.4", default-features = false, features = ["tags"] }
 itertools = "0.14"
-memchr = "2.7"
+memchr = "2.8"
 regex = "1.12"
 serde = { version = "1.0", optional = true }
-tiny_pretty = { version = "0.3", features = ["unicode-width"] }
+tiny_pretty = "0.4"
 
 [dev-dependencies]
 anyhow.workspace = true
diff --git a/markup_fmt/tests/fmt/html/attributes/srcset.snap b/markup_fmt/tests/fmt/html/attributes/srcset.snap
index 903d1a96..90e2f86c 100644
--- a/markup_fmt/tests/fmt/html/attributes/srcset.snap
+++ b/markup_fmt/tests/fmt/html/attributes/srcset.snap
@@ -19,9 +19,11 @@ source: markup_fmt/tests/fmt.rs
   sizes="(max-width: 66rem) 100vw, 66rem"
   alt=""
 />
-<img srcset="
+<img
+  srcset="
              /media/examples/surfer-240-200.jpg
-">
+"
+>
 <!-- #8150 -->
 <img
   sizes="(max-width: 1400px) 100vw, 1400px"
diff --git a/markup_fmt/tests/fmt/html/comments/surrounding-empty-line.strict-whitespace.snap b/markup_fmt/tests/fmt/html/comments/surrounding-empty-line.strict-whitespace.snap
index 4f8c9df1..16ff0d8b 100644
--- a/markup_fmt/tests/fmt/html/comments/surrounding-empty-line.strict-whitespace.snap
+++ b/markup_fmt/tests/fmt/html/comments/surrounding-empty-line.strict-whitespace.snap
@@ -5,8 +5,7 @@ source: markup_fmt/tests/fmt.rs
 --><li>First</li><!-- 123
 456
    789
---><li
-  >Second</li><!--
+--><li>Second</li><!--
 
 
     123
@@ -14,8 +13,7 @@ source: markup_fmt/tests/fmt.rs
           789
 
 
---><li
-  >Second</li><!--
+--><li>Second</li><!--
 
 
            123
diff --git a/markup_fmt/tests/fmt/html/srcset/invalid.snap b/markup_fmt/tests/fmt/html/srcset/invalid.snap
index 6c023882..2a0d693f 100644
--- a/markup_fmt/tests/fmt/html/srcset/invalid.snap
+++ b/markup_fmt/tests/fmt/html/srcset/invalid.snap
@@ -10,9 +10,13 @@ source: markup_fmt/tests/fmt.rs
   alt=""
 />
 
-<img src="a" srcset="
+<img
+  src="a"
+  srcset="
  should-not-format ,, should-not-format 0q,,,
-" alt="" />
+"
+  alt=""
+/>
 
 <img src="a" srcset=",,," />
 
diff --git a/markup_fmt/tests/fmt/html/tags/pre.strict-whitespace.snap b/markup_fmt/tests/fmt/html/tags/pre.strict-whitespace.snap
index b05a850f..d5acc766 100644
--- a/markup_fmt/tests/fmt/html/tags/pre.strict-whitespace.snap
+++ b/markup_fmt/tests/fmt/html/tags/pre.strict-whitespace.snap
@@ -1,8 +1,7 @@
 ---
 source: markup_fmt/tests/fmt.rs
 ---
-<pre
->
+<pre>
 --------------------------------------------------------------------------------
 
 
@@ -26,8 +25,7 @@ source: markup_fmt/tests/fmt.rs
 
 --------------------------------------------------------------------------------
 </pre>
-<pre
->
+<pre>
 
         Text in a pre element
 
@@ -49,8 +47,7 @@ source: markup_fmt/tests/fmt.rs
 <pre>
      Foo     Bar</pre>
 <figure role="img" aria-labelledby="cow-caption">
-  <pre
-  >
+  <pre>
 ___________________________
 < I'm an expert in my field. >
 ---------------------------
diff --git a/markup_fmt/tests/fmt/html/tags/textarea.default.snap b/markup_fmt/tests/fmt/html/tags/textarea.default.snap
index 7d1b50b8..19fdff8f 100644
--- a/markup_fmt/tests/fmt/html/tags/textarea.default.snap
+++ b/markup_fmt/tests/fmt/html/tags/textarea.default.snap
@@ -13,11 +13,7 @@ source: markup_fmt/tests/fmt.rs
                   <div>
                     <div>
                       <div>
-                        <textarea
-                          rows="10"
-                          cols="45"
-                          name="text"
-                        >
+                        <textarea rows="10" cols="45" name="text">
                         String
                         </textarea>
                       </div>
diff --git a/markup_fmt/tests/fmt/html/tags/textarea.ignore-whitespace.snap b/markup_fmt/tests/fmt/html/tags/textarea.ignore-whitespace.snap
index 7d1b50b8..19fdff8f 100644
--- a/markup_fmt/tests/fmt/html/tags/textarea.ignore-whitespace.snap
+++ b/markup_fmt/tests/fmt/html/tags/textarea.ignore-whitespace.snap
@@ -13,11 +13,7 @@ source: markup_fmt/tests/fmt.rs
                   <div>
                     <div>
                       <div>
-                        <textarea
-                          rows="10"
-                          cols="45"
-                          name="text"
-                        >
+                        <textarea rows="10" cols="45" name="text">
                         String
                         </textarea>
                       </div>
diff --git a/markup_fmt/tests/fmt/html/tags/textarea.strict-whitespace.snap b/markup_fmt/tests/fmt/html/tags/textarea.strict-whitespace.snap
index 7d1b50b8..19fdff8f 100644
--- a/markup_fmt/tests/fmt/html/tags/textarea.strict-whitespace.snap
+++ b/markup_fmt/tests/fmt/html/tags/textarea.strict-whitespace.snap
@@ -13,11 +13,7 @@ source: markup_fmt/tests/fmt.rs
                   <div>
                     <div>
                       <div>
-                        <textarea
-                          rows="10"
-                          cols="45"
-                          name="text"
-                        >
+                        <textarea rows="10" cols="45" name="text">
                         String
                         </textarea>
                       </div>
diff --git a/markup_fmt/tests/fmt/jinja/whitespace-control/fixture.snap b/markup_fmt/tests/fmt/jinja/whitespace-control/fixture.snap
index 0aaa6f8c..11d8affb 100644
--- a/markup_fmt/tests/fmt/jinja/whitespace-control/fixture.snap
+++ b/markup_fmt/tests/fmt/jinja/whitespace-control/fixture.snap
@@ -25,7 +25,10 @@ source: markup_fmt/tests/fmt.rs
 {%- endfor %}
 
 {%- macro textarea(name, value='', rows=10, cols=40) -%}
-  <textarea name="{{ name }}" rows="{{ rows }}" cols="{{ cols
+  <textarea
+    name="{{ name }}"
+    rows="{{ rows }}"
+    cols="{{ cols
         }}"
   >{{ value|e }}</textarea>
 {%- endmacro %}
diff --git a/markup_fmt/tests/fmt/mustache/comments/comments.snap b/markup_fmt/tests/fmt/mustache/comments/comments.snap
index a243b162..ad174fb0 100644
--- a/markup_fmt/tests/fmt/mustache/comments/comments.snap
+++ b/markup_fmt/tests/fmt/mustache/comments/comments.snap
@@ -1,8 +1,7 @@
 ---
 source: markup_fmt/tests/fmt.rs
 ---
-12345{{! Comment Block! }}67890
-12345{{!
+12345{{! Comment Block! }}67890 12345{{!
     This is a
     multi-line comment...
 }}67890

From d53979c22dc04b6ed0a58492a8b6901e1fba75de Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 27 May 2026 16:37:35 +0800
Subject: [PATCH 63/67] v0.27.2

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad26b49b..855873b7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -327,7 +327,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.27.1"
+version = "0.27.2"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -696,7 +696,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.27.1"
+version = "0.27.2"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index a7163e06..c238a036 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.27.1.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.27.2.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index 46e45a38..1ce1ea1e 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.27.1"
+version = "0.27.2"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index 2e8f9613..dbdda92f 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.27.1",
+  "version": "0.27.2",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index 3a321041..eade8a83 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.27.1/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.27.2/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 2a544fc2..13da6a85 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.27.1"
+version = "0.27.2"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From d9e7195c83bc77abc2457b35fcc735ca5f20e6f8 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 29 May 2026 10:38:46 +0800
Subject: [PATCH 64/67] refactor: switch from `Doc::text` to `Doc::char` for
 single char

---
 markup_fmt/src/printer.rs | 154 +++++++++++++++++++-------------------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
index 0608a3cb..528296ee 100644
--- a/markup_fmt/src/printer.rs
+++ b/markup_fmt/src/printer.rs
@@ -36,7 +36,7 @@ impl<'s> DocGen<'s> for AngularElseIf<'s> {
             ctx,
             state,
         ));
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
         Doc::list(docs)
     }
 }
@@ -72,14 +72,14 @@ impl<'s> DocGen<'s> for AngularFor<'s> {
             ctx,
             state,
         ));
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
 
         if let Some(children) = &self.empty {
             docs.push(Doc::text(" @empty {"));
             docs.push(format_control_structure_block_children(
                 children, ctx, state,
             ));
-            docs.push(Doc::text("}"));
+            docs.push(Doc::char('}'));
         }
 
         Doc::list(docs)
@@ -92,7 +92,7 @@ impl<'s> DocGen<'s> for AngularGenericBlock<'s> {
         F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let mut docs = Vec::with_capacity(5);
-        docs.push(Doc::text("@"));
+        docs.push(Doc::char('@'));
         docs.push(Doc::text(self.keyword));
         if let Some(header) = self.header {
             docs.push(Doc::space());
@@ -104,7 +104,7 @@ impl<'s> DocGen<'s> for AngularGenericBlock<'s> {
             ctx,
             state,
         ));
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
         Doc::list(docs)
     }
 }
@@ -153,7 +153,7 @@ impl<'s> DocGen<'s> for AngularIf<'s> {
             ctx,
             state,
         ));
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
 
         docs.extend(
             self.else_if_blocks
@@ -167,7 +167,7 @@ impl<'s> DocGen<'s> for AngularIf<'s> {
             docs.push(format_control_structure_block_children(
                 children, ctx, state,
             ));
-            docs.push(Doc::text("}"));
+            docs.push(Doc::char('}'));
         }
 
         Doc::list(docs)
@@ -203,7 +203,7 @@ impl<'s> DocGen<'s> for AngularLet<'s> {
             .append(Doc::text(self.name))
             .append(Doc::text(" = "))
             .append(Doc::text(ctx.format_expr(self.expr.0, false, self.expr.1)))
-            .append(Doc::text(";"))
+            .append(Doc::char(';'))
     }
 }
 
@@ -224,7 +224,7 @@ impl<'s> DocGen<'s> for AngularSwitch<'s> {
         Doc::list(docs)
             .nest(ctx.indent_width)
             .append(Doc::hard_line())
-            .append(Doc::text("}"))
+            .append(Doc::char('}'))
     }
 }
 
@@ -238,7 +238,7 @@ impl<'s> DocGen<'s> for AngularSwitchArm<'s> {
         if let Some(expr) = self.expr {
             docs.push(Doc::text(" ("));
             docs.push(Doc::text(ctx.format_expr(expr.0, false, expr.1)));
-            docs.push(Doc::text(")"));
+            docs.push(Doc::char(')'));
         }
         docs.push(Doc::text(" {"));
         docs.push(format_control_structure_block_children(
@@ -246,7 +246,7 @@ impl<'s> DocGen<'s> for AngularSwitchArm<'s> {
             ctx,
             state,
         ));
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
         Doc::list(docs)
     }
 }
@@ -257,20 +257,20 @@ impl<'s> DocGen<'s> for AstroAttribute<'s> {
         F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let expr_code = ctx.format_expr(self.expr.0, false, self.expr.1);
-        let expr = Doc::text("{")
+        let expr = Doc::char('{')
             .concat(reflow_with_indent(&expr_code, true))
-            .append(Doc::text("}"));
+            .append(Doc::char('}'));
         if let Some(name) = self.name {
             if matches!(ctx.options.astro_attr_shorthand, Some(true)) && name == expr_code {
                 expr
             } else {
-                Doc::text(name).append(Doc::text("=")).append(expr)
+                Doc::text(name).append(Doc::char('=')).append(expr)
             }
         } else if matches!(ctx.options.astro_attr_shorthand, Some(false))
             && !expr_code.starts_with("...")
         {
             Doc::text(expr_code.clone())
-                .append(Doc::text("="))
+                .append(Doc::char('='))
                 .append(expr)
         } else {
             expr
@@ -310,7 +310,7 @@ impl<'s> DocGen<'s> for AstroExpr<'s> {
         });
 
         let mut docs = Vec::with_capacity(self.children.len() + 3);
-        docs.push(Doc::text("{"));
+        docs.push(Doc::char('{'));
         formatted_script
             .split(PLACEHOLDER)
             .zip_longest(templates)
@@ -328,12 +328,12 @@ impl<'s> DocGen<'s> for AstroExpr<'s> {
                         docs.push(template.nest(extra_indent));
                     } else {
                         docs.push(
-                            Doc::flat_or_break(Doc::nil(), Doc::text("("))
+                            Doc::flat_or_break(Doc::nil(), Doc::char('('))
                                 .append(Doc::line_or_nil())
                                 .append(template)
                                 .nest(indent_width)
                                 .append(Doc::line_or_nil())
-                                .append(Doc::flat_or_break(Doc::nil(), Doc::text(")")))
+                                .append(Doc::flat_or_break(Doc::nil(), Doc::char(')')))
                                 .group()
                                 .nest(extra_indent),
                         );
@@ -351,7 +351,7 @@ impl<'s> DocGen<'s> for AstroExpr<'s> {
         if self.has_line_comment {
             docs.push(Doc::hard_line());
         }
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
         Doc::list(docs)
     }
 }
@@ -427,7 +427,7 @@ impl<'s> DocGen<'s> for Doctype<'s> {
             } else {
                 self.value
             }))
-            .append(Doc::text(">"))
+            .append(Doc::char('>'))
     }
 }
 
@@ -502,7 +502,7 @@ impl<'s> DocGen<'s> for Element<'s> {
 
         let mut docs = Vec::with_capacity(5);
 
-        docs.push(Doc::text("<"));
+        docs.push(Doc::char('<'));
         docs.push(Doc::text(formatted_tag_name.clone()));
 
         match &*self.attrs {
@@ -512,13 +512,13 @@ impl<'s> DocGen<'s> for Element<'s> {
                     return Doc::list(docs).group();
                 }
                 if self.void_element {
-                    docs.push(Doc::text(">"));
+                    docs.push(Doc::char('>'));
                     return Doc::list(docs).group();
                 }
                 if is_empty || !is_whitespace_sensitive {
-                    docs.push(Doc::text(">"));
+                    docs.push(Doc::char('>'));
                 } else {
-                    docs.push(Doc::line_or_nil().append(Doc::text(">")).group());
+                    docs.push(Doc::line_or_nil().append(Doc::char('>')).group());
                 }
             }
             [attr]
@@ -532,7 +532,7 @@ impl<'s> DocGen<'s> for Element<'s> {
                     docs.push(Doc::text(" />"));
                     return Doc::list(docs);
                 } else {
-                    docs.push(Doc::text(">"));
+                    docs.push(Doc::char('>'));
                 };
                 if self.void_element {
                     return Doc::list(docs);
@@ -594,11 +594,11 @@ impl<'s> DocGen<'s> for Element<'s> {
                     if !ctx.options.closing_bracket_same_line {
                         docs.push(Doc::line_or_nil());
                     }
-                    docs.push(Doc::text(">"));
+                    docs.push(Doc::char('>'));
                     return Doc::list(docs).group();
                 }
                 if ctx.options.closing_bracket_same_line {
-                    docs.push(attrs.append(Doc::text(">")).group());
+                    docs.push(attrs.append(Doc::char('>')).group());
                 } else {
                     // for #16
                     if is_whitespace_sensitive
@@ -621,13 +621,13 @@ impl<'s> DocGen<'s> for Element<'s> {
                             attrs
                                 .group()
                                 .append(Doc::line_or_nil())
-                                .append(Doc::text(">")),
+                                .append(Doc::char('>')),
                         );
                     } else {
                         docs.push(
                             attrs
                                 .append(Doc::line_or_nil())
-                                .append(Doc::text(">"))
+                                .append(Doc::char('>'))
                                 .group(),
                         );
                     }
@@ -994,7 +994,7 @@ impl<'s> DocGen<'s> for JinjaInterpolation<'s> {
     {
         Doc::text("{{")
             .append(if self.trim_prev {
-                Doc::text("-")
+                Doc::char('-')
             } else {
                 Doc::nil()
             })
@@ -1006,7 +1006,7 @@ impl<'s> DocGen<'s> for JinjaInterpolation<'s> {
             .nest(ctx.indent_width)
             .append(Doc::line_or_space())
             .append(if self.trim_next {
-                Doc::text("-")
+                Doc::char('-')
             } else {
                 Doc::nil()
             })
@@ -1080,7 +1080,7 @@ impl<'s> DocGen<'s> for MustacheBlock<'s> {
                     let mut docs = Vec::with_capacity(3);
                     docs.push(Doc::text("{{"));
                     if control.wc_before {
-                        docs.push(Doc::text("~"));
+                        docs.push(Doc::char('~'));
                     }
                     docs.push(Doc::text(control.prefix));
                     docs.push(Doc::text(control.name));
@@ -1089,7 +1089,7 @@ impl<'s> DocGen<'s> for MustacheBlock<'s> {
                         docs.extend(reflow_raw(content.trim_ascii()));
                     }
                     if control.wc_after {
-                        docs.push(Doc::text("~"));
+                        docs.push(Doc::char('~'));
                     }
                     docs.push(Doc::text("}}"));
                     Doc::list(docs)
@@ -1178,14 +1178,14 @@ impl<'s> DocGen<'s> for NativeAttribute<'s> {
                             None if matches!(ctx.options.svelte_attr_shorthand, Some(true))
                                 && self.name == formatted_expr =>
                             {
-                                Doc::text("{")
+                                Doc::char('{')
                                     .concat(reflow_with_indent(&formatted_expr, true))
-                                    .append(Doc::text("}"))
+                                    .append(Doc::char('}'))
                             }
                             _ => Doc::text(self.name.to_owned())
                                 .append(Doc::text("={"))
                                 .concat(reflow_with_indent(&formatted_expr, true))
-                                .append(Doc::text("}")),
+                                .append(Doc::char('}')),
                         };
                     } else {
                         Cow::from(value)
@@ -1210,7 +1210,7 @@ impl<'s> DocGen<'s> for NativeAttribute<'s> {
             let quote;
             let mut docs = Vec::with_capacity(5);
             docs.push(name);
-            docs.push(Doc::text("="));
+            docs.push(Doc::char('='));
             if helpers::should_be_space_separated(self.name, state.current_tag_name) {
                 quote = compute_attr_value_quote(&value, self.quote, ctx);
                 let value = value.trim();
@@ -1291,7 +1291,7 @@ impl<'s> DocGen<'s> for NativeAttribute<'s> {
         {
             if let Some((_, binding_name)) = self.name.split_once(':') {
                 let value = format!("{{{binding_name}}}");
-                name.append(Doc::text("="))
+                name.append(Doc::char('='))
                     .append(if ctx.options.strict_svelte_attr {
                         format_attr_value(value, &ctx.options.quotes)
                     } else {
@@ -1407,7 +1407,7 @@ impl<'s> DocGen<'s> for SvelteAtTag<'s> {
                 &ctx.format_expr(self.expr.0, false, self.expr.1),
                 true,
             ))
-            .append(Doc::text("}"))
+            .append(Doc::char('}'))
     }
 }
 
@@ -1417,9 +1417,9 @@ impl<'s> DocGen<'s> for SvelteAttribute<'s> {
         F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
         let expr_code = ctx.format_expr(self.expr.0, false, self.expr.1);
-        let expr = Doc::text("{")
+        let expr = Doc::char('{')
             .concat(reflow_with_indent(&expr_code, true))
-            .append(Doc::text("}"));
+            .append(Doc::char('}'));
         if let Some(name) = self.name {
             match name.split_once(':') {
                 Some((_, binding_name))
@@ -1434,7 +1434,7 @@ impl<'s> DocGen<'s> for SvelteAttribute<'s> {
                     expr
                 }
                 _ => {
-                    let name = Doc::text(name).append(Doc::text("="));
+                    let name = Doc::text(name).append(Doc::char('='));
                     if ctx.options.strict_svelte_attr {
                         name.append(format_attr_value(
                             format!("{{{expr_code}}}"),
@@ -1446,7 +1446,7 @@ impl<'s> DocGen<'s> for SvelteAttribute<'s> {
                 }
             }
         } else if matches!(ctx.options.svelte_attr_shorthand, Some(false)) {
-            let name = Doc::text(expr_code.clone()).append(Doc::text("="));
+            let name = Doc::text(expr_code.clone()).append(Doc::char('='));
             if ctx.options.strict_svelte_attr {
                 name.append(format_attr_value(
                     format!("{{{expr_code}}}"),
@@ -1469,7 +1469,7 @@ impl<'s> DocGen<'s> for SvelteAttachment<'s> {
         let expr_code = ctx.format_expr(self.expr.0, false, self.expr.1);
         Doc::text("{@attach ")
             .concat(reflow_with_indent(&expr_code, true))
-            .append(Doc::text("}"))
+            .append(Doc::char('}'))
     }
 }
 
@@ -1505,7 +1505,7 @@ impl<'s> DocGen<'s> for SvelteAwaitBlock<'s> {
             Doc::list(head)
                 .nest(ctx.indent_width)
                 .append(Doc::line_or_nil())
-                .append(Doc::text("}"))
+                .append(Doc::char('}'))
                 .group(),
         );
         docs.push(format_control_structure_block_children(
@@ -1536,7 +1536,7 @@ impl<'s> DocGen<'s> for SvelteCatchBlock<'s> {
         if let Some((binding, start)) = self.binding {
             Doc::text("{:catch ")
                 .append(Doc::text(ctx.format_binding(binding, start)))
-                .append(Doc::text("}"))
+                .append(Doc::char('}'))
                 .append(children)
         } else {
             Doc::text("{:catch}").append(children)
@@ -1568,10 +1568,10 @@ impl<'s> DocGen<'s> for SvelteEachBlock<'s> {
         if let Some((key, start)) = self.key {
             docs.push(Doc::text(" ("));
             docs.push(Doc::text(ctx.format_expr(key, false, start)));
-            docs.push(Doc::text(")"));
+            docs.push(Doc::char(')'));
         }
 
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
         docs.push(format_control_structure_block_children(
             &self.children,
             ctx,
@@ -1597,7 +1597,7 @@ impl<'s> DocGen<'s> for SvelteElseIfBlock<'s> {
     {
         Doc::text("{:else if ")
             .append(Doc::text(ctx.format_expr(self.expr.0, false, self.expr.1)))
-            .append(Doc::text("}"))
+            .append(Doc::char('}'))
             .append(format_control_structure_block_children(
                 &self.children,
                 ctx,
@@ -1614,7 +1614,7 @@ impl<'s> DocGen<'s> for SvelteIfBlock<'s> {
         let mut docs = Vec::with_capacity(5);
         docs.push(Doc::text("{#if "));
         docs.push(Doc::text(ctx.format_expr(self.expr.0, false, self.expr.1)));
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
         docs.push(format_control_structure_block_children(
             &self.children,
             ctx,
@@ -1644,7 +1644,7 @@ impl<'s> DocGen<'s> for SvelteInterpolation<'s> {
     where
         F: for<'a> FnMut(&'a str, Hints) -> Result<Cow<'a, str>, Error>,
     {
-        Doc::text("{")
+        Doc::char('{')
             .append(Doc::line_or_nil())
             .concat(reflow_with_indent(
                 &ctx.format_expr(self.expr.0, false, self.expr.1),
@@ -1652,7 +1652,7 @@ impl<'s> DocGen<'s> for SvelteInterpolation<'s> {
             ))
             .nest(ctx.indent_width)
             .append(Doc::line_or_nil())
-            .append(Doc::text("}"))
+            .append(Doc::char('}'))
             .group()
     }
 }
@@ -1664,7 +1664,7 @@ impl<'s> DocGen<'s> for SvelteKeyBlock<'s> {
     {
         Doc::text("{#key ")
             .append(Doc::text(ctx.format_expr(self.expr.0, false, self.expr.1)))
-            .append(Doc::text("}"))
+            .append(Doc::char('}'))
             .append(format_control_structure_block_children(
                 &self.children,
                 ctx,
@@ -1692,7 +1692,7 @@ impl<'s> DocGen<'s> for SvelteSnippetBlock<'s> {
                     .unwrap_or(&formatted)
                     .to_owned(),
             ))
-            .append(Doc::text("}"))
+            .append(Doc::char('}'))
             .append(format_control_structure_block_children(
                 &self.children,
                 ctx,
@@ -1713,7 +1713,7 @@ impl<'s> DocGen<'s> for SvelteThenBlock<'s> {
             docs.push(Doc::space());
             docs.push(Doc::text(ctx.format_binding(binding, start)));
         }
-        docs.push(Doc::text("}"));
+        docs.push(Doc::char('}'));
         docs.push(format_control_structure_block_children(
             &self.children,
             ctx,
@@ -1814,7 +1814,7 @@ impl<'s> DocGen<'s> for VentoInterpolation<'s> {
     {
         Doc::text("{{")
             .append(if self.trim_prev {
-                Doc::text("-")
+                Doc::char('-')
             } else {
                 Doc::nil()
             })
@@ -1833,7 +1833,7 @@ impl<'s> DocGen<'s> for VentoInterpolation<'s> {
             .nest(ctx.indent_width)
             .append(Doc::line_or_space())
             .append(if self.trim_next {
-                Doc::text("-")
+                Doc::char('-')
             } else {
                 Doc::nil()
             })
@@ -1849,7 +1849,7 @@ impl<'s> DocGen<'s> for VentoTag<'s> {
     {
         Doc::text("{{")
             .append(if self.trim_prev {
-                Doc::text("-")
+                Doc::char('-')
             } else {
                 Doc::nil()
             })
@@ -1900,7 +1900,7 @@ impl<'s> DocGen<'s> for VentoTag<'s> {
                                     &ctx.format_expr(template, false, 0),
                                     true,
                                 ))
-                                .append(Doc::text(" "))
+                                .append(Doc::space())
                                 .concat(reflow_with_indent(&ctx.format_expr(data, false, 0), true))
                         } else {
                             Doc::text(tag_name.to_string()).append(Doc::space()).concat(
@@ -1943,7 +1943,7 @@ impl<'s> DocGen<'s> for VentoTag<'s> {
             .nest(ctx.indent_width)
             .append(Doc::line_or_space())
             .append(if self.trim_next {
-                Doc::text("-")
+                Doc::char('-')
             } else {
                 Doc::nil()
             })
@@ -1982,7 +1982,7 @@ impl<'s> DocGen<'s> for VueDirective<'s> {
                 docs.push(if let Some(VBindStyle::Long) = ctx.options.v_bind_style {
                     Doc::text("v-bind:")
                 } else {
-                    Doc::text(":")
+                    Doc::char(':')
                 });
                 if let Some(arg_and_modifiers) = self.arg_and_modifiers {
                     docs.push(Doc::text(arg_and_modifiers.trim_start_matches(':')));
@@ -1993,7 +1993,7 @@ impl<'s> DocGen<'s> for VueDirective<'s> {
                 if let Some(arg_and_modifiers) = self.arg_and_modifiers {
                     docs.push(if let Some(VBindStyle::Short) = ctx.options.v_bind_style {
                         if arg_and_modifiers.starts_with(':') {
-                            Doc::text("")
+                            Doc::nil()
                         } else {
                             Doc::text("v-bind")
                         }
@@ -2009,7 +2009,7 @@ impl<'s> DocGen<'s> for VueDirective<'s> {
                 docs.push(if let Some(VOnStyle::Long) = ctx.options.v_on_style {
                     Doc::text("v-on:")
                 } else {
-                    Doc::text("@")
+                    Doc::char('@')
                 });
                 if let Some(arg_and_modifiers) = self.arg_and_modifiers {
                     docs.push(Doc::text(arg_and_modifiers.trim_start_matches(':')));
@@ -2018,7 +2018,7 @@ impl<'s> DocGen<'s> for VueDirective<'s> {
             "on" => {
                 if let Some(arg_and_modifiers) = self.arg_and_modifiers {
                     docs.push(if let Some(VOnStyle::Short) = ctx.options.v_on_style {
-                        Doc::text("@")
+                        Doc::char('@')
                     } else {
                         Doc::text("v-on:")
                     });
@@ -2110,14 +2110,14 @@ impl<'s> DocGen<'s> for VueDirective<'s> {
                 && is_v_bind
                 && matches!(self.arg_and_modifiers, Some(arg_and_modifiers) if arg_and_modifiers == value))
             {
-                docs.push(Doc::text("="));
+                docs.push(Doc::char('='));
                 docs.push(format_attr_value(value, &ctx.options.quotes));
             }
         } else if matches!(ctx.options.v_bind_same_name_short_hand, Some(false))
             && is_v_bind
             && let Some(arg_and_modifiers) = self.arg_and_modifiers
         {
-            docs.push(Doc::text("="));
+            docs.push(Doc::char('='));
             docs.push(format_attr_value(arg_and_modifiers, &ctx.options.quotes));
         }
 
@@ -2394,13 +2394,13 @@ fn has_two_more_non_text_children(children: &[Node], language: Language) -> bool
 fn format_attr_value(value: impl AsRef<str>, quotes: &Quotes) -> Doc<'_> {
     let value = value.as_ref();
     let quote = if value.contains('"') {
-        Doc::text("'")
+        Doc::char('\'')
     } else if value.contains('\'') {
-        Doc::text("\"")
+        Doc::char('"')
     } else if let Quotes::Double = quotes {
-        Doc::text("\"")
+        Doc::char('"')
     } else {
-        Doc::text("'")
+        Doc::char('\'')
     };
     quote
         .clone()
@@ -2738,19 +2738,19 @@ where
     let has_double = attr_value.contains('"');
     if has_double && has_single {
         if let Some(quote) = initial_quote {
-            Doc::text(quote.to_string())
+            Doc::char(quote)
         } else if let Quotes::Double = ctx.options.quotes {
-            Doc::text("\"")
+            Doc::char('"')
         } else {
-            Doc::text("'")
+            Doc::char('\'')
         }
     } else if has_double {
-        Doc::text("'")
+        Doc::char('\'')
     } else if has_single {
-        Doc::text("\"")
+        Doc::char('"')
     } else if let Quotes::Double = ctx.options.quotes {
-        Doc::text("\"")
+        Doc::char('"')
     } else {
-        Doc::text("'")
+        Doc::char('\'')
     }
 }

From 7968726589ea9e8912a5cbfbf1653b4eecc94eca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <bartek@deno.com>
Date: Tue, 2 Jun 2026 04:29:28 +0200
Subject: [PATCH 65/67] fix: fix wrong column computation (#226)

---
 markup_fmt/src/helpers.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/markup_fmt/src/helpers.rs b/markup_fmt/src/helpers.rs
index 2ef21985..23ee70e7 100644
--- a/markup_fmt/src/helpers.rs
+++ b/markup_fmt/src/helpers.rs
@@ -315,7 +315,21 @@ pub(crate) fn pos_to_line_col(source: &str, pos: usize) -> (usize, usize) {
         },
     );
     match search {
-        ControlFlow::Break((line, offset)) => (line, pos - offset.max(pos)),
+        ControlFlow::Break((line, offset)) => (line, pos - offset + 1),
         ControlFlow::Continue((line, _)) => (line, 0),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn pos_to_line_col() {
+        let source = "abc\ndef\nghi";
+        // Positions whose line is followed by a later newline go through the
+        // `Break` arm, which must report a non-zero column.
+        assert_eq!(super::pos_to_line_col(source, 0), (1, 1));
+        assert_eq!(super::pos_to_line_col(source, 2), (1, 3));
+        assert_eq!(super::pos_to_line_col(source, 4), (2, 2));
+        assert_eq!(super::pos_to_line_col(source, 6), (2, 4));
+    }
+}

From aba0d10232dc2d56db290e6f2589649f176eab1b Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Tue, 2 Jun 2026 10:46:21 +0800
Subject: [PATCH 66/67] v0.27.3

---
 Cargo.lock                                | 4 ++--
 README.md                                 | 2 +-
 dprint_plugin/Cargo.toml                  | 2 +-
 dprint_plugin/deployment/npm/package.json | 2 +-
 dprint_plugin/deployment/schema.json      | 2 +-
 markup_fmt/Cargo.toml                     | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 855873b7..cb6813e5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -327,7 +327,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -696,7 +696,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.27.2"
+version = "0.27.3"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/README.md b/README.md
index c238a036..ead67247 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ After adding the dprint plugins, update your `dprint.json` and add configuration
   // ...
   "plugins": [
     // ... other plugins URL
-    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.27.2.wasm"
+    "https://plugins.dprint.dev/g-plane/markup_fmt-v0.27.3.wasm"
   ],
   "markup": { // <-- the key name here is "markup", not "markup_fmt"
     // config comes here
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index 1ce1ea1e..2c9dd3b2 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.27.2"
+version = "0.27.3"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/dprint_plugin/deployment/npm/package.json b/dprint_plugin/deployment/npm/package.json
index dbdda92f..79a94d06 100644
--- a/dprint_plugin/deployment/npm/package.json
+++ b/dprint_plugin/deployment/npm/package.json
@@ -1,7 +1,7 @@
 {
   "name": "dprint-plugin-markup",
   "description": "markup_fmt as dprint plugin.",
-  "version": "0.27.2",
+  "version": "0.27.3",
   "author": "Pig Fang <g-plane@hotmail.com>",
   "repository": "g-plane/markup_fmt",
   "license": "MIT",
diff --git a/dprint_plugin/deployment/schema.json b/dprint_plugin/deployment/schema.json
index eade8a83..4e1c7cc7 100644
--- a/dprint_plugin/deployment/schema.json
+++ b/dprint_plugin/deployment/schema.json
@@ -1,6 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
-  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.27.2/schema.json",
+  "$id": "https://plugins.dprint.dev/g-plane/markup_fmt/v0.27.3/schema.json",
   "title": "Config",
   "description": "Configuration for dprint-plugin-markup.",
   "type": "object",
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 13da6a85..eead6dc4 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.27.2"
+version = "0.27.3"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."

From b633beb8baeec27fe7e2c708ada7661fa719ccc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20W=C3=B6lfer?= <lukas.woelfer@pickware.de>
Date: Mon, 6 Jul 2026 17:25:06 +0200
Subject: [PATCH 67/67] chore: version 0.27.3+pw1

---
 Cargo.lock               | 4 ++--
 dprint_plugin/Cargo.toml | 2 +-
 markup_fmt/Cargo.toml    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bd6a4b19..24b00408 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -327,7 +327,7 @@ dependencies = [
 
 [[package]]
 name = "dprint_plugin_markup"
-version = "0.27.3+pw.3"
+version = "0.27.3+pw.1"
 dependencies = [
  "anyhow",
  "dprint-core",
@@ -696,7 +696,7 @@ dependencies = [
 
 [[package]]
 name = "markup_fmt"
-version = "0.27.3+pw.3"
+version = "0.27.3+pw.1"
 dependencies = [
  "aho-corasick",
  "anyhow",
diff --git a/dprint_plugin/Cargo.toml b/dprint_plugin/Cargo.toml
index d3d02383..b84eb50c 100644
--- a/dprint_plugin/Cargo.toml
+++ b/dprint_plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dprint_plugin_markup"
-version = "0.27.3+pw.3"
+version = "0.27.3+pw.1"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "markup_fmt as dprint plugin."
diff --git a/markup_fmt/Cargo.toml b/markup_fmt/Cargo.toml
index 1eda6774..c6144feb 100644
--- a/markup_fmt/Cargo.toml
+++ b/markup_fmt/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "markup_fmt"
-version = "0.27.3+pw.3"
+version = "0.27.3+pw.1"
 edition = "2024"
 authors = ["Pig Fang <g-plane@hotmail.com>"]
 description = "Configurable HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, Vento, Mustache, Handlebars and XML formatter."