Fix more memory leaks.

Hosch250 · Hosch250 · commit 0b99ef924ec1 · 2016-07-27T15:11:00.000-05:00
diff --git a/RetailCoder.VBE/Inspections/Inspector.cs b/RetailCoder.VBE/Inspections/Inspector.cs
@@ -18,11 +18,11 @@ namespace Rubberduck.Inspections
         public class Inspector : IInspector
         {
             private readonly IGeneralConfigService _configService;
-            private readonly IEnumerable<IInspection> _inspections;
+            private readonly List<IInspection> _inspections;
 
             public Inspector(IGeneralConfigService configService, IEnumerable<IInspection> inspections)
             {
-                _inspections = inspections;
+                _inspections = inspections.ToList();
 
                 _configService = configService;
                 configService.SettingsChanged += ConfigServiceSettingsChanged;
@@ -127,6 +127,8 @@ public void Dispose()
                 {
                     _configService.SettingsChanged -= ConfigServiceSettingsChanged;
                 }
+
+                _inspections.Clear();
             }
         }
     }
diff --git a/RetailCoder.VBE/Root/RubberduckModule.cs b/RetailCoder.VBE/Root/RubberduckModule.cs
@@ -76,8 +76,8 @@ public override void Load()
                 Assembly.GetAssembly(typeof(IIndenter))
             };
 
-            ApplyConfigurationConvention(assemblies);
             ApplyDefaultInterfacesConvention(assemblies);
+            ApplyConfigurationConvention(assemblies);
             ApplyAbstractFactoryConvention(assemblies);
 
             BindCommandsToMenuItems();
@@ -169,16 +169,16 @@ private void ApplyConfigurationConvention(IEnumerable<Assembly> assemblies)
                 .BindAllInterfaces()
                 .Configure(binding => binding.InSingletonScope()));
 
-            Bind<IPersistanceService<CodeInspectionSettings>>().To<XmlPersistanceService<CodeInspectionSettings>>().InSingletonScope();
-            Bind<IPersistanceService<GeneralSettings>>().To<XmlPersistanceService<GeneralSettings>>().InSingletonScope();
-            Bind<IPersistanceService<HotkeySettings>>().To<XmlPersistanceService<HotkeySettings>>().InSingletonScope();
-            Bind<IPersistanceService<ToDoListSettings>>().To<XmlPersistanceService<ToDoListSettings>>().InSingletonScope();
-            Bind<IPersistanceService<UnitTestSettings>>().To<XmlPersistanceService<UnitTestSettings>>().InSingletonScope();
-            Bind<IPersistanceService<IndenterSettings>>().To<XmlPersistanceService<IndenterSettings>>().InSingletonScope();
-            Bind<IFilePersistanceService<SourceControlSettings>>().To<XmlPersistanceService<SourceControlSettings>>().InSingletonScope();
+            Bind<IPersistanceService<CodeInspectionSettings>>().To<XmlPersistanceService<CodeInspectionSettings>>().InCallScope();
+            Bind<IPersistanceService<GeneralSettings>>().To<XmlPersistanceService<GeneralSettings>>().InCallScope();
+            Bind<IPersistanceService<HotkeySettings>>().To<XmlPersistanceService<HotkeySettings>>().InCallScope();
+            Bind<IPersistanceService<ToDoListSettings>>().To<XmlPersistanceService<ToDoListSettings>>().InCallScope();
+            Bind<IPersistanceService<UnitTestSettings>>().To<XmlPersistanceService<UnitTestSettings>>().InCallScope();
+            Bind<IPersistanceService<IndenterSettings>>().To<XmlPersistanceService<IndenterSettings>>().InCallScope();
+            Bind<IFilePersistanceService<SourceControlSettings>>().To<XmlPersistanceService<SourceControlSettings>>().InCallScope();
 
-            Bind<IIndenterConfigProvider>().To<IndenterConfigProvider>().InSingletonScope();
-            Bind<ISourceControlConfigProvider>().To<SourceControlConfigProvider>().InSingletonScope();
+            Bind<IConfigProvider<IndenterSettings>>().To<IndenterConfigProvider>().InCallScope();
+            Bind<IConfigProvider<SourceControlSettings>>().To<SourceControlConfigProvider>().InCallScope();
 
             Bind<ICodeInspectionSettings>().To<CodeInspectionSettings>().InCallScope();
             Bind<IGeneralSettings>().To<GeneralSettings>().InCallScope();
