Merge pull request #1819 from eclipse-jdt/master

Merge master to BETA_JAVA24

org.eclipse.jdt.bcoview/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.jdt.ui</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.34.0-SNAPSHOT</version>
+    <version>4.35.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.bcoview</artifactId>

org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/RenameUnusedVariableCleanUpCore.java

@@ -26,14 +26,11 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Pattern;
 import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
 import org.eclipse.jdt.internal.corext.fix.RenameUnusedVariableFixCore;
 import org.eclipse.jdt.internal.corext.fix.UnusedCodeFixCore;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
@@ -150,9 +147,7 @@ public int computeNumberOfFixes(CompilationUnit compilationUnit) {
 				if (id == IProblem.LocalVariableIsNeverUsed) {
 					ProblemLocation location= new ProblemLocation(problem);
 					SimpleName name= UnusedCodeFixCore.getUnusedName(compilationUnit, location);
-					if (JavaModelUtil.is22OrHigher(compilationUnit.getJavaElement().getJavaProject()) &&
-							name.getParent() instanceof SingleVariableDeclaration nameParent &&
-							nameParent.getParent() instanceof Pattern) {
+					if (RenameUnusedVariableFixCore.canRenameToUnnamedVariable(compilationUnit, name)) {
 						result++;
 					}
 				} else if (id == IProblem.LambdaParameterIsNeverUsed) {

org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/UnusedCodeCleanUpCore.java

@@ -26,13 +26,11 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.compiler.IProblem;
 import org.eclipse.jdt.core.dom.CompilationUnit;
-import org.eclipse.jdt.core.dom.Pattern;
 import org.eclipse.jdt.core.dom.SimpleName;
-import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
 
 import org.eclipse.jdt.internal.corext.fix.CleanUpConstants;
+import org.eclipse.jdt.internal.corext.fix.RenameUnusedVariableFixCore;
 import org.eclipse.jdt.internal.corext.fix.UnusedCodeFixCore;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 
 import org.eclipse.jdt.ui.cleanup.CleanUpRequirements;
 import org.eclipse.jdt.ui.cleanup.ICleanUpFix;
@@ -277,9 +275,7 @@ public int computeNumberOfFixes(CompilationUnit compilationUnit) {
 				if (id == IProblem.LocalVariableIsNeverUsed) {
 					ProblemLocation location= new ProblemLocation(problem);
 					SimpleName name= UnusedCodeFixCore.getUnusedName(compilationUnit, location);
-					if (!JavaModelUtil.is22OrHigher(compilationUnit.getJavaElement().getJavaProject()) ||
-							!(name.getParent() instanceof SingleVariableDeclaration nameParent) ||
-							!(nameParent.getParent() instanceof Pattern)) {
+					if (!RenameUnusedVariableFixCore.canRenameToUnnamedVariable(compilationUnit, name)) {
 						result++;
 					}
 				}

org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/RenameUnusedVariableFixCore.java

@@ -28,17 +28,19 @@
 import org.eclipse.jdt.core.dom.ASTNode;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.EnhancedForStatement;
+import org.eclipse.jdt.core.dom.ForStatement;
 import org.eclipse.jdt.core.dom.IBinding;
 import org.eclipse.jdt.core.dom.IVariableBinding;
 import org.eclipse.jdt.core.dom.LambdaExpression;
 import org.eclipse.jdt.core.dom.MethodDeclaration;
 import org.eclipse.jdt.core.dom.Pattern;
 import org.eclipse.jdt.core.dom.SimpleName;
 import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
+import org.eclipse.jdt.core.dom.TryStatement;
+import org.eclipse.jdt.core.dom.VariableDeclarationExpression;
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
 
-import org.eclipse.jdt.internal.corext.dom.ASTNodes;
 import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
 import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 
@@ -78,15 +80,10 @@ public static RenameUnusedVariableFixCore createRenameToUnnamedFix(CompilationUn
 			if (name != null) {
 				IBinding binding= name.resolveBinding();
 				if (binding != null) {
-					if (JavaModelUtil.is22OrHigher(compilationUnit.getJavaElement().getJavaProject())) {
-						if (name.getParent() instanceof SingleVariableDeclaration parent &&
-								parent.getParent() instanceof Pattern ||
-								name.getParent() instanceof VariableDeclarationFragment parent2 &&
-								parent2.getParent() instanceof LambdaExpression) {
-							String label= FixMessages.UnusedCodeFix_RenameToUnnamedVariable_description;
-							RenameToUnnamedVariableOperation operation= new RenameToUnnamedVariableOperation(name);
-							return new RenameUnusedVariableFixCore(label, compilationUnit, new CompilationUnitRewriteOperation[] { operation }, getCleanUpOptions());
-						}
+					if (canRenameToUnnamedVariable(compilationUnit, name)) {
+						String label= FixMessages.UnusedCodeFix_RenameToUnnamedVariable_description;
+						RenameToUnnamedVariableOperation operation= new RenameToUnnamedVariableOperation(name);
+						return new RenameUnusedVariableFixCore(label, compilationUnit, new CompilationUnitRewriteOperation[] { operation }, getCleanUpOptions());
 					}
 				}
 			}
@@ -131,16 +128,8 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, IProble
 				if (name != null) {
 					IBinding binding= name.resolveBinding();
 					if (binding instanceof IVariableBinding) {
-						VariableDeclarationFragment parent= ASTNodes.getParent(name, VariableDeclarationFragment.class);
-						if (parent == null || id == IProblem.LambdaParameterIsNeverUsed) {
-							if (JavaModelUtil.is22OrHigher(compilationUnit.getJavaElement().getJavaProject())) {
-								if (name.getParent() instanceof SingleVariableDeclaration nameParent &&
-										nameParent.getParent() instanceof Pattern ||
-										name.getParent() instanceof VariableDeclarationFragment varFragment &&
-										varFragment.getParent() instanceof LambdaExpression) {
-									result.add(new RenameToUnnamedVariableOperation(name));
-								}
-							}
+						if (canRenameToUnnamedVariable(compilationUnit, name)) {
+							result.add(new RenameToUnnamedVariableOperation(name));
 						}
 					}
 				}
@@ -153,8 +142,23 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, IProble
 		return new RenameUnusedVariableFixCore(FixMessages.UnusedCodeFix_change_name, compilationUnit, result.toArray(new CompilationUnitRewriteOperation[result.size()]));
 	}
 
-	public static boolean isFormalParameterInEnhancedForStatement(SimpleName name) {
-		return name.getParent() instanceof SingleVariableDeclaration && name.getParent().getLocationInParent() == EnhancedForStatement.PARAMETER_PROPERTY;
+	public static boolean canRenameToUnnamedVariable(CompilationUnit compilationUnit, SimpleName name) {
+		if (JavaModelUtil.is22OrHigher(compilationUnit.getJavaElement().getJavaProject())) {
+			if (name.getParent() instanceof SingleVariableDeclaration nameParent) {
+				if (nameParent.getParent() instanceof Pattern || nameParent.getParent() instanceof EnhancedForStatement) {
+					return true;
+				}
+			} else if (name.getParent() instanceof VariableDeclarationFragment varFragment) {
+				if (varFragment.getParent() instanceof LambdaExpression) {
+					return true;
+				} else if (varFragment.getParent() instanceof VariableDeclarationExpression varFragmentParent) {
+					if (varFragmentParent.getParent() instanceof TryStatement || varFragmentParent.getParent() instanceof ForStatement) {
+						return true;
+					}
+				}
+			}
+		}
+		return false;
 	}
 
 	public static SimpleName getUnusedName(CompilationUnit compilationUnit, IProblemLocation problem) {

org.eclipse.jdt.core.manipulation/core extension/org/eclipse/jdt/internal/corext/fix/UnusedCodeFixCore.java

@@ -65,7 +65,6 @@
 import org.eclipse.jdt.core.dom.Modifier;
 import org.eclipse.jdt.core.dom.NodeFinder;
 import org.eclipse.jdt.core.dom.ParenthesizedExpression;
-import org.eclipse.jdt.core.dom.Pattern;
 import org.eclipse.jdt.core.dom.PostfixExpression;
 import org.eclipse.jdt.core.dom.PrefixExpression;
 import org.eclipse.jdt.core.dom.QualifiedName;
@@ -90,7 +89,6 @@
 import org.eclipse.jdt.internal.corext.dom.ReplaceRewrite;
 import org.eclipse.jdt.internal.corext.dom.StatementRewrite;
 import org.eclipse.jdt.internal.corext.refactoring.structure.CompilationUnitRewrite;
-import org.eclipse.jdt.internal.corext.util.JavaModelUtil;
 import org.eclipse.jdt.internal.corext.util.Messages;
 
 import org.eclipse.jdt.ui.cleanup.CleanUpOptions;
@@ -930,7 +928,7 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, IProble
 
 			if ((removeUnusedLocalVariables && id == IProblem.LocalVariableIsNeverUsed) || (removeUnusedPrivateFields && id == IProblem.UnusedPrivateField)) {
 				SimpleName name= getUnusedName(compilationUnit, problem);
-				if (name != null) {
+				if (name != null && !RenameUnusedVariableFixCore.canRenameToUnnamedVariable(compilationUnit, name)) {
 					IBinding binding= name.resolveBinding();
 					if (binding instanceof IVariableBinding && !isFormalParameterInEnhancedForStatement(name) && (!((IVariableBinding) binding).isField() || isSideEffectFree(name, compilationUnit))) {
 						VariableDeclarationFragment parent= ASTNodes.getParent(name, VariableDeclarationFragment.class);
@@ -941,16 +939,7 @@ public static ICleanUpFix createCleanUp(CompilationUnit compilationUnit, IProble
 							}
 							variableDeclarations.get(varDecl).add(name);
 						} else {
-							if (id == IProblem.LocalVariableIsNeverUsed) {
-								SimpleName nameNode= UnusedCodeFixCore.getUnusedName(compilationUnit, problem);
-								if (!JavaModelUtil.is22OrHigher(compilationUnit.getJavaElement().getJavaProject()) ||
-										!(nameNode.getParent() instanceof SingleVariableDeclaration nameParent) ||
-										!(nameParent.getParent() instanceof Pattern)) {
-									result.add(new RemoveUnusedMemberOperation(new SimpleName[] { name }, false));
-								}
-							} else {
-								result.add(new RemoveUnusedMemberOperation(new SimpleName[] { name }, false));
-							}
+							result.add(new RemoveUnusedMemberOperation(new SimpleName[] { name }, false));
 						}
 					}
 				}

org.eclipse.jdt.junit.runtime/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.jdt.ui</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.34.0-SNAPSHOT</version>
+    <version>4.35.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.junit.runtime</artifactId>

org.eclipse.jdt.junit/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.eclipse.jdt.junit
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.junit;singleton:=true
-Bundle-Version: 3.16.600.qualifier
+Bundle-Version: 3.16.700.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.junit.ui.JUnitPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName

org.eclipse.jdt.junit4.runtime/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.jdt.ui</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.34.0-SNAPSHOT</version>
+    <version>4.35.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.junit4.runtime</artifactId>

org.eclipse.jdt.junit5.runtime/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>eclipse.jdt.ui</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.34.0-SNAPSHOT</version>
+    <version>4.35.0-SNAPSHOT</version>
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.junit5.runtime</artifactId>

org.eclipse.jdt.text.tests/pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tests-pom</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.34.0-SNAPSHOT</version>
+    <version>4.35.0-SNAPSHOT</version>
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <groupId>org.eclipse.jdt</groupId>

org.eclipse.jdt.ui.examples.projects/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<artifactId>eclipse.jdt.ui</artifactId>
 		<groupId>eclipse.jdt.ui</groupId>
-		<version>4.34.0-SNAPSHOT</version>
+		<version>4.35.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.jdt</groupId>
 	<artifactId>org.eclipse.jdt.ui.examples.projects</artifactId>

org.eclipse.jdt.ui.junit.sampleproject/pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<artifactId>eclipse.jdt.ui</artifactId>
 		<groupId>eclipse.jdt.ui</groupId>
-		<version>4.34.0-SNAPSHOT</version>
+		<version>4.35.0-SNAPSHOT</version>
 	</parent>
 	<groupId>org.eclipse.jdt.ui</groupId>
 	<artifactId>org.eclipse.jdt.ui.junit.sampleproject</artifactId>

org.eclipse.jdt.ui.tests.refactoring/pom.xml

@@ -14,7 +14,7 @@
   <parent>
     <artifactId>tests-pom</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.34.0-SNAPSHOT</version>
+    <version>4.35.0-SNAPSHOT</version>
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <groupId>org.eclipse.jdt</groupId>

org.eclipse.jdt.ui.tests/leaks/org/eclipse/jdt/ui/leaktest/reftracker/ReferenceTracker.java

@@ -81,6 +81,11 @@ private void followFieldReference(ReferencedObject ref, Object curr, Field fld)
 			if (fieldVal != null) {
 				fQueue.add(new ReferencedFieldElement(ref, fld, fieldVal));
 			}
+		} catch (IllegalArgumentException  e) {
+			// XXX workaround for error in JDK: https://bugs.openjdk.org/browse/JDK-8337622
+			if (!"Can not get final java.lang.Class field java.lang.Class.componentType on java.lang.Class".equals(e.getMessage())) {
+				throw e;
+			}
 		} catch (IllegalAccessException  e) {
 			handleError(e, fld);
 		}

org.eclipse.jdt.ui.tests/pom.xml

@@ -15,7 +15,7 @@
   <parent>
     <artifactId>tests-pom</artifactId>
     <groupId>eclipse.jdt.ui</groupId>
-    <version>4.34.0-SNAPSHOT</version>
+    <version>4.35.0-SNAPSHOT</version>
     <relativePath>../tests-pom/</relativePath>
   </parent>
   <groupId>org.eclipse.jdt</groupId>

org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/AssistQuickFixTest12.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2020 IBM Corporation and others.
+ * Copyright (c) 2019, 2024 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -126,7 +126,7 @@ enum Day {
 	public void testSplitSwitchCaseLabelRuleStatement() throws Exception {
 		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");
 		fJProject1.setRawClasspath(projectSetup.getDefaultClasspath(), null);
-		JavaProjectHelper.set12CompilerOptions(fJProject1, true);
+		JavaProjectHelper.set14CompilerOptions(fJProject1, true);
 		fSourceFolder= JavaProjectHelper.addSourceContainer(fJProject1, "src");
 
 		String str= """