mirror of
https://github.com/astral-sh/ruff.git
synced 2025-09-27 20:42:10 +00:00

Summary -- This PR updates `check_path` in the `ruff_linter` crate to return a `Vec<Message>` instead of a `Vec<Diagnostic>`. The main motivation for this is to make it easier to convert semantic syntax errors directly into `Message`s rather than `Diagnostic`s in #16106. However, this also has the benefit of keeping the preview check on unsupported syntax errors in `check_path`, as suggested in https://github.com/astral-sh/ruff/pull/16429#discussion_r1974748024. All of the interesting changes are in the first commit. The second commit just renames variables like `diagnostics` to `messages`, and the third commit is a tiny import fix. I also updated the `ExpandedMessage::location` field name, which caused a few extra commits tidying up the playground code. I thought it was nicely symmetric with `end_location`, but I'm happy to revert that too. Test Plan -- Existing tests. I also tested the playground and server manually.
389 lines
13 KiB
Rust
389 lines
13 KiB
Rust
#![cfg(any(test, fuzzing))]
|
|
//! Helper functions for the tests of rule implementations.
|
|
|
|
use std::borrow::Cow;
|
|
use std::path::Path;
|
|
|
|
#[cfg(not(fuzzing))]
|
|
use anyhow::Result;
|
|
use itertools::Itertools;
|
|
use rustc_hash::FxHashMap;
|
|
|
|
use ruff_diagnostics::{Applicability, FixAvailability};
|
|
use ruff_notebook::Notebook;
|
|
#[cfg(not(fuzzing))]
|
|
use ruff_notebook::NotebookError;
|
|
use ruff_python_ast::PySourceType;
|
|
use ruff_python_codegen::Stylist;
|
|
use ruff_python_index::Indexer;
|
|
use ruff_python_parser::{ParseError, ParseOptions};
|
|
use ruff_python_trivia::textwrap::dedent;
|
|
use ruff_source_file::SourceFileBuilder;
|
|
|
|
use crate::fix::{fix_file, FixResult};
|
|
use crate::linter::check_path;
|
|
use crate::message::{Emitter, EmitterContext, Message, TextEmitter};
|
|
use crate::package::PackageRoot;
|
|
use crate::packaging::detect_package_root;
|
|
use crate::registry::AsRule;
|
|
use crate::settings::types::UnsafeFixes;
|
|
use crate::settings::{flags, LinterSettings};
|
|
use crate::source_kind::SourceKind;
|
|
use crate::{directives, Locator};
|
|
|
|
#[cfg(not(fuzzing))]
|
|
pub(crate) fn test_resource_path(path: impl AsRef<Path>) -> std::path::PathBuf {
|
|
Path::new("./resources/test/").join(path)
|
|
}
|
|
|
|
/// Run [`check_path`] on a Python file in the `resources/test/fixtures` directory.
|
|
#[cfg(not(fuzzing))]
|
|
pub(crate) fn test_path(path: impl AsRef<Path>, settings: &LinterSettings) -> Result<Vec<Message>> {
|
|
let path = test_resource_path("fixtures").join(path);
|
|
let source_type = PySourceType::from(&path);
|
|
let source_kind = SourceKind::from_path(path.as_ref(), source_type)?.expect("valid source");
|
|
Ok(test_contents(&source_kind, &path, settings).0)
|
|
}
|
|
|
|
#[cfg(not(fuzzing))]
|
|
pub(crate) struct TestedNotebook {
|
|
pub(crate) messages: Vec<Message>,
|
|
pub(crate) source_notebook: Notebook,
|
|
pub(crate) linted_notebook: Notebook,
|
|
}
|
|
|
|
#[cfg(not(fuzzing))]
|
|
pub(crate) fn assert_notebook_path(
|
|
path: impl AsRef<Path>,
|
|
expected: impl AsRef<Path>,
|
|
settings: &LinterSettings,
|
|
) -> Result<TestedNotebook, NotebookError> {
|
|
let source_notebook = Notebook::from_path(path.as_ref())?;
|
|
|
|
let source_kind = SourceKind::IpyNotebook(source_notebook);
|
|
let (messages, transformed) = test_contents(&source_kind, path.as_ref(), settings);
|
|
let expected_notebook = Notebook::from_path(expected.as_ref())?;
|
|
let linted_notebook = transformed.into_owned().expect_ipy_notebook();
|
|
|
|
assert_eq!(
|
|
linted_notebook.cell_offsets(),
|
|
expected_notebook.cell_offsets()
|
|
);
|
|
assert_eq!(linted_notebook.index(), expected_notebook.index());
|
|
assert_eq!(
|
|
linted_notebook.source_code(),
|
|
expected_notebook.source_code()
|
|
);
|
|
|
|
Ok(TestedNotebook {
|
|
messages,
|
|
source_notebook: source_kind.expect_ipy_notebook(),
|
|
linted_notebook,
|
|
})
|
|
}
|
|
|
|
/// Run [`check_path`] on a snippet of Python code.
|
|
pub fn test_snippet(contents: &str, settings: &LinterSettings) -> Vec<Message> {
|
|
let path = Path::new("<filename>");
|
|
let contents = dedent(contents);
|
|
test_contents(&SourceKind::Python(contents.into_owned()), path, settings).0
|
|
}
|
|
|
|
thread_local! {
|
|
static MAX_ITERATIONS: std::cell::Cell<usize> = const { std::cell::Cell::new(10) };
|
|
}
|
|
|
|
pub fn set_max_iterations(max: usize) {
|
|
MAX_ITERATIONS.with(|iterations| iterations.set(max));
|
|
}
|
|
|
|
pub(crate) fn max_iterations() -> usize {
|
|
MAX_ITERATIONS.with(std::cell::Cell::get)
|
|
}
|
|
|
|
/// A convenient wrapper around [`check_path`], that additionally
|
|
/// asserts that fixes converge after a fixed number of iterations.
|
|
pub(crate) fn test_contents<'a>(
|
|
source_kind: &'a SourceKind,
|
|
path: &Path,
|
|
settings: &LinterSettings,
|
|
) -> (Vec<Message>, Cow<'a, SourceKind>) {
|
|
let source_type = PySourceType::from(path);
|
|
let target_version = settings.resolve_target_version(path);
|
|
let options = ParseOptions::from(source_type).with_target_version(target_version);
|
|
let parsed = ruff_python_parser::parse_unchecked(source_kind.source_code(), options.clone())
|
|
.try_into_module()
|
|
.expect("PySourceType always parses into a module");
|
|
let locator = Locator::new(source_kind.source_code());
|
|
let stylist = Stylist::from_tokens(parsed.tokens(), locator.contents());
|
|
let indexer = Indexer::from_tokens(parsed.tokens(), locator.contents());
|
|
let directives = directives::extract_directives(
|
|
parsed.tokens(),
|
|
directives::Flags::from_settings(settings),
|
|
&locator,
|
|
&indexer,
|
|
);
|
|
let messages = check_path(
|
|
path,
|
|
path.parent()
|
|
.and_then(|parent| detect_package_root(parent, &settings.namespace_packages))
|
|
.map(|path| PackageRoot::Root { path }),
|
|
&locator,
|
|
&stylist,
|
|
&indexer,
|
|
&directives,
|
|
settings,
|
|
flags::Noqa::Enabled,
|
|
source_kind,
|
|
source_type,
|
|
&parsed,
|
|
target_version,
|
|
);
|
|
|
|
let source_has_errors = parsed.has_invalid_syntax();
|
|
|
|
// Detect fixes that don't converge after multiple iterations.
|
|
let mut iterations = 0;
|
|
|
|
let mut transformed = Cow::Borrowed(source_kind);
|
|
|
|
if messages.iter().any(|message| message.fix().is_some()) {
|
|
let mut messages = messages.clone();
|
|
|
|
while let Some(FixResult {
|
|
code: fixed_contents,
|
|
source_map,
|
|
..
|
|
}) = fix_file(
|
|
&messages,
|
|
&Locator::new(transformed.source_code()),
|
|
UnsafeFixes::Enabled,
|
|
) {
|
|
if iterations < max_iterations() {
|
|
iterations += 1;
|
|
} else {
|
|
let output = print_diagnostics(messages, path, &transformed);
|
|
|
|
panic!(
|
|
"Failed to converge after {} iterations. This likely \
|
|
indicates a bug in the implementation of the fix. Last diagnostics:\n{}",
|
|
max_iterations(),
|
|
output
|
|
);
|
|
}
|
|
|
|
transformed = Cow::Owned(transformed.updated(fixed_contents, &source_map));
|
|
|
|
let parsed =
|
|
ruff_python_parser::parse_unchecked(transformed.source_code(), options.clone())
|
|
.try_into_module()
|
|
.expect("PySourceType always parses into a module");
|
|
let locator = Locator::new(transformed.source_code());
|
|
let stylist = Stylist::from_tokens(parsed.tokens(), locator.contents());
|
|
let indexer = Indexer::from_tokens(parsed.tokens(), locator.contents());
|
|
let directives = directives::extract_directives(
|
|
parsed.tokens(),
|
|
directives::Flags::from_settings(settings),
|
|
&locator,
|
|
&indexer,
|
|
);
|
|
|
|
let fixed_messages = check_path(
|
|
path,
|
|
None,
|
|
&locator,
|
|
&stylist,
|
|
&indexer,
|
|
&directives,
|
|
settings,
|
|
flags::Noqa::Enabled,
|
|
&transformed,
|
|
source_type,
|
|
&parsed,
|
|
target_version,
|
|
);
|
|
|
|
if parsed.has_invalid_syntax() && !source_has_errors {
|
|
// Previous fix introduced a syntax error, abort
|
|
let fixes = print_diagnostics(messages, path, source_kind);
|
|
let syntax_errors =
|
|
print_syntax_errors(parsed.errors(), path, &locator, &transformed);
|
|
|
|
panic!(
|
|
"Fixed source has a syntax error where the source document does not. This is a bug in one of the generated fixes:
|
|
{syntax_errors}
|
|
Last generated fixes:
|
|
{fixes}
|
|
Source with applied fixes:
|
|
{}",
|
|
transformed.source_code()
|
|
);
|
|
}
|
|
|
|
messages = fixed_messages;
|
|
}
|
|
}
|
|
|
|
let source_code = SourceFileBuilder::new(
|
|
path.file_name().unwrap().to_string_lossy().as_ref(),
|
|
source_kind.source_code(),
|
|
)
|
|
.finish();
|
|
|
|
let messages = messages
|
|
.into_iter()
|
|
.filter_map(Message::into_diagnostic_message)
|
|
.map(|mut diagnostic| {
|
|
let rule = diagnostic.kind.rule();
|
|
let fixable = diagnostic.fix.as_ref().is_some_and(|fix| {
|
|
matches!(
|
|
fix.applicability(),
|
|
Applicability::Safe | Applicability::Unsafe
|
|
)
|
|
});
|
|
|
|
match (fixable, rule.fixable()) {
|
|
(true, FixAvailability::Sometimes | FixAvailability::Always)
|
|
| (false, FixAvailability::None | FixAvailability::Sometimes) => {
|
|
// Ok
|
|
}
|
|
(true, FixAvailability::None) => {
|
|
panic!(
|
|
"Rule {rule:?} is marked as non-fixable but it created a fix.
|
|
Change the `Violation::FIX_AVAILABILITY` to either \
|
|
`FixAvailability::Sometimes` or `FixAvailability::Always`"
|
|
);
|
|
}
|
|
(false, FixAvailability::Always) if source_has_errors => {
|
|
// Ok
|
|
}
|
|
(false, FixAvailability::Always) => {
|
|
panic!(
|
|
"\
|
|
Rule {rule:?} is marked to always-fixable but the diagnostic has no fix.
|
|
Either ensure you always emit a fix or change `Violation::FIX_AVAILABILITY` to either \
|
|
`FixAvailability::Sometimes` or `FixAvailability::None`"
|
|
)
|
|
}
|
|
}
|
|
|
|
assert!(
|
|
!(fixable && diagnostic.kind.suggestion.is_none()),
|
|
"Diagnostic emitted by {rule:?} is fixable but \
|
|
`Violation::fix_title` returns `None`"
|
|
);
|
|
|
|
// Not strictly necessary but adds some coverage for this code path
|
|
diagnostic.noqa_offset = directives.noqa_line_for.resolve(diagnostic.range.start());
|
|
diagnostic.file = source_code.clone();
|
|
|
|
Message::Diagnostic(diagnostic)
|
|
})
|
|
.chain(parsed.errors().iter().map(|parse_error| {
|
|
Message::from_parse_error(parse_error, &locator, source_code.clone())
|
|
}))
|
|
.sorted()
|
|
.collect();
|
|
(messages, transformed)
|
|
}
|
|
|
|
fn print_syntax_errors(
|
|
errors: &[ParseError],
|
|
path: &Path,
|
|
locator: &Locator,
|
|
source: &SourceKind,
|
|
) -> String {
|
|
let filename = path.file_name().unwrap().to_string_lossy();
|
|
let source_file = SourceFileBuilder::new(filename.as_ref(), source.source_code()).finish();
|
|
|
|
let messages: Vec<_> = errors
|
|
.iter()
|
|
.map(|parse_error| Message::from_parse_error(parse_error, locator, source_file.clone()))
|
|
.collect();
|
|
|
|
if let Some(notebook) = source.as_ipy_notebook() {
|
|
print_jupyter_messages(&messages, path, notebook)
|
|
} else {
|
|
print_messages(&messages)
|
|
}
|
|
}
|
|
|
|
/// Print the [`Message::Diagnostic`]s in `messages`.
|
|
fn print_diagnostics(mut messages: Vec<Message>, path: &Path, source: &SourceKind) -> String {
|
|
messages.retain(Message::is_diagnostic_message);
|
|
|
|
if let Some(notebook) = source.as_ipy_notebook() {
|
|
print_jupyter_messages(&messages, path, notebook)
|
|
} else {
|
|
print_messages(&messages)
|
|
}
|
|
}
|
|
|
|
pub(crate) fn print_jupyter_messages(
|
|
messages: &[Message],
|
|
path: &Path,
|
|
notebook: &Notebook,
|
|
) -> String {
|
|
let mut output = Vec::new();
|
|
|
|
TextEmitter::default()
|
|
.with_show_fix_status(true)
|
|
.with_show_fix_diff(true)
|
|
.with_show_source(true)
|
|
.with_unsafe_fixes(UnsafeFixes::Enabled)
|
|
.emit(
|
|
&mut output,
|
|
messages,
|
|
&EmitterContext::new(&FxHashMap::from_iter([(
|
|
path.file_name().unwrap().to_string_lossy().to_string(),
|
|
notebook.index().clone(),
|
|
)])),
|
|
)
|
|
.unwrap();
|
|
|
|
String::from_utf8(output).unwrap()
|
|
}
|
|
|
|
pub(crate) fn print_messages(messages: &[Message]) -> String {
|
|
let mut output = Vec::new();
|
|
|
|
TextEmitter::default()
|
|
.with_show_fix_status(true)
|
|
.with_show_fix_diff(true)
|
|
.with_show_source(true)
|
|
.with_unsafe_fixes(UnsafeFixes::Enabled)
|
|
.emit(
|
|
&mut output,
|
|
messages,
|
|
&EmitterContext::new(&FxHashMap::default()),
|
|
)
|
|
.unwrap();
|
|
|
|
String::from_utf8(output).unwrap()
|
|
}
|
|
|
|
#[macro_export]
|
|
macro_rules! assert_messages {
|
|
($value:expr, $path:expr, $notebook:expr) => {{
|
|
insta::with_settings!({ omit_expression => true }, {
|
|
insta::assert_snapshot!(
|
|
$crate::test::print_jupyter_messages(&$value, &$path, &$notebook)
|
|
);
|
|
});
|
|
}};
|
|
($value:expr, @$snapshot:literal) => {{
|
|
insta::with_settings!({ omit_expression => true }, {
|
|
insta::assert_snapshot!($crate::test::print_messages(&$value), $snapshot);
|
|
});
|
|
}};
|
|
($name:expr, $value:expr) => {{
|
|
insta::with_settings!({ omit_expression => true }, {
|
|
insta::assert_snapshot!($name, $crate::test::print_messages(&$value));
|
|
});
|
|
}};
|
|
($value:expr) => {{
|
|
insta::with_settings!({ omit_expression => true }, {
|
|
insta::assert_snapshot!($crate::test::print_messages(&$value));
|
|
});
|
|
}};
|
|
}
|