mark f522 as sometimes fixable (#4893)

astral-sh · Jun 13, 2023 · 57d90e4 · 57d90e4
1 parent eb90d03
commit 57d90e4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 3 deletions.
diff --git a/crates/ruff/resources/test/fixtures/pyflakes/F522.py b/crates/ruff/resources/test/fixtures/pyflakes/F522.py
@@ -2,3 +2,6 @@
 "{bar}{}".format(1, bar=2, spam=3)  # F522
 "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+# Not fixable
+(''
+ .format(x=2))
diff --git a/crates/ruff/src/rules/pyflakes/rules/strings.rs b/crates/ruff/src/rules/pyflakes/rules/strings.rs
@@ -386,18 +386,20 @@ pub struct StringDotFormatExtraNamedArguments {
     missing: Vec<String>,
 }
 
-impl AlwaysAutofixableViolation for StringDotFormatExtraNamedArguments {
+impl Violation for StringDotFormatExtraNamedArguments {
+    const AUTOFIX: AutofixKind = AutofixKind::Sometimes;
+
     #[derive_message_formats]
     fn message(&self) -> String {
         let StringDotFormatExtraNamedArguments { missing } = self;
         let message = missing.join(", ");
         format!("`.format` call has unused named argument(s): {message}")
     }
 
-    fn autofix_title(&self) -> String {
+    fn autofix_title(&self) -> Option<String> {
         let StringDotFormatExtraNamedArguments { missing } = self;
         let message = missing.join(", ");
-        format!("Remove extra named arguments: {message}")
+        Some(format!("Remove extra named arguments: {message}"))
     }
 }
 

diff --git a/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F522_F522.py.snap b/crates/ruff/src/rules/pyflakes/snapshots/ruff__rules__pyflakes__tests__F522_F522.py.snap
@@ -33,13 +33,16 @@ F522.py:2:1: F522 [*] `.format` call has unused named argument(s): spam
   2 |+"{bar}{}".format(1, bar=2, )  # F522
 3 3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 4 4 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+5 5 | # Not fixable
 
 F522.py:4:1: F522 [*] `.format` call has unused named argument(s): eggs, ham
   |
 4 | "{bar}{}".format(1, bar=2, spam=3)  # F522
 5 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 6 | "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ F522
+7 | # Not fixable
+8 | (''
   |
   = help: Remove extra named arguments: eggs, ham
 
@@ -49,5 +52,19 @@ F522.py:4:1: F522 [*] `.format` call has unused named argument(s): eggs, ham
 3 3 | "{bar:{spam}}".format(bar=2, spam=3)  # No issues
 4   |-"{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
   4 |+"{bar:{spam}}".format(bar=2, spam=3, )  # F522
+5 5 | # Not fixable
+6 6 | (''
+7 7 |  .format(x=2))
+
+F522.py:6:2: F522 `.format` call has unused named argument(s): x
+  |
+6 |   "{bar:{spam}}".format(bar=2, spam=3, eggs=4, ham=5)  # F522
+7 |   # Not fixable
+8 |   (''
+  |  __^
+9 | |  .format(x=2))
+  | |_____________^ F522
+  |
+  = help: Remove extra named arguments: x