update gson, fix argument indexing, delete empty class mappings

6 files changed, 35 insertions, 12 deletions

diff --git a/build.gradle b/build.gradle
index bcafc1c8..2a9d2a4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,7 @@ configurations {
 dependencies {
     compile 'com.google.guava:guava:23.+'
     compile 'org.bitbucket.mstrobel:procyon-compilertools:0.5.33.8-enigma'
-    compile 'com.google.code.gson:gson:2.8.1'
+    compile 'com.google.code.gson:gson:2.8.5'
     compile 'org.ow2.asm:asm:6.2.1'
     compile 'org.ow2.asm:asm-analysis:6.2.1'
     compile 'org.ow2.asm:asm-commons:6.2.1'
diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java b/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
index 83e5e04f..2a638db5 100644
--- a/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
@@ -33,6 +33,7 @@ public class SourceIndexMethodVisitor extends SourceIndexVisitor {
 
         private Multimap<String, Identifier> unmatchedIdentifier = HashMultimap.create();
         private Map<String, Entry> identifierEntryCache = new HashMap<>();
+        private int argumentPosition = 0;
 
         public SourceIndexMethodVisitor(ReferencedEntryPool entryPool, ClassDefEntry ownerEntry, MethodDefEntry methodEntry) {
                 super(entryPool);
@@ -107,10 +108,9 @@ public class SourceIndexMethodVisitor extends SourceIndexVisitor {
 
         @Override
         public Void visitParameterDeclaration(ParameterDeclaration node, SourceIndex index) {
-                ParameterDefinition def = node.getUserData(Keys.PARAMETER_DEFINITION);
+                // DO NOT USE def.getSlot()! Doubleword slots increase by 2, not by 1
 
-                int variableOffset = this.methodEntry.getVariableOffset(ownerEntry);
-                int parameterIndex = def.getSlot() - variableOffset;
+                int parameterIndex = (argumentPosition++);
 
                 if (parameterIndex >= 0) {
                         LocalVariableEntry localVariableEntry = new LocalVariableEntry(methodEntry, parameterIndex, node.getName());
@@ -184,8 +184,7 @@ public class SourceIndexMethodVisitor extends SourceIndexVisitor {
                                 if (variable != null) {
                                         VariableDefinition originalVariable = variable.getOriginalVariable();
                                         if (originalVariable != null) {
-                                                int variableOffset = methodEntry.getVariableOffset(ownerEntry);
-                                                int variableIndex = originalVariable.getSlot() - variableOffset;
+                                                int variableIndex = (argumentPosition++);
                                                 if (variableIndex >= 0) {
                                                         LocalVariableEntry localVariableEntry = new LocalVariableEntry(methodEntry, variableIndex, initializer.getName());
                                                         identifierEntryCache.put(identifier.getName(), localVariableEntry);
diff --git a/src/main/java/cuchaz/enigma/config/Themes.java b/src/main/java/cuchaz/enigma/config/Themes.java
index 79c245b4..04ecfde3 100644
--- a/src/main/java/cuchaz/enigma/config/Themes.java
+++ b/src/main/java/cuchaz/enigma/config/Themes.java
@@ -13,7 +13,7 @@ import java.io.IOException;
 public class Themes {
 
     public static void setDefault(Gui gui) {
-        //TODO set to default
+        // TODO set to default
             try {
                     Config.getInstance().reset();
             } catch (IOException e) {
diff --git a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
index 369ba8c6..9c193ef4 100644
--- a/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
+++ b/src/main/java/cuchaz/enigma/mapping/ClassMapping.java
@@ -577,7 +577,7 @@ public class ClassMapping implements Comparable<ClassMapping> {
         }
 
         // Used for tiny parsing to keep track of deobfuscate inner classes
-        public ClassMapping setDeobInner(String deobName) {
+        public ClassMapping setDeobfInner(String deobName) {
                 this.deobfFullName = deobName;
                 return this;
         }
@@ -607,4 +607,21 @@ public class ClassMapping implements Comparable<ClassMapping> {
         public boolean equals(Object obj) {
                 return obj instanceof ClassMapping && ((ClassMapping) obj).obfFullName.equals(this.obfFullName);
         }
+
+    public boolean isEmpty() {
+                if (fieldsByDeobf.isEmpty() && methodsByDeobf.isEmpty() && deobfFullName == null && deobfName == null
+                                && innerClassesByObfSimple.values().stream().allMatch(ClassMapping::isEmpty)) {
+
+                        // check args
+                        for (MethodMapping mapping : methodsByObf.values()) {
+                                if (mapping.arguments().iterator().hasNext()) {
+                                        return false;
+                                }
+                        }
+
+                        return true;
+                }
+
+                return false;
+    }
 }
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
index b29990f5..e3302b14 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsEnigmaWriter.java
@@ -33,10 +33,19 @@ public class MappingsEnigmaWriter {
 
                 Mappings previousState = mappings.getPreviousState();
                 for (ClassMapping classMapping : sorted(mappings.classes())) {
+                        File result = new File(target, classMapping.getSaveName() + ".mapping");
+
                         if (!classMapping.isDirty()) {
                                 continue;
                         }
 
+                        if (classMapping.isEmpty()) {
+                                if (result.exists()) {
+                                        result.delete();
+                                }
+                                continue;
+                        }
+
                         if (previousState != null) {
                                 ClassMapping previousClass = previousState.classesByObf.get(classMapping.getObfFullName());
                                 File previousFile;
@@ -50,8 +59,6 @@ public class MappingsEnigmaWriter {
                                 }
                         }
 
-                        File result = new File(target, classMapping.getSaveName() + ".mapping");
-
                         File packageFile = result.getParentFile();
                         if (!packageFile.exists()) {
                                 packageFile.mkdirs();
diff --git a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
index 69d5684b..756ac432 100644
--- a/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
+++ b/src/main/java/cuchaz/enigma/mapping/MappingsTinyReader.java
@@ -17,7 +17,7 @@ public class MappingsTinyReader {
         public ClassMapping readClass(String[] parts) {
                 // Extract the inner naming of the deob form if it have one
                 String deobName = parts[2].contains("$") ? parts[2].substring(parts[2].lastIndexOf('$') + 1) : parts[2];
-                return new ClassMapping(parts[1], deobName).setDeobInner(parts[2]);
+                return new ClassMapping(parts[1], deobName).setDeobfInner(parts[2]);
         }
 
         public FieldMapping readField(String[] parts) {
@@ -52,7 +52,7 @@ public class MappingsTinyReader {
                                                                           parts[2];
 
                                                         // Add full deob name to the class mapping to handle inner class after this loop
-                                                        classMappingMap.put(parts[2], classMapping.setDeobInner(parts[2]));
+                                                        classMappingMap.put(parts[2], classMapping.setDeobfInner(parts[2]));
                                                         classMapping.setDeobfName(deobName);
 
                                                         // Avoid to make the mapping dirty directly at the startup