Protect against error for anonymous class in lambda in unopened class (#2720)

jjohnstn · trancexpress · web-flow · commit b0fb24a2a420 · 2026-01-06T13:57:58.000-05:00
* Protect against error for anonymous class in lambda in unopened class

- add isAnonymous check in MethodChecks.isDeclaredInInterface()
- add isAnonymous check in
  RenameMethodProcessor.classesDeclareMethodName()
- add isAnonymous check in 
  RenameVirtualMethodProcessor.classesDeclareOverridingNativeMethod()
- add test for refactor rename error in lambda with subtype
- fixes #4704

Co-authored-by: Simeon Andreev &lt;simeon.danailov.andreev@gmail.com&gt;
diff --git a/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/rename/MethodChecks.java b/org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/refactoring/rename/MethodChecks.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2018 IBM Corporation and others.
+ * Copyright (c) 2000, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -109,15 +109,17 @@ public static IMethod isDeclaredInInterface(IMethod method, ITypeHierarchy hiera
 			IType[] classes= hierarchy.getAllClasses();
 			subMonitor.beginTask("", classes.length); //$NON-NLS-1$
 			for (IType clazz : classes) {
-				IType[] superinterfaces= null;
-				if (clazz.equals(hierarchy.getType()))
-					superinterfaces= hierarchy.getAllSuperInterfaces(clazz);
-				else
-					superinterfaces= clazz.newSupertypeHierarchy(Progress.subMonitor(subMonitor, 1)).getAllSuperInterfaces(clazz);
-				for (IType superinterface : superinterfaces) {
-					IMethod found= Checks.findSimilarMethod(method, superinterface);
-					if (found != null && !found.equals(method))
-						return found;
+				if (!clazz.isAnonymous()) { // no need to look at an anonymous instance
+					IType[] superinterfaces= null;
+					if (clazz.equals(hierarchy.getType()))
+						superinterfaces= hierarchy.getAllSuperInterfaces(clazz);
+					else
+						superinterfaces= clazz.newSupertypeHierarchy(Progress.subMonitor(subMonitor, 1)).getAllSuperInterfaces(clazz);
+					for (IType superinterface : superinterfaces) {
+						IMethod found= Checks.findSimilarMethod(method, superinterface);
+						if (found != null && !found.equals(method))
+							return found;
+					}
 				}
 				subMonitor.worked(1);
 			}
diff --git a/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/RenameMethodProcessor.java b/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/RenameMethodProcessor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2024 IBM Corporation and others.
+ * Copyright (c) 2000, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -701,15 +701,20 @@ private static IMethod[] classesDeclareMethodName(ITypeHierarchy hier, List<ITyp
 		boolean isMethodPrivate= JdtFlags.isPrivate(method);
 
 		for (IType clazz : classes) {
-			boolean isSubclass= subtypes.contains(clazz);
-			for (IMethod m : clazz.getMethods()) {
-				IMethod foundMethod= Checks.findMethod(newName, parameterCount, false, new IMethod[]{m});
-				if (foundMethod == null)
-					continue;
-				if (isSubclass
-						|| type.equals(clazz)
-						|| (!isMethodPrivate && !JdtFlags.isPrivate(m))) {
-					result.add(foundMethod);
+			// try and find the method declaration -.don't look at anonymous types as
+			// we will find the method in the real type and there is a current bug scenario where accessing
+			// may cause a model exception when the class is created in a lambda expression and the file is unopen
+			if (!clazz.isAnonymous()) {
+				boolean isSubclass= subtypes.contains(clazz);
+				for (IMethod m : clazz.getMethods()) {
+					IMethod foundMethod= Checks.findMethod(newName, parameterCount, false, new IMethod[]{m});
+					if (foundMethod == null)
+						continue;
+					if (isSubclass
+							|| type.equals(clazz)
+							|| (!isMethodPrivate && !JdtFlags.isPrivate(m))) {
+						result.add(foundMethod);
+					}
 				}
 			}
 		}
diff --git a/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/RenameVirtualMethodProcessor.java b/org.eclipse.jdt.core.manipulation/refactoring/org/eclipse/jdt/internal/corext/refactoring/rename/RenameVirtualMethodProcessor.java
@@ -247,10 +247,12 @@ private Set<IType> getRelatedTypes() {
 	//---- Class checks -------------------------------------
 
 	private boolean classesDeclareOverridingNativeMethod(IType[] classes) throws CoreException {
- 		for (IType type : classes) {
-			for (IMethod method : type.getMethods()) {
-				if ((!method.equals(getMethod())) && (JdtFlags.isNative(method)) && (null != Checks.findSimilarMethod(getMethod(), new IMethod[]{method}))) {
-					return true;
+		for (IType type : classes) {
+			if (!type.isAnonymous()) {
+				for (IMethod method : type.getMethods()) {
+					if ((!method.equals(getMethod())) && (JdtFlags.isNative(method)) && (null != Checks.findSimilarMethod(getMethod(), new IMethod[]{method}))) {
+						return true;
+					}
 				}
 			}
 		}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/META-INF/MANIFEST.MF b/org.eclipse.jdt.ui.tests.refactoring/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.ui.tests.refactoring
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.jdt.ui.tests.refactoring; singleton:=true
-Bundle-Version: 3.16.300.qualifier
+Bundle-Version: 3.16.400.qualifier
 Bundle-Activator: org.eclipse.jdt.ui.tests.refactoring.infra.RefactoringTestPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Plugin.providerName
diff --git a/org.eclipse.jdt.ui.tests.refactoring/pom.xml b/org.eclipse.jdt.ui.tests.refactoring/pom.xml
@@ -19,7 +19,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.ui.tests.refactoring</artifactId>
-  <version>3.16.300-SNAPSHOT</version>
+  <version>3.16.400-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
   <properties>
     <testSuite>${project.artifactId}</testSuite>
diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodWithSubtypeInLambda/testGH4704/in/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodWithSubtypeInLambda/testGH4704/in/A.java
@@ -0,0 +1,5 @@
+package p;
+//renaming A.m to k
+abstract class A {
+	void m() {}
+}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodWithSubtypeInLambda/testGH4704/in/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodWithSubtypeInLambda/testGH4704/in/B.java
@@ -0,0 +1,6 @@
+package p;
+class B {
+	public void t() {
+		Runnable r = () -> new A() {};
+	}
+}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodWithSubtypeInLambda/testGH4704/out/A.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodWithSubtypeInLambda/testGH4704/out/A.java
@@ -0,0 +1,5 @@
+package p;
+//renaming A.m to k
+abstract class A {
+	void k() {}
+}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodWithSubtypeInLambda/testGH4704/out/B.java b/org.eclipse.jdt.ui.tests.refactoring/resources/RenameMethodWithSubtypeInLambda/testGH4704/out/B.java
@@ -0,0 +1,6 @@
+package p;
+class B {
+	public void t() {
+		Runnable r = () -> new A() {};
+	}
+}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllRefactoringTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/AllRefactoringTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2021 IBM Corporation and others.
+ * Copyright (c) 2000, 2026 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -84,6 +84,7 @@
 	RenamePrivateMethodTests.class,
 	RenameStaticMethodTests.class,
 	RenameParametersTests.class,
+	RenameMethodWithSubtypeInLambdaTests.class,
 	MoveInstanceMethodTests.class,
 	MoveInstanceMethodTests1d8.class,
 	IntroduceIndirectionTests.class,
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodWithSubtypeInLambdaTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameMethodWithSubtypeInLambdaTests.java
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2026 Advantest and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *     Advantest - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.jdt.ui.tests.refactoring;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import org.eclipse.ltk.core.refactoring.Refactoring;
+import org.eclipse.ltk.core.refactoring.RefactoringStatus;
+
+import org.eclipse.jdt.core.ICompilationUnit;
+import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IMethod;
+import org.eclipse.jdt.core.IType;
+import org.eclipse.jdt.core.refactoring.IJavaRefactorings;
+import org.eclipse.jdt.core.refactoring.descriptors.RenameJavaElementDescriptor;
+
+import org.eclipse.jdt.internal.core.refactoring.descriptors.RefactoringSignatureDescriptorFactory;
+
+import org.eclipse.jdt.ui.tests.refactoring.rules.Java1d8Setup;
+
+public class RenameMethodWithSubtypeInLambdaTests extends GenericRefactoringTest {
+
+	private static final String REFACTORING_PATH= "RenameMethodWithSubtypeInLambda/";
+
+	public RenameMethodWithSubtypeInLambdaTests() {
+		rts= new Java1d8Setup();
+	}
+
+	@Override
+	protected String getRefactoringPath() {
+		return REFACTORING_PATH;
+	}
+
+	@Test
+	public void testGH4704() throws Exception{
+		ICompilationUnit cuA= createCUfromTestFile(getPackageP(), "A");
+		ICompilationUnit cuB= createCUfromTestFile(getPackageP(), "B");
+		IJavaProject project= rts.getProject();
+		// Since we just created B.java, we need to close the project and re-open it to reproduce the bug.
+		project.close();
+		project.open(null);
+
+		IType classA= getType(cuA, "A");
+		IMethod method= classA.getMethod("m", null);
+
+		final RenameJavaElementDescriptor descriptor= RefactoringSignatureDescriptorFactory.createRenameJavaElementDescriptor(IJavaRefactorings.RENAME_METHOD);
+		descriptor.setJavaElement(method);
+		descriptor.setNewName("k");
+		descriptor.setUpdateReferences(true);
+		final RefactoringStatus status= new RefactoringStatus();
+		final Refactoring refactoring= descriptor.createRefactoring(status);
+		assertNotNull("Refactoring should not be null", refactoring);
+		assertTrue("status should be ok", status.isOK());
+
+		assertNull("was supposed to pass", performRefactoring(refactoring));
+		assertEqualLines("invalid renaming A", getFileContents(getOutputTestFileName("A")), cuA.getSource());
+		assertEqualLines("invalid renaming B", getFileContents(getOutputTestFileName("B")), cuB.getSource());
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -247,10 +247,12 @@ private Set<IType> getRelatedTypes() {`
`247`	`247`	`//---- Class checks -------------------------------------`
`248`	`248`
`249`	`249`	`private boolean classesDeclareOverridingNativeMethod(IType[] classes) throws CoreException {`
`250`		`- for (IType type : classes) {`
`251`		`- for (IMethod method : type.getMethods()) {`
`252`		`- if ((!method.equals(getMethod())) && (JdtFlags.isNative(method)) && (null != Checks.findSimilarMethod(getMethod(), new IMethod[]{method}))) {`
`253`		`- return true;`
	`250`	`+ for (IType type : classes) {`
	`251`	`+ if (!type.isAnonymous()) {`
	`252`	`+ for (IMethod method : type.getMethods()) {`
	`253`	`+ if ((!method.equals(getMethod())) && (JdtFlags.isNative(method)) && (null != Checks.findSimilarMethod(getMethod(), new IMethod[]{method}))) {`
	`254`	`+ return true;`
	`255`	`+ }`
`254`	`256`	`}`
`255`	`257`	`}`
`256`	`258`	`}`