remove duplicated space when max_attrs_per_line set

in self-closing tag fix #2
g-plane · Nov 10, 2023 · 759d1fe · 759d1fe
1 parent 604d8f5
commit 759d1fe
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 16 deletions.
diff --git a/markup_fmt/src/printer.rs b/markup_fmt/src/printer.rs
@@ -99,21 +99,26 @@ impl<'s> DocGen<'s> for Element<'s> {
         }));
 
         let attrs = if let Some(max) = ctx.options.max_attrs_per_line {
-            Doc::line_or_space()
-                .concat(itertools::intersperse(
-                    self.attrs.chunks(max.into()).map(|chunk| {
-                        Doc::list(
-                            itertools::intersperse(
-                                chunk.iter().map(|attr| attr.doc(ctx)),
-                                Doc::line_or_space(),
-                            )
-                            .collect(),
+            // fix #2
+            if self.attrs.is_empty() {
+                Doc::line_or_nil()
+            } else {
+                Doc::line_or_space()
+            }
+            .concat(itertools::intersperse(
+                self.attrs.chunks(max.into()).map(|chunk| {
+                    Doc::list(
+                        itertools::intersperse(
+                            chunk.iter().map(|attr| attr.doc(ctx)),
+                            Doc::line_or_space(),
                         )
-                        .group()
-                    }),
-                    Doc::hard_line(),
-                ))
-                .nest_with_ctx(ctx)
+                        .collect(),
+                    )
+                    .group()
+                }),
+                Doc::hard_line(),
+            ))
+            .nest_with_ctx(ctx)
         } else {
             Doc::list(
                 self.attrs

diff --git a/markup_fmt/tests/fmt/html/self-closing/config.toml b/markup_fmt/tests/fmt/html/self-closing/config.toml
@@ -24,3 +24,7 @@
 
 [mathml-disabled]
 "mathml.selfClosing" = false
+
+[with-max-attrs-per-line]
+"html.normal.selfClosing" = true
+maxAttrsPerLine = 1
diff --git a/markup_fmt/tests/fmt/html/self-closing/fixture.with-max-attrs-per-line.snap b/markup_fmt/tests/fmt/html/self-closing/fixture.with-max-attrs-per-line.snap
@@ -0,0 +1,15 @@
+---
+source: markup_fmt/tests/fmt.rs
+---
+<div />
+<div />
+
+<input>
+<input />
+
+<circle></circle>
+<circle />
+
+<abs></abs>
+<abs />
+
diff --git a/markup_fmt/tests/fmt/vue/max-attrs-per-line/max-attrs-per-line.one.snap b/markup_fmt/tests/fmt/vue/max-attrs-per-line/max-attrs-per-line.one.snap
@@ -1,7 +1,7 @@
 ---
 source: markup_fmt/tests/fmt.rs
 ---
-<template >
+<template>
   <div data-a="1">
     Lorem ipsum dolor sit amet, consectetur adipiscing elit.
   </div>

diff --git a/markup_fmt/tests/fmt/vue/max-attrs-per-line/max-attrs-per-line.two.snap b/markup_fmt/tests/fmt/vue/max-attrs-per-line/max-attrs-per-line.two.snap
@@ -1,7 +1,7 @@
 ---
 source: markup_fmt/tests/fmt.rs
 ---
-<template >
+<template>
   <div data-a="1">
     Lorem ipsum dolor sit amet, consectetur adipiscing elit.
   </div>