fixed issue with resolution of member calls in With block, where an extra reference was added to the type of the referenced local variable.

Author: retailcoder

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -82,8 +82,8 @@ public void EnterWithBlock(VBAParser.WithStmtContext context)
             if (context.NEW() == null)
             {
                 // with block is using an identifier declared elsewhere.
-                qualifier = ResolveType(context.implicitCallStmt_InStmt());
-                reference = CreateReference(context.implicitCallStmt_InStmt(), qualifier);
+                var callee = ResolveInternal(context.implicitCallStmt_InStmt(), _currentScope, ContextAccessorType.GetValueOrReference);
+                qualifier = ResolveType(callee);
             }
             else
             {
@@ -106,11 +106,10 @@ public void EnterWithBlock(VBAParser.WithStmtContext context)
                 else
                 {
                     qualifier = ResolveType(typeContext.complexType());
-                    reference = CreateReference(typeContext.complexType(), qualifier);
                 }
             }
 
-            if (qualifier != null)
+            if (qualifier != null && reference != null)
             {
                 qualifier.AddReference(reference);
                 _alreadyResolved.Add(reference.Context);
@@ -179,28 +178,6 @@ private Declaration ResolveType(VBAParser.ComplexTypeContext context)
             return null;
         }
 
-        private Declaration ResolveType(VBAParser.ImplicitCallStmt_InStmtContext context, Declaration localScope = null)
-        {
-            if (context == null)
-            {
-                return null;
-            }
-
-            if (localScope == null)
-            {
-                localScope = _currentScope;
-            }
-
-            var dictionaryCall = context.iCS_S_DictionaryCall();
-
-            var type = ResolveInternal(context.iCS_S_VariableOrProcedureCall(), localScope)
-                       ?? ResolveInternal(context.iCS_S_ProcedureOrArrayCall(), localScope)
-                       ?? ResolveInternal(context.iCS_S_MembersCall(), ContextAccessorType.GetValueOrReference)
-                       ?? ResolveInternal(dictionaryCall, localScope, ContextAccessorType.GetValueOrReference, dictionaryCall == null ? null : dictionaryCall.dictionaryCallStmt());
-
-            return ResolveType(type);
-        }
-
         private Declaration ResolveType(Declaration parent)
         {
             if (parent == null || parent.AsTypeName == null)
@@ -258,7 +235,7 @@ private Declaration ResolveInternal(ParserRuleContext callSiteContext, Declarati
             {
                 // localScope is probably a UDT
                 var udt = ResolveType(localScope);
-                if (udt != null)
+                if (udt != null && udt.DeclarationType == DeclarationType.UserDefinedType)
                 {
                     callee = _declarations[identifierName].SingleOrDefault(item => item.Context != null && item.Context.Parent == udt.Context);
                 }
@@ -381,16 +358,6 @@ private Declaration ResolveInternal(VBAParser.ICS_S_MembersCallContext context,
                 parent = ResolveType(parent);
             }
 
-            if (parent != null)
-            {
-                var parentReference = CreateReference(parent.Context, parent);
-                if (parentReference != null)
-                {
-                    parent.AddReference(parentReference);
-                    _alreadyResolved.Add(parentReference.Context);
-                }
-            }
-
             var chainedCalls = context.iCS_S_MemberCall();
             var lastCall = chainedCalls.Last();
             foreach (var memberCall in chainedCalls)
@@ -550,9 +517,9 @@ public void Resolve(VBAParser.ICS_S_MembersCallContext context)
                 var notationToken = memberCall.children[0];
                 if (notationToken.GetText() == "!")
                 {
-                    // we can't handle this syntax yet.
-                    // we need to know what the parent's default property is..
-                    // ...and whether it has a parameterized getter taking in a string.
+                    // the memberCall is a shorthand reference to the type's default member.
+                    // since the reference isn't explicit, we don't need to care for it.
+                    // (and we couldn't handle it if we wanted to, since we aren't parsing member attributes)
                     return;
                 }