Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 28 additions & 10 deletions src/cmds/system/format_cmd.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,22 @@ fn detect_formatter_in_dir(args: &[String], dir: &Path) -> String {
"ruff".to_string()
}

fn formatter_prefix_args(formatter: &str, user_args: &[String]) -> Vec<&'static str> {
match formatter {
"black" if !user_args.iter().any(|arg| arg == "--check" || arg == "--diff") => {
vec!["--check"]
}
"ruff" if user_args.is_empty() || !user_args[0].starts_with("format") => {
let mut args = vec!["format"];
if !user_args.iter().any(|arg| arg == "--check" || arg == "--diff") {
args.push("--check");
}
args
}
_ => Vec::new(),
}
}

pub fn run(args: &[String], verbose: u8) -> Result<i32> {
let timer = tracking::TimedExecution::start();

Expand Down Expand Up @@ -84,16 +100,8 @@ pub fn run(args: &[String], verbose: u8) -> Result<i32> {
// Add formatter-specific flags
let user_args = args[start_idx..].to_vec();

match formatter.as_str() {
// Inject --check if not present for check mode
"black" if !user_args.iter().any(|a| a == "--check" || a == "--diff") => {
cmd.arg("--check");
}
// Add "format" subcommand if not present
"ruff" if user_args.is_empty() || !user_args[0].starts_with("format") => {
cmd.arg("format");
}
_ => {}
for arg in formatter_prefix_args(&formatter, &user_args) {
cmd.arg(arg);
}

// Add user arguments
Expand Down Expand Up @@ -304,6 +312,16 @@ mod tests {
assert_eq!(formatter, "ruff");
}

#[test]
fn test_ruff_defaults_to_check_mode() {
assert_eq!(formatter_prefix_args("ruff", &[]), ["format", "--check"]);
assert_eq!(
formatter_prefix_args("ruff", &["--diff".to_string()]),
["format"]
);
assert!(formatter_prefix_args("ruff", &["format".to_string()]).is_empty());
}

#[test]
fn test_detect_formatter_from_pyproject_black() {
let temp_dir = TempDir::new().unwrap();
Expand Down