mirror of
https://github.com/astral-sh/ruff.git
synced 2025-10-02 06:42:02 +00:00

Summary -- This PR adds a macro-generated method to retrieve the `Rule` associated with a given `Violation` struct, which makes it substantially cheaper than parsing from the rule name. The rule is then converted to a `NoqaCode` for storage on the `Message` (and eventually on the new diagnostic type). The `ViolationMetadata::rule_name` method was now unused, so the `rule` method replaces it. Several types had to be moved from the `ruff_diagnostics` crate to the `ruff_linter` crate to make this work, namely the `Violation` traits and the old `Diagnostic` type, which had a constructor generic over a `Violation`. It's actually a fairly small PR, minus the hundreds of import changes. The main changes are in these files: - [crates/ruff_linter/src/message/mod.rs](https://github.com/astral-sh/ruff/pull/18234/files#diff-139754ea310d75f28307008d21c771a190038bd106efe3b9267cc2d6c0fa0921) - [crates/ruff_diagnostics/src/lib.rs](https://github.com/astral-sh/ruff/pull/18234/files#diff-8e8ea5c586935bf21ea439f24253fcfd5955d2cb130f5377c2fa7bfee3ea3a81) - [crates/ruff_linter/src/diagnostic.rs](https://github.com/astral-sh/ruff/pull/18234/files#diff-1d0c9aad90d8f9446079c5be5f284150d97797158715bd9729e6f1f70246297a) - [crates/ruff_linter/src/lib.rs](https://github.com/astral-sh/ruff/pull/18234/files#diff-eb93ef7e78a612f5fa9145412c75cf6b1a5cefba1c2233e4a11a880a1ce1fbcc) Test Plan -- Existing tests
82 lines
2.6 KiB
Rust
82 lines
2.6 KiB
Rust
use std::fmt::{Debug, Display};
|
|
|
|
use crate::codes::Rule;
|
|
|
|
#[derive(Debug, Copy, Clone)]
|
|
pub enum FixAvailability {
|
|
Sometimes,
|
|
Always,
|
|
None,
|
|
}
|
|
|
|
impl Display for FixAvailability {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
match self {
|
|
FixAvailability::Sometimes => write!(f, "Fix is sometimes available."),
|
|
FixAvailability::Always => write!(f, "Fix is always available."),
|
|
FixAvailability::None => write!(f, "Fix is not available."),
|
|
}
|
|
}
|
|
}
|
|
|
|
pub trait ViolationMetadata {
|
|
/// Returns the rule for this violation
|
|
fn rule() -> Rule;
|
|
|
|
/// Returns an explanation of what this violation catches,
|
|
/// why it's bad, and what users should do instead.
|
|
fn explain() -> Option<&'static str>;
|
|
}
|
|
|
|
pub trait Violation: ViolationMetadata {
|
|
/// `None` in the case a fix is never available or otherwise Some
|
|
/// [`FixAvailability`] describing the available fix.
|
|
const FIX_AVAILABILITY: FixAvailability = FixAvailability::None;
|
|
|
|
/// The message used to describe the violation.
|
|
fn message(&self) -> String;
|
|
|
|
// TODO(micha): Move `fix_title` to `Fix`, add new `advice` method that is shown as an advice.
|
|
// Change the `Diagnostic` renderer to show the advice, and render the fix message after the `Suggested fix: <here>`
|
|
|
|
/// Returns the title for the fix. The message is also shown as an advice as part of the diagnostics.
|
|
///
|
|
/// Required for rules that have fixes.
|
|
fn fix_title(&self) -> Option<String> {
|
|
None
|
|
}
|
|
|
|
/// Returns the format strings used by [`message`](Violation::message).
|
|
fn message_formats() -> &'static [&'static str];
|
|
}
|
|
|
|
/// This trait exists just to make implementing the [`Violation`] trait more
|
|
/// convenient for violations that can always be fixed.
|
|
pub trait AlwaysFixableViolation: ViolationMetadata {
|
|
/// The message used to describe the violation.
|
|
fn message(&self) -> String;
|
|
|
|
/// The title displayed for the available fix.
|
|
fn fix_title(&self) -> String;
|
|
|
|
/// Returns the format strings used by
|
|
/// [`message`](AlwaysFixableViolation::message).
|
|
fn message_formats() -> &'static [&'static str];
|
|
}
|
|
|
|
/// A blanket implementation.
|
|
impl<V: AlwaysFixableViolation> Violation for V {
|
|
const FIX_AVAILABILITY: FixAvailability = FixAvailability::Always;
|
|
|
|
fn message(&self) -> String {
|
|
<Self as AlwaysFixableViolation>::message(self)
|
|
}
|
|
|
|
fn fix_title(&self) -> Option<String> {
|
|
Some(<Self as AlwaysFixableViolation>::fix_title(self))
|
|
}
|
|
|
|
fn message_formats() -> &'static [&'static str] {
|
|
<Self as AlwaysFixableViolation>::message_formats()
|
|
}
|
|
}
|