@@ -311,7 +311,7 @@ private static int FindRubberduckMenuInsertionIndex(CommandBarControls controls,
         private void BindCommandsToMenuItems()
         {
             var types = Assembly.GetExecutingAssembly().GetTypes()
-                .Where(type => type.IsClass && type.Namespace != null && type.Namespace.StartsWith(typeof(CommandBase).Namespace ?? String.Empty))
+                .Where(type => type.IsClass && type.Namespace != null && type.Namespace.StartsWith(typeof(CommandBase).Namespace ?? string.Empty))
                 .ToList();
 
             // note: CommandBase naming convention: [Foo]Command
@@ -333,7 +333,7 @@ private void BindCommandsToMenuItems()
                             binding.WhenInjectedInto<RubberduckHooks>().BindingConfiguration.Condition;
 
                         binding.When(request => whenCommandMenuItemCondition(request) || whenHooksCondition(request))
-                            .InSingletonScope();
+                            .InCallScope();
                     }
                 }
                 catch (InvalidOperationException)
diff --git a/RetailCoder.VBE/Settings/CodeInspectionConfigProvider.cs b/RetailCoder.VBE/Settings/CodeInspectionConfigProvider.cs
@@ -4,14 +4,7 @@
 
 namespace Rubberduck.Settings
 {
-    public interface ICodeInspectionConfigProvider
-    {
-        CodeInspectionSettings Create();
-        CodeInspectionSettings CreateDefaults();
-        void Save(CodeInspectionSettings settings);
-    }
-
-    public class CodeInspectionConfigProvider : ICodeInspectionConfigProvider
+    public class CodeInspectionConfigProvider : IConfigProvider<CodeInspectionSettings>
     {
         private readonly IPersistanceService<CodeInspectionSettings> _persister;
 
diff --git a/RetailCoder.VBE/Settings/ConfigurationLoader.cs b/RetailCoder.VBE/Settings/ConfigurationLoader.cs
@@ -23,15 +23,15 @@ public interface IGeneralConfigService : IConfigurationService<Configuration>
 
     public class ConfigurationLoader : IGeneralConfigService
     {
-        private readonly IGeneralConfigProvider _generalProvider;
-        private readonly IHotkeyConfigProvider _hotkeyProvider;
-        private readonly IToDoListConfigProvider _todoProvider;
-        private readonly ICodeInspectionConfigProvider _inspectionProvider;
-        private readonly IUnitTestConfigProvider _unitTestProvider;
-        private readonly IIndenterConfigProvider _indenterProvider;
+        private readonly IConfigProvider<GeneralSettings> _generalProvider;
+        private readonly IConfigProvider<HotkeySettings> _hotkeyProvider;
+        private readonly IConfigProvider<ToDoListSettings> _todoProvider;
+        private readonly IConfigProvider<CodeInspectionSettings> _inspectionProvider;
+        private readonly IConfigProvider<UnitTestSettings> _unitTestProvider;
+        private readonly IConfigProvider<IndenterSettings> _indenterProvider;
 
-        public ConfigurationLoader(IGeneralConfigProvider generalProvider, IHotkeyConfigProvider hotkeyProvider, IToDoListConfigProvider todoProvider,
-                                   ICodeInspectionConfigProvider inspectionProvider, IUnitTestConfigProvider unitTestProvider, IIndenterConfigProvider indenterProvider)
+        public ConfigurationLoader(IConfigProvider<GeneralSettings> generalProvider, IConfigProvider<HotkeySettings> hotkeyProvider, IConfigProvider<ToDoListSettings> todoProvider,
+                                   IConfigProvider<CodeInspectionSettings> inspectionProvider, IConfigProvider<UnitTestSettings> unitTestProvider, IConfigProvider<IndenterSettings> indenterProvider)
         {
             _generalProvider = generalProvider;
             _hotkeyProvider = hotkeyProvider;
diff --git a/RetailCoder.VBE/Settings/GeneralConfigProvider.cs b/RetailCoder.VBE/Settings/GeneralConfigProvider.cs
@@ -3,15 +3,7 @@
 
 namespace Rubberduck.Settings
 {
-    public interface IGeneralConfigProvider
-    {
-        GeneralSettings Create();
-        GeneralSettings CreateDefaults();
-
-        void Save(GeneralSettings settings);
-    }
-
-    public class GeneralConfigProvider : IGeneralConfigProvider
+    public class GeneralConfigProvider : IConfigProvider<GeneralSettings>
     {
         private GeneralSettings _current;
         private readonly IPersistanceService<GeneralSettings> _persister;
diff --git a/RetailCoder.VBE/Settings/HotkeyConfigProvider.cs b/RetailCoder.VBE/Settings/HotkeyConfigProvider.cs
@@ -2,14 +2,7 @@
 
 namespace Rubberduck.Settings
 {
-    public interface IHotkeyConfigProvider
-    {
-        HotkeySettings Create();
-        HotkeySettings CreateDefaults();
-        void Save(HotkeySettings settings);
-    }
-
-    public class HotkeyConfigProvider : IHotkeyConfigProvider
+    public class HotkeyConfigProvider : IConfigProvider<HotkeySettings>
     {
         private readonly IPersistanceService<HotkeySettings> _persister;
 
@@ -19,7 +12,7 @@ public HotkeyConfigProvider(IPersistanceService<HotkeySettings> persister)
         }
 
         public HotkeySettings Create()
-        {          
+        {
             var prototype = new HotkeySettings();
             return _persister.Load(prototype) ?? prototype;
         }
diff --git a/RetailCoder.VBE/Settings/ToDoListConfigProvider.cs b/RetailCoder.VBE/Settings/ToDoListConfigProvider.cs
@@ -2,14 +2,7 @@
 
 namespace Rubberduck.Settings
 {
-    public interface IToDoListConfigProvider
-    {
-        ToDoListSettings Create();
-        ToDoListSettings CreateDefaults();
-        void Save(ToDoListSettings settings);
-    }
-
-    public class ToDoListConfigProvider : IToDoListConfigProvider
+    public class ToDoListConfigProvider : IConfigProvider<ToDoListSettings>
     {
         private readonly IPersistanceService<ToDoListSettings> _persister;
 
diff --git a/RetailCoder.VBE/Settings/UnitTestConfigProvider.cs b/RetailCoder.VBE/Settings/UnitTestConfigProvider.cs
@@ -2,15 +2,7 @@
 
 namespace Rubberduck.Settings
 {
-    public interface IUnitTestConfigProvider
-    {
-        UnitTestSettings Create();
-        UnitTestSettings CreateDefaults();
-
-        void Save(UnitTestSettings settings);
-    }
-
-    public class UnitTestConfigProvider : IUnitTestConfigProvider
+    public class UnitTestConfigProvider : IConfigProvider<UnitTestSettings>
     {
         private readonly IPersistanceService<UnitTestSettings> _persister;
 
diff --git a/RetailCoder.VBE/UI/SourceControl/SettingsViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/SettingsViewViewModel.cs
@@ -3,20 +3,21 @@
 using System.IO;
 using System.Windows.Forms;
 using NLog;
+using Rubberduck.Settings;
 using Rubberduck.UI.Command;
 using Rubberduck.SourceControl;
 
 namespace Rubberduck.UI.SourceControl
 {
     public class SettingsViewViewModel : ViewModelBase, IControlViewModel, IDisposable
     {
-        private readonly ISourceControlConfigProvider _configService;
+        private readonly IConfigProvider<SourceControlSettings> _configService;
         private readonly IFolderBrowserFactory _folderBrowserFactory;
         private readonly IOpenFileDialog _openFileDialog;
         private readonly SourceControlSettings _config;
 
         public SettingsViewViewModel(
-            ISourceControlConfigProvider configService,
+            IConfigProvider<SourceControlSettings> configService,
             IFolderBrowserFactory folderBrowserFactory,
             IOpenFileDialog openFileDialog)
         {
diff --git a/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs b/RetailCoder.VBE/UI/SourceControl/SourceControlViewViewModel.cs
@@ -9,10 +9,10 @@
 using System.Windows.Forms;
 using System.Windows.Media.Imaging;
 using Microsoft.Vbe.Interop;
-using Ninject;
 using NLog;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Settings;
 using Rubberduck.SourceControl;
 using Rubberduck.UI.Command;
 using Rubberduck.UI.Command.MenuItems;
@@ -36,7 +36,7 @@ public sealed class SourceControlViewViewModel : ViewModelBase, IDisposable
         private readonly ISinks _sinks;
         private readonly ISourceControlProviderFactory _providerFactory;
         private readonly IFolderBrowserFactory _folderBrowserFactory;
-        private readonly ISourceControlConfigProvider _configService;
+        private readonly IConfigProvider<SourceControlSettings> _configService;
         private readonly ICodePaneWrapperFactory _wrapperFactory;
         private readonly IMessageBox _messageBox;
         private readonly FileSystemWatcher _fileSystemWatcher;
@@ -51,7 +51,7 @@ public SourceControlViewViewModel(
             ISinks sinks,
             ISourceControlProviderFactory providerFactory,
             IFolderBrowserFactory folderBrowserFactory,
-            ISourceControlConfigProvider configService,
+            IConfigProvider<SourceControlSettings> configService,
             IEnumerable<IControlView> views,
             ICodePaneWrapperFactory wrapperFactory,
             IMessageBox messageBox)
diff --git a/Rubberduck.SettingsProvider/IConfigProvider.cs b/Rubberduck.SettingsProvider/IConfigProvider.cs
@@ -0,0 +1,10 @@
+﻿namespace Rubberduck.Settings
+{
+    public interface IConfigProvider<T>
+    {
+        T Create();
+        T CreateDefaults();
+
+        void Save(T settings);
+    }
+}
diff --git a/Rubberduck.SettingsProvider/Rubberduck.SettingsProvider.csproj b/Rubberduck.SettingsProvider/Rubberduck.SettingsProvider.csproj
@@ -39,6 +39,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IConfigProvider.cs" />
     <Compile Include="IPersistanceService.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="XmlPersistanceService.cs" />
diff --git a/Rubberduck.SmartIndenter/IndenterConfigProvider.cs b/Rubberduck.SmartIndenter/IndenterConfigProvider.cs
@@ -1,16 +1,9 @@
-﻿using Rubberduck.SettingsProvider;
+﻿using Rubberduck.Settings;
+using Rubberduck.SettingsProvider;
 
 namespace Rubberduck.SmartIndenter
 {
-    public interface IIndenterConfigProvider
-    {
-        IndenterSettings Create();
-        IndenterSettings CreateDefaults();
-
-        void Save(IndenterSettings settings);
-    }
-
-    public class IndenterConfigProvider : IIndenterConfigProvider
+    public class IndenterConfigProvider : IConfigProvider<IndenterSettings>
     {
         private readonly IPersistanceService<IndenterSettings> _persister;
 
diff --git a/Rubberduck.SourceControl/SourceControlConfigProvider.cs b/Rubberduck.SourceControl/SourceControlConfigProvider.cs
@@ -1,18 +1,11 @@
 ﻿using System;
 using System.IO;
+using Rubberduck.Settings;
 using Rubberduck.SettingsProvider;
 
 namespace Rubberduck.SourceControl
 {
-    public interface ISourceControlConfigProvider
-    {
-        SourceControlSettings Create();
-        SourceControlSettings CreateDefaults();
-
-        void Save(SourceControlSettings settings);
-    }
-
-    public class SourceControlConfigProvider : ISourceControlConfigProvider
+    public class SourceControlConfigProvider : IConfigProvider<SourceControlSettings>
     {
         private readonly string _rootPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Rubberduck");
         private readonly IFilePersistanceService<SourceControlSettings> _persister;
diff --git a/RubberduckTests/SourceControl/SettingsViewModelTests.cs b/RubberduckTests/SourceControl/SettingsViewModelTests.cs
@@ -2,6 +2,7 @@
 using System.Windows.Forms;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
+using Rubberduck.Settings;
 using Rubberduck.SourceControl;
 using Rubberduck.UI;
 using Rubberduck.UI.SourceControl;
@@ -21,7 +22,7 @@ public class SettingsViewModelTests
         private const string OtherRepoLocation = @"C:\Users\KingLear\Documents";
         private const string OtherCommandPromptLocation = @"C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe";
 
-        private Mock<ISourceControlConfigProvider> _configService;
+        private Mock<IConfigProvider<SourceControlSettings>> _configService;
         private SourceControlSettings _config;
 
         private Mock<IFolderBrowserFactory> _folderBrowserFactory;
@@ -34,7 +35,7 @@ public void Initialize()
         {
             _config = new SourceControlSettings(Name, Email, RepoLocation, new List<Repository>(), CommandPromptLocation);
 
-            _configService = new Mock<ISourceControlConfigProvider>();
+            _configService = new Mock<IConfigProvider<SourceControlSettings>>();
             _configService.Setup(s => s.Create()).Returns(_config);
 
             _folderBrowser = new Mock<IFolderBrowser>();
diff --git a/RubberduckTests/SourceControl/SourceControlViewModelTests.cs b/RubberduckTests/SourceControl/SourceControlViewModelTests.cs
@@ -5,9 +5,9 @@
 using Microsoft.Vbe.Interop;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Moq;
-using Rubberduck;
 using Rubberduck.Parsing;
 using Rubberduck.Parsing.VBA;
+using Rubberduck.Settings;
 using Rubberduck.SourceControl;
 using Rubberduck.UI;
 using Rubberduck.UI.SourceControl;
@@ -34,7 +34,7 @@ public class SourceControlViewModelTests
         private UnsyncedCommitsViewViewModel _unsyncedVM;
         private SettingsViewViewModel _settingsVM;
 
-        private Mock<ISourceControlConfigProvider> _configService;
+        private Mock<IConfigProvider<SourceControlSettings>> _configService;
 
         private Mock<IFolderBrowserFactory> _folderBrowserFactory;
         private Mock<IFolderBrowser> _folderBrowser;
@@ -52,7 +52,7 @@ public void InitializeMocks()
             var mockHost = new Mock<IHostApplication>();
             mockHost.SetupAllProperties();
 
-            _configService = new Mock<ISourceControlConfigProvider>();
+            _configService = new Mock<IConfigProvider<SourceControlSettings>>();
             _configService.Setup(c => c.Create()).Returns(GetDummyConfig());
 
             _folderBrowser = new Mock<IFolderBrowser>();

Original file line number	Diff line number	Diff line change
`@@ -18,11 +18,11 @@ namespace Rubberduck.Inspections`
`18`	`18`	`public class Inspector : IInspector`
`19`	`19`	`{`
`20`	`20`	`private readonly IGeneralConfigService _configService;`
`21`		`- private readonly IEnumerable<IInspection> _inspections;`
	`21`	`+ private readonly List<IInspection> _inspections;`
`22`	`22`
`23`	`23`	`public Inspector(IGeneralConfigService configService, IEnumerable<IInspection> inspections)`
`24`	`24`	`{`
`25`		`- _inspections = inspections;`
	`25`	`+ _inspections = inspections.ToList();`
`26`	`26`
`27`	`27`	`_configService = configService;`
`28`	`28`	`configService.SettingsChanged += ConfigServiceSettingsChanged;`
`@@ -127,6 +127,8 @@ public void Dispose()`
`127`	`127`	`{`
`128`	`128`	`_configService.SettingsChanged -= ConfigServiceSettingsChanged;`
`129`	`129`	`}`
	`130`	`+`
	`131`	`+ _inspections.Clear();`
`130`	`132`	`}`
`131`	`133`	`}`
`132`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Rubberduck.Settings`
`6`	`6`	`{`
`7`		`- public interface ICodeInspectionConfigProvider`
`8`		`- {`
`9`		`- CodeInspectionSettings Create();`
`10`		`- CodeInspectionSettings CreateDefaults();`
`11`		`- void Save(CodeInspectionSettings settings);`
`12`		`- }`
`13`		`-`
`14`		`- public class CodeInspectionConfigProvider : ICodeInspectionConfigProvider`
	`7`	`+ public class CodeInspectionConfigProvider : IConfigProvider<CodeInspectionSettings>`
`15`	`8`	`{`
`16`	`9`	`private readonly IPersistanceService<CodeInspectionSettings> _persister;`
`17`	`10`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Rubberduck.Settings`
`4`	`4`	`{`
`5`		`- public interface IHotkeyConfigProvider`
`6`		`- {`
`7`		`- HotkeySettings Create();`
`8`		`- HotkeySettings CreateDefaults();`
`9`		`- void Save(HotkeySettings settings);`
`10`		`- }`
`11`		`-`
`12`		`- public class HotkeyConfigProvider : IHotkeyConfigProvider`
	`5`	`+ public class HotkeyConfigProvider : IConfigProvider<HotkeySettings>`
`13`	`6`	`{`
`14`	`7`	`private readonly IPersistanceService<HotkeySettings> _persister;`
`15`	`8`
`@@ -19,7 +12,7 @@ public HotkeyConfigProvider(IPersistanceService<HotkeySettings> persister)`
`19`	`12`	`}`
`20`	`13`
`21`	`14`	`public HotkeySettings Create()`
`22`		`- {`
	`15`	`+ {`
`23`	`16`	`var prototype = new HotkeySettings();`
`24`	`17`	`return _persister.Load(prototype) ?? prototype;`
`25`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace Rubberduck.Settings`
`4`	`4`	`{`
`5`		`- public interface IToDoListConfigProvider`
`6`		`- {`
`7`		`- ToDoListSettings Create();`
`8`		`- ToDoListSettings CreateDefaults();`
`9`		`- void Save(ToDoListSettings settings);`
`10`		`- }`
`11`		`-`
`12`		`- public class ToDoListConfigProvider : IToDoListConfigProvider`
	`5`	`+ public class ToDoListConfigProvider : IConfigProvider<ToDoListSettings>`
`13`	`6`	`{`
`14`	`7`	`private readonly IPersistanceService<ToDoListSettings> _persister;`
`15`	`8`