vfmt: exit with error code if encountering diffs with -diff flag (#21603)

ttytm · web-flow · commit 52dfef1a8c3c · 2024-05-30T17:51:30.000+03:00
diff --git a/cmd/tools/vfmt.v b/cmd/tools/vfmt.v
@@ -145,7 +145,9 @@ fn main() {
 	}
 	ecode := if has_internal_error { 5 } else { 0 }
 	if errors > 0 {
-		eprintln('Encountered a total of: ${errors} formatting errors.')
+		if !foptions.is_diff {
+			eprintln('Encountered a total of: ${errors} formatting errors.')
+		}
 		match true {
 			foptions.is_noerror { exit(0 + ecode) }
 			foptions.is_verify { exit(1 + ecode) }
@@ -245,7 +247,7 @@ fn (mut foptions FormatOptions) post_process_file(file string, formatted_file_pa
 			return
 		}
 		println(diff.compare_files(file, formatted_file_path)!)
-		return
+		return error('')
 	}
 	if foptions.is_verify {
 		if !is_formatted_different {

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,9 @@ fn main() {`
`145`	`145`	`}`
`146`	`146`	`ecode := if has_internal_error { 5 } else { 0 }`
`147`	`147`	`if errors > 0 {`
`148`		`- eprintln('Encountered a total of: ${errors} formatting errors.')`
	`148`	`+ if !foptions.is_diff {`
	`149`	`+ eprintln('Encountered a total of: ${errors} formatting errors.')`
	`150`	`+ }`
`149`	`151`	`match true {`
`150`	`152`	`foptions.is_noerror { exit(0 + ecode) }`
`151`	`153`	`foptions.is_verify { exit(1 + ecode) }`
`@@ -245,7 +247,7 @@ fn (mut foptions FormatOptions) post_process_file(file string, formatted_file_pa`
`245`	`247`	`return`
`246`	`248`	`}`
`247`	`249`	`println(diff.compare_files(file, formatted_file_path)!)`
`248`		`- return`
	`250`	`+ return error('')`
`249`	`251`	`}`
`250`	`252`	`if foptions.is_verify {`
`251`	`253`	`if !is_formatted_different {`