implemented user-defined type member resolution; assignments count as property getter reference, which is a minor bug considering rename refactoring must pick it up anyway, but it does throw off "member not used" inspection results.

Author: retailcoder

Rubberduck.Parsing/Symbols/IdentifierReferenceListener.cs

@@ -84,12 +84,18 @@ public override void EnterICS_B_MemberProcedureCall(VBAParser.ICS_B_MemberProced
 
         public override void EnterICS_S_VariableOrProcedureCall(VBAParser.ICS_S_VariableOrProcedureCallContext context)
         {
-            _resolver.Resolve(context);
+            if (context.Parent.GetType() != typeof (VBAParser.ICS_S_MemberCallContext))
+            {
+                _resolver.Resolve(context);
+            }
         }
 
         public override void EnterICS_S_ProcedureOrArrayCall(VBAParser.ICS_S_ProcedureOrArrayCallContext context)
         {
-            _resolver.Resolve(context);
+            if (context.Parent.GetType() != typeof(VBAParser.ICS_S_MemberCallContext))
+            {
+                _resolver.Resolve(context);
+            }
         }
 
         public override void EnterICS_S_MembersCall(VBAParser.ICS_S_MembersCallContext context)
@@ -99,7 +105,10 @@ public override void EnterICS_S_MembersCall(VBAParser.ICS_S_MembersCallContext c
 
         public override void EnterICS_S_DictionaryCall(VBAParser.ICS_S_DictionaryCallContext context)
         {
-            _resolver.Resolve(context);
+            if (context.Parent.GetType() != typeof(VBAParser.ICS_S_MemberCallContext))
+            {
+                _resolver.Resolve(context);
+            }
         }
 
         public override void EnterLetStmt(VBAParser.LetStmtContext context)

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -159,7 +159,7 @@ private Declaration ResolveType(VBAParser.ComplexTypeContext context)
             {
                 return _declarations[identifier.GetText()].SingleOrDefault(item =>
                     item.ProjectName == libraryName
-                    && _moduleTypes.Contains(item.DeclarationType));
+                    && (_moduleTypes.Contains(item.DeclarationType)) || item.DeclarationType == DeclarationType.UserDefinedType);
             }
 
             return null;
@@ -194,28 +194,46 @@ private Declaration ResolveType(Declaration parent)
                 return null;
             }
 
-            // look in current project first.
             var result = _declarations[parent.AsTypeName].SingleOrDefault(item =>
-                _moduleTypes.Contains(item.DeclarationType)
-                && item.ProjectName == _currentScope.ProjectName);
+                item.DeclarationType == DeclarationType.UserDefinedType
+                && item.Project == _currentScope.Project
+                && item.ComponentName == _currentScope.ComponentName);
+
+            if (result == null)
+            {
+                result = _declarations[parent.AsTypeName].SingleOrDefault(item =>
+                    _moduleTypes.Contains(item.DeclarationType)
+                    && item.Project == _currentScope.Project);                
+            }
 
             if (result == null)
             {
-                // look in all projects (including VbaStdLib library).
                 result = _declarations[parent.AsTypeName].SingleOrDefault(item =>
                     _moduleTypes.Contains(item.DeclarationType));
             }
 
             return result;
         }
 
