greg/just
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print format diff to stdout (#1506)

Browse Source
This commit is contained in:
Casey Rodarmor 2023-01-13 10:30:27 -08:00
parent 3bf3be9af8
commit 1d02f0ef80
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/subcommand.rs
View File

@ -383,12 +383,12 @@ impl Subcommand {
for op in diff.ops() { for op in diff.ops() {
for change in diff.iter_changes(op) { for change in diff.iter_changes(op) {
let (symbol, color) = match change.tag() { let (symbol, color) = match change.tag() {
ChangeTag::Delete => ("-", config.color.stderr().diff_deleted()), ChangeTag::Delete => ("-", config.color.stdout().diff_deleted()),
ChangeTag::Equal => (" ", config.color.stderr()), ChangeTag::Equal => (" ", config.color.stdout()),
ChangeTag::Insert => ("+", config.color.stderr().diff_added()), ChangeTag::Insert => ("+", config.color.stdout().diff_added()),
}; };
eprint!("{}{symbol}{change}{}", color.prefix(), color.suffix()); print!("{}{symbol}{change}{}", color.prefix(), color.suffix());
} }
} }
} }

10
tests/fmt.rs
View File

@ -45,9 +45,11 @@ test! {
name: check_found_diff, name: check_found_diff,
justfile: "x:=``\n", justfile: "x:=``\n",
args: ("--unstable", "--fmt", "--check"), args: ("--unstable", "--fmt", "--check"),
stderr: " stdout: "
-x:=`` -x:=``
+x := `` +x := ``
",
stderr: "
error: Formatted justfile differs from original. error: Formatted justfile differs from original.
", ",
status: EXIT_FAILURE, status: EXIT_FAILURE,
@ -65,10 +67,12 @@ test! {
name: check_diff_color, name: check_diff_color,
justfile: "x:=``\n", justfile: "x:=``\n",
args: ("--unstable", "--fmt", "--check", "--color", "always"), args: ("--unstable", "--fmt", "--check", "--color", "always"),
stderr: " stdout: "
\u{1b}[31m-x:=`` \u{1b}[31m-x:=``
\u{1b}[0m\u{1b}[32m+x := `` \u{1b}[0m\u{1b}[32m+x := ``
\u{1b}[0m\u{1b}[1;31merror\u{1b}[0m: \u{1b}[1mFormatted justfile differs from original.\u{1b}[0m \u{1b}[0m",
stderr: "
\u{1b}[1;31merror\u{1b}[0m: \u{1b}[1mFormatted justfile differs from original.\u{1b}[0m
", ",
status: EXIT_FAILURE, status: EXIT_FAILURE,
} }