mirror of
https://github.com/astral-sh/ruff.git
synced 2025-08-04 02:38:25 +00:00
Replace Formatter<PyFormatContext<'_>>
with PyFormatter
(#6330)
This is a refactoring to use the type alias in more places. In the process, I had to fix and run generate.py. There are no functional changes.
This commit is contained in:
parent
8a5bc93fdd
commit
a48d16e025
23 changed files with 212 additions and 424 deletions
|
@ -61,7 +61,7 @@ groups = {
|
|||
|
||||
def group_for_node(node: str) -> str:
|
||||
for group in groups:
|
||||
if node.startswith(group.title()):
|
||||
if node.startswith(group.title().replace("_", "")):
|
||||
return group
|
||||
else:
|
||||
return "other"
|
||||
|
@ -98,7 +98,7 @@ for group, group_nodes in nodes_grouped.items():
|
|||
|
||||
impl FormatNodeRule<{node}> for Format{node} {{
|
||||
fn fmt_fields(&self, item: &{node}, f: &mut PyFormatter) -> FormatResult<()> {{
|
||||
write!(f, [verbatim_text(item.range)])
|
||||
write!(f, [verbatim_text(item)])
|
||||
}}
|
||||
}}
|
||||
""".strip() # noqa: E501
|
||||
|
@ -112,8 +112,7 @@ generated = """//! This is a generated file. Don't modify it by hand! Run `crate
|
|||
#![allow(unknown_lints, clippy::default_constructed_unit_structs)]
|
||||
|
||||
use crate::context::PyFormatContext;
|
||||
use crate::{AsFormat, FormatNodeRule, IntoFormat};
|
||||
use ruff_formatter::formatter::Formatter;
|
||||
use crate::{AsFormat, FormatNodeRule, IntoFormat, PyFormatter};
|
||||
use ruff_formatter::{FormatOwnedWithRule, FormatRefWithRule, FormatResult, FormatRule};
|
||||
use ruff_python_ast as ast;
|
||||
|
||||
|
@ -127,7 +126,7 @@ for node in nodes:
|
|||
fn fmt(
|
||||
&self,
|
||||
node: &ast::{node},
|
||||
f: &mut Formatter<PyFormatContext<'_>>,
|
||||
f: &mut PyFormatter,
|
||||
) -> FormatResult<()> {{
|
||||
FormatNodeRule::<ast::{node}>::fmt(self, node, f)
|
||||
}}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue