Clean COM wrappers leak: Round 2

Rubberduck.API/VBA/Parser.cs

@@ -67,10 +67,10 @@ public interface IParserEvents
     ]
     public sealed class Parser : IParser, IDisposable
     {
-        private RubberduckParserState _state;
-        private SynchronousParseCoordinator _parser;
-        private IVBE _vbe;
-        private IVBEEvents _vbeEvents;
+        private readonly RubberduckParserState _state;
+        private readonly SynchronousParseCoordinator _parser;
+        private readonly IVBE _vbe;
+        private readonly IVBEEvents _vbeEvents;
         private readonly IUiDispatcher _dispatcher;
         private readonly CancellationTokenSource _tokenSource;
 
@@ -228,6 +228,9 @@ public void Dispose()
             }
 
             _disposed = true;
+            _parser?.Dispose();
+            _vbe?.Dispose();
+            _tokenSource.Dispose();
         }
     }
 }

Rubberduck.CodeAnalysis/QuickFixes/IgnoreOnceQuickFix.cs

@@ -33,7 +33,7 @@ public override void Fix(IInspectionResult result, IRewriteSession rewriteSessio
 
             int annotationLine;
             //TODO: Make this use the parse tree instead of the code module.
-            var component = _state.ProjectsProvider.Component(result.QualifiedSelection.QualifiedName);
+            using (var component = _state.ProjectsProvider.Component(result.QualifiedSelection.QualifiedName))
             using (var module = component.CodeModule)
             {
                 annotationLine = result.QualifiedSelection.Selection.StartLine;

Rubberduck.Core/Common/WindowsOperatingSystem.cs

@@ -11,7 +11,8 @@ public void ShowFolder(string folderPath)
             {
                 Directory.CreateDirectory(folderPath);
             }
-            Process.Start(folderPath);
+
+            using (Process.Start(folderPath)) { }
         }
     }
 }

Rubberduck.Core/UI/CodeExplorer/Commands/AddMDIFormCommand.cs

@@ -45,14 +45,17 @@ private bool EvaluateCanExecuteCore(IVBProject project, CodeExplorerItemViewMode
                 return false;
             }
 
-            foreach (var component in project.VBComponents)
+            using (var components = project.VBComponents)
             {
-                using (component)
+                foreach (var component in components)
                 {
-                    if (component.Type == ComponentType.MDIForm)
+                    using (component)
                     {
-                        // Only one MDI Form allowed per project
-                        return false;
+                        if (component.Type == ComponentType.MDIForm)
+                        {
+                            // Only one MDI Form allowed per project
+                            return false;
+                        }
                     }
                 }
             }

Rubberduck.Core/UI/CodeExplorer/Commands/CopyResultsCommand.cs

@@ -22,29 +22,31 @@ public CopyResultsCommand(RubberduckParserState state) : base(LogManager.GetCurr
 
         protected override void OnExecute(object parameter)
         {
-                const string XML_SPREADSHEET_DATA_FORMAT = "XML Spreadsheet";
+            const string XML_SPREADSHEET_DATA_FORMAT = "XML Spreadsheet";
 
-                ColumnInfo[] ColumnInfos = { new ColumnInfo("Project"), new ColumnInfo("Folder"), new ColumnInfo("Component"), new ColumnInfo("Declaration Type"), new ColumnInfo("Scope"),
-                                           new ColumnInfo("Name"), new ColumnInfo("Return Type") };
+            ColumnInfo[] ColumnInfos = { new ColumnInfo("Project"), new ColumnInfo("Folder"), new ColumnInfo("Component"), new ColumnInfo("Declaration Type"), new ColumnInfo("Scope"),
+                                       new ColumnInfo("Name"), new ColumnInfo("Return Type") };
 
-                // this.ProjectName, this.CustomFolder, this.ComponentName, this.DeclarationType.ToString(), this.Scope 
-                var aDeclarations = _state.AllUserDeclarations.Select(declaration => declaration.ToArray()).ToArray();
+            // this.ProjectName, this.CustomFolder, this.ComponentName, this.DeclarationType.ToString(), this.Scope 
+            var aDeclarations = _state.AllUserDeclarations.Select(declaration => declaration.ToArray()).ToArray();
 
-                const string resource = "Rubberduck User Declarations - {0}";
-                var title = string.Format(resource, DateTime.Now.ToString(CultureInfo.InvariantCulture));
-            
-                var csvResults = ExportFormatter.Csv(aDeclarations, title, ColumnInfos);
-                var htmlResults = ExportFormatter.HtmlClipboardFragment(aDeclarations, title, ColumnInfos);
-                var rtfResults = ExportFormatter.RTF(aDeclarations, title);
+            const string resource = "Rubberduck User Declarations - {0}";
+            var title = string.Format(resource, DateTime.Now.ToString(CultureInfo.InvariantCulture));
+
+            var csvResults = ExportFormatter.Csv(aDeclarations, title, ColumnInfos);
+            var htmlResults = ExportFormatter.HtmlClipboardFragment(aDeclarations, title, ColumnInfos);
+            var rtfResults = ExportFormatter.RTF(aDeclarations, title);
 
-                var strm1 = ExportFormatter.XmlSpreadsheetNew(aDeclarations, title, ColumnInfos);
+            using (var strm1 = ExportFormatter.XmlSpreadsheetNew(aDeclarations, title, ColumnInfos))
+            {
                 //Add the formats from richest formatting to least formatting
                 _clipboard.AppendStream(DataFormats.GetDataFormat(XML_SPREADSHEET_DATA_FORMAT).Name, strm1);
                 _clipboard.AppendString(DataFormats.Rtf, rtfResults);
                 _clipboard.AppendString(DataFormats.Html, htmlResults);
                 _clipboard.AppendString(DataFormats.CommaSeparatedValue, csvResults);
 
                 _clipboard.Flush();
+            }
         }
     }
 }