+        private static readonly Type[] IdentifierContexts =
+        {
+            typeof (VBAParser.AmbiguousIdentifierContext),
+            typeof (VBAParser.CertainIdentifierContext)
+        };
+
         private Declaration ResolveInternal(ParserRuleContext callSiteContext, Declaration localScope, ContextAccessorType accessorType = ContextAccessorType.GetValueOrReference, VBAParser.DictionaryCallStmtContext fieldCall = null, bool hasExplicitLetStatement = false, bool isAssignmentTarget = false)
         {
             if (callSiteContext == null)
             {
                 return null;
             }
 
+            if (!IdentifierContexts.Contains(callSiteContext.GetType()))
+            {
+                throw new ArgumentException("'" + callSiteContext.GetType().Name + "' is not an identifier context.", "callSiteContext");
+            }
+
+
             /* VBA allows ambiguous identifiers; if foo is declared at both
              * local and module scope, local scope takes precedence.
              * Identifier reference resolution should therefore start search for 
@@ -242,10 +260,20 @@ private Declaration ResolveInternal(ParserRuleContext callSiteContext, Declarati
             }
 
             var identifierName = callSiteContext.GetText();
-            var callee = FindLocalScopeDeclaration(identifierName, localScope)
+            Declaration callee;
+            if (localScope.DeclarationType == DeclarationType.Variable)
+            {
+                // localScope is a UDT
+                var udt = ResolveType(localScope);
+                callee = _declarations[identifierName].SingleOrDefault(item => item.Context.Parent == udt.Context);
+            }
+            else
+            {
+                callee = FindLocalScopeDeclaration(identifierName, localScope)
                          ?? FindModuleScopeDeclaration(identifierName, localScope)
                          ?? FindModuleScopeProcedure(identifierName, localScope, accessorType, isAssignmentTarget)
                          ?? FindProjectScopeDeclaration(identifierName);
+            }
 
             if (callee == null)
             {
@@ -265,7 +293,7 @@ private Declaration ResolveInternal(ParserRuleContext callSiteContext, Declarati
 
             var reference = CreateReference(callSiteContext, callee, isAssignmentTarget, hasExplicitLetStatement);
             callee.AddReference(reference);
-            _alreadyResolved.Add(callSiteContext.Parent);
+            _alreadyResolved.Add(reference.Context);
 
             if (fieldCall != null)
             {
@@ -308,7 +336,7 @@ private Declaration ResolveInternal(VBAParser.DictionaryCallStmtContext fieldCal
             var identifierContext = fieldCall.ambiguousIdentifier();
             var reference = CreateReference(identifierContext, result, isAssignmentTarget, hasExplicitLetStatement);
             result.AddReference(reference);
-            _alreadyResolved.Add(fieldCall);
+            _alreadyResolved.Add(reference.Context);
 
             return result;
         }
@@ -346,7 +374,7 @@ private Declaration ResolveInternal(VBAParser.ICS_S_MembersCallContext context,
             {
                 var parentReference = CreateReference(parent.Context, parent);
                 parent.AddReference(parentReference);
-                _alreadyResolved.Add(parent.Context);
+                _alreadyResolved.Add(parentReference.Context);
             }
 
             var chainedCalls = context.iCS_S_MemberCall();
@@ -404,7 +432,7 @@ private Declaration ResolveInternal(VBAParser.ICS_B_ProcedureCallContext context
 
             var reference = CreateReference(identifierContext, callee);
             callee.AddReference(reference);
-            _alreadyResolved.Add(context);
+            _alreadyResolved.Add(reference.Context);
 
             return callee;
         }
@@ -422,7 +450,9 @@ private void ResolveIdentifier(VBAParser.AmbiguousIdentifierContext context)
                 return;
             }
 
-            identifier.AddReference(CreateReference(context, identifier));
+            var reference = CreateReference(context, identifier);
+            identifier.AddReference(reference);
+            _alreadyResolved.Add(reference.Context);
         }
 
         public void Resolve(VBAParser.ICS_B_ProcedureCallContext context)
@@ -465,7 +495,7 @@ public void Resolve(VBAParser.ICS_B_MemberProcedureCallContext context)
             {
                 var reference = CreateReference(identifierContext, member);
                 member.AddReference(reference);
-                _alreadyResolved.Add(context);
+                _alreadyResolved.Add(reference.Context);
             }
 
             var fieldCall = context.dictionaryCallStmt();
@@ -474,17 +504,54 @@ public void Resolve(VBAParser.ICS_B_MemberProcedureCallContext context)
 
         public void Resolve(VBAParser.ICS_S_VariableOrProcedureCallContext context)
         {
-            TryResolve(context);
+            ResolveInternal(context, _currentScope);
         }
 
         public void Resolve(VBAParser.ICS_S_ProcedureOrArrayCallContext context)
         {
-            TryResolve(context);
+            ResolveInternal(context, _currentScope);
         }
 
         public void Resolve(VBAParser.ICS_S_MembersCallContext context)
         {
-            TryResolve(context);
+            if (context == null)
+            {
+                return;
+            }
+
+            var parent = ResolveInternal(context.iCS_S_ProcedureOrArrayCall(), _currentScope)
+                      ?? ResolveInternal(context.iCS_S_VariableOrProcedureCall(), _currentScope);
+
+            if (parent != null)
+            {
+                var identifierContext = ((dynamic)parent.Context).ambiguousIdentifier() as VBAParser.AmbiguousIdentifierContext;
+
+                var parentReference = CreateReference(identifierContext, parent);
+                parent.AddReference(parentReference);
+                _alreadyResolved.Add(parentReference.Context);
+            }
+
+            var chainedCalls = context.iCS_S_MemberCall();
+            foreach (var memberCall in chainedCalls)
+            {
+                var member = ResolveInternal(memberCall.iCS_S_ProcedureOrArrayCall(), parent)
+                          ?? ResolveInternal(memberCall.iCS_S_VariableOrProcedureCall(), parent);
+
+                if (member == null)
+                {
+                    return;
+                }
+
+                parent = member;
+            }
+
+            var fieldCall = context.dictionaryCallStmt();
+            if (fieldCall == null)
+            {
+                return;
+            }
+
+            ResolveInternal(fieldCall, parent);
         }
 
         public void Resolve(VBAParser.ICS_S_DictionaryCallContext context)
@@ -552,6 +619,7 @@ public void Resolve(VBAParser.AsTypeClauseContext context)
             if (type != null)
             {
                 type.AddReference(reference);
+                _alreadyResolved.Add(reference.Context);
             }
         }
 
@@ -566,7 +634,8 @@ public void Resolve(VBAParser.ForNextStmtContext context)
 
             if (identifiers.Count > 1)
             {
-                identifier.AddReference(CreateReference(identifiers[1], identifier));
+                var endForBlockReference = CreateReference(identifiers[1], identifier);
+                identifier.AddReference(endForBlockReference);
             }
         }
 
@@ -631,16 +700,40 @@ private Declaration FindParentCall(VBAParser.VsAssignContext context)
                    ?? ResolveInternal(calleeContext as VBAParser.ICS_S_MembersCallContext, _currentScope);
         }
 
+        private Declaration FindFunctionOrPropertyGetter(string identifierName, Declaration localScope = null)
+        {
+            if (localScope == null)
+            {
+                localScope = _currentScope;
+            }
+
+            var matches = _declarations[identifierName];
+            var parent = matches.SingleOrDefault(item =>
+                item.Scope == localScope.Scope
+                && (item.DeclarationType == DeclarationType.Function
+                    || item.DeclarationType == DeclarationType.PropertyGet));
+
+            return parent;
+        }
+
         private Declaration FindLocalScopeDeclaration(string identifierName, Declaration localScope = null)
         {
             if (localScope == null)
             {
                 localScope = _currentScope;
             }
 
-            var parent = _declarations[identifierName].SingleOrDefault(item =>
+            if (localScope.DeclarationType == DeclarationType.Function ||
+                localScope.DeclarationType == DeclarationType.PropertyGet)
+            {
+                return FindFunctionOrPropertyGetter(identifierName, localScope);
+            }
+
+            var matches = _declarations[identifierName];
+            var parent = matches.SingleOrDefault(item =>
                 item.ParentScope == localScope.Scope
                 && !_moduleTypes.Contains(item.DeclarationType));
+
             return parent;
         }
 
@@ -651,7 +744,8 @@ private Declaration FindModuleScopeDeclaration(string identifierName, Declaratio
                 localScope = _currentScope;
             }
 
-            return _declarations[identifierName].SingleOrDefault(item =>
+            var matches = _declarations[identifierName];
+            return matches.SingleOrDefault(item =>
                 item.ParentScope == localScope.ParentScope
                 && !item.DeclarationType.HasFlag(DeclarationType.Member)
                 && !_moduleTypes.Contains(item.DeclarationType));
@@ -664,17 +758,19 @@ private Declaration FindModuleScopeProcedure(string identifierName, Declaration
                 localScope = _currentScope;
             }
 
-            return _declarations[identifierName].SingleOrDefault(item =>
+            var matches = _declarations[identifierName];
+            return matches.SingleOrDefault(item =>
                 IsProcedure(item) || IsPropertyAccessor(item, accessorType, localScope, isAssignmentTarget));
         }
 
         private Declaration FindProjectScopeDeclaration(string identifierName)
         {
             // assume unqualified variable call, i.e. unique declaration.
-            return _declarations[identifierName].SingleOrDefault(item =>
-                (item.Accessibility == Accessibility.Public
+            return _declarations[identifierName].SingleOrDefault(item => 
+                !item.DeclarationType.HasFlag(DeclarationType.Member)
+                && (item.Accessibility == Accessibility.Public
                  || item.Accessibility == Accessibility.Global
-                 || _moduleTypes.Contains(item.DeclarationType)));
+                 || _moduleTypes.Contains(item.DeclarationType) /* because static classes are accessed just like modules */));
         }
 
         private bool IsProcedure(Declaration item)

