IDEA-227152 [java]: don't break methods call with unnecessary argument

for "Move Instance Method" refactoring

GitOrigin-RevId: e6c49f9107a0597480e5ef88511f7465b4ff578b

Author: BasLeijdekkers

java/java-impl-refactorings/src/com/intellij/refactoring/move/moveInstanceMethod/MoveInstanceMethodProcessor.java

@@ -387,8 +387,7 @@ private void correctMethodCall(final PsiMethodCallExpression expression, final b
       }
 
       PsiExpression newArgument = null;
-
-      if (classReferencedByThis != null) {
+      if (classReferencedByThis != null && !myOldClassParameterNames.isEmpty()) {
         @NonNls String thisArgumentText = null;
         if (manager.areElementsEquivalent(myMethod.getContainingClass(), classReferencedByThis)) {
           if (myOldClassParameterNames.containsKey(myMethod.getContainingClass())) {
@@ -420,7 +419,6 @@ private void correctMethodCall(final PsiMethodCallExpression expression, final b
         }
       }
 
-
       if (newArgument != null) {
         expression.getArgumentList().add(newArgument);
       }
@@ -650,7 +648,7 @@ private void addParameters(final PsiElementFactory factory, final PsiMethod meth
     }
   }
 
-  private String getParameterNameToCreate(@NotNull PsiClass aClass) {
+  private String getParameterNameToCreate(PsiClass aClass) {
     return myOldClassParameterNames.get(aClass);
   }
 }

java/java-tests/testData/refactoring/moveInstanceMethod/NoIncorrectParameterAdded.java

@@ -0,0 +1,21 @@
+class AbstractMoveInstanceMethod {
+  public String code;
+
+  protected void <caret>setupApplication(Application customApplication, String code, Integer properties) {
+    customApplication.setCode(code);
+    customApplication.setProperties(properties);
+    customApplication.start();
+  }
+}
+
+class MoveInstanceMethod extends AbstractMoveInstanceMethod {
+  void setup(Application application, Integer properties) {
+    setupApplication(application, code, properties);
+  }
+}
+
+abstract class Application {
+  abstract void setCode(String code);
+  abstract void setProperties(Integer properties);
+  abstract void start();
+}

java/java-tests/testData/refactoring/moveInstanceMethod/NoIncorrectParameterAdded.java.after

@@ -0,0 +1,22 @@
+class AbstractMoveInstanceMethod {
+  public String code;
+
+}
+
+class MoveInstanceMethod extends AbstractMoveInstanceMethod {
+  void setup(Application application, Integer properties) {
+    application.setupApplication(code, properties);
+  }
+}
+
+abstract class Application {
+  abstract void setCode(String code);
+  abstract void setProperties(Integer properties);
+  abstract void start();
+
+    protected void setupApplication(String code, Integer properties) {
+      setCode(code);
+      setProperties(properties);
+      start();
+    }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/moveMethod/MoveInstanceMethodTest.java

@@ -56,6 +56,7 @@ public class MoveInstanceMethodTest extends LightJavaCodeInsightTestCase {
   public void testOverloadingMethods() { doTest(true, 0); }
   public void testOverloadingMethods1() { doTest(true, 0); }
   public void testMoveAbstractMethod() { doTest(true, 0); }
+  public void testNoIncorrectParameterAdded() { doTest(true, 0); }
   public void testPolyadicExpr() { doTest(true, 0); }
 
   public void testIOOBE_MovingInvalidCode() { doTest(true, 0); }
@@ -140,10 +141,9 @@ private void doTest(boolean isTargetParameter, int targetIndex, String newVisibi
     PsiMethod method = (PsiMethod) targetElement;
     final PsiVariable targetVariable = isTargetParameter ? method.getParameterList().getParameters()[targetIndex] :
                                        method.getContainingClass().getFields()[targetIndex];
-    new MoveInstanceMethodProcessor(getProject(),
-                                    method, targetVariable, newVisibility, MoveInstanceMethodHandler.suggestParameterNames (method, targetVariable)).run();
+    new MoveInstanceMethodProcessor(getProject(), method, targetVariable, newVisibility, 
+                                    MoveInstanceMethodHandler.suggestParameterNames (method, targetVariable)).run();
     checkResultByFile(filePath + ".after");
-
   }
 
   @Override