SONARPY-1025 Fix Quickfix for functions with * parameter (#1148)

Author: nils-werner-sonarsource

python-checks/src/main/java/org/sonar/python/checks/InstanceAndClassMethodsAtLeastOnePositionalCheck.java

@@ -37,7 +37,7 @@
 import org.sonar.python.quickfix.PythonQuickFix;
 import org.sonar.python.tree.TreeUtils;
 
-import static org.sonar.python.quickfix.PythonTextEdit.insertBefore;
+import static org.sonar.python.quickfix.PythonTextEdit.insertAfter;
 
 @Rule(key="S5719")
 public class InstanceAndClassMethodsAtLeastOnePositionalCheck extends PythonSubscriptionCheck {
@@ -99,10 +99,10 @@ private static void handleFunctionDef(SubscriptionContext ctx, ClassDef classDef
   private static void addIssue(SubscriptionContext ctx, FunctionDef functionDef, MethodIssueType type) {
     IssueWithQuickFix issue = (IssueWithQuickFix) ctx.addIssue(functionDef.defKeyword(), functionDef.rightPar(),
       type.message);
-
+    String separator = functionDef.parameters() == null ? "" : ", ";
     for (String insertion : type.insertions) {
       PythonQuickFix quickFix = PythonQuickFix.newQuickFix(String.format("Add '%s' as the first argument.", insertion))
-        .addTextEdit(insertBefore(functionDef.rightPar(), insertion))
+        .addTextEdit(insertAfter(functionDef.leftPar(), insertion + separator))
         .build();
       issue.addQuickFix(quickFix);
     }

python-checks/src/test/java/org/sonar/python/checks/InstanceAndClassMethodsAtLeastOnePositionalCheckTest.java

@@ -34,10 +34,13 @@ public void test() {
 
   @Test
   public void class_method_quickfix() {
-    String codeWithIssue = "class Foo():\n" +
+    String codeWithIssue = "" +
+      "class Foo():\n" +
       "    @classmethod\n" +
       "    def bar(): pass";
-    String fixedCodeWithClassParameter = "class Foo():\n" +
+
+    String fixedCodeWithClassParameter = "" +
+      "class Foo():\n" +
       "    @classmethod\n" +
       "    def bar(cls): pass";
 
@@ -46,15 +49,35 @@ public void class_method_quickfix() {
 
   @Test
   public void regular_method_quickfix() {
-    String codeWithIssue = "class Foo():\n" +
+    String codeWithIssue = "" +
+      "class Foo():\n" +
       "    def bar(): pass";
-    String fixedCodeWithSelfParameter = "class Foo():\n" +
+
+    String fixedCodeWithSelfParameter = "" +
+      "class Foo():\n" +
       "    def bar(self): pass";
-    String fixedCodeWithClassParameter = "class Foo():\n" +
+
+    String fixedCodeWithClassParameter = "" +
+      "class Foo():\n" +
       "    def bar(cls): pass";
 
     PythonQuickFixVerifier.verify(check, codeWithIssue,
       fixedCodeWithSelfParameter,
       fixedCodeWithClassParameter);
   }
+
+  @Test
+  public void no_pos_args_quickfix() {
+    String codeWithIssue = "" +
+      "class Foo():\n" +
+      "    @classmethod\n" +
+      "    def bar(*, param): pass";
+
+    String fixedCodeWithClassParameter = "" +
+      "class Foo():\n" +
+      "    @classmethod\n" +
+      "    def bar(cls, *, param): pass";
+
+    PythonQuickFixVerifier.verify(check, codeWithIssue, fixedCodeWithClassParameter);
+  }
 }