Rubberduck.Parsing/VBProjectParseResult.cs

@@ -47,20 +47,20 @@ private void OnProgress(VBComponentParseResult result)
         public void Resolve()
         {
             // make a first pass to identify all interface implementations - resolver needs this to disembiguate members.
-            foreach (var componentParseResult in _parseResults)
-            {
-                try
-                {
-                    var resolver = new IdentifierReferenceResolver(componentParseResult.QualifiedName, _declarations);
-                    var listener = new InterfaceImplementationListener(resolver);
-                    var walker = new ParseTreeWalker();
-                    walker.Walk(listener, componentParseResult.ParseTree);
-                }
-                catch (WalkerCancelledException)
-                {
-                    // exception is purposely thrown when walker exits the module's declarations section.
-                }
-            }
+            //foreach (var componentParseResult in _parseResults)
+            //{
+            //    try
+            //    {
+            //        var resolver = new IdentifierReferenceResolver(componentParseResult.QualifiedName, _declarations);
+            //        var listener = new InterfaceImplementationListener(resolver);
+            //        var walker = new ParseTreeWalker();
+            //        walker.Walk(listener, componentParseResult.ParseTree);
+            //    }
+            //    catch (WalkerCancelledException)
+            //    {
+            //        // exception is purposely thrown when walker exits the module's declarations section.
+            //    }
+            //}
 
             // second pass; resolve all identifier usages
             foreach (var componentParseResult in _parseResults)