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

fix(cli/fmt): make fmt output more readable (#7534)

Browse source
This commit is contained in:
Pig Fang 2020-09-18 09:48:08 +08:00 committed by GitHub
parent d245ececb6
commit e4188f7dfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cli/colors.rs
View file

@ -85,6 +85,12 @@ pub fn white_on_green(s: &str) -> impl fmt::Display {
style(&s, style_spec) style(&s, style_spec)
} }
pub fn black_on_green(s: &str) -> impl fmt::Display {
let mut style_spec = ColorSpec::new();
style_spec.set_bg(Some(Green)).set_fg(Some(Black));
style(&s, style_spec)
}
pub fn yellow(s: &str) -> impl fmt::Display { pub fn yellow(s: &str) -> impl fmt::Display {
let mut style_spec = ColorSpec::new(); let mut style_spec = ColorSpec::new();
style_spec.set_fg(Some(Yellow)); style_spec.set_fg(Some(Yellow));

14
cli/diff.rs
View file

@ -14,7 +14,7 @@ fn fmt_add_text(x: &str) -> String {
} }
fn fmt_add_text_highlight(x: &str) -> String { fn fmt_add_text_highlight(x: &str) -> String {
format!("{}", colors::white_on_green(x)) format!("{}", colors::black_on_green(x))
} }
fn fmt_rem() -> String { fn fmt_rem() -> String {
@ -41,9 +41,9 @@ fn write_line_diff(
for (i, s) in split { for (i, s) in split {
write!( write!(
diff, diff,
"{:0width$}{} ", "{:width$}{} ",
*orig_line + i, *orig_line + i,
colors::gray("|"), colors::gray(" |"),
width = line_number_width width = line_number_width
)?; )?;
write!(diff, "{}", fmt_rem())?; write!(diff, "{}", fmt_rem())?;
@ -55,9 +55,9 @@ fn write_line_diff(
for (i, s) in split { for (i, s) in split {
write!( write!(
diff, diff,
"{:0width$}{} ", "{:width$}{} ",
*edit_line + i, *edit_line + i,
colors::gray("|"), colors::gray(" |"),
width = line_number_width width = line_number_width
)?; )?;
write!(diff, "{}", fmt_add())?; write!(diff, "{}", fmt_add())?;
@ -160,13 +160,13 @@ fn test_diff() {
colors::strip_ansi_codes( colors::strip_ansi_codes(
&diff(simple_console_log_unfmt, simple_console_log_fmt).unwrap() &diff(simple_console_log_unfmt, simple_console_log_fmt).unwrap()
), ),
"1| -console.log('Hello World')\n1| +console.log(\"Hello World\");\n" "1 | -console.log('Hello World')\n1 | +console.log(\"Hello World\");\n"
); );
let line_number_unfmt = "\n\n\n\nconsole.log(\n'Hello World'\n)"; let line_number_unfmt = "\n\n\n\nconsole.log(\n'Hello World'\n)";
let line_number_fmt = "console.log(\n\"Hello World\"\n);"; let line_number_fmt = "console.log(\n\"Hello World\"\n);";
assert_eq!( assert_eq!(
colors::strip_ansi_codes(&diff(line_number_unfmt, line_number_fmt).unwrap()), colors::strip_ansi_codes(&diff(line_number_unfmt, line_number_fmt).unwrap()),
"1| -\n2| -\n3| -\n4| -\n5| -console.log(\n1| +console.log(\n6| -'Hello World'\n2| +\"Hello World\"\n7| -)\n3| +);\n" "1 | -\n2 | -\n3 | -\n4 | -\n5 | -console.log(\n1 | +console.log(\n6 | -'Hello World'\n2 | +\"Hello World\"\n7 | -)\n3 | +);\n"
) )
} }