From 3daab54612309a3e3aec5b7b8bd24b39ad510943 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Mon, 9 Sep 2024 23:45:17 +0800 Subject: fix(fmt): fix tabs in YAML (#25536) Fixes #25176 --- cli/Cargo.toml | 2 +- cli/tools/fmt.rs | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'cli') diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 3a141b3e1..c582004ad 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -134,7 +134,7 @@ p256.workspace = true pathdiff = "0.2.1" percent-encoding.workspace = true phf.workspace = true -pretty_yaml = "=0.4.0" +pretty_yaml = "=0.5.0" quick-junit = "^0.3.5" rand = { workspace = true, features = ["small_rng"] } regex.workspace = true diff --git a/cli/tools/fmt.rs b/cli/tools/fmt.rs index 97f3b3215..feb716100 100644 --- a/cli/tools/fmt.rs +++ b/cli/tools/fmt.rs @@ -1011,7 +1011,6 @@ fn get_resolved_yaml_config( let layout_options = LayoutOptions { print_width: options.line_width.unwrap_or(80) as usize, - use_tabs: options.use_tabs.unwrap_or_default(), indent_width: options.indent_width.unwrap_or(2) as usize, line_break: LineBreak::Lf, }; @@ -1028,6 +1027,9 @@ fn get_resolved_yaml_config( brace_spacing: true, bracket_spacing: false, dash_spacing: DashSpacing::OneSpace, + prefer_single_line: false, + flow_sequence_prefer_single_line: None, + flow_map_prefer_single_line: None, trim_trailing_whitespaces: true, trim_trailing_zero: false, ignore_comment_directive: "deno-fmt-ignore".into(), -- cgit v1.2.3