Merge branch 'master' into Convert_String_concatenation_to_Text_Block

eclipse-jdt · Jul 26, 2024 · ee01629 · ee01629
2 parents da4d207 + 3d32db8
commit ee01629
Show file tree

Hide file tree

Showing 34 changed files with 654 additions and 1,027 deletions.
diff --git a/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/VarCleanUpCore.java b/org.eclipse.jdt.core.manipulation/common/org/eclipse/jdt/internal/ui/fix/VarCleanUpCore.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2023 Fabrice TIERCELIN and others.
+ * Copyright (c) 2020, 2024 Fabrice TIERCELIN and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -34,6 +34,7 @@
 import org.eclipse.jdt.core.dom.ClassInstanceCreation;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.Expression;
+import org.eclipse.jdt.core.dom.ExpressionMethodReference;
 import org.eclipse.jdt.core.dom.FieldDeclaration;
 import org.eclipse.jdt.core.dom.IMethodBinding;
 import org.eclipse.jdt.core.dom.ITypeBinding;
@@ -150,6 +151,9 @@ public boolean visit(final SingleVariableDeclaration node) {
 			}
 
 			private boolean maybeUseVar(final Type type, final Expression initializer, final int extraDimensions) {
+				if (initializer instanceof ExpressionMethodReference) {
+					return false;
+				}
 				if (type.isVar()
 						|| initializer == null
 						|| initializer.resolveTypeBinding() == null

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PluginsNotLoadedTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/PluginsNotLoadedTest.java
@@ -88,7 +88,7 @@ public class PluginsNotLoadedTest {
 			"org.eclipse.help.ui",
 			"org.eclipse.help.webapp",
 			"org.eclipse.jdt",
-			"org.eclipse.jdt.apt.core",
+//			"org.eclipse.jdt.apt.core", loaded for Java 1.8+ projects
 			"org.eclipse.jdt.apt.ui",
 			"org.eclipse.jdt.compiler.apt",
 			"org.eclipse.jdt.compiler.tool",
@@ -163,7 +163,7 @@ public class PluginsNotLoadedTest {
 			"org.eclipse.equinox.launcher",
 			"org.eclipse.equinox.launcher.win32.win32.x86",
 			"org.eclipse.help.appserver",
-			"org.eclipse.jdt.apt.pluggable.core",
+//			"org.eclipse.jdt.apt.pluggable.core", loaded for Java 1.8+ projects
 			"org.eclipse.jdt.source",
 			"org.eclipse.jsch.ui",
 			"org.eclipse.osgi.util",