add tests

Author: Andrin Meier

Rubberduck.Parsing/Binding/MemberAccessTypeBinding.cs

@@ -152,7 +152,7 @@ procedural module.
             }
             else
             {
-                var proceduralModuleInReferencedProject = _declarationFinder.FindModuleReferencedProject(_project, referencedProject, _module, name, DeclarationType.ClassModule);
+                var proceduralModuleInReferencedProject = _declarationFinder.FindModuleReferencedProject(_project, _module, referencedProject, name, DeclarationType.ProceduralModule);
                 if (proceduralModuleInReferencedProject != null)
                 {
                     return new MemberAccessExpression(proceduralModuleInReferencedProject, ExpressionClassification.ProceduralModule, GetExpressionContext(), lExpression);

Rubberduck.Parsing/Binding/SimpleNameTypeBinding.cs

@@ -83,13 +83,21 @@ procedural module or class module contained in the enclosing project.
             var referencedProject = _declarationFinder.FindReferencedProject(_project, name);
             if (referencedProject != null)
             {
-                return new SimpleNameExpression(referencedProject, ExpressionClassification.Type, _expression);
+                return new SimpleNameExpression(referencedProject, ExpressionClassification.Project, _expression);
+            }
+            if (_module.DeclarationType == DeclarationType.ProceduralModule && _module.IdentifierName == name)
+            {
+                return new SimpleNameExpression(_module, ExpressionClassification.ProceduralModule, _expression);
             }
             var proceduralModuleEnclosingProject = _declarationFinder.FindModuleEnclosingProjectWithoutEnclosingModule(_project, _module, name, DeclarationType.ProceduralModule);
             if (proceduralModuleEnclosingProject != null)
             {
                 return new SimpleNameExpression(proceduralModuleEnclosingProject, ExpressionClassification.ProceduralModule, _expression);
             }
+            if (_module.DeclarationType == DeclarationType.ClassModule && _module.IdentifierName == name)
+            {
+                return new SimpleNameExpression(_module, ExpressionClassification.Type, _expression);
+            }
             var classEnclosingProject = _declarationFinder.FindModuleEnclosingProjectWithoutEnclosingModule(_project, _module, name, DeclarationType.ClassModule);
             if (classEnclosingProject != null)
             {

Rubberduck.Parsing/Symbols/ClassModuleDeclaration.cs

@@ -8,13 +8,16 @@ namespace Rubberduck.Parsing.Symbols
 {
     public sealed class ClassModuleDeclaration : Declaration
     {
+        private readonly bool _isExposed;
+
         public ClassModuleDeclaration(
                   QualifiedMemberName qualifiedName,
                   Declaration projectDeclaration,
                   string name,
                   bool isBuiltIn,
                   IEnumerable<IAnnotation> annotations,
-                  Attributes attributes)
+                  Attributes attributes,
+                  bool isExposed = false)
             : base(
                   qualifiedName,
                   projectDeclaration,
@@ -30,6 +33,7 @@ public ClassModuleDeclaration(
                   annotations,
                   attributes)
         {
+            _isExposed = isExposed;
         }
 
         /// <summary>
@@ -40,12 +44,13 @@ public bool IsExposed
         {
             get
             {
+                bool attributeIsExposed = false;
                 IEnumerable<string> value;
                 if (Attributes.TryGetValue("VB_Exposed", out value))
                 {
-                    return value.Single() == "True";
+                    attributeIsExposed = value.Single() == "True";
                 }
-                return false;
+                return _isExposed || attributeIsExposed;
             }
         }
     }

Rubberduck.Parsing/Symbols/Declaration.cs

@@ -106,6 +106,10 @@ public Declaration(
 
         public static Declaration GetMemberModule(Declaration member)
         {
+            if (member.ParentDeclaration == null)
+            {
+                return null;
+            }
             if (member.ParentDeclaration.DeclarationType == DeclarationType.ClassModule || member.ParentDeclaration.DeclarationType == DeclarationType.ProceduralModule)
             {
                 return member.ParentDeclaration;
@@ -115,6 +119,10 @@ public static Declaration GetMemberModule(Declaration member)
 
         public static Declaration GetMemberProject(Declaration declaration)
         {
+            if (declaration.ParentDeclaration == null)
+            {
+                return null;
+            }
             if (declaration.ParentDeclaration.DeclarationType == DeclarationType.Project)
             {
                 return declaration.ParentDeclaration;

Rubberduck.Parsing/Symbols/IdentifierReferenceListener.cs

@@ -1,3 +1,4 @@
+using Antlr4.Runtime;
 using Rubberduck.Parsing.Grammar;
 
 namespace Rubberduck.Parsing.Symbols
@@ -130,9 +131,28 @@ public override void EnterICS_S_ProcedureOrArrayCall(VBAParser.ICS_S_ProcedureOr
 
         public override void EnterICS_S_MembersCall(VBAParser.ICS_S_MembersCallContext context)
         {
+            // Implement statements are handled separately and directly through new binding expressions.
+            // Prevent duplicate references.
+            if (ComesFromImplementsStmt(context))
+            {
+                return;
+            }
             _resolver.Resolve(context);
         }
 
+        private bool ComesFromImplementsStmt(RuleContext context)
+        {
+            if (context == null)
+            {
+                return false;
+            }
+            if (context.Parent is VBAParser.ImplementsStmtContext)
+            {
+                return true;
+            }
+            return ComesFromImplementsStmt(context.Parent);
+        }
+
         public override void EnterICS_S_DictionaryCall(VBAParser.ICS_S_DictionaryCallContext context)
         {
             if (context.Parent.GetType() != typeof(VBAParser.ICS_S_MemberCallContext))

Rubberduck.Parsing/Symbols/IdentifierReferenceResolver.cs

@@ -51,27 +51,27 @@ public IdentifierReferenceResolver(QualifiedModuleName qualifiedModuleName, Decl
 
             _moduleTypes = new[]
             {
-                DeclarationType.ProceduralModule, 
+                DeclarationType.ProceduralModule,
                 DeclarationType.ClassModule,
             };
 
             _memberTypes = new[]
             {
-                DeclarationType.Procedure, 
-                DeclarationType.Function, 
-                DeclarationType.PropertyGet, 
-                DeclarationType.PropertyLet, 
-                DeclarationType.PropertySet, 
+                DeclarationType.Procedure,
+                DeclarationType.Function,
+                DeclarationType.PropertyGet,
+                DeclarationType.PropertyLet,
+                DeclarationType.PropertySet,
             };
 
             _returningMemberTypes = new[]
             {
                 DeclarationType.Function,
-                DeclarationType.PropertyGet, 
+                DeclarationType.PropertyGet,
             };
 
             _moduleDeclaration = finder.MatchName(_qualifiedModuleName.ComponentName)
-                .SingleOrDefault(item => 
+                .SingleOrDefault(item =>
                     (item.DeclarationType == DeclarationType.ClassModule || item.DeclarationType == DeclarationType.ProceduralModule)
                 && item.QualifiedName.QualifiedModuleName.Equals(_qualifiedModuleName));
 
@@ -91,10 +91,10 @@ public void SetCurrentScope()
         public void SetCurrentScope(string memberName, DeclarationType type)
         {
             Debug.WriteLine("Setting current scope: {0} ({1}) in thread {2}", memberName, type, Thread.CurrentThread.ManagedThreadId);
-            
-            _currentParent = _declarationFinder.MatchName(memberName).SingleOrDefault(item => 
+
+            _currentParent = _declarationFinder.MatchName(memberName).SingleOrDefault(item =>
                 item.QualifiedName.QualifiedModuleName == _qualifiedModuleName && item.DeclarationType == type);
-            
+
             _currentScope = _declarationFinder.MatchName(memberName).SingleOrDefault(item =>
                 item.QualifiedName.QualifiedModuleName == _qualifiedModuleName && item.DeclarationType == type) ?? _moduleDeclaration;
 
@@ -175,7 +175,7 @@ private IEnumerable<IAnnotation> FindAnnotations(int line)
         private void ResolveType(VBAParser.ICS_S_MembersCallContext context)
         {
             var first = context.iCS_S_VariableOrProcedureCall().ambiguousIdentifier();
-            var identifiers = new[] {first}.Concat(context.iCS_S_MemberCall()
+            var identifiers = new[] { first }.Concat(context.iCS_S_MemberCall()
                         .Select(member => member.iCS_S_VariableOrProcedureCall().ambiguousIdentifier()))
                         .ToList();
             ResolveType(identifiers);
@@ -310,7 +310,7 @@ private Declaration ResolveType(IList<VBAParser.AmbiguousIdentifierContext> iden
             // if there are 3 identifiers, type isn't in current project.
             if (identifiers.Count != 3)
             {
-                
+
                 var moduleMatch = _declarationFinder.FindStdModule(projectMatch, identifiers[0].GetText());
                 if (moduleMatch != null)
                 {
@@ -369,15 +369,15 @@ private Declaration ResolveInScopeType(string identifier, Declaration scope)
             {
                 return sameScopeUdt.Single();
             }
-            
+
             // todo: try to resolve identifier using referenced projects
 
             return null;
         }
-        
+
         private Declaration ResolveType(Declaration parent)
         {
-            if (parent != null && (parent.DeclarationType == DeclarationType.UserDefinedType 
+            if (parent != null && (parent.DeclarationType == DeclarationType.UserDefinedType
                                 || parent.DeclarationType == DeclarationType.Enumeration
                                 || parent.DeclarationType == DeclarationType.Project
                                 || parent.DeclarationType == DeclarationType.ProceduralModule
@@ -415,7 +415,7 @@ private Declaration ResolveType(Declaration parent)
                 result = matches.Where(item =>
                     _moduleTypes.Contains(item.DeclarationType)
                     && item.ProjectId == _currentScope.ProjectId)
-                .ToList();                
+                .ToList();
             }
 
             if (!result.Any())
@@ -425,7 +425,7 @@ private Declaration ResolveType(Declaration parent)
                 .ToList();
             }
 
-            return result.Count == 1 ? result.SingleOrDefault() : 
+            return result.Count == 1 ? result.SingleOrDefault() :
                 matches.Count == 1 ? matches.First() : null;
         }
 
@@ -527,6 +527,10 @@ private Declaration ResolveInternal(VBAParser.ICS_S_VariableOrProcedureCallConte
             {
                 return null;
             }
+            if (ComesFromImplementsStmt(context))
+            {
+                return null;
+            }
 
             var identifierContext = context.ambiguousIdentifier();
             var fieldCall = context.dictionaryCallStmt();
@@ -545,6 +549,19 @@ private Declaration ResolveInternal(VBAParser.ICS_S_VariableOrProcedureCallConte
             return result;
         }
 
+        private bool ComesFromImplementsStmt(RuleContext context)
+        {
+            if (context == null)
+            {
+                return false;
+            }
+            if (context.Parent is VBAParser.ImplementsStmtContext)
+            {
+                return true;
+            }
+            return ComesFromImplementsStmt(context.Parent);
+        }
+
         private Declaration ResolveInternal(VBAParser.DictionaryCallStmtContext fieldCall, Declaration parent, bool hasExplicitLetStatement = false, bool isAssignmentTarget = false)
         {
             if (fieldCall == null)
@@ -632,7 +649,7 @@ private Declaration ResolveInternal(VBAParser.ICS_S_MembersCallContext context,
                 // if we're on the left side of an assignment, only the last memberCall is the assignment target.
                 var isLast = memberCall.Equals(lastCall);
                 var accessor = isLast
-                    ? accessorType 
+                    ? accessorType
                     : ContextAccessorType.GetValueOrReference;
                 var isTarget = isLast && isAssignmentTarget;
 
@@ -744,7 +761,7 @@ public void Resolve(VBAParser.ICS_B_MemberProcedureCallContext context)
                 member.AddReference(reference);
                 _alreadyResolved.Add(reference.Context);
             }
-            
+
             var fieldCall = context.dictionaryCallStmt();
             ResolveInternal(fieldCall, member);
         }
@@ -803,7 +820,7 @@ public void Resolve(VBAParser.ICS_S_MembersCallContext context)
 
             if (parent == null)
             {
-                
+
 
                 return;
             }
@@ -981,7 +998,7 @@ public void Resolve(VBAParser.ImplementsStmtContext context)
             var boundExpression = _bindingService.Resolve(_moduleDeclaration, _currentScope, context.valueStmt().GetText());
             if (boundExpression != null)
             {
-                _boundExpressionVisitor.AddIdentifierReferences(boundExpression, declaration => CreateReference(context.valueStmt(), declaration));                
+                _boundExpressionVisitor.AddIdentifierReferences(boundExpression, declaration => CreateReference(context.valueStmt(), declaration));
             }
         }
 
@@ -1031,7 +1048,7 @@ private Declaration FindFunctionOrPropertyGetter(string identifierName, Declarat
             return parent;
         }
 
-        private Declaration FindLocalScopeDeclaration(string identifierName, Declaration localScope = null, bool parentContextIsVariableOrProcedureCall = false, bool isAssignmentTarget= false)
+        private Declaration FindLocalScopeDeclaration(string identifierName, Declaration localScope = null, bool parentContextIsVariableOrProcedureCall = false, bool isAssignmentTarget = false)
         {
             if (localScope == null)
             {
@@ -1048,7 +1065,7 @@ private Declaration FindLocalScopeDeclaration(string identifierName, Declaration
 
             var results = matches.Where(item =>
                 ((localScope.Equals(item.ParentDeclaration)
-                || (item.DeclarationType == DeclarationType.Parameter && localScope.Equals(item.ParentScopeDeclaration))) 
+                || (item.DeclarationType == DeclarationType.Parameter && localScope.Equals(item.ParentScopeDeclaration)))
                 || (isAssignmentTarget && item.Scope == localScope.Scope))
                 && localScope.Context.GetSelection().Contains(item.Selection)
                 && !_moduleTypes.Contains(item.DeclarationType))
@@ -1106,7 +1123,7 @@ private Declaration FindModuleScopeDeclaration(string identifierName, Declaratio
 
             if (matches.Any() && !result.Any())
             {
-                result = matches.Where(item => 
+                result = matches.Where(item =>
                     (localScope != null && localScope.Equals(item.ParentScopeDeclaration))
                     && !item.DeclarationType.HasFlag(DeclarationType.Member)
                     && !_moduleTypes.Contains(item.DeclarationType)
@@ -1187,7 +1204,7 @@ private bool IsStaticClass(Declaration declaration)
 
         private Declaration FindProjectScopeDeclaration(string identifierName, Declaration localScope = null, ContextAccessorType accessorType = ContextAccessorType.GetValueOrReference, bool hasStringQualifier = false)
         {
-            var matches = _declarationFinder.MatchName(identifierName).Where(item => 
+            var matches = _declarationFinder.MatchName(identifierName).Where(item =>
                 item.DeclarationType == DeclarationType.Project
                 || item.DeclarationType == DeclarationType.ProceduralModule
                 || IsStaticClass(item)
@@ -1227,7 +1244,7 @@ private Declaration FindProjectScopeDeclaration(string identifierName, Declarati
                 {
                     if (localScope == null)
                     {
-                        var names = new[] {"Global", "_Global"};
+                        var names = new[] { "Global", "_Global" };
                         var appGlobals = temp.Where(item => names.Contains(item.ParentDeclaration.IdentifierName)).ToList();
                         if (appGlobals.Count == 1)
                         {
@@ -1276,7 +1293,7 @@ private static bool IsPublicOrGlobal(Declaration item)
 
         private bool IsUserDeclarationInProjectScope(Declaration item)
         {
-            var isNonMemberUserDeclaration = !item.IsBuiltIn 
+            var isNonMemberUserDeclaration = !item.IsBuiltIn
                 && !item.DeclarationType.HasFlag(DeclarationType.Member)
                 // events can't be called outside the class they're declared in, exclude them as well:
                 && item.DeclarationType != DeclarationType.Event;
@@ -1288,15 +1305,15 @@ private bool IsUserDeclarationInProjectScope(Declaration item)
         private static bool IsBuiltInDeclarationInScope(Declaration item, Declaration localScope)
         {
             var isBuiltInNonEvent = item.IsBuiltIn && item.DeclarationType != DeclarationType.Event;
-            
+
             // if localScope is null, we can only resolve to a global:
             // note: built-in declarations are designed that way
             var isBuiltInGlobal = localScope == null && item.Accessibility == Accessibility.Global;
 
             // if localScope is not null, we can resolve to any public or global in that scope:
             var isInLocalScope = (localScope != null && item.Accessibility == Accessibility.Global
                 && localScope.IdentifierName == item.ParentDeclaration.IdentifierName)
-                || (localScope != null && localScope.QualifiedName.QualifiedModuleName.Component != null 
+                || (localScope != null && localScope.QualifiedName.QualifiedModuleName.Component != null
                     && localScope.QualifiedName.QualifiedModuleName.Component.Type == Microsoft.Vbe.Interop.vbext_ComponentType.vbext_ct_Document
                  && item.Accessibility == Accessibility.Public && item.ParentDeclaration.DeclarationType == localScope.DeclarationType);
 

Rubberduck.Parsing/Symbols/ReferencedDeclarationsCollector.cs

@@ -156,7 +156,7 @@ public IEnumerable<Declaration> GetDeclarationsForReference(Reference reference)
                 }
                 else
                 {
-                    moduleDeclaration = new ClassModuleDeclaration(typeQualifiedMemberName, projectDeclaration, typeName, true, new List<IAnnotation>(), attributes);
+                    moduleDeclaration = new ClassModuleDeclaration(typeQualifiedMemberName, projectDeclaration, typeName, true, new List<IAnnotation>(), attributes, isExposed: true);
                 }
                 yield return moduleDeclaration;