Skip to content

Commit f240c45

Browse files
authored
fix(fmt): return formatted code when stdin and --raw (#11900)
1 parent fe10724 commit f240c45

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

crates/forge/src/cmd/fmt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ impl FmtArgs {
129129
let formatted = forge_fmt::format_ast(gcx, source_unit, fmt_config.clone())?;
130130
let from_stdin = path.is_none();
131131

132-
// Return formatted code when read from stdin without check or raw switch.
132+
// Return formatted code when read from stdin and raw enabled.
133133
// <https://github.com/foundry-rs/foundry/issues/11871>
134-
if from_stdin && !self.check && !self.raw {
134+
if from_stdin && self.raw {
135135
return Some(Ok(formatted));
136136
}
137137

crates/forge/tests/cli/fmt.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ forgetest!(fmt_stdin, |_prj, cmd| {
4444
cmd.stdin(UNFORMATTED.as_bytes());
4545
cmd.assert_success().stdout_eq(FORMATTED);
4646

47+
// stdin with `--raw` returns formatted code
4748
cmd.stdin(FORMATTED.as_bytes());
49+
cmd.assert_success().stdout_eq(FORMATTED);
50+
51+
// stdin with `--check` and without `--raw`returns diff
52+
cmd.forge_fuse().args(["fmt", "-", "--check"]);
4853
cmd.assert_success().stdout_eq("");
4954
});
5055

@@ -93,7 +98,7 @@ Diff in stdin:
9398
// Test that original is returned if read from stdin and no diff.
9499
// <https://github.com/foundry-rs/foundry/issues/11871>
95100
forgetest!(fmt_stdin_original, |_prj, cmd| {
96-
cmd.args(["fmt", "-"]);
101+
cmd.args(["fmt", "-", "--raw"]);
97102

98103
cmd.stdin(FORMATTED.as_bytes());
99104
cmd.assert_success().stdout_eq(FORMATTED.as_bytes());

0 commit comments

Comments
 (0)