fix unstable formatting of interpolation in non-ws-sensitive tag

(fix #26)
g-plane · Jun 21, 2024 · 82f8423 · 82f8423
1 parent 5bc7f82
commit 82f8423
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
@@ -512,17 +512,19 @@ impl<'s> DocGen<'s> for Element<'s> {
  ctx,
  &state,
  ));
- if self.children.iter().all(|child| {
- matches!(
- child,
- Node::VueInterpolation(..)
- | Node::SvelteInterpolation(..)
- | Node::Comment(..)
- | Node::AstroExpr(..)
- | Node::JinjaInterpolation(..)
- | Node::VentoInterpolation(..)
- )
- }) {
+ if is_whitespace_sensitive
+ && self.children.iter().all(|child| {
+ matches!(
+ child,
+ Node::VueInterpolation(..)
+ | Node::SvelteInterpolation(..)
+ | Node::Comment(..)
+ | Node::AstroExpr(..)
+ | Node::JinjaInterpolation(..)
+ | Node::VentoInterpolation(..)
+ )
+ })
+ {
  // This lets it format like this:
  // ```
  // <span>{{

diff --git a/markup_fmt/tests/fmt/jinja/interpolation/fixture.jinja b/markup_fmt/tests/fmt/jinja/interpolation/fixture.jinja
@@ -5,3 +5,5 @@
 </div>
 
 <span>{{ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx }}</span>
+
+<div>{{ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx }}</div>
diff --git a/markup_fmt/tests/fmt/jinja/interpolation/fixture.snap b/markup_fmt/tests/fmt/jinja/interpolation/fixture.snap
@@ -10,3 +10,7 @@ source: markup_fmt/tests/fmt.rs
 <span>{{
  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 }}</span>
+
+<div>
+ {{ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx }}
+</div>