Defer refreshVarNames until debug names have been assigned

This ensures none of the names collide with a field.
master
Graham 5 years ago
parent 17c4438d37
commit 964f7292a8
  1. 3
      src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java

@ -138,7 +138,6 @@ public class ClassWrapper {
// rename vars so that no one has the same name as a field // rename vars so that no one has the same name as a field
VarNamesCollector namesCollector = new VarNamesCollector(); VarNamesCollector namesCollector = new VarNamesCollector();
classStruct.getFields().forEach(f -> namesCollector.addName(f.getName())); classStruct.getFields().forEach(f -> namesCollector.addName(f.getName()));
varProc.refreshVarNames(namesCollector);
Map<Integer, String> paramNames = new HashMap<>(); Map<Integer, String> paramNames = new HashMap<>();
@ -222,6 +221,8 @@ public class ClassWrapper {
return 0; return 0;
}, true); }, true);
} }
varProc.refreshVarNames(namesCollector);
} }
DecompilerContext.getLogger().endMethod(); DecompilerContext.getLogger().endMethod();

Loading…
Cancel
Save