From 824d407de00665d1d09c4395e98f13cf321a12c4 Mon Sep 17 00:00:00 2001 From: Chris Pryer Date: Sat, 24 Jun 2023 01:11:34 -0400 Subject: [PATCH] Update snapshot Set output to target --- ...ests__ruff_test__statement__delete_py.snap | 8 ++++++- .../src/statement/stmt_delete.rs | 22 +++++-------------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__delete_py.snap b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__delete_py.snap index 750196e0eb6cc8..fb93b2e7fabdd0 100644 --- a/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__delete_py.snap +++ b/crates/ruff_python_formatter/src/snapshots/ruff_python_formatter__tests__ruff_test__statement__delete_py.snap @@ -117,7 +117,13 @@ del ( # Done deleting # Delete something -del x, aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, b, c, d # Delete these +del ( + x, + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, + b, + c, + d +) # Delete these # Ready to delete # Delete something diff --git a/crates/ruff_python_formatter/src/statement/stmt_delete.rs b/crates/ruff_python_formatter/src/statement/stmt_delete.rs index 5262632e426bf4..bf3a881909a59a 100644 --- a/crates/ruff_python_formatter/src/statement/stmt_delete.rs +++ b/crates/ruff_python_formatter/src/statement/stmt_delete.rs @@ -1,9 +1,6 @@ -use crate::expression::parentheses::Parenthesize; use crate::prelude::PyFormatContext; -use crate::{AsFormat, FormatNodeRule, PyFormatter}; -use ruff_formatter::prelude::{ - format_args, format_with, group, soft_line_break_or_space, space, text, Formatter, -}; +use crate::{FormatNodeRule, FormattedIterExt, PyFormatter}; +use ruff_formatter::prelude::{format_args, soft_line_break_or_space, space, text, Formatter, group}; use ruff_formatter::{write, Buffer, Format, FormatResult}; use rustpython_parser::ast::{Expr, StmtDelete}; @@ -13,7 +10,7 @@ pub struct FormatStmtDelete; impl FormatNodeRule for FormatStmtDelete { fn fmt_fields(&self, item: &StmtDelete, f: &mut PyFormatter) -> FormatResult<()> { let StmtDelete { range: _, targets } = item; - write!(f, [text("del"), space(), DeleteList::new(targets)]) + write!(f, [text("del"), space(), group(&DeleteList::new(targets))]) } } @@ -31,15 +28,8 @@ impl<'a> DeleteList<'a> { impl Format> for DeleteList<'_> { fn fmt(&self, f: &mut Formatter>) -> FormatResult<()> { - let separator = - format_with(|f| group(&format_args![text(","), soft_line_break_or_space(),]).fmt(f)); - let mut join = f.join_with(separator); - - for element in self.delete_list { - join.entry(&format_with(|f| { - write!(f, [element.format().with_options(Parenthesize::IfBreaks)]) - })); - } - join.finish() + f.join_with(&format_args!(text(","), soft_line_break_or_space())) + .entries(self.delete_list.iter().formatted()) + .finish() } }