More teardown.

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -402,6 +402,8 @@ public void Dispose()
                 item.Value.Item1.Unadvise(item.Value.Item2);
             }
             _hooks.Dispose();
+
+            _stateBar.Dispose();
         }
     }
 }

RetailCoder.VBE/AppMenu.cs

@@ -1,11 +1,12 @@
+using System;
 using System.Collections.Generic;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
 
 namespace Rubberduck
 {
-    public class AppMenu : IAppMenu
+    public class AppMenu : IAppMenu, IDisposable
     {
         private readonly IEnumerable<IParentMenuItem> _menus;
 
@@ -37,5 +38,16 @@ public void Localize()
                 menu.Localize();
             }
         }
+
+        public void Dispose()
+        {
+            foreach (var menu in _menus)
+            {
+                if (menu.Item != null)
+                {
+                    menu.Item.Delete();
+                }
+            }
+        }
     }
 }

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -64,6 +64,7 @@ public override void Load()
             _kernel.Bind<GitProvider>().ToSelf().InSingletonScope();
             _kernel.Bind<NewUnitTestModuleCommand>().ToSelf().InSingletonScope();
             _kernel.Bind<NewTestMethodCommand>().ToSelf().InSingletonScope();
+            _kernel.Bind<RubberduckCommandBar>().ToSelf().InSingletonScope();
 
             BindCodeInspectionTypes();
 

RetailCoder.VBE/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

@@ -195,7 +195,14 @@ public void Dispose()
         {
             foreach (var item in _items)
             {
-                item.Value.Delete();
+                try
+                {
+                    item.Value.Delete();
+                }
+                catch (COMException)
+                {
+                    // gulp
+                }
             }
 
             Item.Delete();

RetailCoder.VBE/UI/Command/MenuItems/RubberduckCommandBar.cs

@@ -11,7 +11,7 @@
 
 namespace Rubberduck.UI.Command.MenuItems
 {
-    public class RubberduckCommandBar
+    public class RubberduckCommandBar : IDisposable
     {
         private readonly RubberduckParserState _state;
         private readonly VBE _vbe;
@@ -20,6 +20,7 @@ public class RubberduckCommandBar
         private CommandBarButton _refreshButton;
         private CommandBarButton _statusButton;
         private CommandBarButton _selectionButton;
+        private CommandBar _commandbar;
 
         public RubberduckCommandBar(RubberduckParserState state, VBE vbe, IShowParserErrorsCommand command)
         {
@@ -105,31 +106,47 @@ private void OnRefresh()
 
         public void Initialize()
         {
-            var commandbar = _vbe.CommandBars.Add("Rubberduck", MsoBarPosition.msoBarTop, false, true);
+            _commandbar = _vbe.CommandBars.Add("Rubberduck", MsoBarPosition.msoBarTop, false, true);
 
-            _refreshButton = (CommandBarButton)commandbar.Controls.Add(MsoControlType.msoControlButton);
+            _refreshButton = (CommandBarButton)_commandbar.Controls.Add(MsoControlType.msoControlButton);
             ParentMenuItemBase.SetButtonImage(_refreshButton, Resources.arrow_circle_double, Resources.arrow_circle_double_mask);
             _refreshButton.Style = MsoButtonStyle.msoButtonIcon;
             _refreshButton.Tag = "Refresh";
             _refreshButton.TooltipText =RubberduckUI.RubberduckCommandbarRefreshButtonTooltip;
             _refreshButton.Click += refreshButton_Click;
 
-            _statusButton = (CommandBarButton)commandbar.Controls.Add(MsoControlType.msoControlButton);
+            _statusButton = (CommandBarButton)_commandbar.Controls.Add(MsoControlType.msoControlButton);
             _statusButton.Style = MsoButtonStyle.msoButtonCaption;
             _statusButton.Tag = "Status";
             _statusButton.Click += _statusButton_Click;
 
-            _selectionButton = (CommandBarButton)commandbar.Controls.Add(MsoControlType.msoControlButton);
+            _selectionButton = (CommandBarButton)_commandbar.Controls.Add(MsoControlType.msoControlButton);
             _selectionButton.Style = MsoButtonStyle.msoButtonCaption;
             _selectionButton.BeginGroup = true;
             _selectionButton.Enabled = false;
 
-            commandbar.Visible = true;
+            _commandbar.Visible = true;
         }
 
         private void refreshButton_Click(CommandBarButton Ctrl, ref bool CancelDefault)
         {
             OnRefresh();
         }
+
+        private bool _isDisposed;
+        public void Dispose()
+        {
+            if (_isDisposed)
+            {
+                return;
+            }
+
+            _refreshButton.Delete();
+            _selectionButton.Delete();
+            _statusButton.Delete();
+            _commandbar.Delete();
+
+            _isDisposed = true;
+        }
     }
 }

Rubberduck.Parsing/VBA/RubberduckParserState.cs

@@ -52,7 +52,7 @@ public RubberduckStatusMessageEventArgs(string message)
         public string Message { get { return _message; } }
     }
 
-    public sealed class RubberduckParserState
+    public sealed class RubberduckParserState : IDisposable
     {
         // circumvents VBIDE API's tendency to return a new instance at every parse, which breaks reference equality checks everywhere
         private readonly IDictionary<string, Func<VBProject>> _projects = new Dictionary<string, Func<VBProject>>();
@@ -727,5 +727,28 @@ public void RemoveBuiltInDeclarations(Reference reference)
                 Debug.WriteLine("Could not remove declarations for removed reference '{0}' ({1}).", reference.Name, QualifiedModuleName.GetProjectId(reference));
             }
         }
+
+        private bool _isDisposed;
+        public void Dispose()
+        {
+            if (_isDisposed)
+            {
+                return;
+            }
+
+            _declarations.Clear();
+            _tokenStreams.Clear();
+            _parseTrees.Clear();
+            _moduleStates.Clear();
+            _moduleContentHashCodes.Clear();
+            _comments.Clear();
+            _annotations.Clear();
+            _moduleExceptions.Clear();
+            _moduleAttributes.Clear();
+            _declarationSelections.Clear();
+            _projects.Clear();
+
+            _isDisposed = true;
+        }
     }
 }