patch var keywords forcing implicit imports into remapped source files (

#5)
FabricMC · Oct 14, 2024 · d68c8f7 · d68c8f7
1 parent 11db15e
commit d68c8f7
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java b/src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java
@@ -120,14 +120,16 @@ private void remapType(SimpleName node, ITypeBinding binding) {
         }
 
         String qualifiedName = (mapping != null ? mapping.getFullDeobfuscatedName().replace('/', '.') : binding.getBinaryName()).replace('$', '.');
-        String newName = this.importRewrite.addImport(qualifiedName, this.importStack.peek());
 
-        if (!node.getIdentifier().equals(newName) && !node.isVar()) {
-            if (newName.indexOf('.') == -1) {
-                this.context.createASTRewrite().set(node, SimpleName.IDENTIFIER_PROPERTY, newName, null);
-            } else {
-                // Qualified name
-                this.context.createASTRewrite().replace(node, node.getAST().newName(newName), null);
+        if(!node.isVar()) {
+            String newName = this.importRewrite.addImport(qualifiedName, this.importStack.peek());
+            if(!node.getIdentifier().equals(newName)) {
+                if(newName.indexOf('.') == -1) {
+                    this.context.createASTRewrite().set(node, SimpleName.IDENTIFIER_PROPERTY, newName, null);
+                } else {
+                    // Qualified name
+                    this.context.createASTRewrite().replace(node, node.getAST().newName(newName), null);
+                }
             }
         }
     }