Merge branch 'next' into codeExplorerCommandFix

Author: Hosch250

RetailCoder.VBE/Sinks.cs

@@ -120,20 +120,21 @@ private void _sink_ProjectAdded(object sender, DispatcherEventArgs<VBProject> e)
             e.Item.AssignProjectId();
             var projectId = e.Item.HelpFile;
 
+            RegisterComponentsEventSink(e.Item.VBComponents, projectId);
+
             Task.Run(() =>
             {
                 var handler = ProjectAdded;
                 if (handler != null)
                 {
                     handler(sender, new ProjectEventArgs(projectId));
                 }
-
-                RegisterComponentsEventSink(e.Item.VBComponents, e.Item.HelpFile);
             });
         }
 
         private void _sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject> e)
         {
+            UnregisterComponentsEventSink(e.Item.HelpFile);
             if (!IsEnabled) { return; }
 
             var projectId = e.Item.HelpFile;
@@ -145,8 +146,6 @@ private void _sink_ProjectRemoved(object sender, DispatcherEventArgs<VBProject>
                 {
                     handler(sender, new ProjectEventArgs(projectId));
                 }
-
-                UnregisterComponentsEventSink(e.Item.HelpFile);
             });
         }
 

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -93,7 +93,7 @@ private void Sinks_ProjectRemoved(object sender, IProjectEventArgs e)
 
             Debug.Assert(e.ProjectId != null);
 
-            RemoveProject(e.ProjectId);
+            RemoveProject(e.ProjectId, true);
             OnParseRequested(sender);
         }
 
@@ -224,27 +224,14 @@ public void RefreshProjects()
             }
         }
 
-        private void RemoveProject(string projectId)
+        private void RemoveProject(string projectId, bool notifyStateChanged = false)
         {
-            VBProject project = null;
-            foreach (var p in Projects)
-            {
-                if (p.HelpFile == projectId)
-                {
-                    project = p;
-                    break;
-                }
-            }
-
             if (_projects.ContainsKey(projectId))
             {
                 _projects.Remove(projectId);
             }
 
-            if (project != null)
-            {
-                ClearStateCache(project);
-            }
+            ClearStateCache(projectId, notifyStateChanged);
         }
 
         public List<VBProject> Projects
@@ -654,20 +641,30 @@ public void AddDeclaration(Declaration declaration)
             }
         }
 
-        private void ClearStateCache(VBProject project, bool notifyStateChanged = false)
+        private void ClearStateCache(string projectId, bool notifyStateChanged = false)
         {
             try
             {
-                foreach (VBComponent component in project.VBComponents)
+                var qualifiedModuleName = new QualifiedModuleName();
+
+                foreach (var moduleState in _moduleStates)
                 {
-                    while (!ClearStateCache(component))
+                    if (moduleState.Key.ProjectId == projectId && moduleState.Key.Component != null)
+                    {
+                        while (!ClearStateCache(moduleState.Key.Component))
+                        {
+                            // until Hell freezes over?
+                        }
+                    }
+                    else if (moduleState.Key.ProjectId == projectId && moduleState.Key.Component == null)
                     {
-                        // until Hell freezes over?
+                        // store project module name
+                        qualifiedModuleName = moduleState.Key;
                     }
                 }
 
                 ModuleState state;
-                if (_moduleStates.TryRemove(new QualifiedModuleName(project), out state))
+                if (_moduleStates.TryRemove(qualifiedModuleName, out state))
                 {
                     state.Dispose();
                 }