Fix pull up refactoring to properly replace this argument when needed (eclipse-jdt#2193)

- modify PullUpRefactoringProcessor.PullUASTNodeMapper to replace
  a this argument to a method with the new argument that gets added
- modify existing PullUpTests where the behavior has been fixed
- add new test to PullUpTests
- fixes eclipse-jdt#2192

Author: jjohnstn

org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/structure/PullUpRefactoringProcessor.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2024 IBM Corporation and others.
+ * Copyright (c) 2006, 2025 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -298,6 +298,27 @@ public final boolean visit(final ThisExpression node) {
 						final SimpleName ref= ast.newSimpleName(newArgument);
 						fRewrite.replace(node, ref, null);
 					}
+				} else if (node.getLocationInParent() == MethodInvocation.ARGUMENTS_PROPERTY) {
+					// we are calling a method with "this" as parameter, check what type it needs to be
+					MethodInvocation methodInvocation= (MethodInvocation)node.getParent();
+					IMethodBinding methodBinding= methodInvocation.resolveMethodBinding();
+					if (methodBinding != null) {
+						ITypeBinding[] parameterTypes= methodBinding.getParameterTypes();
+						List<Expression> args= methodInvocation.arguments();
+						int index= 0;
+						for (int i= 0; i < args.size(); ++i) {
+							if (args.get(i) == node) {
+								index= i;
+								break;
+							}
+						}
+						ITypeBinding thisRequiredType= parameterTypes[index];
+						if (thisRequiredType.isEqualTo(node.resolveTypeBinding())) {
+							String newArgument= fNewArgumentMap.get(fEnclosingMethod.getJavaElement());
+							final SimpleName ref= ast.newSimpleName(newArgument);
+							fRewrite.replace(node, ref, null);
+						}
+					}
 				}
 				return true;
 			}

org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test56/out/A.java

@@ -4,6 +4,6 @@ class A {
 	void a(A a){}
 	public void a(B b){}
 	protected void m(B b) {
-		a(this);
+		a(b);
 	}
 }

org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test57/out/A.java

@@ -4,7 +4,7 @@ class A {
 	void a(A a){}
 	public void a(B b){}
 	protected void m(B b) {
-		a(this);
+		a(b);
 	}
 	protected void foo2(B b) {
 		m(b);

org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test58/out/A.java

@@ -5,7 +5,7 @@ void a(A a){}
 	public void a(B b){}
 	protected void m(B b) {
 		foo2(b);
-		a(this);
+		a(b);
 	}
 	protected void foo2(B b) {
 		m(b);

org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test59/out/A.java

@@ -5,7 +5,7 @@ void a(A a){}
 	public void a(B b){}
 	protected void m(B b) {
 		foo2(b);
-		a(this);
+		a(b);
 	}
 	protected void foo2(B b) {
 		m(b);

org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test63/in/A.java

@@ -0,0 +1,6 @@
+package p;
+
+class A {
+	void a(A a){}
+	void a(B b){}
+}

org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test63/in/B.java

@@ -0,0 +1,7 @@
+package p;
+
+class B extends A {
+	public void m() {
+		a(this);
+	}
+}

org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test63/out/A.java

@@ -0,0 +1,9 @@
+package p;
+
+class A {
+	void a(A a){}
+	void a(B b){}
+	public void m(B b) {
+		a(b);
+	}
+}

org.eclipse.jdt.ui.tests.refactoring/resources/PullUp/test63/out/B.java

@@ -0,0 +1,4 @@
+package p;
+
+class B extends A {
+}

org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/PullUpTests.java

@@ -1492,6 +1492,41 @@ public void test62() throws Exception {
 		helper1(new String[] { "foo" }, new String[][] { new String[0] }, true, false, 0);
 	}
 
+	@Test
+	public void test63() throws Exception {
+		// test for bug 241035
+		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
+		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
+
+		IType typeA= getType(cuA, "A");
+		IType typeB= getType(cuB, "B");
+		String[] methodNames= new String[] { "m" };
+		String[][] signatures= new String[][] { new String[0] };
+		IMethod[] methods= getMethods(typeB, methodNames, signatures);
+
+		PullUpRefactoringProcessor processor= createRefactoringProcessor(methods);
+		Refactoring ref= processor.getRefactoring();
+		FussyProgressMonitor testMonitor= new FussyProgressMonitor();
+		assertTrue("activation", ref.checkInitialConditions(testMonitor).isOK());
+		testMonitor.assertUsedUp();
+		testMonitor.prepare();
+
+		setTargetClass(processor, 0);
+		processor.setDestinationType(typeA);
+		processor.setMembersToMove(methods);
+		processor.setDeletedMethods(methods);
+		processor.setReplace(true);
+
+		assertTrue("final", ref.checkFinalConditions(testMonitor).isOK());
+		testMonitor.assertUsedUp();
+		testMonitor.prepare();
+
+		performChange(ref, false);
+
+		assertEqualLines("A", getFileContents(getOutputTestFileName("A")), cuA.getSource());
+		assertEqualLines("B", getFileContents(getOutputTestFileName("B")), cuB.getSource());
+	}
+
 	@Test
 	public void testFail0() throws Exception {
 //		printTestDisabledMessage("6538: searchDeclarationsOf* incorrect");