3 files changed, 37 insertions, 27 deletions

diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
index a2346f1c..f990f98c 100644
--- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -273,7 +273,7 @@ public class GuiController implements ClientPacketHandler {
                 if (entry == null) {
                         throw new IllegalArgumentException("Entry cannot be null!");
                 }
-                openReference(new EntryReference<>(entry, entry.getName()));
+                openReference(EntryReference.declaration(entry, entry.getName()));
         }
 
         /**
@@ -301,7 +301,7 @@ public class GuiController implements ClientPacketHandler {
          * @param reference the reference
          */
         private void setReference(EntryReference<Entry<?>, Entry<?>> reference) {
-                gui.openClass(reference.getLocationClassEntry()).showReference(reference);
+                gui.openClass(reference.getLocationClassEntry().getOutermostClass()).showReference(reference);
         }
 
         public Collection<Token> getTokensForReference(DecompiledClassSource source, EntryReference<Entry<?>, Entry<?>> reference) {
diff --git a/enigma/src/main/java/cuchaz/enigma/analysis/EntryReference.java b/enigma/src/main/java/cuchaz/enigma/analysis/EntryReference.java
index cccabd01..6dd65260 100644
--- a/enigma/src/main/java/cuchaz/enigma/analysis/EntryReference.java
+++ b/enigma/src/main/java/cuchaz/enigma/analysis/EntryReference.java
@@ -28,11 +28,15 @@ import cuchaz.enigma.translation.representation.entry.MethodEntry;
 public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements Translatable {
 
         private static final List<String> CONSTRUCTOR_NON_NAMES = Arrays.asList("this", "super", "static");
-        public E entry;
-        public C context;
-        public ReferenceTargetType targetType;
-
-        private boolean sourceName;
+        public final E entry;
+        public final C context;
+        public final ReferenceTargetType targetType;
+        private final boolean declaration; // if the ref goes to the decl of the item. when true context == null
+        private final boolean sourceName;
+
+        public static <E extends Entry<?>, C extends Entry<?>> EntryReference<E, C> declaration(E entry, String sourceName) {
+                return new EntryReference<>(entry, sourceName, null, ReferenceTargetType.none(), true);
+        }
 
         public EntryReference(E entry, String sourceName) {
                 this(entry, sourceName, null);
@@ -43,6 +47,10 @@ public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements T
         }
 
         public EntryReference(E entry, String sourceName, C context, ReferenceTargetType targetType) {
+                this(entry, sourceName, context, targetType, false);
+        }
+
+        protected EntryReference(E entry, String sourceName, C context, ReferenceTargetType targetType, boolean declaration) {
                 if (entry == null) {
                         throw new IllegalArgumentException("Entry cannot be null!");
                 }
@@ -50,11 +58,10 @@ public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements T
                 this.entry = entry;
                 this.context = context;
                 this.targetType = targetType;
+                this.declaration = declaration;
 
-                this.sourceName = sourceName != null && !sourceName.isEmpty();
-                if (entry instanceof MethodEntry && ((MethodEntry) entry).isConstructor() && CONSTRUCTOR_NON_NAMES.contains(sourceName)) {
-                        this.sourceName = false;
-                }
+                this.sourceName = sourceName != null && !sourceName.isEmpty() &&
+                                !(entry instanceof MethodEntry && ((MethodEntry) entry).isConstructor() && CONSTRUCTOR_NON_NAMES.contains(sourceName));
         }
 
         public EntryReference(E entry, C context, EntryReference<E, C> other) {
@@ -62,6 +69,7 @@ public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements T
                 this.context = context;
                 this.sourceName = other.sourceName;
                 this.targetType = other.targetType;
+                this.declaration = other.declaration;
         }
 
         public ClassEntry getLocationClassEntry() {
@@ -75,6 +83,13 @@ public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements T
                 return this.sourceName;
         }
 
+        /**
+         * Returns whether this refers to the declaration of an entry.
+         */
+        public boolean isDeclaration() {
+                return this.declaration;
+        }
+
         public Entry<?> getNameableEntry() {
                 if (entry instanceof MethodEntry && ((MethodEntry) entry).isConstructor()) {
                         // renaming a constructor really means renaming the class
@@ -92,7 +107,7 @@ public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements T
                 if (context != null) {
                         return Objects.hash(entry.hashCode(), context.hashCode());
                 }
-                return entry.hashCode();
+                return entry.hashCode() ^ Boolean.hashCode(this.declaration);
         }
 
         @Override
@@ -101,21 +116,10 @@ public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements T
         }
 
         public boolean equals(EntryReference<?, ?> other) {
-                if (other == null) return false;
-
-                // check entry first
-                boolean isEntrySame = entry.equals(other.entry);
-                if (!isEntrySame) {
-                        return false;
-                }
-
-                // check caller
-                if (context == null && other.context == null) {
-                        return true;
-                } else if (context != null && other.context != null) {
-                        return context.equals(other.context);
-                }
-                return false;
+                return other != null
+                                && Objects.equals(entry, other.entry)
+                                && Objects.equals(context, other.context)
+                                && declaration == other.declaration;
         }
 
         @Override
@@ -123,6 +127,11 @@ public class EntryReference<E extends Entry<?>, C extends Entry<?>> implements T
                 StringBuilder buf = new StringBuilder();
                 buf.append(entry);
 
+                if (declaration) {
+                        buf.append("'s declaration");
+                        return buf.toString();
+                }
+
                 if (context != null) {
                         buf.append(" called from ");
                         buf.append(context);
diff --git a/enigma/src/main/java/cuchaz/enigma/source/SourceIndex.java b/enigma/src/main/java/cuchaz/enigma/source/SourceIndex.java
index 178ce20e..ed6cfb94 100644
--- a/enigma/src/main/java/cuchaz/enigma/source/SourceIndex.java
+++ b/enigma/src/main/java/cuchaz/enigma/source/SourceIndex.java
@@ -88,6 +88,7 @@ public class SourceIndex {
             EntryReference<Entry<?>, Entry<?>> reference = new EntryReference<>(deobfEntry, token.text);
             tokenToReference.put(token, reference);
             referenceToTokens.put(reference, token);
+            referenceToTokens.put(EntryReference.declaration(deobfEntry, token.text), token);
             declarationToToken.put(deobfEntry, token);
         }
     }