Merge branch 'next' of https://github.com/comintern/Rubberduck.git

Author: comintern

Rubberduck.Parsing/Symbols/DeclarationFinder.cs

@@ -98,15 +98,23 @@ public DeclarationFinder(IReadOnlyList<Declaration> declarations, IEnumerable<IA
                 cls.References.Where(reference => ParserRuleContextHelper.HasParent<VBAParser.ImplementsStmtContext>(reference.Context))
                     .Select(reference => new { IdentifierReference = reference, Context = ParserRuleContextHelper.GetParent<VBAParser.ImplementsStmtContext>(reference.Context)}));
 
-            var interfaceMembers = implementsInstructions.Select(item => new
+            var interfaceModules = implementsInstructions.Select(item => item.IdentifierReference.Declaration).Distinct();
+
+            var interfaceMembers = interfaceModules.Select(item => new
                 {
-                    InterfaceModule = item.IdentifierReference.Declaration,
-                    InterfaceMembers = _declarations[item.IdentifierReference.Declaration.QualifiedName.QualifiedModuleName]
-                    .Where(member => member.DeclarationType.HasFlag(DeclarationType.Member))
+                    InterfaceModule = item,
+                    InterfaceMembers = _declarations[item.QualifiedName.QualifiedModuleName]
+                        .Where(member => member.DeclarationType.HasFlag(DeclarationType.Member))
                 });
 
             _interfaceMembers = new Lazy<ConcurrentDictionary<Declaration, Declaration[]>>(() =>
-               new ConcurrentDictionary<Declaration, Declaration[]>(interfaceMembers.ToDictionary(item => item.InterfaceModule, item => item.InterfaceMembers.ToArray())), true);
+                 new ConcurrentDictionary<Declaration, Declaration[]>(
+                         interfaceMembers.ToDictionary(
+                                                item => item.InterfaceModule,
+                                                item => item.InterfaceMembers.ToArray()
+                                            )
+                     )
+                , true);
 
             var implementingNames = new Lazy<IEnumerable<string>>(() => implementsInstructions.SelectMany(item =>
                     _declarations[item.IdentifierReference.Declaration.QualifiedName.QualifiedModuleName]

Rubberduck.Parsing/VBA/ParseCoordinator.cs

@@ -215,7 +215,7 @@ private void ExecuteCommonParseActivities(List<IVBComponent> toParse, Cancellati
                 token.ThrowIfCancellationRequested();
 
             _projectDeclarations.Clear();
-            State.ClearBuiltInReferences();
+            State.ClearAllReferences();
 
             ParseComponents(toParse, token);
 
@@ -612,7 +612,7 @@ private void ParseAllInternal(object requestor, CancellationToken token)
 
                 token.ThrowIfCancellationRequested();
 
-            var componentsRemoved = ClearStateCashForRemovedComponents(components);
+            var componentsRemoved = CleanUpRemovedComponents(components);
 
                 token.ThrowIfCancellationRequested();
 
@@ -642,10 +642,10 @@ private void ParseAllInternal(object requestor, CancellationToken token)
         }
 
         /// <summary>
-        /// Clears state cach for removed components.
+        /// Clears state cache of removed components.
         /// Returns whether components have been removed.
         /// </summary>
-        private bool ClearStateCashForRemovedComponents(List<IVBComponent> components)
+        private bool CleanUpRemovedComponents(List<IVBComponent> components)
         {
             var removedModuledecalrations = RemovedModuleDeclarations(components);
             var componentRemoved = removedModuledecalrations.Any();

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -742,6 +742,14 @@ public void ClearBuiltInReferences()
             }
         }
 
+        public void ClearAllReferences()
+        {
+            foreach (var declaration in AllDeclarations)
+            {
+                declaration.ClearReferences();
+            }
+        }
+
         public bool ClearStateCache(IVBComponent component, bool notifyStateChanged = false)
         {
             return component != null && ClearStateCache(new QualifiedModuleName(component), notifyStateChanged);