SONARPY-1727 remove trailing comma of singelton tuple

SonarSource · Sep 27, 2024 · a647ba8 · a647ba8
1 parent fbfb393
commit a647ba8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/python-checks/src/main/java/org/sonar/python/checks/tests/AssertOnTupleLiteralCheck.java b/python-checks/src/main/java/org/sonar/python/checks/tests/AssertOnTupleLiteralCheck.java
@@ -45,10 +45,16 @@ public void initialize(Context context) {
 
         if (tuple.leftParenthesis() != null && tuple.rightParenthesis() != null) {
           // defensive condition
-          issue.addQuickFix(PythonQuickFix.newQuickFix(QUICK_FIX_MESSAGE)
-            .addTextEdit(TextEditUtils.remove(tuple.leftParenthesis()))
-            .addTextEdit(TextEditUtils.remove(tuple.rightParenthesis()))
-            .build());
+          var quickfixBuilder = PythonQuickFix.newQuickFix(QUICK_FIX_MESSAGE)
+            .addTextEdit(TextEditUtils.remove(tuple.leftParenthesis()));
+
+          if(tuple.elements().size() == 1 && !tuple.commas().isEmpty()) {
+            quickfixBuilder.addTextEdit(TextEditUtils.replaceRange(tuple.commas().get(0), tuple.rightParenthesis(), ""));
+          } else {
+            quickfixBuilder.addTextEdit(TextEditUtils.remove(tuple.rightParenthesis()));
+          }
+
+          issue.addQuickFix(quickfixBuilder.build());
         }
       }
     });

diff --git a/python-checks/src/test/java/org/sonar/python/checks/tests/AssertOnTupleLiteralCheckTest.java b/python-checks/src/test/java/org/sonar/python/checks/tests/AssertOnTupleLiteralCheckTest.java
@@ -41,6 +41,8 @@ void quickFixTest() {
       "    assert a, b";
     PythonQuickFixVerifier.verify(new AssertOnTupleLiteralCheck(), before, after);
     PythonQuickFixVerifier.verifyQuickFixMessages(new AssertOnTupleLiteralCheck(), before, AssertOnTupleLiteralCheck.QUICK_FIX_MESSAGE);
+
+    PythonQuickFixVerifier.verify(new AssertOnTupleLiteralCheck(), "assert (foo(),)", "assert foo()");
   }
 
   @Test