Merge branch 'next' into next

Author: Hosch250

RetailCoder.VBE/App.cs

@@ -26,7 +26,7 @@ public sealed class App : IDisposable
         private const string FILE_TARGET_NAME = "file";
         private readonly VBE _vbe;
         private readonly IMessageBox _messageBox;
-        private readonly IRubberduckParser _parser;
+        private IRubberduckParser _parser;
         private AutoSave.AutoSave _autoSave;
         private IGeneralConfigService _configService;
         private readonly IAppMenu _appMenus;
@@ -468,6 +468,16 @@ public void Dispose()
                 _branchesVM.LoadingComponentsCompleted -= EnableSinkEventHandlersAndUpdateCache;
             }
 
+            _handleSinkEvents = false;
+
+            if (_parser != null && _parser.State != null)
+            {
+                _parser.State.StateChanged -= Parser_StateChanged;
+                _parser.State.StatusMessageUpdate -= State_StatusMessageUpdate;
+                _parser.Dispose();
+                // I won't set this to null because other components may try to release things
+            }
+
             if (_hooks != null)
             {
                 _hooks.MessageReceived -= _hooks_MessageReceived;
@@ -482,13 +492,6 @@ public void Dispose()
                 _configService = null;
             }
 
-            if (_parser != null && _parser.State != null)
-            {
-                _parser.State.StateChanged -= Parser_StateChanged;
-                _parser.State.StatusMessageUpdate -= State_StatusMessageUpdate;
-                // I won't set this to null because other components may try to release things
-            }
-
             if (_stateBar != null)
             {
                 _stateBar.Refresh -= _stateBar_Refresh;
@@ -531,6 +534,8 @@ public void Dispose()
                 item.Value.Item1.Unadvise(item.Value.Item2);
             }
 
+            UiDispatcher.Shutdown();
+
             _disposed = true;
         }
     }

RetailCoder.VBE/AppMenu.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Rubberduck.Parsing.VBA;
 using Rubberduck.UI.Command.MenuItems;
 using Rubberduck.UI.Command.MenuItems.ParentMenus;
@@ -43,6 +44,7 @@ public void Dispose()
         {
             foreach (var menu in _menus)
             {
+                menu.RemoveChildren();
                 if (menu.Item != null)
                 {
                     menu.Item.Delete();

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

@@ -1,3 +1,4 @@
+using System;
 using Microsoft.Office.Core;
 
 namespace Rubberduck.UI.Command.MenuItems.ParentMenus
@@ -6,5 +7,6 @@ public interface IParentMenuItem : IMenuItem, IAppMenu
     {
         CommandBarControls Parent { get; set; }
         CommandBarPopup Item { get; }
+        void RemoveChildren();
     }
 }

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

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -34,7 +35,7 @@ protected ParentMenuItemBase(string key, IEnumerable<IMenuItem> items, int? befo
 
         public virtual bool BeginGroup { get { return false; } }
         public virtual int DisplayOrder { get { return default(int); } }
-        
+
         public void Localize()
         {
             if (Item == null)
@@ -81,6 +82,23 @@ public void Initialize()
             _logger.Debug("'{0}' ({1}) parent menu initialized, hash code {2}.", _key, GetHashCode(), Item.GetHashCode());
         }
 
+        public void RemoveChildren()
+        {
+            foreach (var child in _items.Keys.Select(item => item as IParentMenuItem).Where(child => child != null))
+            {
+                Debug.WriteLine("Deleting menu item {0}.", child.Caption);
+                child.RemoveChildren();
+                Debug.Assert(_items[child] is CommandBarPopup);
+                (_items[child] as CommandBarPopup).Delete();
+            }
+            foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
+            {
+                child.Click -= child_Click;
+                Debug.WriteLine("Deleting child menu item {0}.", child.Caption);
+                child.Delete();
+            }
+        }
+
         public void EvaluateCanExecute(RubberduckParserState state)
         {
             foreach (var kvp in _items)

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

@@ -58,5 +58,10 @@ private static void CheckInitialization()
         {
             if (UiContext == null) throw new InvalidOperationException("UiDispatcher is not initialized. Invoke Initialize() from UI thread first.");
         }
+
+        public static void Shutdown()
+        {
+            Invoke(() => Dispatcher.CurrentDispatcher.InvokeShutdown());
+        }
     }
 }

Rubberduck.Parsing/IRubberduckParser.cs

@@ -1,8 +1,9 @@
+using System;
 using Rubberduck.Parsing.VBA;
 
 namespace Rubberduck.Parsing
 {
-    public interface IRubberduckParser
+    public interface IRubberduckParser : IDisposable
     {
         RubberduckParserState State { get; }
     }

Rubberduck.Parsing/VBA/RubberduckParser.cs

@@ -19,7 +19,7 @@
 
 namespace Rubberduck.Parsing.VBA
 {
-    public class RubberduckParser : IRubberduckParser, IDisposable
+    public class RubberduckParser : IRubberduckParser
     {
         public RubberduckParserState State { get { return _state; } }
 
@@ -605,16 +605,17 @@ private void ResolveReferences(DeclarationFinder finder, VBComponent component,
         public void Dispose()
         {
             State.ParseRequest -= ReparseRequested;
-            if (_resolverTokenSource != null)
-            {
-                _resolverTokenSource.Dispose();
-            }
 
             if (_central != null)
             {
-                _central.Cancel();
+                //_central.Cancel();
                 _central.Dispose();
             }
+
+            if (_resolverTokenSource != null)
+            {
+                _resolverTokenSource.Dispose();
+            }
         }
     }
 }