Merge branch 'next' of https://github.com/rubberduck-vba/Rubberduck into next

Author: ThunderFrame

RetailCoder.VBE/AppMenu.cs

@@ -42,11 +42,12 @@ public void Localize()
 
         public void Dispose()
         {
-            foreach (var menu in _menus.Where(menu => menu.Item != null))
-            {
-                menu.RemoveChildren();
-                menu.Item.Delete();
-            }
+            // note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
+            //foreach (var menu in _menus.Where(menu => menu.Item != null))
+            //{
+            //    menu.RemoveChildren();
+            //    menu.Item.Delete();
+            //}
         }
     }
 }

RetailCoder.VBE/Extension.cs

@@ -212,11 +212,15 @@ private void Startup()
 
             _app = _kernel.Get<App>();
             _app.Startup();
+
             _isInitialized = true;
         }
 
         private void ShutdownAddIn()
         {
+            var currentDomain = AppDomain.CurrentDomain;
+            currentDomain.AssemblyResolve -= LoadFromSameFolder;
+
             User32.EnumChildWindows(_ide.MainWindow.Handle(), EnumCallback, new IntPtr(0));
 
             if (_app != null)

RetailCoder.VBE/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs

@@ -110,12 +110,13 @@ public void EvaluateCanExecute(RubberduckParserState state)
         public ICommandBar Item { get; private set; }
         public void RemoveChildren()
         {
-            foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
-            {
-                child.Click -= child_Click;
-                child.Delete();
-                //child.Release();
-            }
+            // note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
+            //foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
+            //{
+            //    child.Click -= child_Click;
+            //    child.Delete();
+            //    child.Release();
+            //}
         }
 
         // note: HAAAAACK!!!

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

@@ -53,9 +53,10 @@ public void SetContextSelectionCaption(string caption)
 
         public void Dispose()
         {
-            RemoveChildren();
-            Item.Delete();
-            Item.Release(true);
+            //note: doing this wrecks the teardown process. counter-intuitive? sure. but hey it works.
+            //RemoveChildren();
+            //Item.Delete();
+            //Item.Release(true);
         }
     }
 

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

@@ -96,14 +96,14 @@ public void RemoveChildren()
             foreach (var child in _items.Keys.Select(item => item as IParentMenuItem).Where(child => child != null))
             {
                 child.RemoveChildren();
-                var item = _items[child];
-                Debug.Assert(item is CommandBarPopup);
-                (item as CommandBarPopup).Delete();
+                //var item = _items[child];
+                //Debug.Assert(item is CommandBarPopup);
+                //(item as CommandBarPopup).Delete();
             }
             foreach (var child in _items.Values.Select(item => item as CommandBarButton).Where(child => child != null))
             {
                 child.Click -= child_Click;
-                child.Delete();
+                //child.Delete();
             }
         }
 

Rubberduck.VBEEditor/SafeComWrappers/Office.Core/CommandBarButton.cs

@@ -51,9 +51,11 @@ private void Target_Click(Microsoft.Office.Core.CommandBarButton ctrl, ref bool
             //note: event is fired for every parent the command exists under. not sure why.
             //System.Diagnostics.Debug.WriteLine("Target_Click: {0} '{1}' (tag: {2}, hashcode:{3})", Parent.Name, Target.Caption, Tag, Target.GetHashCode());
 
-            var args = new CommandBarButtonClickEventArgs(new CommandBarButton(ctrl));
+            var button = new CommandBarButton(ctrl);
+            var args = new CommandBarButtonClickEventArgs(button);
             handler.Invoke(this, args);
             cancelDefault = args.Cancel;
+            button.Release(final:true);
         }
 
         public bool IsBuiltInFace

Rubberduck.VBEEditor/SafeComWrappers/Office.Core/CommandBars.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using Rubberduck.VBEditor.SafeComWrappers.MSForms;
 using Rubberduck.VBEditor.SafeComWrappers.Office.Core.Abstract;
@@ -17,14 +18,33 @@ public CommandBars(Microsoft.Office.Core.CommandBars target)
 
         public ICommandBar Add(string name)
         {
+            DeleteExistingCommandBar(name);
             return new CommandBar(Target.Add(name, Temporary:true));
         }
 
         public ICommandBar Add(string name, CommandBarPosition position)
         {
+            DeleteExistingCommandBar(name);
             return new CommandBar(Target.Add(name, position, Temporary: true));
         }
 
+        private void DeleteExistingCommandBar(string name)
+        {
+            try
+            {
+                var existing = Target[name];
+                if (existing != null)
+                {
+                    existing.Delete();
+                    Marshal.FinalReleaseComObject(existing);
+                }
+            }
+            catch
+            {
+                // specified commandbar didn't exist
+            }
+        }
+
         public ICommandBarControl FindControl(int id)
         {
             return new CommandBarControl(Target.FindControl(Id:id));
@@ -57,15 +77,15 @@ public ICommandBar this[object index]
 
         public override void Release(bool final = false)
         {
-            if (!IsWrappingNullReference)
-            {
-                var commandBars = this.ToArray();
-                foreach (var commandBar in commandBars)
-                {
-                    commandBar.Release();
-                }
-                base.Release(final);
-            }
+            //if (!IsWrappingNullReference)
+            //{
+            //    var commandBars = this.ToArray();
+            //    foreach (var commandBar in commandBars)
+            //    {
+            //        commandBar.Release();
+            //    }
+            //    base.Release(final);
+            //}
         }
 
         public override bool Equals(ISafeComWrapper<Microsoft.Office.Core.CommandBars> other)

Rubberduck.VBEEditor/SafeComWrappers/VBA/VBE.cs

@@ -90,7 +90,7 @@ public override void Release(bool final = false)
             {
                 VBProjects.Release();
                 CodePanes.Release();
-                CommandBars.Release();
+                //CommandBars.Release();
                 Windows.Release();
                 AddIns.Release();
                 base.Release(final);