Changes following PR comments

rubberduck-vba · Apr 19, 2018 · 8ac6a5f · 8ac6a5f
1 parent 25ba7ad
commit 8ac6a5f
Show file tree

Hide file tree

Showing 11 changed files with 83 additions and 47 deletions.
diff --git a/Rubberduck.VBEEditor/SafeComWrappers/SafeRedirectedEventedComWrapper.cs b/Rubberduck.VBEEditor/SafeComWrappers/SafeRedirectedEventedComWrapper.cs
@@ -24,6 +24,10 @@ protected SafeRedirectedEventedComWrapper(TSource target, TEventSource eventSour
         protected override void Dispose(bool disposing)
         {
             DetachEvents();
+
+            Marshal.ReleaseComObject(_eventSource);
+            _eventSource = null;
+
             base.Dispose(disposing);
         }
 
@@ -74,10 +78,8 @@ public void DetachEvents()
                     _cookie = NotAdvising;
                 }
 
-                Marshal.ReleaseComObject(_icp);
-                Marshal.ReleaseComObject(_eventSource);
-                _icp = null;
-                _eventSource = null;
+                Marshal.ReleaseComObject(_icp);                
+                _icp = null;                
             }
         }
     }

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/Office/CommandBarControls.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/Office/CommandBarControls.cs
@@ -52,18 +52,6 @@ IEnumerator IEnumerable.GetEnumerator()
                 : ((IEnumerable<ICommandBarControl>) this).GetEnumerator();
         }
 
-        //public override void Release(bool final = false)
-        //{
-        //    if (!IsWrappingNullReference)
-        //    {
-        //        for (var i = 1; i <= Count; i++)
-        //        {
-        //            this[i].Release();
-        //        }
-        //        base.Release(final);
-        //    }
-        //}
-
         public override bool Equals(ISafeComWrapper<MSO.CommandBarControls> other)
         {
             return IsEqualIfNull(other) || (other != null && ReferenceEquals(other.Target, Target));

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/Office/CommandBars.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/Office/CommandBars.cs
@@ -2,11 +2,8 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using MSO = Office_v8::Office;
-using VB = Microsoft.Vbe.Interop.VB6;
 
 // ReSharper disable once CheckNamespace - Special dispensation due to conflicting file vs namespace priorities
 namespace Rubberduck.VBEditor.SafeComWrappers.Office8
@@ -34,22 +31,20 @@ public ICommandBar Add(string name, CommandBarPosition position)
         }
 
         private void DeleteExistingCommandBar(string name)
