Small tweak to RubberduckParserState design mode validation on events

Author: MDoerner

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -62,6 +62,7 @@ public sealed class RubberduckParserState : IDisposable, IDeclarationFinderProvi
 
         public DeclarationFinder DeclarationFinder { get; private set; }
 
+        private readonly IVBE _vbe;
         private readonly IProjectsRepository _projectRepository;   
         private readonly IHostApplication _hostApp;
         private readonly IDeclarationFinderFactory _declarationFinderFactory;
@@ -76,7 +77,13 @@ public RubberduckParserState(IVBE vbe, IProjectsRepository projectRepository, ID
             {
                 throw new ArgumentNullException(nameof(declarationFinderFactory));
             }
+            if (projectRepository == null)
+            {
+                throw new ArgumentException(nameof(projectRepository));
+            }
 
+
+            _vbe = vbe;
             _projectRepository = projectRepository;
             _declarationFinderFactory = declarationFinderFactory;
 
@@ -86,7 +93,7 @@ public RubberduckParserState(IVBE vbe, IProjectsRepository projectRepository, ID
                 States.Add((ParserState)value);
             }
 
-            _hostApp = vbe.HostApplication();
+            _hostApp = _vbe.HostApplication();
             AddEventHandlers();
             IsEnabled = true;
             RefreshFinder(_hostApp);
@@ -128,7 +135,7 @@ private void RemoveEventHandlers()
 
         private void Sinks_ProjectAdded(object sender, ProjectEventArgs e)
         {
-            if (!e.Project.VBE.IsInDesignMode)
+            if (!_vbe.IsInDesignMode)
             {
                 return;
             }
@@ -139,7 +146,7 @@ private void Sinks_ProjectAdded(object sender, ProjectEventArgs e)
 
         private void Sinks_ProjectRemoved(object sender, ProjectEventArgs e)
         {
-            if (!e.Project.VBE.IsInDesignMode)
+            if (!_vbe.IsInDesignMode)
             {
                 return;
             }
@@ -150,12 +157,7 @@ private void Sinks_ProjectRemoved(object sender, ProjectEventArgs e)
 
         private void Sinks_ProjectRenamed(object sender, ProjectRenamedEventArgs e)
         {
-            if (!e.Project.VBE.IsInDesignMode)
-            {
-                return;
-            }
-
-            if (!ThereAreDeclarations())
+            if (!_vbe.IsInDesignMode || !ThereAreDeclarations())
             {
                 return;
             }
@@ -167,9 +169,7 @@ private void Sinks_ProjectRenamed(object sender, ProjectRenamedEventArgs e)
 
         private void Sinks_ComponentAdded(object sender, ComponentEventArgs e)
         {
-            if (!e.Project.VBE.IsInDesignMode) { return; }
-
-            if (!ThereAreDeclarations())
+            if (!_vbe.IsInDesignMode || !ThereAreDeclarations())
             {
                 return;
             }
@@ -180,9 +180,7 @@ private void Sinks_ComponentAdded(object sender, ComponentEventArgs e)
 
         private void Sinks_ComponentRemoved(object sender, ComponentEventArgs e)
         {
-            if (!e.Project.VBE.IsInDesignMode) { return; }
-
-            if (!ThereAreDeclarations())
+            if (!_vbe.IsInDesignMode || !ThereAreDeclarations())
             {
                 return;
             }
@@ -193,12 +191,7 @@ private void Sinks_ComponentRemoved(object sender, ComponentEventArgs e)
 
         private void Sinks_ComponentRenamed(object sender, ComponentRenamedEventArgs e)
         {
-            if (!e.Project.VBE.IsInDesignMode)
-            {
-                return;
-            }
-
-            if (!ThereAreDeclarations())
+            if (!_vbe.IsInDesignMode || !ThereAreDeclarations())
             {
                 return;
             }

Rubberduck.VBEEditor/ComManagement/ProjectsRepository.cs

@@ -67,7 +67,7 @@ private void LoadComponents(IVBComponents componentsCollection)
         {
             foreach (var component in componentsCollection)
             {
-                var qmn = new QualifiedModuleName(component);
+                var qmn = component.QualifiedModuleName;
                 _components.Add(qmn, component);
                 _codeModules.Add(qmn, component.CodeModule);
             }