properly dispose GitProvider; removed SourceControlProviderFactory, kept abstract factory and switched ninject binding to factory extension, which properly disposes the provider instances.

Author: retailcoder

RetailCoder.VBE/Root/RubberduckModule.cs

@@ -26,7 +26,6 @@
 using Rubberduck.UI.UnitTesting;
 using Rubberduck.Parsing.Preprocessing;
 using System.Globalization;
-using Ninject.Activation;
 using Ninject.Extensions.Interception.Infrastructure.Language;
 using Ninject.Extensions.NamedScope;
 using Rubberduck.Parsing.Symbols;
@@ -109,10 +108,6 @@ public override void Load()
                 .ToSelf()
                 .InSingletonScope();
 
-            Bind<ISourceControlProviderFactory>()
-                .To<SourceControlProviderFactory>()
-                .WhenInjectedInto<SourceControlViewViewModel>();
-
             Bind<IDockablePresenter>().To<SourceControlDockablePresenter>()
                 .WhenInjectedInto(
                     typeof(ShowSourceControlPanelCommand),

RetailCoder.VBE/UI/SourceControl/SourceControlProviderFactory.cs

@@ -9,22 +9,4 @@ public interface ISourceControlProviderFactory
         ISourceControlProvider CreateProvider(IVBProject project, IRepository repository);
         ISourceControlProvider CreateProvider(IVBProject isAny, IRepository repository, SecureCredentials secureCredentials);
     }
-
-    public class SourceControlProviderFactory : ISourceControlProviderFactory
-    {
-        public ISourceControlProvider CreateProvider(IVBProject project)
-        {
-            return new GitProvider(project);
-        }
-
-        public ISourceControlProvider CreateProvider(IVBProject project, IRepository repository)
-        {
-            return new GitProvider(project, repository);
-        }
-        
-        public ISourceControlProvider CreateProvider(IVBProject project, IRepository repository, SecureCredentials creds)
-        {
-            return new GitProvider(project, repository, creds);
-        }
-    }
 }

Rubberduck.SourceControl/GitProvider.cs

@@ -5,13 +5,11 @@
 using System.Security;
 using LibGit2Sharp;
 using LibGit2Sharp.Handlers;
-using Rubberduck.VBEditor.SafeComWrappers;
 using Rubberduck.VBEditor.SafeComWrappers.Abstract;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
 
 namespace Rubberduck.SourceControl
 {
-    public class GitProvider : SourceControlProviderBase // note: why not : IDisposable?
+    public class GitProvider : SourceControlProviderBase, IDisposable
     {
         private readonly LibGit2Sharp.Repository _repo;
         private readonly LibGit2Sharp.Credentials _credentials;
@@ -42,7 +40,7 @@ public GitProvider(IVBProject project, IRepository repository)
             }
         }
 
-        public GitProvider(VBProject project, IRepository repository, string userName, string passWord)
+        public GitProvider(IVBProject project, IRepository repository, string userName, string passWord)
             : this(project, repository)
         {
             _credentials = new UsernamePasswordCredentials()
@@ -66,7 +64,7 @@ public GitProvider(IVBProject project, IRepository repository, ICredentials<Secu
             _credentialsHandler = (url, user, cred) => _credentials;
         }
 
-        ~GitProvider()
+        public void Dispose()
         {
             if (_repo != null)
             {

Rubberduck.SourceControl/Interop/GitProvider.cs

@@ -4,8 +4,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security;
-using Rubberduck.VBEditor.SafeComWrappers;
-using Rubberduck.VBEditor.SafeComWrappers.VBA;
+using Rubberduck.VBEditor.SafeComWrappers.Abstract;
 
 namespace Rubberduck.SourceControl.Interop
 {
@@ -16,20 +15,20 @@ namespace Rubberduck.SourceControl.Interop
     [Description("VBA Editor integrated access to Git.")]
     class GitProvider : SourceControl.GitProvider, ISourceControlProvider
     {
-        public GitProvider(VBProject project) 
+        public GitProvider(IVBProject project) 
             : base(project)
         { }
 
-        public GitProvider(VBProject project, IRepository repository)
+        public GitProvider(IVBProject project, IRepository repository)
             : base(project, repository)
         { }
 
-        [Obsolete]
-        public GitProvider(VBProject project, IRepository repository, string userName, string passWord)
+        [Obsolete("Use the ICredentials overload instead.")]
+        public GitProvider(IVBProject project, IRepository repository, string userName, string passWord)
             : base(project, repository, userName, passWord)
         { }
 
-        public GitProvider(VBProject project, IRepository repository, ICredentials credentials)
+        public GitProvider(IVBProject project, IRepository repository, ICredentials credentials)
             :base(project, repository, credentials.Username, credentials.Password)
         { }