diff --git a/crates/ruff_cli/src/printer.rs b/crates/ruff_cli/src/printer.rs index bf56bb7883..dbd0f5f262 100644 --- a/crates/ruff_cli/src/printer.rs +++ b/crates/ruff_cli/src/printer.rs @@ -499,20 +499,18 @@ fn num_digits(n: usize) -> usize { /// Print a single `Message` with full details. fn print_message(stdout: &mut T, message: &Message) -> Result<()> { let label = format!( - "{}{}{}{}{}{} {} {}{}", - relativize_path(Path::new(&message.filename)).bold(), - ":".cyan(), - message.location.row(), - ":".cyan(), - message.location.column(), - ":".cyan(), - message.kind.rule().code().red().bold(), - message + "{path}{sep}{row}{sep}{col}{sep} {code} {autofix}{body}", + path = relativize_path(Path::new(&message.filename)).bold(), + sep = ":".cyan(), + row = message.location.row(), + col = message.location.column(), + code = message.kind.rule().code().red().bold(), + autofix = message .kind .fixable() .then_some(format_args!("[{}] ", "*".cyan())) .unwrap_or(format_args!("")), - message.kind.body(), + body = message.kind.body(), ); writeln!(stdout, "{label}")?; if let Some(source) = &message.source { @@ -569,19 +567,19 @@ fn print_grouped_message( column_length: usize, ) -> Result<()> { let label = format!( - " {}{}{}{}{} {} {}{}", - " ".repeat(row_length - num_digits(message.location.row())), - message.location.row(), - ":".cyan(), - message.location.column(), - " ".repeat(column_length - num_digits(message.location.column())), - message.kind.rule().code().red().bold(), - message + " {row_padding}{row}{sep}{col}{col_padding} {code} {autofix}{body}", + row_padding = " ".repeat(row_length - num_digits(message.location.row())), + row = message.location.row(), + sep = ":".cyan(), + col = message.location.column(), + col_padding = " ".repeat(column_length - num_digits(message.location.column())), + code = message.kind.rule().code().red().bold(), + autofix = message .kind .fixable() .then_some(format_args!("[{}] ", "*".cyan())) .unwrap_or(format_args!("")), - message.kind.body(), + body = message.kind.body(), ); writeln!(stdout, "{label}")?; if let Some(source) = &message.source {