language-servers/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-28 21:05:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

refactor: Reduce code duplication

Browse source
This commit is contained in:
Martin Fischer 2023-02-10 09:55:55 +01:00 • committed by Charlie Marsh
parent c32441e4ab
commit 682d206992
2 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
crates/ruff_cli/src/printer.rs
View file

@ -1,4 +1,5 @@
use std::collections::BTreeMap;
use std::fmt::Display;
use std::io;
use std::io::{BufWriter, Write};
use std::path::Path;
@ -496,21 +497,34 @@ fn num_digits(n: usize) -> usize {
.max(1)
}
struct CodeAndBody<'a>(&'a Message);
impl Display for CodeAndBody<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(
f,
"{code} {autofix}{body}",
code = self.0.kind.rule().code().red().bold(),
autofix = self
.0
.kind
.fixable()
.then_some(format_args!("[{}] ", "*".cyan()))
.unwrap_or(format_args!("")),
body = self.0.kind.body(),
)
}
}
/// Print a single `Message` with full details.
fn print_message<T: Write>(stdout: &mut T, message: &Message) -> Result<()> {
let label = format!(
"{path}{sep}{row}{sep}{col}{sep} {code} {autofix}{body}",
"{path}{sep}{row}{sep}{col}{sep} {code_and_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!("")),
body = message.kind.body(),
code_and_body = CodeAndBody(message)
);
writeln!(stdout, "{label}")?;
if let Some(source) = &message.source {
@ -567,19 +581,13 @@ fn print_grouped_message<T: Write>(
column_length: usize,
) -> Result<()> {
let label = format!(
" {row_padding}{row}{sep}{col}{col_padding} {code} {autofix}{body}",
" {row_padding}{row}{sep}{col}{col_padding} {code_and_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!("")),
body = message.kind.body(),
code_and_body = CodeAndBody(message),
);
writeln!(stdout, "{label}")?;
if let Some(source) = &message.source {

1
crates/ruff_dev/src/generate_rules_table.rs
View file

@ -36,6 +36,7 @@ fn generate_table(table_out: &mut String, rules: impl IntoIterator<Item = Rule>)
let rule_name = rule.as_ref();
#[allow(clippy::or_fun_call)]
table_out.push_str(&format!(
"| {} | {} | {} | {} |",
rule.code(),