inline redundant array: remove tailing commas (IDEA-67212)

java/java-impl/src/com/intellij/refactoring/util/InlineUtil.java

@@ -196,6 +196,12 @@ public class InlineUtil {
           if (nextSibling.getNode().getElementType() == JavaTokenType.RBRACE) break;
           lastInitializerSibling = nextSibling;
         }
+        if (lastInitializerSibling instanceof PsiWhiteSpace) {
+          lastInitializerSibling = PsiTreeUtil.skipSiblingsBackward(lastInitializerSibling, PsiWhiteSpace.class);
+        }
+        if (lastInitializerSibling.getNode().getElementType() == JavaTokenType.COMMA) {
+          lastInitializerSibling = lastInitializerSibling.getPrevSibling();
+        }
         argumentList.addRange(initializers[0], lastInitializerSibling);
       }
       args[args.length - 1].delete();

java/java-tests/testData/inspection/redundantArrayForVarargs/quickFix/RemoveTailingCommas.java

@@ -0,0 +1,9 @@
+public class Main {
+    public static void main(String[] args) {
+        display(new S<caret>tring[]{
+                "hi",
+        });
+    }
+
+    private static void display(String... messages) { }
+}

java/java-tests/testData/inspection/redundantArrayForVarargs/quickFix/RemoveTailingCommas_after.java

@@ -0,0 +1,7 @@
+public class Main {
+    public static void main(String[] args) {
+        display("hi");
+    }
+
+    private static void display(String... messages) { }
+}

java/java-tests/testSrc/com/intellij/codeInspection/RedundantArray4VarargsCallInspectionTest.java

@@ -55,6 +55,10 @@ public class RedundantArray4VarargsCallInspectionTest extends UsefulTestCase {
     doTest();
   }
 
+  public void testRemoveTailingCommas() {
+    doTest();
+  }
+
   private void doTest() {
     myFixture.configureByFile(getTestName(false) + ".java");
     myFixture.launchAction(assertOneElement(myFixture.filterAvailableIntentions(InspectionsBundle.message("inspection.redundant.array.creation.quickfix"))));