fix(fmt): fix invalid block seq indent

when indent width is greater than 2
g-plane · Jul 4, 2024 · 2e9e57e · 2e9e57e
1 parent 444cc16
commit 2e9e57e
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 1 deletion.
diff --git a/pretty_yaml/src/printer.rs b/pretty_yaml/src/printer.rs
@@ -193,9 +193,14 @@ impl DocGen for BlockSeqEntry {
  {
  let mut trivia_docs = format_trivias_after_token(&token, ctx);
  docs.push(Doc::space());
+ docs.push(Doc::text(
+ " ".repeat(ctx.indent_width.checked_sub(2).unwrap_or_default()),
+ ));
  docs.append(&mut trivia_docs);
  } else if self.block().is_some() || self.flow().is_some() {
- docs.push(Doc::space());
+ docs.push(Doc::text(
+ " ".repeat(ctx.indent_width.checked_sub(1).unwrap_or(1)),
+ ));
  }
  }
 

diff --git a/pretty_yaml/tests/fmt/indent/config.toml b/pretty_yaml/tests/fmt/indent/config.toml
@@ -0,0 +1,5 @@
+[2]
+indentWidth = 2
+
+[4]
+indentWidth = 4
diff --git a/pretty_yaml/tests/fmt/indent/flow-sequence.2.snap b/pretty_yaml/tests/fmt/indent/flow-sequence.2.snap
@@ -0,0 +1,5 @@
+---
+source: pretty_yaml/tests/fmt.rs
+---
+- a: b
+ c: d
diff --git a/pretty_yaml/tests/fmt/indent/flow-sequence.4.snap b/pretty_yaml/tests/fmt/indent/flow-sequence.4.snap
@@ -0,0 +1,5 @@
+---
+source: pretty_yaml/tests/fmt.rs
+---
+- a: b
+ c: d
diff --git a/pretty_yaml/tests/fmt/indent/flow-sequence.yaml b/pretty_yaml/tests/fmt/indent/flow-sequence.yaml
@@ -0,0 +1,2 @@
+- a: b
+ c: d