foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

fix(fmt): fix tabs in YAML (#25536)

Browse source 
Fixes #25176
This commit is contained in:
Pig Fang 2024-09-09 23:45:17 +08:00 committed by GitHub
parent 582be0adc2
commit 3daab54612
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -5242,9 +5242,9 @@ dependencies = [
[[package]] [[package]]
name = "pretty_yaml" name = "pretty_yaml"
version = "0.4.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22ba50511591c8e1d84125f7e2e6d17ccb06865c484b812f5ee3af61f42a66be" checksum = "dda9a64ee7296e82d1e0f4389383e6a7d8e6e2487d8391f7d028c131395fd376"
dependencies = [ dependencies = [
"rowan", "rowan",
"tiny_pretty", "tiny_pretty",

2
cli/Cargo.toml
View file

@ -134,7 +134,7 @@ p256.workspace = true
pathdiff = "0.2.1" pathdiff = "0.2.1"
percent-encoding.workspace = true percent-encoding.workspace = true
phf.workspace = true phf.workspace = true
pretty_yaml = "=0.4.0" pretty_yaml = "=0.5.0"
quick-junit = "^0.3.5" quick-junit = "^0.3.5"
rand = { workspace = true, features = ["small_rng"] } rand = { workspace = true, features = ["small_rng"] }
regex.workspace = true regex.workspace = true

4
cli/tools/fmt.rs
View file

@ -1011,7 +1011,6 @@ fn get_resolved_yaml_config(
let layout_options = LayoutOptions { let layout_options = LayoutOptions {
print_width: options.line_width.unwrap_or(80) as usize, 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, indent_width: options.indent_width.unwrap_or(2) as usize,
line_break: LineBreak::Lf, line_break: LineBreak::Lf,
}; };
@ -1028,6 +1027,9 @@ fn get_resolved_yaml_config(
brace_spacing: true, brace_spacing: true,
bracket_spacing: false, bracket_spacing: false,
dash_spacing: DashSpacing::OneSpace, 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_whitespaces: true,
trim_trailing_zero: false, trim_trailing_zero: false,
ignore_comment_directive: "deno-fmt-ignore".into(), ignore_comment_directive: "deno-fmt-ignore".into(),