do not propagate non-argument local variable names

2 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
index 9be8378..c474d68 100644
--- a/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
+++ b/src/main/java/cuchaz/enigma/analysis/EntryRenamer.java
@@ -99,7 +99,8 @@ public class EntryRenamer {
                         return (T) new LocalVariableEntry(
                                         renameMethodsInThing(renames, variableEntry.getOwnerEntry()),
                                         variableEntry.getIndex(),
-                                        variableEntry.getName()
+                                        variableEntry.getName(),
+                                        variableEntry.isParameter()
                         );
                 } else if (thing instanceof EntryReference) {
                         EntryReference<Entry, Entry> reference = (EntryReference<Entry, Entry>) thing;
@@ -147,7 +148,7 @@ public class EntryRenamer {
                         );
                 } else if (thing instanceof LocalVariableEntry) {
                         LocalVariableEntry argumentEntry = (LocalVariableEntry) thing;
-                        return (T) new LocalVariableEntry(renameClassesInThing(renames, argumentEntry.getOwnerEntry()), argumentEntry.getIndex(), argumentEntry.getName());
+                        return (T) new LocalVariableEntry(renameClassesInThing(renames, argumentEntry.getOwnerEntry()), argumentEntry.getIndex(), argumentEntry.getName(), argumentEntry.isParameter());
                 } else if (thing instanceof EntryReference) {
                         EntryReference<Entry, Entry> reference = (EntryReference<Entry, Entry>) thing;
                         reference.entry = renameClassesInThing(renames, reference.entry);
diff --git a/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java b/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
index 45f7a0e..139fcea 100644
--- a/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
+++ b/src/main/java/cuchaz/enigma/analysis/SourceIndexMethodVisitor.java
@@ -111,7 +111,7 @@ public class SourceIndexMethodVisitor extends SourceIndexVisitor {
                 int parameterIndex = def.getSlot();
 
                 if (parameterIndex >= 0) {
-                        LocalVariableEntry localVariableEntry = new LocalVariableEntry(methodEntry, parameterIndex, node.getName());
+                        LocalVariableEntry localVariableEntry = new LocalVariableEntry(methodEntry, parameterIndex, node.getName(), true);
                         Identifier identifier = node.getNameToken();
                         // cache the argument entry and the identifier
                         identifierEntryCache.put(identifier.getName(), localVariableEntry);
@@ -184,7 +184,7 @@ public class SourceIndexMethodVisitor extends SourceIndexVisitor {
                                         if (originalVariable != null) {
                                                 int variableIndex = originalVariable.getSlot();
                                                 if (variableIndex >= 0) {
-                                                        LocalVariableEntry localVariableEntry = new LocalVariableEntry(methodEntry, variableIndex, initializer.getName());
+                                                        LocalVariableEntry localVariableEntry = new LocalVariableEntry(methodEntry, variableIndex, initializer.getName(), false);
                                                         identifierEntryCache.put(identifier.getName(), localVariableEntry);
                                                         addDeclarationToUnmatched(identifier.getName(), index);
                                                         index.addDeclaration(identifier, localVariableEntry);