Python
/
ruff
mirror of https://github.com/astral-sh/ruff
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Also show rule codes in autofix errors in production codes (#4327) 

I needed those changes for #4326
This commit is contained in:
konstin 2023-05-11 17:36:03 +02:00 committed by GitHub
parent b76b4b6016
commit 3c2f41b615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/ruff/src/linter.rs
View File

@ -497,8 +497,8 @@ fn collect_rule_codes(rules: impl IntoIterator<Item = Rule>) -> String {
#[allow(clippy::print_stderr)] #[allow(clippy::print_stderr)]
fn report_failed_to_converge_error(path: &Path, transformed: &str, diagnostics: &[Diagnostic]) { fn report_failed_to_converge_error(path: &Path, transformed: &str, diagnostics: &[Diagnostic]) {
let codes = collect_rule_codes(diagnostics.iter().map(|diagnostic| diagnostic.kind.rule()));
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
let codes = collect_rule_codes(diagnostics.iter().map(|diagnostic| diagnostic.kind.rule()));
eprintln!( eprintln!(
"{}: Failed to converge after {} iterations in `{}` with rule codes {}:---\n{}\n---", "{}: Failed to converge after {} iterations in `{}` with rule codes {}:---\n{}\n---",
"debug error".red().bold(), "debug error".red().bold(),
@ -516,13 +516,14 @@ This indicates a bug in `{}`. If you could open an issue at:
{}/issues/new?title=%5BInfinite%20loop%5D {}/issues/new?title=%5BInfinite%20loop%5D
...quoting the contents of `{}`, along with the `pyproject.toml` settings and executed command, we'd be very appreciative! ...quoting the contents of `{}`, the rule codes {}, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
"#, "#,
"error".red().bold(), "error".red().bold(),
MAX_ITERATIONS, MAX_ITERATIONS,
CARGO_PKG_NAME, CARGO_PKG_NAME,
CARGO_PKG_REPOSITORY, CARGO_PKG_REPOSITORY,
fs::relativize_path(path), fs::relativize_path(path),
codes
); );
} }
} }
@ -534,8 +535,8 @@ fn report_autofix_syntax_error(
error: &ParseError, error: &ParseError,
rules: impl IntoIterator<Item = Rule>, rules: impl IntoIterator<Item = Rule>,
) { ) {
let codes = collect_rule_codes(rules);
if cfg!(debug_assertions) { if cfg!(debug_assertions) {
let codes = collect_rule_codes(rules);
eprintln!( eprintln!(
"{}: Autofix introduced a syntax error in `{}` with rule codes {}: {}\n---\n{}\n---", "{}: Autofix introduced a syntax error in `{}` with rule codes {}: {}\n---\n{}\n---",
"error".red().bold(), "error".red().bold(),
@ -553,12 +554,13 @@ This indicates a bug in `{}`. If you could open an issue at:
{}/issues/new?title=%5BAutofix%20error%5D {}/issues/new?title=%5BAutofix%20error%5D
...quoting the contents of `{}`, along with the `pyproject.toml` settings and executed command, we'd be very appreciative! ...quoting the contents of `{}`, the rule codes {}, along with the `pyproject.toml` settings and executed command, we'd be very appreciative!
"#, "#,
"error".red().bold(), "error".red().bold(),
CARGO_PKG_NAME, CARGO_PKG_NAME,
CARGO_PKG_REPOSITORY, CARGO_PKG_REPOSITORY,
fs::relativize_path(path), fs::relativize_path(path),
codes,
); );
} }
} }