1 files changed, 14 insertions, 6 deletions

diff --git a/src/cuchaz/enigma/analysis/SourceIndexVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexVisitor.java
index f31eb1a..841d176 100644
--- a/src/cuchaz/enigma/analysis/SourceIndexVisitor.java
+++ b/src/cuchaz/enigma/analysis/SourceIndexVisitor.java
@@ -213,6 +213,20 @@ public class SourceIndexVisitor implements IAstVisitor<SourceIndex, Void>
                 return recurse( node, index );
         }
         
+        @Override
+        public Void visitIdentifierExpression( IdentifierExpression node, SourceIndex index )
+        {
+                MemberReference ref = node.getUserData( Keys.MEMBER_REFERENCE );
+                if( ref != null )
+                {
+                        ClassEntry classEntry = new ClassEntry( ref.getDeclaringType().getInternalName() );
+                        FieldEntry fieldEntry = new FieldEntry( classEntry, ref.getName() );
+                        index.add( node.getIdentifierToken(), fieldEntry );
+                }
+                
+                return recurse( node, index );
+        }
+        
         private Void recurse( AstNode node, SourceIndex index )
         {
                 for( final AstNode child : node.getChildren() )
@@ -477,12 +491,6 @@ public class SourceIndexVisitor implements IAstVisitor<SourceIndex, Void>
         }
         
         @Override
-        public Void visitIdentifierExpression( IdentifierExpression node, SourceIndex index )
-        {
-                return recurse( node, index );
-        }
-        
-        @Override
         public Void visitUnaryOperatorExpression( UnaryOperatorExpression node, SourceIndex index )
         {
                 return recurse( node, index );