Merge remote-tracking branch 'fabric/main' into develop

Author: Juuxel

build.gradle.kts

@@ -44,12 +44,11 @@ dependencyLocking {
     lockMode.set(LockMode.STRICT)
 }
 
-val jdtVersion = "org.eclipse.jdt:org.eclipse.jdt.core:3.35.0"
+val jdtVersion = "org.eclipse.jdt:org.eclipse.jdt.core:3.43.0"
 dependencies {
-    // JDT pulls all of these deps in, however they do not specify the exact version to use so they can get updated without us knowing.
-    // Depend specifically on these versions to prevent them from being updated under our feet.
-    // The POM is also patched later on to as this strict versioning does not make it through.
-    "jdt" (jdtVersion)
+    "jdt" (jdtVersion) {
+        exclude(group = "net.java.dev.jna")
+    }
 
     // TODO: Split in separate modules
     api("org.cadixdev:at:0.1.0-rc1")
@@ -80,6 +79,7 @@ val extract = task<Copy>("extractJdt") {
     destinationDir = patches.rootDir
 
     include("org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java")
+    include("org/eclipse/jdt/core/dom/CompilationUnitResolver.java")
     include("org/eclipse/jdt/internal/core/dom/rewrite/imports/*.java")
 }
 tasks["applyPatches"].inputs.files(extract)

gradle.lockfile

@@ -6,21 +6,21 @@ org.cadixdev:at:0.1.0-rc1=compileClasspath,runtimeClasspath,testCompileClasspath
 org.cadixdev:bombe:0.3.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.cadixdev:lorenz-io-jam:0.5.7=testRuntimeClasspath
 org.cadixdev:lorenz:0.5.7=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jdt:ecj:3.35.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.jdt:org.eclipse.jdt.core:3.35.0=compileClasspath,jdt,jdtSources,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.commands:3.11.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.contenttype:3.9.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.expressions:3.9.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.filesystem:1.10.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.jobs:3.15.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.resources:3.19.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.core.runtime:3.29.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.equinox.app:1.6.300=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.equinox.common:3.18.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.equinox.preferences:3.10.300=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.equinox.registry:3.11.300=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.osgi:3.18.500=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-org.eclipse.platform:org.eclipse.text:3.13.100=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jdt:ecj:3.43.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.jdt:org.eclipse.jdt.core:3.43.0=compileClasspath,jdt,jdtSources,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.commands:3.12.400=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.contenttype:3.9.700=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.expressions:3.9.500=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.filesystem:1.11.300=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.jobs:3.15.700=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.resources:3.23.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.core.runtime:3.34.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.equinox.app:1.7.500=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.equinox.common:3.20.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.equinox.preferences:3.12.0=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.equinox.registry:3.12.500=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.osgi:3.23.200=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
+org.eclipse.platform:org.eclipse.text:3.14.400=compileClasspath,jdt,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-api:5.7.0=testCompileClasspath,testRuntimeClasspath
 org.junit.jupiter:junit-jupiter-engine:5.7.0=testRuntimeClasspath
 org.junit.platform:junit-platform-commons:1.7.0=testCompileClasspath,testRuntimeClasspath

gradle.properties

@@ -1,6 +1,6 @@
 group = dev.architectury
 og_group = org.cadixdev
 name = Mercury
-base_version = 0.1.4
+base_version = 0.4.3
 description = A source transformation and -remapping framework for Java.
 url = https://github.com/architectury/Mercury

patches/org/eclipse/jdt/core/dom/CompilationUnitResolver.java.patch

@@ -0,0 +1,11 @@
+--- a/org/eclipse/jdt/core/dom/CompilationUnitResolver.java
++++ b/org/eclipse/jdt/core/dom/CompilationUnitResolver.java
+@@ -1073,6 +1073,8 @@
+ 						// remove at the end so that we don't resolve twice if a source and a key for the same file name have been requested
+ 						this.requestedKeys.put(fileName, null); // mark it as removed
+ 					}
++				} catch (Exception e) {
++                    throw new RuntimeException("Failed to process " + new String(unit.compilationResult.getFileName()) + " " + e.getMessage(), e);
+ 				} finally {
+ 					// cleanup compilation unit result
+ 					unit.cleanUp();

patches/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java.patch

@@ -1,22 +1,6 @@
 --- a/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java
 +++ b/org/eclipse/jdt/core/dom/rewrite/ImportRewrite.java
-@@ -61,6 +61,7 @@
- import org.eclipse.jdt.core.dom.Modifier;
- import org.eclipse.jdt.core.dom.Name;
- import org.eclipse.jdt.core.dom.NormalAnnotation;
-+import org.eclipse.jdt.core.dom.PackageDeclaration;
- import org.eclipse.jdt.core.dom.ParameterizedType;
- import org.eclipse.jdt.core.dom.PrimitiveType;
- import org.eclipse.jdt.core.dom.SimpleName;
-@@ -76,6 +77,7 @@
- import org.eclipse.jdt.internal.core.dom.rewrite.imports.ImportRewriteConfiguration.ImportContainerSorting;
- import org.eclipse.jdt.internal.core.util.Messages;
- import org.eclipse.jdt.internal.core.util.Util;
-+import org.eclipse.jface.text.IDocument;
- import org.eclipse.text.edits.MultiTextEdit;
- import org.eclipse.text.edits.TextEdit;
- 
-@@ -323,6 +325,9 @@
+@@ -289,6 +289,9 @@
  	private final ICompilationUnit compilationUnit;
  	private final CompilationUnit astRoot;
 
@@ -26,7 +10,7 @@
  	private final boolean restoreExistingImports;
  	private final List existingImports;
  	private final Map importsKindMap;
-@@ -384,9 +389,8 @@
+@@ -349,9 +352,8 @@
  	}
 
  	/**
@@ -38,7 +22,7 @@
  	 * will be inserted at best matching locations. If <code>restoreExistingImports</code> is <code>false</code>, the
  	 * existing imports will be removed and only the newly added imports will be created.
  	 * <p>
-@@ -395,14 +399,14 @@
+@@ -360,14 +362,14 @@
  	 * @param astRoot the AST root node to create the imports for
  	 * @param restoreExistingImports specifies if the existing imports should be kept or removed.
  	 * @return the created import rewriter.
@@ -55,7 +39,7 @@
  			throw new IllegalArgumentException("AST must have been constructed from a Java element"); //$NON-NLS-1$
  		}
  		List existingImport= null;
-@@ -425,7 +429,7 @@
+@@ -390,7 +392,7 @@
  	}
 
  	private ImportRewrite(ICompilationUnit cu, CompilationUnit astRoot, List existingImports) {
@@ -64,7 +48,7 @@
  		this.astRoot= astRoot; // might be null
  		if (existingImports != null) {
  			this.existingImports= existingImports;
-@@ -458,8 +462,33 @@
+@@ -423,8 +425,33 @@
  		this.importsKindMap = new HashMap();
  	}
 
@@ -98,7 +82,7 @@
  	 * Defines the import groups and order to be used by the {@link ImportRewrite}.
  	 * Imports are added to the group matching their qualified name most. The empty group name groups all imports not matching
  	 * any other group. Static imports are managed in separate groups. Static import group names are prefixed with a '#' character.
-@@ -506,7 +535,8 @@
+@@ -471,7 +498,8 @@
 
  	/**
  	 * The compilation unit for which this import rewrite was created for.
@@ -108,7 +92,7 @@
  	 */
  	public ICompilationUnit getCompilationUnit() {
  		return this.compilationUnit;
-@@ -611,15 +641,38 @@
+@@ -576,15 +604,38 @@
  			}
  		}
 