Rubberduck.Core/UI/CodeExplorer/Commands/PrintCommand.cs

@@ -87,19 +87,23 @@ protected override void OnExecute(object parameter)
                 {
                     while (index < text.Count)
                     {
-                        var font = new Font(new FontFamily("Consolas"), 10, FontStyle.Regular);
-                        printPageArgs.Graphics.DrawString(text[index++], font, Brushes.Black, 0, offsetY, new StringFormat());
+                        using (var font = new Font(new FontFamily("Consolas"), 10, FontStyle.Regular))
+                        using (var stringFormat = new StringFormat())
+                        {
+                            printPageArgs.Graphics.DrawString(text[index++], font, Brushes.Black, 0, offsetY,
+                                stringFormat);
 
-                        offsetY += font.Height;
+                            offsetY += font.Height;
 
-                        if (offsetY >= pageHeight)
-                        {
-                            printPageArgs.HasMorePages = true;
-                            offsetY = 0;
-                            return;
-                        }
+                            if (offsetY >= pageHeight)
+                            {
+                                printPageArgs.HasMorePages = true;
+                                offsetY = 0;
+                                return;
+                            }
 
-                        printPageArgs.HasMorePages = false;
+                            printPageArgs.HasMorePages = false;
+                        }
                     }
                 };
 

Rubberduck.Core/UI/Command/ExportAllCommand.cs

@@ -61,12 +61,27 @@ private bool Evaluate(IVBProject project)
 
         protected override void OnExecute(object parameter)
         {
-            var projectNode = parameter as CodeExplorerProjectViewModel;
-
-            var vbproject = parameter as IVBProject;
+            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 project = projectNode?.Declaration.Project ?? vbproject ?? _vbe.ActiveVBProject;
-            
+        private void Export(IVBProject project)
+        {
             var desc = string.Format(RubberduckUI.ExportAllCommand_SaveAsDialog_Title, project.Name);
 
             // If .GetDirectoryName is passed an empty string for a RootFolder, 

Rubberduck.Core/UI/Command/FindAllReferencesCommand.cs

@@ -232,32 +232,47 @@ private Declaration FindFormDesignerTarget(QualifiedModuleName? qualifiedModuleN
             {
                 projectId = activeProject.ProjectId;
             }
-            var component = _vbe.SelectedVBComponent;
 
-            if (component?.HasDesigner ?? false)
+            using (var component = _vbe.SelectedVBComponent)
             {
-                DeclarationType selectedType;
-                string selectedName;
-                using (var selectedControls = component.SelectedControls)
+                if (component?.HasDesigner ?? false)
                 {
-                    var selectedCount = selectedControls.Count;
-                    if (selectedCount > 1)
+                    DeclarationType selectedType;
+                    string selectedName;
+                    using (var selectedControls = component.SelectedControls)
                     {
-                        return null;
+                        var selectedCount = selectedControls.Count;
+                        if (selectedCount > 1)
+                        {
+                            return null;
+                        }
+
+                        (selectedType, selectedName) = GetSelectedName(component, selectedControls, selectedCount);
                     }
 
-                    // Cannot use DeclarationType.UserForm, parser only assigns UserForms the ClassModule flag
-                    (selectedType, selectedName) = selectedCount == 0
-                        ? (DeclarationType.ClassModule, component.Name)
-                        : (DeclarationType.Control, selectedControls[0].Name);
+                    return _state.DeclarationFinder
+                        .MatchName(selectedName)
+                        .SingleOrDefault(m => m.ProjectId == projectId
+                                              && m.DeclarationType.HasFlag(selectedType)
+                                              && m.ComponentName == component.Name);
                 }
-                return _state.DeclarationFinder
-                    .MatchName(selectedName)
-                    .SingleOrDefault(m => m.ProjectId == projectId
-                        && m.DeclarationType.HasFlag(selectedType)
-                        && m.ComponentName == component.Name);                
+
+                return null;
+            }
+        }
+
+        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);
             }
-            return null;
         }
 
         private Declaration FindFormDesignerTarget(QualifiedModuleName qualifiedModuleName)

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

@@ -169,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()
         {
@@ -181,9 +200,9 @@ public void RemoveCommandBar()
                     Logger.Debug("Removing commandbar.");
                     RemoveChildren();
                     Item.Delete();
-                    Item.Dispose();
+
+                    // Setting them to null will automatically dispose those
                     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;
 
@@ -91,7 +110,8 @@ public void RemoveMenu()
             Logger.Debug($"Removing menu {_key}.");
             RemoveChildren();
             Item?.Delete();
-            Item?.Dispose();
+
+            //This will also dispose the Item as well
             Item = null;
         }
 

Rubberduck.Core/UI/Command/Refactorings/CodePaneRefactorRenameCommand.cs

@@ -59,7 +59,7 @@ protected override void OnExecute(object parameter)
                 }
                 else
                 {
-                    target = _state.FindSelectedDeclaration(Vbe.ActiveCodePane);
+                    target = _state.FindSelectedDeclaration(activePane);
                 }
             }