Don't remap usages of the var language feature

This prevents code like `var example = get();` from being remapped to code like `FetchedValue example = get();`.
CadixDev · May 31, 2021 · 409123d · 409123d
1 parent 0277125
commit 409123d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java b/src/main/java/org/cadixdev/mercury/remapper/RemapperVisitor.java
@@ -121,7 +121,7 @@ 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)) {
+        if (!node.getIdentifier().equals(newName) && !node.isVar()) {
             if (newName.indexOf('.') == -1) {
                 this.context.createASTRewrite().set(node, SimpleName.IDENTIFIER_PROPERTY, newName, null);
             } else {

diff --git a/src/main/java/org/cadixdev/mercury/remapper/SimpleRemapperVisitor.java b/src/main/java/org/cadixdev/mercury/remapper/SimpleRemapperVisitor.java
@@ -68,7 +68,7 @@ class SimpleRemapperVisitor extends ASTVisitor {
     }
 
     final void updateIdentifier(SimpleName node, String newName) {
-        if (!node.getIdentifier().equals(newName)) {
+        if (!node.getIdentifier().equals(newName) && !node.isVar()) {
             this.context.createASTRewrite().set(node, SimpleName.IDENTIFIER_PROPERTY, newName, null);
         }
     }

diff --git a/src/test/java/org/cadixdev/mercury/test/RemappingTests.java b/src/test/java/org/cadixdev/mercury/test/RemappingTests.java
@@ -19,6 +19,7 @@
 import org.cadixdev.lorenz.io.MappingsReader;
 import org.cadixdev.mercury.Mercury;
 import org.cadixdev.mercury.remapper.MercuryRemapper;
+import org.eclipse.jdt.core.JavaCore;
 import org.junit.jupiter.api.Test;
 
 import java.io.ByteArrayOutputStream;
@@ -97,6 +98,7 @@ void remap() throws Exception {
 
         // Run Mercury
         final Mercury mercury = new Mercury();
+        mercury.setSourceCompatibility(JavaCore.VERSION_11);
         mercury.getProcessors().add(MercuryRemapper.create(mappings));
         mercury.setFlexibleAnonymousClassMemberLookups(true);
         mercury.rewrite(in, out);

diff --git a/src/test/resources/a/OverrideChild.java b/src/test/resources/a/OverrideChild.java
@@ -12,7 +12,8 @@ class OverrideChild extends OverrideParent<String> {
 
     @Override
     public String abc() {
-        return "Hello, World!";
+        var result = "Hello, World!";
+        return result;
     }
 
     @Override

diff --git a/src/test/resources/a/com/example/ImportTest.java b/src/test/resources/a/com/example/ImportTest.java
@@ -19,8 +19,8 @@
 public class ImportTest {
 
     public void test() {
-        OtherClass otherClass = new OtherClass();
-        AnotherClass anotherClass = new AnotherClass();
+        var otherClass = new OtherClass();
+        var anotherClass = new AnotherClass();
     }
 
 }
diff --git a/src/test/resources/b/OverrideChild.java b/src/test/resources/b/OverrideChild.java
@@ -12,7 +12,8 @@ class OverrideChild extends OverrideParent<String> {
 
     @Override
     public String get() {
-        return "Hello, World!";
+        var result = "Hello, World!";
+        return result;
     }
 
     @Override

diff --git a/src/test/resources/b/net/example/ImportTestNew.java b/src/test/resources/b/net/example/ImportTestNew.java
@@ -20,8 +20,8 @@
 public class ImportTestNew {
 
     public void test() {
-        OtherClass otherClass = new OtherClass();
-        AnotherClass anotherClass = new AnotherClass();
+        var otherClass = new OtherClass();
+        var anotherClass = new AnotherClass();
     }
 
 }