@@ -150,7 +134,7 @@
 
  				if (this.astRoot != null) {
  					List<AbstractTypeDeclaration> types = this.astRoot.types();
-@@ -1304,7 +1357,28 @@
+@@ -1268,7 +1319,28 @@
  	 * @throws CoreException the exception is thrown if the rewrite fails.
  	 */
  	public final TextEdit rewriteImports(IProgressMonitor monitor) throws CoreException {
@@ -171,15 +155,15 @@
 +	 * recorded by this rewriter
 +	 * @throws CoreException the exception is thrown if the rewrite fails.
 +	 */
-+	public final TextEdit rewriteImports(IDocument document, IProgressMonitor monitor) throws CoreException {
++	public final TextEdit rewriteImports(org.eclipse.jface.text.IDocument document, IProgressMonitor monitor) throws CoreException {
 +		if (this.compilationUnit == null && document == null) {
 +			throw new IllegalArgumentException("Cannot rewrite imports without compilation unit or document");
 +		}
 +
  		SubMonitor subMonitor = SubMonitor.convert(monitor,
  				Messages.bind(Messages.importRewrite_processDescription), 2);
  		if (!hasRecordedChanges()) {
-@@ -1325,7 +1399,7 @@
+@@ -1289,7 +1361,7 @@
  		ImportRewriteConfiguration config= buildImportRewriteConfiguration();
 
  		ImportRewriteAnalyzer computer=
@@ -188,7 +172,7 @@
 
  		for (String addedImport : this.addedImports) {
  			boolean isStatic = STATIC_PREFIX == addedImport.charAt(0);
-@@ -1368,11 +1442,17 @@
+@@ -1332,11 +1404,17 @@
  		configBuilder.setTypeOnDemandThreshold(this.importOnDemandThreshold);
  		configBuilder.setStaticOnDemandThreshold(this.staticImportOnDemandThreshold);
 

patches/org/eclipse/jdt/internal/core/dom/rewrite/imports/ImportRewriteAnalyzer.java.patch

@@ -1,40 +1,28 @@
 --- a/org/eclipse/jdt/internal/core/dom/rewrite/imports/ImportRewriteAnalyzer.java
 +++ b/org/eclipse/jdt/internal/core/dom/rewrite/imports/ImportRewriteAnalyzer.java
-@@ -46,8 +46,11 @@
- import org.eclipse.jdt.internal.core.JavaProject;
- import org.eclipse.jdt.internal.core.dom.rewrite.imports.ConflictIdentifier.Conflicts;
- import org.eclipse.jdt.internal.core.util.Util;
-+import org.eclipse.jface.text.BadLocationException;
-+import org.eclipse.jface.text.IDocument;
- import org.eclipse.jface.text.IRegion;
- import org.eclipse.jface.text.Region;
-+import org.eclipse.jface.text.TextUtilities;
- import org.eclipse.text.edits.TextEdit;
- 
- /**
-@@ -261,10 +264,10 @@
+@@ -250,10 +250,10 @@
  	}
 
  	private static RewriteSite determineRewriteSite(
 -			CompilationUnit compilationUnit, List<OriginalImportEntry> originalImports) throws JavaModelException {
-+			CompilationUnit compilationUnit, IDocument document, List<OriginalImportEntry> originalImports) throws JavaModelException {
++			CompilationUnit compilationUnit, org.eclipse.jface.text.IDocument document, List<OriginalImportEntry> originalImports) throws JavaModelException {
  		IRegion importsRegion = determineImportsRegion(originalImports);
 
 -		IRegion surroundingRegion = determineSurroundingRegion(compilationUnit, importsRegion);
 +		IRegion surroundingRegion = determineSurroundingRegion(compilationUnit, document, importsRegion);
 
  		boolean hasPrecedingElements = surroundingRegion.getOffset() != 0;
 
-@@ -302,7 +305,7 @@
+@@ -291,7 +291,7 @@
  	 * Determines the region to be occupied by imports, their associated comments, and surrounding
  	 * whitespace.
  	 */
 -	private static IRegion determineSurroundingRegion(CompilationUnit compilationUnit, IRegion importsRegion) throws JavaModelException {
-+	private static IRegion determineSurroundingRegion(CompilationUnit compilationUnit, IDocument document, IRegion importsRegion) throws JavaModelException {
++	private static IRegion determineSurroundingRegion(CompilationUnit compilationUnit, org.eclipse.jface.text.IDocument document, IRegion importsRegion) throws JavaModelException {
  		NavigableMap<Integer, ASTNode> nodesTreeMap = mapTopLevelNodes(compilationUnit);
 
  		int surroundingStart;
-@@ -331,12 +334,24 @@
+@@ -332,12 +332,24 @@
  		}
 
  		int surroundingEnd = positionAfterImports;
@@ -44,7 +32,7 @@
 +				while (surroundingEnd < length && Character.isWhitespace(document.getChar(surroundingEnd))) {
 +					surroundingEnd++;
 +				}
-+			} catch (BadLocationException e) {
++			} catch (org.eclipse.jface.text.BadLocationException e) {
 +				throw new RuntimeException(e);
 +			}
 +		} else {
@@ -59,15 +47,15 @@
  		return new Region(surroundingStart, surroundingEnd - surroundingStart);
  	}
 
-@@ -432,6 +447,7 @@
+@@ -433,6 +445,7 @@
  	public ImportRewriteAnalyzer(
  			ICompilationUnit cu,
  			CompilationUnit astRoot,
-+			IDocument document,
++			org.eclipse.jface.text.IDocument document,
  			ImportRewriteConfiguration configuration) throws JavaModelException {
  		this.originalImportEntries = Collections.unmodifiableList(readOriginalImports(astRoot));
 
-@@ -460,7 +476,7 @@
+@@ -461,7 +474,7 @@
 
  		ImportGroupComparator importGroupComparator = new ImportGroupComparator(configuration.importOrder);
 
@@ -76,7 +64,7 @@
 
  		this.importAdder = configuration.originalImportHandling.createImportAdder(new ImportComparator(
  				importGroupComparator,
-@@ -468,31 +484,39 @@
+@@ -469,31 +482,39 @@
  				configuration.staticContainerSorting.createContainerComparator(javaProject)));
 
  		this.implicitImportContainerNames =
@@ -105,7 +93,7 @@
 +		if (cu != null) {
  		this.lineDelimiter = cu.findRecommendedLineSeparator();
 +		} else {
-+			this.lineDelimiter = TextUtilities.getDefaultLineDelimiter(document);
++			this.lineDelimiter = org.eclipse.jface.text.TextUtilities.getDefaultLineDelimiter(document);
 +		}
 
  		this.importEditor = new ImportEditor(
@@ -120,7 +108,7 @@
  				this.importDeclarationWriter);
  	}
 
-@@ -566,18 +590,18 @@
+@@ -567,18 +588,18 @@
 
  		Set<ImportName> touchedContainers = determineTouchedContainers();
 
@@ -133,11 +121,11 @@
 -				progressMonitor);
 +				progressMonitor) : null;
 
- 		Set<String> allTypeExplicitSimpleNames = new HashSet<String>(this.typeExplicitSimpleNames);
+ 		Set<String> allTypeExplicitSimpleNames = new HashSet<>(this.typeExplicitSimpleNames);
 -		allTypeExplicitSimpleNames.addAll(conflicts.typeConflicts);
 +		if (conflicts != null) allTypeExplicitSimpleNames.addAll(conflicts.typeConflicts);
 
- 		Set<String> allStaticExplicitSimpleNames = new HashSet<String>(this.staticExplicitSimpleNames);
+ 		Set<String> allStaticExplicitSimpleNames = new HashSet<>(this.staticExplicitSimpleNames);
 -		allStaticExplicitSimpleNames.addAll(conflicts.staticConflicts);
 +		if (conflicts != null) allStaticExplicitSimpleNames.addAll(conflicts.staticConflicts);