-        {
-            try
+        {            
+            foreach (var commandBar in (IEnumerable<ICommandBar>) this)
             {
-                var existing = Target.Cast<MSO.CommandBar>().FirstOrDefault(bar => bar.Name == name);
-                if (existing != null)
+                using (commandBar)
                 {
-                    existing.Delete();
-                    Marshal.FinalReleaseComObject(existing);
+                    if (commandBar.Name == name)
+                    {
+                        commandBar.Delete();
+                    }
                 }
             }
-            catch
-            {
-                // specified commandbar didn't exist
-            }
         }
 
+
         public ICommandBarControl FindControl(int id)
         {
             return new CommandBarControl(IsWrappingNullReference ? null : Target.FindControl(Id: id), _vbe);

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/AddIns.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/AddIns.cs
@@ -44,7 +44,9 @@ public override int GetHashCode()
 
         IEnumerator IEnumerable.GetEnumerator()
         {
-            return IsWrappingNullReference ? new List<IEnumerable>().GetEnumerator() : Target.GetEnumerator();
+            return IsWrappingNullReference
+                ? (IEnumerator)new List<IEnumerable>().GetEnumerator()
+                : ((IEnumerable<IAddIn>)this).GetEnumerator();
         }
 
         IEnumerator<IAddIn> IEnumerable<IAddIn>.GetEnumerator()

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/CodeModule.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/CodeModule.cs
@@ -66,7 +66,7 @@ public void DeleteLines(Selection selection)
 
             using (var codePane = CodePane)
             {
-                if (CodePane.IsWrappingNullReference)
+                if (codePane.IsWrappingNullReference)
                 {
                     return null;
                 }

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/LinkedWindows.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/LinkedWindows.cs
@@ -43,7 +43,9 @@ public void Add(IWindow window)
 
         IEnumerator IEnumerable.GetEnumerator()
         {
-            return IsWrappingNullReference ? new List<IEnumerable>().GetEnumerator() : Target.GetEnumerator();
+            return IsWrappingNullReference
+                ? (IEnumerator)new List<IEnumerable>().GetEnumerator()
+                : ((IEnumerable<IWindow>)this).GetEnumerator();
         }
 
         IEnumerator<IWindow> IEnumerable<IWindow>.GetEnumerator()

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBComponents.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBComponents.cs
@@ -124,10 +124,7 @@ public void ImportSourceFile(string path)
                         component = Import(path);
                     }
 
-                    var codeString =
-                        File.ReadAllText(path,
-                            Encoding
-                                .Default); //The VBE uses the current ANSI codepage from the windows settings to export and import.
+                    var codeString = File.ReadAllText(path, Encoding.Default); //The VBE uses the current ANSI codepage from the windows settings to export and import.
                     var codeLines = codeString.Split(new[] {Environment.NewLine}, StringSplitOptions.None);
 
                     var nonAttributeLines = codeLines.TakeWhile(line => !line.StartsWith("Attribute")).Count();

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBControl.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBControl.cs
@@ -1,3 +1,4 @@
+using System;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 using VB = Microsoft.Vbe.Interop.VB6;
 
@@ -11,10 +12,54 @@ public VBControl(VB.VBControl target, bool rewrapping = false)
         {
         }
 
+        public IProperties Properties => new Properties(IsWrappingNullReference? null : Target.Properties);
+
         public string Name
         {
-            get => IsWrappingNullReference ? string.Empty : Target.Properties.Item("Name").Value.ToString();
-            set { if (!IsWrappingNullReference) Target.Properties.Item("Name").Value = value; }
+            get
+            {
+                if (IsWrappingNullReference)
+                {
+                    return string.Empty;
+                }
+
+                using (var properties = this.Properties)
+                {
+                    foreach (var property in properties)
+                    {
+                        using (property)
+                        {
+                            if (property.Name == "Name")
+                            {
+                                return (string)property.Value;
+                            }
+                        }
+                    }
+                }
+                // Should never happen - all VB controls are required to be named.
+                return null;
+            }
+            set
+            {
+                if (!IsWrappingNullReference)
+                {
+                    using (var properties = this.Properties)
+                    {
+                        foreach (var property in properties)
+                        {
+                            using (property)
+                            {
+                                if (property.Name == "Name")
+                                {
+                                    property.Value = value;
+                                    return;
+                                }
+                            }
+                        }                        
+                    }
+                    // Should never happen - all VB controls are required to be named.                    
+                }                
+            }
         }
 
         public override bool Equals(ISafeComWrapper<VB.VBControl> other)

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBE.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBE.cs
@@ -125,19 +125,19 @@ public static void SetSelection(IVBProject vbProject, Selection selection, strin
         {
             using (var components = vbProject.VBComponents)
             {
-                using (var component = components.SingleOrDefault(c => ComponentHasName(c, name))) 
+                using (var component = components.SingleOrDefault(c => ComponentHasName(c, name)))
                 {
-            if (component == null || component.IsWrappingNullReference)
-            {
-                return;
-            }
+                    if (component == null || component.IsWrappingNullReference)
+                    {
+                        return;
+                    }
 
                     using (var module = component.CodeModule)
                     {
                         using (var pane = module.CodePane)
                         {
-            pane.Selection = selection;
-        }
+                            pane.Selection = selection;
+                        }
                     }
                 }
             }

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBProject.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/VBProject.cs
@@ -43,7 +43,10 @@ public EnvironmentMode Mode
         {
             get
             {
-                if (IsWrappingNullReference) {return 0; }
+                if (IsWrappingNullReference)
+                {
+                    return 0;
+                }
 
                 return (EnvironmentMode) EbMode();
             }

diff --git a/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/Windows.cs b/Rubberduck.VBEditor.VB6/SafeComWrappers/VB/Windows.cs
@@ -49,7 +49,9 @@ public void ReleaseDockableHosts()
 
         IEnumerator IEnumerable.GetEnumerator()
         {
-            return IsWrappingNullReference ? new List<IEnumerable>().GetEnumerator() : Target.GetEnumerator();
+            return IsWrappingNullReference
+                ? (IEnumerator)new List<IEnumerable>().GetEnumerator()
+                : ((IEnumerable<IWindow>)this).GetEnumerator();
         }
 
         IEnumerator<IWindow> IEnumerable<IWindow>.GetEnumerator()