Rereference modules referencing libraries affected by priority changes

Author: MDoerner

Rubberduck.Parsing/VBA/ComReferenceLoading/COMReferenceSynchronizerBase.cs

@@ -24,7 +24,7 @@ public abstract class COMReferenceSynchronizerBase : ICOMReferenceSynchronizer,
         private readonly IProjectsProvider _projectsProvider;
         private readonly IReferencedDeclarationsCollector _referencedDeclarationsCollector;
 
-        private readonly List<QualifiedModuleName> _unloadedCOMReferences = new List<QualifiedModuleName>();
+        private readonly List<string> _unloadedCOMReferences = new List<string>();
         private readonly List<(string projectId, string referencedProjectId)> _referencesAffectedByPriorityChanges = new List<(string projectId, string referencedProjectId)>();
 
         private readonly Dictionary<(string identifierName, string fullPath), string> _projectIdsByFilePathAndProjectName = new Dictionary<(string identifierName, string fullPath), string>();
@@ -59,7 +59,7 @@ protected COMReferenceSynchronizerBase(RubberduckParserState state, IParserState
 
 
         public bool LastSyncOfCOMReferencesLoadedReferences { get; private set; }
-        public IEnumerable<QualifiedModuleName> COMReferencesUnloadedInLastSync => _unloadedCOMReferences;
+        public IEnumerable<string> COMReferencesUnloadedInLastSync => _unloadedCOMReferences;
         public IEnumerable<(string projectId, string referencedProjectId)> COMReferencesAffectedByPriorityChangesInLastSync => _referencesAffectedByPriorityChanges;
 
         private readonly IDictionary<string, ReferencePriorityMap> _projectReferences = new Dictionary<string, ReferencePriorityMap>();
@@ -362,9 +362,9 @@ private void UnloadComReference(string referencedProjectId)
             //There is nothing to unload for a user project.
             if (!IsUserProjectProjectId(referencedProjectId))
             {
-                var projectQMN = ProjectQMNFromBuildInProjectId(referencedProjectId);
+                _unloadedCOMReferences.Add(referencedProjectId);
 
-                _unloadedCOMReferences.Add(projectQMN);
+                var projectQMN = ProjectQMNFromBuildInProjectId(referencedProjectId);
                 _state.RemoveBuiltInDeclarations(projectQMN);
             }
         }

Rubberduck.Parsing/VBA/ComReferenceLoading/ICOMReferenceSynchronizer.cs

@@ -1,13 +1,12 @@
 using System.Collections.Generic;
 using System.Threading;
-using Rubberduck.VBEditor;
 
 namespace Rubberduck.Parsing.VBA.ComReferenceLoading
 {
     public interface ICOMReferenceSynchronizer
     {
         bool LastSyncOfCOMReferencesLoadedReferences { get; }
-        IEnumerable<QualifiedModuleName> COMReferencesUnloadedInLastSync { get; }
+        IEnumerable<string> COMReferencesUnloadedInLastSync { get; }
         IEnumerable<(string projectId, string referencedProjectId)> COMReferencesAffectedByPriorityChangesInLastSync { get; }
 
         void SyncComReferences(CancellationToken token);

Rubberduck.Parsing/VBA/ParseCoordinator.cs

@@ -226,13 +226,32 @@ private void ExecuteCommonParseActivities(IReadOnlyCollection<QualifiedModuleNam
             _parsingStageService.SyncComReferences(token);
             if (_parsingStageService.LastSyncOfCOMReferencesLoadedReferences || _parsingStageService.COMReferencesUnloadedInLastSync.Any())
             {
-                var unloadedReferences = _parsingStageService.COMReferencesUnloadedInLastSync;
-                var additionalModulesToBeReresolved = OtherModulesReferencingAnyNotToBeParsed(unloadedReferences.ToHashSet().AsReadOnly(), toParse);
+                var unloadedReferences = _parsingStageService.COMReferencesUnloadedInLastSync.ToHashSet();
+                var unloadedModules =
+                    _parsingCacheService.DeclarationFinder.AllModules
+                        .Where(qmn => unloadedReferences.Contains(qmn.ProjectId))
+                        .ToHashSet();
+                var additionalModulesToBeReresolved = OtherModulesReferencingAnyNotToBeParsed(unloadedModules.AsReadOnly(), toParse);
                 toReresolveReferences.UnionWith(additionalModulesToBeReresolved);
                 _parserStateManager.SetModuleStates(additionalModulesToBeReresolved, ParserState.ResolvingReferences, token);
-                ClearModuleToModuleReferences(unloadedReferences);
+                ClearModuleToModuleReferences(unloadedModules);
                 RefreshDeclarationFinder();
             }
+
+            if (_parsingStageService.COMReferencesAffectedByPriorityChangesInLastSync.Any())
+            {
+                //We only use the referencedProjectId because that simplifies the reference management immensely.  
+                var affectedReferences = _parsingStageService.COMReferencesAffectedByPriorityChangesInLastSync
+                    .Select(tpl => tpl.referencedProjectId)
+                    .ToHashSet();
+                var referenceModules =
+                    _parsingCacheService.DeclarationFinder.AllModules
+                        .Where(qmn => affectedReferences.Contains(qmn.ProjectId))
+                        .ToHashSet();
+                var additionalModulesToBeReresolved = OtherModulesReferencingAnyNotToBeParsed(referenceModules.AsReadOnly(), toParse);
+                toReresolveReferences.UnionWith(additionalModulesToBeReresolved);
+                _parserStateManager.SetModuleStates(additionalModulesToBeReresolved, ParserState.ResolvingReferences, token);
+            }
             token.ThrowIfCancellationRequested();
 
             _parsingStageService.LoadBuitInDeclarations();

Rubberduck.Parsing/VBA/ParsingStageService.cs

@@ -54,7 +54,7 @@ public ParsingStageService(
 
         public bool LastLoadOfBuiltInDeclarationsLoadedDeclarations => _builtInDeclarationLoader.LastLoadOfBuiltInDeclarationsLoadedDeclarations;
         public bool LastSyncOfCOMReferencesLoadedReferences => _comSynchronizer.LastSyncOfCOMReferencesLoadedReferences;
-        public IEnumerable<QualifiedModuleName> COMReferencesUnloadedInLastSync => _comSynchronizer.COMReferencesUnloadedInLastSync;
+        public IEnumerable<string> COMReferencesUnloadedInLastSync => _comSynchronizer.COMReferencesUnloadedInLastSync;
         public IEnumerable<(string projectId, string referencedProjectId)>COMReferencesAffectedByPriorityChangesInLastSync =>_comSynchronizer.COMReferencesAffectedByPriorityChangesInLastSync;
 
         public void LoadBuitInDeclarations()