diff options
| author | Pig Fang <g-plane@hotmail.com> | 2024-09-09 23:45:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 15:45:17 +0000 |
| commit | 3daab54612309a3e3aec5b7b8bd24b39ad510943 (patch) | |
| tree | af442941b60e8b9d1db24879ad6af9968b7518a5 | |
| parent | 582be0adc2b80e532cf92ffbc44c8c8268a51774 (diff) | |
fix(fmt): fix tabs in YAML (#25536)
Fixes #25176
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | cli/Cargo.toml | 2 | ||||
| -rw-r--r-- | cli/tools/fmt.rs | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 2fd8a59a2..5f8b8837c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5242,9 +5242,9 @@ dependencies = [ [[package]] name = "pretty_yaml" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ba50511591c8e1d84125f7e2e6d17ccb06865c484b812f5ee3af61f42a66be" +checksum = "dda9a64ee7296e82d1e0f4389383e6a7d8e6e2487d8391f7d028c131395fd376" dependencies = [ "rowan", "tiny_pretty", 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(), |