Eclipse 4.22 (RC1) JDT Patch for Groovy-Eclipse

https://git.eclipse.org/c/jdt/eclipse.jdt.core.git/tag/?h=S4_22_0_RC1

#1302 #1303

groovy-eclipse.setup

@@ -293,7 +293,7 @@
         <repository
             url="https://download.eclipse.org/eclipse/updates/4.22"/>
 	    <repository
-	        url="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211111-0910"/>
+	        url="https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211117-1830"/>
       </repositoryList>
       <repositoryList
           name="2021-09">

jdt-patch/e422/Feature-org.codehaus.groovy.jdt.patch/feature.xml

@@ -18,7 +18,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.jdt" version="3.18.1000.v20211111-0910" patch="true"/>
+      <import feature="org.eclipse.jdt" version="3.18.1000.v20211117-1830" patch="true"/>
    </requires>
 
    <plugin

jdt-patch/e422/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/lookup/BoundSet.java

@@ -328,16 +328,14 @@ else if (type.hasNullTypeAnnotations())
 			this.instantiation = type;
 		}
 	}
-
 	// main storage of type bounds:
-	Map<InferenceVariable, ThreeSets> boundsPerVariable = new HashMap<>();
+	HashMap<InferenceVariable, ThreeSets> boundsPerVariable = new HashMap<>();
 
 	/**
 	 * 18.1.3 bullet 4: G<α1, ..., αn> = capture(G<A1, ..., An>)
 	 * On both sides we only enter types with nonnull arguments.
 	 */
-	Map<ParameterizedTypeBinding, ParameterizedTypeBinding> captures = new HashMap<>();
-
+	HashMap<ParameterizedTypeBinding,ParameterizedTypeBinding> captures = new HashMap<>();
 	/** 18.1.3 bullet 5: throws α */
 	Set<InferenceVariable> inThrows = new HashSet<>();
 
@@ -529,7 +527,6 @@ boolean incorporate(InferenceContext18 context) throws InferenceFailureException
 
 		return true;
 	}
-
 	/**
 	 * <b>JLS 18.3:</b> Try to infer new constraints from pairs of existing type bounds.
 	 * Each new constraint is first reduced and checked for TRUE or FALSE, which will
@@ -1167,7 +1164,6 @@ public TypeBinding findWrapperTypeBound(InferenceVariable variable) {
 		if (three == null) return null;
 		return three.findSingleWrapperType();
 	}
-
 	// this condition is just way too complex to check it in-line:
 	public boolean condition18_5_2_bullet_3_3_1(InferenceVariable alpha, TypeBinding targetType) {
 		// T is a reference type, but is not a wildcard-parameterized type, and either
@@ -1246,7 +1242,6 @@ public boolean condition18_5_2_bullet_3_3_2(InferenceVariable alpha, TypeBinding
 		}
 		return false;
 	}
-
 	private boolean superOnlyRaw(TypeBinding g, TypeBinding s, LookupEnvironment env) {
 		if (s instanceof InferenceVariable)
 			return false; // inference has no super types

jdt-patch/e422/org.eclipse.jdt.core/model/org/eclipse/jdt/core/Flags.java

@@ -199,7 +199,6 @@ public final class Flags {
 	 * Virtual Machine specification.
 	 * </p>
 	 * @since 3.24
-	 * @noreference This field is not intended to be referenced by clients as it is a part of Java preview feature.
 	 */
 	public static final int  AccSealed = ExtraCompilerModifiers.AccSealed;
 	/**
@@ -209,7 +208,6 @@ public final class Flags {
 	 * Virtual Machine specification.
 	 * </p>
 	 * @since 3.24
-	 * @noreference This field is not intended to be referenced by clients as it is a part of Java preview feature.
 	 */
 	public static final int  AccNonSealed = ExtraCompilerModifiers.AccNonSealed;
 

jdt-patch/e422/org.eclipse.jdt.core/search/org/eclipse/jdt/core/search/IJavaSearchConstants.java

@@ -499,7 +499,6 @@ public interface IJavaSearchConstants {
 	 * returned.
 	 *</p>
 	 * @since 3.24
-	 * @noreference permit type reference
 	 * @category limitTo
 	 */
 	int PERMITTYPE_TYPE_REFERENCE = 0x20000000;

jdt-patch/e422/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/matching/ModuleLocator.java

@@ -1,3 +1,14 @@
+package org.eclipse.jdt.internal.core.search.matching;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.jdt.core.search.SearchMatch;
+import org.eclipse.jdt.internal.compiler.ast.ASTNode;
+import org.eclipse.jdt.internal.compiler.ast.ModuleDeclaration;
+import org.eclipse.jdt.internal.compiler.ast.ModuleReference;
+import org.eclipse.jdt.internal.compiler.lookup.Binding;
+import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding;
+
 /*******************************************************************************
  * Copyright (c) 2017 IBM Corporation and others.
  *
@@ -12,17 +23,6 @@
  *     IBM Corporation - initial API and implementation
  *
  *******************************************************************************/
-package org.eclipse.jdt.internal.core.search.matching;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.search.SearchMatch;
-import org.eclipse.jdt.internal.compiler.ast.ASTNode;
-import org.eclipse.jdt.internal.compiler.ast.ModuleDeclaration;
-import org.eclipse.jdt.internal.compiler.ast.ModuleReference;
-import org.eclipse.jdt.internal.compiler.lookup.Binding;
-import org.eclipse.jdt.internal.compiler.lookup.ModuleBinding;
-
 public class ModuleLocator extends PatternLocator {
 
 	private ModulePattern pattern;

jdt-patch/e422/org.eclipse.jdt.core/search/org/eclipse/jdt/internal/core/search/processing/JobManager.java

@@ -253,7 +253,7 @@ public boolean performConcurrentJob(IJob searchJob, int waitingPolicy, IProgress
 									throw new OperationCanceledException();
 								IJob currentJob = currentJob();
 								// currentJob can be null when jobs have been added to the queue but job manager is not enabled
-								if (currentJob != null) {
+								if (currentJob != null ) {
 									synchronized (this.idleMonitor) {
 										this.idleMonitor.notifyAll(); // wake up idle sleepers
 									}
@@ -438,7 +438,8 @@ protected IStatus run(IProgressMonitor monitor) {
 							this.progressJob.setSystem(true);
 							this.progressJob.schedule();
 						}
-						job.execute(null);
+						/*boolean status = */job.execute(null);
+						//if (status == FAILED) request(job);
 					} finally {
 						this.executing = false;
 						if (VERBOSE)

pom.xml

@@ -126,7 +126,7 @@
 				<repository>
 					<id>milestone</id>
 					<layout>p2</layout>
-					<url>https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211111-0910</url>
+					<url>https://download.eclipse.org/eclipse/updates/4.22-I-builds/I20211117-1830</url>
 				</repository>
 			</repositories>
 			<modules>