Merge pull request #3813 from MDoerner/MakeProjectDeclarationsDisposable

retailcoder · web-flow · commit 017d134a9078 · 2018-03-03T14:27:09.000-05:00
Makes project declarations implement IDisposable (no user-facing changes)
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerProjectViewModel.cs
@@ -36,7 +36,7 @@ public CodeExplorerProjectViewModel(FolderHelper folderHelper, Declaration decla
                 FillFolders(declarations.ToList());
                 Items = _folderTree.Items.ToList();
 
-                _icon = Declaration.Project.Protection == ProjectProtection.Locked
+                _icon = Declaration.Project?.Protection == ProjectProtection.Locked
                     ? GetImageSource(resx.lock__exclamation)
                     : GetImageSource(resx.ObjectLibrary);
             }
diff --git a/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs b/RetailCoder.VBE/Navigation/CodeExplorer/CodeExplorerViewModel.cs
@@ -373,7 +373,7 @@ private void ParserState_ModuleStateChanged(object sender, ParseProgressEventArg
             var componentProject = _state.ProjectsProvider.Project(e.Module.ProjectId);
             {
                 var projectNode = Projects.OfType<CodeExplorerProjectViewModel>()
-                    .FirstOrDefault(p => p.Declaration.Project.Equals(componentProject));
+                    .FirstOrDefault(p => p.Declaration.Project?.Equals(componentProject) ?? false);
 
                 if (projectNode == null)
                 {
@@ -422,7 +422,7 @@ private Declaration CreateDeclaration(QualifiedModuleName module)
         {
             var projectDeclaration =
                 _state.DeclarationFinder.UserDeclarations(DeclarationType.Project)
-                    .FirstOrDefault(item => item.Project.ProjectId == module.ProjectId);
+                    .FirstOrDefault(item => item.ProjectId == module.ProjectId);
 
             if (module.ComponentType == ComponentType.StandardModule)
             {
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfacePresenter.cs
@@ -1,5 +1,6 @@
 ﻿using System.Linq;
 using System.Windows.Forms;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.UI.Refactorings;
 
 namespace Rubberduck.Refactorings.ExtractInterface
@@ -27,7 +28,11 @@ public ExtractInterfaceModel Show()
                 return null;
             }
 
-            _view.ViewModel.ComponentNames = _model.TargetDeclaration.Project.VBComponents.Select(c => c.Name).ToList();
+            _view.ViewModel.ComponentNames = _model.State.DeclarationFinder
+                .UserDeclarations(DeclarationType.Module)
+                .Where(moduleDeclaration => moduleDeclaration.ProjectId == _model.TargetDeclaration.ProjectId)
+                .Select(module => module.ComponentName)
+                .ToList();
             _view.ViewModel.InterfaceName = _model.InterfaceName;
             _view.ViewModel.Members = _model.Members.ToList();
 
diff --git a/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs b/RetailCoder.VBE/Refactorings/ExtractInterface/ExtractInterfaceRefactoring.cs
@@ -87,6 +87,12 @@ public void Refactor(Declaration target)
 
         private void AddInterface()
         {
+            var targetProject = _model.TargetDeclaration.Project;
+            if (targetProject == null)
+            {
+                return; //The target project is not available.
+            }
+
             var rewriter = _model.State.GetRewriter(_model.TargetDeclaration);
 
             var firstNonFieldMember = _model.State.DeclarationFinder.Members(_model.TargetDeclaration)
@@ -96,7 +102,7 @@ private void AddInterface()
 
             AddInterfaceMembersToClass(rewriter);
 
-            using (var components = _model.TargetDeclaration.Project.VBComponents)
+            using (var components = targetProject.VBComponents)
             {
                 using (var interfaceComponent = components.Add(ComponentType.ClassModule))
                 {
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/AddComponentCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/AddComponentCommand.cs
@@ -30,8 +30,14 @@ public bool CanAddComponent(CodeExplorerItemViewModel parameter)
 
         public void AddComponent(CodeExplorerItemViewModel node, ComponentType type)
         {
+            var nodeProject = GetDeclaration(node)?.Project;
+            if (node != null && nodeProject == null)
+            {
+                return; //The project is not available.
+            }
+
             using (var components = node != null
-                ? GetDeclaration(node).Project.VBComponents
+                ? nodeProject.VBComponents
                 : ComponentsCollectionFromActiveProject())
             {
                 var folderAnnotation = $"'@Folder(\"{GetFolder(node)}\")";
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/AddTestModuleCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/AddTestModuleCommand.cs
@@ -23,7 +23,7 @@ protected override bool EvaluateCanExecute(object parameter)
         {
             try
             {
-                return GetDeclaration(parameter) != null || _vbe.ProjectsCount == 1;
+                return GetDeclaration(parameter)?.Project != null || _vbe.ProjectsCount == 1;
             }
             catch (COMException)
             {
@@ -33,8 +33,14 @@ protected override bool EvaluateCanExecute(object parameter)
 
         protected override void OnExecute(object parameter)
         {
+            var parameterProject = GetDeclaration(parameter)?.Project;
+            if (parameter != null && parameterProject == null)
+            {
+                return; //The project selected module is not available.
+            }
+
             _newUnitTestModuleCommand.Execute(parameter != null
-                ? GetDeclaration(parameter).Project
+                ? parameterProject
                 : _vbe.ActiveVBProject);
         }
 
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/IndentCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/IndentCommand.cs
@@ -51,7 +51,7 @@ protected override bool EvaluateCanExecute(object parameter)
                 return _state.AllUserDeclarations
                             .Any(c => c.DeclarationType.HasFlag(DeclarationType.Module) &&
                             c.Annotations.All(a => a.AnnotationType != AnnotationType.NoIndent) &&
-                            c.Project == declaration.Project);
+                            c.ProjectId == declaration.ProjectId);
             }
 
             if (parameter is CodeExplorerCustomFolderViewModel)
diff --git a/RetailCoder.VBE/UI/CodeExplorer/Commands/OpenProjectPropertiesCommand.cs b/RetailCoder.VBE/UI/CodeExplorer/Commands/OpenProjectPropertiesCommand.cs
@@ -3,7 +3,6 @@
 using Rubberduck.Navigation.CodeExplorer;
 using Rubberduck.UI.Command;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.SafeComWrappers.Office.Core.Abstract;
 
 namespace Rubberduck.UI.CodeExplorer.Commands
 {
@@ -50,9 +49,15 @@ protected override void OnExecute(object parameter)
                         node = node.Parent; // the project node is an ICodeExplorerDeclarationViewModel--no worries here
                     }
 
+                    var nodeProject = node.GetSelectedDeclaration().Project;
+                    if (nodeProject == null)
+                    {
+                        return; //The project declaration has been disposed, i.e. the project has been removed already.
+                    }
+
                     try
                     {
-                        _vbe.ActiveVBProject = node.GetSelectedDeclaration().Project;
+                        _vbe.ActiveVBProject = nodeProject;
                     }
                     catch (COMException)
                     {
diff --git a/RetailCoder.VBE/UI/Command/AddTestModuleCommand.cs b/RetailCoder.VBE/UI/Command/AddTestModuleCommand.cs
@@ -147,7 +147,7 @@ protected override void OnExecute(object parameter)
             var project = parameter as IVBProject ??
                           (parameterIsModuleDeclaration ? ((Declaration) parameter).Project : GetProject());
 
-            if (project.IsWrappingNullReference)
+            if (project == null || project.IsWrappingNullReference)
             {
                 return;
             }
diff --git a/RetailCoder.VBE/UI/Command/RunAllTestsCommand.cs b/RetailCoder.VBE/UI/Command/RunAllTestsCommand.cs
@@ -5,6 +5,7 @@
 using Rubberduck.UI.UnitTesting;
 using Rubberduck.UnitTesting;
 using System.Linq;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.UI.Command
@@ -54,13 +55,19 @@ protected override void OnExecute(object parameter)
 
         private void EnsureRubberduckIsReferencedForEarlyBoundTests()
         {
-            foreach (var member in _state.AllUserDeclarations)
+            var projectIdsOfMembersUsingAddInLibrary = _state.DeclarationFinder.AllUserDeclarations
+                .Where(member => member.AsTypeName == "Rubberduck.PermissiveAssertClass"
+                                 || member.AsTypeName == "Rubberduck.AssertClass")
+                .Select(member => member.ProjectId)
+                .ToHashSet();
+            var projectsUsingAddInLibrary = _state.DeclarationFinder
+                .UserDeclarations(DeclarationType.Project)
+                .Where(declaration => projectIdsOfMembersUsingAddInLibrary.Contains(declaration.ProjectId))
+                .Select(declaration => declaration.Project);
+
+            foreach (var project in projectsUsingAddInLibrary)
             {
-                if (member.AsTypeName == "Rubberduck.PermissiveAssertClass" ||
-                    member.AsTypeName == "Rubberduck.AssertClass")
-                {
-                    member.Project.EnsureReferenceToAddInLibrary();
-                }
+                project?.EnsureReferenceToAddInLibrary();
             }
         }
 
diff --git a/RetailCoder.VBE/UI/UnitTesting/TestExplorerViewModel.cs b/RetailCoder.VBE/UI/UnitTesting/TestExplorerViewModel.cs
@@ -5,6 +5,7 @@
 using System.Windows;
 using NLog;
 using Rubberduck.Common;
+using Rubberduck.Parsing.Symbols;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Settings;
 using Rubberduck.UI.Command;
@@ -222,13 +223,19 @@ private bool CanExecuteRefreshCommand(object parameter)
 
         private void EnsureRubberduckIsReferencedForEarlyBoundTests()
         {
-            foreach (var member in _state.AllUserDeclarations)
+            var projectIdsOfMembersUsingAddInLibrary = _state.DeclarationFinder.AllUserDeclarations
+                .Where(member => member.AsTypeName == "Rubberduck.PermissiveAssertClass" 
+                                    || member.AsTypeName == "Rubberduck.AssertClass")
+                .Select(member => member.ProjectId)
+                .ToHashSet();
+            var projectsUsingAddInLibrary = _state.DeclarationFinder
+                .UserDeclarations(DeclarationType.Project)
+                .Where(declaration => projectIdsOfMembersUsingAddInLibrary.Contains(declaration.ProjectId))
+                .Select(declaration => declaration.Project);
+
+            foreach (var project in projectsUsingAddInLibrary)
             {
-                if (member.AsTypeName == "Rubberduck.PermissiveAssertClass" ||
-                    member.AsTypeName == "Rubberduck.AssertClass")
-                {
-                    member.Project.EnsureReferenceToAddInLibrary();
-                }
+                project?.EnsureReferenceToAddInLibrary();
             }
         }
 
diff --git a/Rubberduck.Inspections/QuickFixes/EncapsulateFieldQuickFix.cs b/Rubberduck.Inspections/QuickFixes/EncapsulateFieldQuickFix.cs
@@ -6,29 +6,30 @@
 using Rubberduck.Refactorings.EncapsulateField;
 using Rubberduck.SmartIndenter;
 using Rubberduck.UI.Refactorings.EncapsulateField;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.QuickFixes
 {
     public sealed class EncapsulateFieldQuickFix : QuickFixBase
     {
+        private readonly IVBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly IIndenter _indenter;
 
-        public EncapsulateFieldQuickFix(RubberduckParserState state, IIndenter indenter)
+        public EncapsulateFieldQuickFix(IVBE vbe, RubberduckParserState state, IIndenter indenter)
             : base(typeof(EncapsulatePublicFieldInspection))
         {
+            _vbe = vbe;
             _state = state;
             _indenter = indenter;
         }
 
         public override void Fix(IInspectionResult result)
         {
-            var vbe = result.Target.Project.VBE;
-
             using (var view = new EncapsulateFieldDialog(new EncapsulateFieldViewModel(_state, _indenter)))
             {
-                var factory = new EncapsulateFieldPresenterFactory(vbe, _state, view);
-                var refactoring = new EncapsulateFieldRefactoring(vbe, _indenter, factory);
+                var factory = new EncapsulateFieldPresenterFactory(_vbe, _state, view);
+                var refactoring = new EncapsulateFieldRefactoring(_vbe, _indenter, factory);
                 refactoring.Refactor(result.Target);
             }
         }
diff --git a/Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs b/Rubberduck.Inspections/QuickFixes/MoveFieldCloserToUsageQuickFix.cs
@@ -5,26 +5,27 @@
 using Rubberduck.Parsing.VBA;
 using Rubberduck.Refactorings.MoveCloserToUsage;
 using Rubberduck.UI;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.QuickFixes
 {
     public sealed class MoveFieldCloserToUsageQuickFix : QuickFixBase
     {
+        private readonly IVBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly IMessageBox _messageBox;
 
-        public MoveFieldCloserToUsageQuickFix(RubberduckParserState state, IMessageBox messageBox)
+        public MoveFieldCloserToUsageQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
             : base(typeof(MoveFieldCloserToUsageInspection))
         {
+            _vbe = vbe;
             _state = state;
             _messageBox = messageBox;
         }
 
         public override void Fix(IInspectionResult result)
         {
-            var vbe = result.Target.Project.VBE;
-
-            var refactoring = new MoveCloserToUsageRefactoring(vbe, _state, _messageBox);
+            var refactoring = new MoveCloserToUsageRefactoring(_vbe, _state, _messageBox);
             refactoring.Refactor(result.Target);
         }
 
diff --git a/Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs b/Rubberduck.Inspections/QuickFixes/RenameDeclarationQuickFix.cs
@@ -6,29 +6,30 @@
 using Rubberduck.Refactorings.Rename;
 using Rubberduck.UI;
 using Rubberduck.UI.Refactorings.Rename;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Inspections.QuickFixes
 {
     public sealed class RenameDeclarationQuickFix : QuickFixBase
     {
+        private readonly IVBE _vbe;
         private readonly RubberduckParserState _state;
         private readonly IMessageBox _messageBox;
 
-        public RenameDeclarationQuickFix(RubberduckParserState state, IMessageBox messageBox)
+        public RenameDeclarationQuickFix(IVBE vbe, RubberduckParserState state, IMessageBox messageBox)
             : base(typeof(HungarianNotationInspection), typeof(UseMeaningfulNameInspection), typeof(DefaultProjectNameInspection))
         {
+            _vbe = vbe;
             _state = state;
             _messageBox = messageBox;
         }
 
         public override void Fix(IInspectionResult result)
         {
-            var vbe = result.Target.Project.VBE;
-
             using (var view = new RenameDialog(new RenameViewModel(_state)))
             {
-                var factory = new RenamePresenterFactory(vbe, view, _state);
-                var refactoring = new RenameRefactoring(vbe, factory, _messageBox, _state);
+                var factory = new RenamePresenterFactory(_vbe, view, _state);
+                var refactoring = new RenameRefactoring(_vbe, factory, _messageBox, _state);
                 refactoring.Refactor(result.Target);
             }
         }
diff --git a/Rubberduck.Parsing/Symbols/ProjectDeclaration.cs b/Rubberduck.Parsing/Symbols/ProjectDeclaration.cs
@@ -1,12 +1,13 @@
-﻿using Rubberduck.Parsing.ComReflection;
+﻿using System;
+using Rubberduck.Parsing.ComReflection;
 using Rubberduck.VBEditor;
 using System.Collections.Generic;
 using System.Linq;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.Parsing.Symbols
 {
-    public sealed class ProjectDeclaration : Declaration
+    public sealed class ProjectDeclaration : Declaration, IDisposable
     {
         private readonly List<ProjectReference> _projectReferences;
 
@@ -60,7 +61,7 @@ public IReadOnlyList<ProjectReference> ProjectReferences
         /// <remarks>
         /// This property is intended to differenciate identically-named VBProjects.
         /// </remarks>
-        public override IVBProject Project => _project;
+        public override IVBProject Project => IsDisposed ? null : _project;
 
         public void AddProjectReference(string referencedProjectId, int priority)
         {
@@ -89,9 +90,17 @@ public override string ProjectDisplayName
                 {
                     return _displayName;
                 }
-                _displayName = _project != null ? _project.ProjectDisplayName : string.Empty;
+                _displayName = !IsDisposed && _project != null ? _project.ProjectDisplayName : string.Empty;
                 return _displayName;
             }
         }
+
+
+        public bool IsDisposed { get; private set; }
+
+        public void Dispose()
+        {
+            IsDisposed = true;
+        }
     }
 }
diff --git a/Rubberduck.Parsing/VBA/ParseCoordinator.cs b/Rubberduck.Parsing/VBA/ParseCoordinator.cs
diff --git a/Rubberduck.Parsing/VBA/RubberduckParserState.cs b/Rubberduck.Parsing/VBA/RubberduckParserState.cs
diff --git a/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs b/RubberduckTests/QuickFixes/MoveFieldCloserToUsageQuickFixTests.cs

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public CodeExplorerProjectViewModel(FolderHelper folderHelper, Declaration decla`
`36`	`36`	`FillFolders(declarations.ToList());`
`37`	`37`	`Items = _folderTree.Items.ToList();`
`38`	`38`
`39`		`- _icon = Declaration.Project.Protection == ProjectProtection.Locked`
	`39`	`+ _icon = Declaration.Project?.Protection == ProjectProtection.Locked`
`40`	`40`	`? GetImageSource(resx.lock__exclamation)`
`41`	`41`	`: GetImageSource(resx.ObjectLibrary);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -373,7 +373,7 @@ private void ParserState_ModuleStateChanged(object sender, ParseProgressEventArg`
`373`	`373`	`var componentProject = _state.ProjectsProvider.Project(e.Module.ProjectId);`
`374`	`374`	`{`
`375`	`375`	`var projectNode = Projects.OfType<CodeExplorerProjectViewModel>()`
`376`		`- .FirstOrDefault(p => p.Declaration.Project.Equals(componentProject));`
	`376`	`+ .FirstOrDefault(p => p.Declaration.Project?.Equals(componentProject) ?? false);`
`377`	`377`
`378`	`378`	`if (projectNode == null)`
`379`	`379`	`{`
`@@ -422,7 +422,7 @@ private Declaration CreateDeclaration(QualifiedModuleName module)`
`422`	`422`	`{`
`423`	`423`	`var projectDeclaration =`
`424`	`424`	`_state.DeclarationFinder.UserDeclarations(DeclarationType.Project)`
`425`		`- .FirstOrDefault(item => item.Project.ProjectId == module.ProjectId);`
	`425`	`+ .FirstOrDefault(item => item.ProjectId == module.ProjectId);`
`426`	`426`
`427`	`427`	`if (module.ComponentType == ComponentType.StandardModule)`
`428`	`428`	`{`
Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,12 @@ public void Refactor(Declaration target)`
`87`	`87`
`88`	`88`	`private void AddInterface()`
`89`	`89`	`{`
	`90`	`+ var targetProject = _model.TargetDeclaration.Project;`
	`91`	`+ if (targetProject == null)`
	`92`	`+ {`
	`93`	`+ return; //The target project is not available.`
	`94`	`+ }`
	`95`	`+`
`90`	`96`	`var rewriter = _model.State.GetRewriter(_model.TargetDeclaration);`
`91`	`97`
`92`	`98`	`var firstNonFieldMember = _model.State.DeclarationFinder.Members(_model.TargetDeclaration)`
`@@ -96,7 +102,7 @@ private void AddInterface()`
`96`	`102`
`97`	`103`	`AddInterfaceMembersToClass(rewriter);`
`98`	`104`
`99`		`- using (var components = _model.TargetDeclaration.Project.VBComponents)`
	`105`	`+ using (var components = targetProject.VBComponents)`
`100`	`106`	`{`
`101`	`107`	`using (var interfaceComponent = components.Add(ComponentType.ClassModule))`
`102`	`108`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ protected override bool EvaluateCanExecute(object parameter)`
`23`	`23`	`{`
`24`	`24`	`try`
`25`	`25`	`{`
`26`		`- return GetDeclaration(parameter) != null \|\| _vbe.ProjectsCount == 1;`
	`26`	`+ return GetDeclaration(parameter)?.Project != null \|\| _vbe.ProjectsCount == 1;`
`27`	`27`	`}`
`28`	`28`	`catch (COMException)`
`29`	`29`	`{`
`@@ -33,8 +33,14 @@ protected override bool EvaluateCanExecute(object parameter)`
`33`	`33`
`34`	`34`	`protected override void OnExecute(object parameter)`
`35`	`35`	`{`
	`36`	`+ var parameterProject = GetDeclaration(parameter)?.Project;`
	`37`	`+ if (parameter != null && parameterProject == null)`
	`38`	`+ {`
	`39`	`+ return; //The project selected module is not available.`
	`40`	`+ }`
	`41`	`+`
`36`	`42`	`_newUnitTestModuleCommand.Execute(parameter != null`
`37`		`- ? GetDeclaration(parameter).Project`
	`43`	`+ ? parameterProject`
`38`	`44`	`: _vbe.ActiveVBProject);`
`39`	`45`	`}`
`40`	`46`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ protected override bool EvaluateCanExecute(object parameter)`
`51`	`51`	`return _state.AllUserDeclarations`
`52`	`52`	`.Any(c => c.DeclarationType.HasFlag(DeclarationType.Module) &&`
`53`	`53`	`c.Annotations.All(a => a.AnnotationType != AnnotationType.NoIndent) &&`
`54`		`- c.Project == declaration.Project);`
	`54`	`+ c.ProjectId == declaration.ProjectId);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if (parameter is CodeExplorerCustomFolderViewModel)`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using Rubberduck.Navigation.CodeExplorer;`
`4`	`4`	`using Rubberduck.UI.Command;`
`5`	`5`	`using Rubberduck.VBEditor.SafeComWrappers.Abstract;`
`6`		`-using Rubberduck.VBEditor.SafeComWrappers.Office.Core.Abstract;`
`7`	`6`
`8`	`7`	`namespace Rubberduck.UI.CodeExplorer.Commands`
`9`	`8`	`{`
`@@ -50,9 +49,15 @@ protected override void OnExecute(object parameter)`
`50`	`49`	`node = node.Parent; // the project node is an ICodeExplorerDeclarationViewModel--no worries here`
`51`	`50`	`}`
`52`	`51`
	`52`	`+ var nodeProject = node.GetSelectedDeclaration().Project;`
	`53`	`+ if (nodeProject == null)`
	`54`	`+ {`
	`55`	`+ return; //The project declaration has been disposed, i.e. the project has been removed already.`
	`56`	`+ }`
	`57`	`+`
`53`	`58`	`try`
`54`	`59`	`{`
`55`		`- _vbe.ActiveVBProject = node.GetSelectedDeclaration().Project;`
	`60`	`+ _vbe.ActiveVBProject = nodeProject;`
`56`	`61`	`}`
`57`	`62`	`catch (COMException)`
`58`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ protected override void OnExecute(object parameter)`
`147`	`147`	`var project = parameter as IVBProject ??`
`148`	`148`	`(parameterIsModuleDeclaration ? ((Declaration) parameter).Project : GetProject());`
`149`	`149`
`150`		`- if (project.IsWrappingNullReference)`
	`150`	`+ if (project == null \|\| project.IsWrappingNullReference)`
`151`	`151`	`{`
`152`	`152`	`return;`
`153`	`153`	`}`