Clean COM wrappers leak: Round 2

Rubberduck.Core/Common/WinAPI/RegistryAccess.cs

@@ -18,11 +18,9 @@ internal static RegistryKey GetDeviceKey(string device)
 
         internal static string GetClassType(string classGuid)
         {
-            using (var classGuidKey =
-                Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Class\" + classGuid))
-            {
-                return classGuidKey != null ? (string) classGuidKey.GetValue("Class") : string.Empty;
-            }
+            var classGuidKey = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\Class\" + classGuid);
+
+            return classGuidKey != null ? (string)classGuidKey.GetValue("Class") : string.Empty;
         }
     }
 }

Rubberduck.Core/UI/Command/ExportAllCommand.cs

@@ -61,32 +61,44 @@ private bool Evaluate(IVBProject project)
 
         protected override void OnExecute(object parameter)
         {
-            var projectNode = parameter as CodeExplorerProjectViewModel;
+            switch (parameter)
+            {
+                case CodeExplorerProjectViewModel projectNode when projectNode.Declaration.Project != null:
+                    Export(projectNode.Declaration.Project);
+                    break;
+                case IVBProject vbproject:
+                    Export(vbproject);
+                    break;
+                default:
+                {
+                    using (var project = _vbe.ActiveVBProject)
+                    {
+                        Export(project);
+                    }
+                    break;
+                }
+            }
+        }
 
-            var vbproject = parameter as IVBProject;
+        private void Export(IVBProject project)
+        {
+            var desc = string.Format(RubberduckUI.ExportAllCommand_SaveAsDialog_Title, project.Name);
 
-            using (var activeProject = _vbe.ActiveVBProject)
+            // If .GetDirectoryName is passed an empty string for a RootFolder, 
+            // it defaults to the Documents library (Win 7+) or equivalent.
+            var path = string.Empty;
+            if (!string.IsNullOrWhiteSpace(project.FileName))
             {
-                var project = projectNode?.Declaration.Project ?? vbproject ?? activeProject;
-
-                var desc = string.Format(RubberduckUI.ExportAllCommand_SaveAsDialog_Title, project.Name);
+                path = Path.GetDirectoryName(project.FileName);
+            }
 
-                // If .GetDirectoryName is passed an empty string for a RootFolder, 
-                // it defaults to the Documents library (Win 7+) or equivalent.
-                var path = string.Empty;
-                if (!string.IsNullOrWhiteSpace(project.FileName))
-                {
-                    path = Path.GetDirectoryName(project.FileName);
-                }
+            using (var _folderBrowser = _factory.CreateFolderBrowser(desc, true, path))
+            {
+                var result = _folderBrowser.ShowDialog();
 
-                using (var _folderBrowser = _factory.CreateFolderBrowser(desc, true, path))
+                if (result == DialogResult.OK)
                 {
-                    var result = _folderBrowser.ShowDialog();
-
-                    if (result == DialogResult.OK)
-                    {
-                        project.ExportSourceFiles(_folderBrowser.SelectedPath);
-                    }
+                    project.ExportSourceFiles(_folderBrowser.SelectedPath);
                 }
             }
         }

Rubberduck.Core/UI/Command/FindAllReferencesCommand.cs

@@ -239,10 +239,7 @@ private Declaration FindFormDesignerTarget(QualifiedModuleName? qualifiedModuleN
                             return null;
                         }
 
-                        // Cannot use DeclarationType.UserForm, parser only assigns UserForms the ClassModule flag
-                        (selectedType, selectedName) = selectedCount == 0
-                            ? (DeclarationType.ClassModule, component.Name)
-                            : (DeclarationType.Control, selectedControls[0].Name);
+                        (selectedType, selectedName) = GetSelectedName(component, selectedControls, selectedCount);
                     }
 
                     return _state.DeclarationFinder
@@ -256,6 +253,20 @@ private Declaration FindFormDesignerTarget(QualifiedModuleName? qualifiedModuleN
             }
         }
 
+        private static (DeclarationType, string Name) GetSelectedName(IVBComponent component, IControls selectedControls, int selectedCount)
+        {
+            // Cannot use DeclarationType.UserForm, parser only assigns UserForms the ClassModule flag
+            if (selectedCount == 0)
+            {
+                return (DeclarationType.ClassModule, component.Name);
+            }
+
+            using (var firstSelectedControl = selectedControls[0])
+            {
+                return (DeclarationType.Control, firstSelectedControl.Name);
+            }
+        }
+
         private Declaration FindFormDesignerTarget(QualifiedModuleName qualifiedModuleName)
         {
             var projectId = qualifiedModuleName.ProjectId;

Rubberduck.Core/UI/Command/MenuItems/CommandBars/AppCommandBarBase.cs

@@ -87,7 +87,6 @@ public virtual void Initialize()
 
             try
             {
-                Item?.Dispose();
                 Item = Parent.Add(_name, _position);
                 Item.IsVisible = true;
             }
@@ -170,8 +169,27 @@ public void EvaluateCanExecute(RubberduckParserState state)
             }
         }
 
-        public ICommandBars Parent { get; set; }
-        public ICommandBar Item { get; private set; }
+        private ICommandBars _parent;
+        public ICommandBars Parent
+        {
+            get => _parent;
+            set
+            {
+                _parent?.Dispose();
+                _parent = value;
+            }
+        }
+
+        private ICommandBar _item;
+        public ICommandBar Item
+        {
+            get => _item;
+            private set
+            {
+                _item?.Dispose();
+                _item = value;
+            }
+        }
 
         public void RemoveCommandBar()
         {
@@ -184,7 +202,6 @@ public void RemoveCommandBar()
                     Item.Delete();
                     Item.Dispose();
                     Item = null;
-                    Parent?.Dispose();
                     Parent = null;
                 }
             }

Rubberduck.Core/UI/Command/MenuItems/ParentMenus/ParentMenuItemBase.cs

@@ -24,8 +24,27 @@ protected ParentMenuItemBase(string key, IEnumerable<IMenuItem> items, int? befo
             _items = items.ToDictionary(item => item, item => null as ICommandBarControl);
         }
 
-        public ICommandBarControls Parent { get; set; }
-        public ICommandBarPopup Item { get; private set; }
+        private ICommandBarControls _parent;
+        public ICommandBarControls Parent
+        {
+            get => _parent;
+            set
+            {
+                _parent?.Dispose();
+                _parent = value;
+            }
+        }
+
+        private ICommandBarPopup _item;
+        public ICommandBarPopup Item
+        {
+            get => _item;
+            private set
+            {
+                _item?.Dispose();
+                _item = value;
+            }
+        }
 
         public string Key => Item?.Tag;
 
@@ -73,7 +92,6 @@ public void Initialize()
                 return;
             }
 
-            Item?.Dispose();
             Item =  Parent.AddPopup(_beforeIndex);                
 
             Item.Tag = _key;            
@@ -92,7 +110,6 @@ public void RemoveMenu()
             Logger.Debug($"Removing menu {_key}.");
             RemoveChildren();
             Item?.Delete();
-            Item?.Dispose();
             Item = null;
         }