1 files changed, 14 insertions, 1 deletions
diff --git a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
index 266ba94..18314d8 100644
--- a/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
+++ b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
@@ -21,6 +21,7 @@ import org.jetbrains.java.decompiler.modules.decompiler.stats.RootStatement;
 import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement;
 import org.jetbrains.java.decompiler.struct.StructMethod;
 import org.jetbrains.java.decompiler.struct.gen.VarType;
+import org.jetbrains.java.decompiler.util.VarHelper; // Spigot
 
 import java.util.*;
 import java.util.Map.Entry;
@@ -36,6 +37,8 @@ public class VarProcessor {
 
   private HashSet<VarVersionPaar> externvars = new HashSet<VarVersionPaar>();
 
+  private VarHelper helper = new VarHelper(); // Spigot
+
   public void setVarVersions(RootStatement root) {
 
     varvers = new VarVersionsProcessor();
@@ -104,13 +107,23 @@ public class VarProcessor {
   }
 
   public String getVarName(VarVersionPaar varpaar) {
-    return mapVarNames == null ? null : mapVarNames.get(varpaar);
+    // Spigot Start
+    String name = mapVarNames.get(varpaar);
+    if (name != null) {
+      mapVarNames.put(varpaar, name = helper.help(name, varpaar.type, varpaar.varargs));
+    }
+    return name;
+    // Spigot End
   }
 
   public void setVarName(VarVersionPaar varpaar, String name) {
     mapVarNames.put(varpaar, name);
   }
 
+  public Collection<String> getVarNames() {
+    return mapVarNames != null ? mapVarNames.values() : Collections.EMPTY_SET;
+  }
+
   public int getVarFinal(VarVersionPaar varpaar) {
     return varvers == null ? VarTypeProcessor.VAR_FINAL : varvers.getVarFinal(varpaar);
   }