mirror of
https://github.com/astral-sh/ruff
synced 2026-01-21 21:40:51 -05:00
daefa74e9a
## Summary Per the suggestion in https://github.com/astral-sh/ruff/discussions/6183, this PR removes `AsyncWith`, `AsyncFor`, and `AsyncFunctionDef`, replacing them with an `is_async` field on the non-async variants of those structs. Unlike an interpreter, we _generally_ have identical handling for these nodes, so separating them into distinct variants adds complexity from which we don't really benefit. This can be seen below, where we get to remove a _ton_ of code related to adding generic `Any*` wrappers, and a ton of duplicate branches for these cases. ## Test Plan `cargo test` is unchanged, apart from parser snapshots.
84 lines
2.8 KiB
Rust
84 lines
2.8 KiB
Rust
use crate::prelude::*;
|
|
use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule};
|
|
use ruff_python_ast::Stmt;
|
|
|
|
pub(crate) mod stmt_ann_assign;
|
|
pub(crate) mod stmt_assert;
|
|
pub(crate) mod stmt_assign;
|
|
pub(crate) mod stmt_aug_assign;
|
|
pub(crate) mod stmt_break;
|
|
pub(crate) mod stmt_class_def;
|
|
pub(crate) mod stmt_continue;
|
|
pub(crate) mod stmt_delete;
|
|
pub(crate) mod stmt_expr;
|
|
pub(crate) mod stmt_for;
|
|
pub(crate) mod stmt_function_def;
|
|
pub(crate) mod stmt_global;
|
|
pub(crate) mod stmt_if;
|
|
pub(crate) mod stmt_import;
|
|
pub(crate) mod stmt_import_from;
|
|
pub(crate) mod stmt_line_magic;
|
|
pub(crate) mod stmt_match;
|
|
pub(crate) mod stmt_nonlocal;
|
|
pub(crate) mod stmt_pass;
|
|
pub(crate) mod stmt_raise;
|
|
pub(crate) mod stmt_return;
|
|
pub(crate) mod stmt_try;
|
|
pub(crate) mod stmt_try_star;
|
|
pub(crate) mod stmt_type_alias;
|
|
pub(crate) mod stmt_while;
|
|
pub(crate) mod stmt_with;
|
|
pub(crate) mod suite;
|
|
|
|
#[derive(Default)]
|
|
pub struct FormatStmt;
|
|
|
|
impl FormatRule<Stmt, PyFormatContext<'_>> for FormatStmt {
|
|
fn fmt(&self, item: &Stmt, f: &mut PyFormatter) -> FormatResult<()> {
|
|
match item {
|
|
Stmt::FunctionDef(x) => x.format().fmt(f),
|
|
Stmt::ClassDef(x) => x.format().fmt(f),
|
|
Stmt::Return(x) => x.format().fmt(f),
|
|
Stmt::Delete(x) => x.format().fmt(f),
|
|
Stmt::Assign(x) => x.format().fmt(f),
|
|
Stmt::AugAssign(x) => x.format().fmt(f),
|
|
Stmt::AnnAssign(x) => x.format().fmt(f),
|
|
Stmt::For(x) => x.format().fmt(f),
|
|
Stmt::While(x) => x.format().fmt(f),
|
|
Stmt::If(x) => x.format().fmt(f),
|
|
Stmt::With(x) => x.format().fmt(f),
|
|
Stmt::Match(x) => x.format().fmt(f),
|
|
Stmt::Raise(x) => x.format().fmt(f),
|
|
Stmt::Try(x) => x.format().fmt(f),
|
|
Stmt::TryStar(x) => x.format().fmt(f),
|
|
Stmt::Assert(x) => x.format().fmt(f),
|
|
Stmt::Import(x) => x.format().fmt(f),
|
|
Stmt::ImportFrom(x) => x.format().fmt(f),
|
|
Stmt::Global(x) => x.format().fmt(f),
|
|
Stmt::Nonlocal(x) => x.format().fmt(f),
|
|
Stmt::Expr(x) => x.format().fmt(f),
|
|
Stmt::Pass(x) => x.format().fmt(f),
|
|
Stmt::Break(x) => x.format().fmt(f),
|
|
Stmt::Continue(x) => x.format().fmt(f),
|
|
Stmt::TypeAlias(x) => x.format().fmt(f),
|
|
Stmt::LineMagic(_) => todo!(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<'ast> AsFormat<PyFormatContext<'ast>> for Stmt {
|
|
type Format<'a> = FormatRefWithRule<'a, Stmt, FormatStmt, PyFormatContext<'ast>>;
|
|
|
|
fn format(&self) -> Self::Format<'_> {
|
|
FormatRefWithRule::new(self, FormatStmt)
|
|
}
|
|
}
|
|
|
|
impl<'ast> IntoFormat<PyFormatContext<'ast>> for Stmt {
|
|
type Format = FormatOwnedWithRule<Stmt, FormatStmt, PyFormatContext<'ast>>;
|
|
|
|
fn into_format(self) -> Self::Format {
|
|
FormatOwnedWithRule::new(self, FormatStmt)
|
|
}
|
|
}
|