Use StartPagePackage as ICodeContainerProvider factory

Simplify by using the built in CreateCodeContainerProvider method.

Author: jcansdale

src/GitHub.VisualStudio.16/InBoxExtensionServices.cs

@@ -9,6 +9,7 @@
 using Microsoft.VisualStudio.ComponentModelHost;
 using CodeContainer = Microsoft.VisualStudio.Shell.CodeContainerManagement.CodeContainer;
 using ICodeContainerProvider = Microsoft.VisualStudio.Shell.CodeContainerManagement.ICodeContainerProvider;
+using System.Runtime.InteropServices;
 
 namespace GitHub.VisualStudio
 {
@@ -18,71 +19,72 @@ public ICodeContainerProvider GetGitHubContainerProvider()
         {
             return new InBoxGitHubContainerProvider();
         }
+    }
 
-        class InBoxGitHubContainerProvider : ICodeContainerProvider
+    [Guid(Guids.CodeContainerProviderId)]
+    public class InBoxGitHubContainerProvider : ICodeContainerProvider
+    {
+        public async Task<CodeContainer> AcquireCodeContainerAsync(IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken)
         {
-            public async Task<CodeContainer> AcquireCodeContainerAsync(IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken)
-            {
-                return await RunAcquisitionAsync(downloadProgress, cancellationToken, null);
-            }
-
-            public async Task<CodeContainer> AcquireCodeContainerAsync(RemoteCodeContainer onlineCodeContainer, IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken)
-            {
-                var url = onlineCodeContainer.DisplayUrl.ToString();
-                return await RunAcquisitionAsync(downloadProgress, cancellationToken, url);
-            }
+            return await RunAcquisitionAsync(downloadProgress, cancellationToken, null);
+        }
 
-            async Task<CodeContainer> RunAcquisitionAsync(IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken, string url = null)
-            {
-                await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
+        public async Task<CodeContainer> AcquireCodeContainerAsync(RemoteCodeContainer onlineCodeContainer, IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken)
+        {
+            var url = onlineCodeContainer.DisplayUrl.ToString();
+            return await RunAcquisitionAsync(downloadProgress, cancellationToken, url);
+        }
 
-                var componentModel = await ServiceProvider.GetGlobalServiceAsync<SComponentModel, IComponentModel>();
-                Assumes.Present(componentModel);
+        async Task<CodeContainer> RunAcquisitionAsync(IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken, string url = null)
+        {
+            await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
 
-                var result = await ShowCloneDialogAsync(componentModel, downloadProgress, cancellationToken, url);
-                if (result == null)
-                {
-                    return null;
-                }
+            var componentModel = await ServiceProvider.GetGlobalServiceAsync<SComponentModel, IComponentModel>();
+            Assumes.Present(componentModel);
 
-                var repositoryName = result.Url.RepositoryName;
-                var repositoryRootFullPath = result.Path;
-                var sccProvider = new Guid(Guids.GitSccProviderId);
-                var codeContainerProvider = new Guid(Guids.CodeContainerProviderId);
-                var displayUrl = result.Url.ToRepositoryUrl();
-                var browseOnlineUrl = new Uri(displayUrl.ToString().TrimSuffix(".git"));
-                var lastAccessed = DateTimeOffset.UtcNow;
+            var result = await ShowCloneDialogAsync(componentModel, downloadProgress, cancellationToken, url);
+            if (result == null)
+            {
+                return null;
+            }
 
-                var codeContainer = new CodeContainer(
-                    localProperties: new CodeContainerLocalProperties(repositoryRootFullPath, CodeContainerType.Folder,
-                        new CodeContainerSourceControlProperties(repositoryName, repositoryRootFullPath, sccProvider)),
-                    remote: new RemoteCodeContainer(repositoryName, codeContainerProvider, displayUrl, browseOnlineUrl, lastAccessed),
-                    isFavorite: false,
-                    lastAccessed: lastAccessed);
+            var repositoryName = result.Url.RepositoryName;
+            var repositoryRootFullPath = result.Path;
+            var sccProvider = new Guid(Guids.GitSccProviderId);
+            var codeContainerProvider = new Guid(Guids.CodeContainerProviderId);
+            var displayUrl = result.Url.ToRepositoryUrl();
+            var browseOnlineUrl = new Uri(displayUrl.ToString().TrimSuffix(".git"));
+            var lastAccessed = DateTimeOffset.UtcNow;
 
-                // Report all steps complete before returning a CodeContainer
-                downloadProgress.Report(new ServiceProgressData(string.Empty, string.Empty, 1, 1));
+            var codeContainer = new CodeContainer(
+                localProperties: new CodeContainerLocalProperties(repositoryRootFullPath, CodeContainerType.Folder,
+                    new CodeContainerSourceControlProperties(repositoryName, repositoryRootFullPath, sccProvider)),
+                remote: new RemoteCodeContainer(repositoryName, codeContainerProvider, displayUrl, browseOnlineUrl, lastAccessed),
+                isFavorite: false,
+                lastAccessed: lastAccessed);
 
-                return codeContainer;
-            }
+            // Report all steps complete before returning a CodeContainer
+            downloadProgress.Report(new ServiceProgressData(string.Empty, string.Empty, 1, 1));
 
-            static async Task<CloneDialogResult> ShowCloneDialogAsync(IComponentModel componentModel,
-                IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken, string url = null)
-            {
-                var compositionServices = new CompositionServices();
-                var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
+            return codeContainer;
+        }
 
-                var dialogService = compositionContainer.GetExportedValue<IDialogService>();
-                var cloneDialogResult = await dialogService.ShowCloneDialog(null, url);
-                if (cloneDialogResult != null)
-                {
-                    var repositoryCloneService = compositionContainer.GetExportedValue<IRepositoryCloneService>();
-                    await repositoryCloneService.CloneOrOpenRepository(cloneDialogResult, downloadProgress, cancellationToken);
-                    return cloneDialogResult;
-                }
+        static async Task<CloneDialogResult> ShowCloneDialogAsync(IComponentModel componentModel,
+            IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken, string url = null)
+        {
+            var compositionServices = new CompositionServices();
+            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
 
-                return null;
+            var dialogService = compositionContainer.GetExportedValue<IDialogService>();
+            var cloneDialogResult = await dialogService.ShowCloneDialog(null, url);
+            if (cloneDialogResult != null)
+            {
+                var repositoryCloneService = compositionContainer.GetExportedValue<IRepositoryCloneService>();
+                await repositoryCloneService.CloneOrOpenRepository(cloneDialogResult, downloadProgress, cancellationToken);
+                return cloneDialogResult;
             }
+
+            return null;
         }
     }
 }

src/GitHub.VisualStudio.16/StartPagePackage.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Threading;
-using System.Threading.Tasks;
 using System.Runtime.InteropServices;
 using GitHub.VisualStudio;
 using Microsoft.VisualStudio.Shell;
-using Microsoft.VisualStudio.Shell.CodeContainerManagement;
-using CodeContainer = Microsoft.VisualStudio.Shell.CodeContainerManagement.CodeContainer;
 using ICodeContainerProvider = Microsoft.VisualStudio.Shell.CodeContainerManagement.ICodeContainerProvider;
 
 namespace GitHub.StartPage
@@ -14,47 +10,18 @@ namespace GitHub.StartPage
     // This is required for .imagemanifest files, XAML and when using unsigned assemblies.
     // See: https://github.com/github/VisualStudio/pull/1236/
     [ProvideBindingPath(SubPath = "UI")]
-
     [PackageRegistration(UseManagedResourcesOnly = true)]
     [Guid(Guids.StartPagePackageId)]
-    [ProvideCodeContainerProvider("GitHub Container", Guids.StartPagePackageId, Images.ImageMonikerGuid, Images.Logo, "#110", "#111", typeof(GitHubContainerProvider))]
+    [ProvideCodeContainerProvider("GitHub Container", Guids.StartPagePackageId, Images.ImageMonikerGuid, Images.Logo, "#110", "#111", typeof(InBoxGitHubContainerProvider))]
     public sealed class StartPagePackage : ExtensionPointPackage
     {
-        protected override void Initialize()
-        {
-            base.Initialize();
-            ServiceProvider = this;
-        }
-
-        internal static IServiceProvider ServiceProvider { get; private set; }
-    }
-
-    [Guid(Guids.CodeContainerProviderId)]
-    public class GitHubContainerProvider : ICodeContainerProvider
-    {
-        readonly ICodeContainerProvider provider;
-
-        public GitHubContainerProvider() : this(StartPagePackage.ServiceProvider)
-        {
-        }
-
-        public GitHubContainerProvider(IServiceProvider serviceProvider)
+        protected override ICodeContainerProvider CreateCodeContainerProvider(Guid provider)
         {
             ThreadHelper.ThrowIfNotOnUIThread();
 
-            var factory = new ExtensionServicesFactory(serviceProvider);
+            var factory = new ExtensionServicesFactory(this);
             var services = factory.Create();
-            provider = services.GetGitHubContainerProvider();
-        }
-
-        public Task<CodeContainer> AcquireCodeContainerAsync(IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken)
-        {
-            return provider.AcquireCodeContainerAsync(downloadProgress, cancellationToken);
-        }
-
-        public Task<CodeContainer> AcquireCodeContainerAsync(RemoteCodeContainer onlineCodeContainer, IProgress<ServiceProgressData> downloadProgress, CancellationToken cancellationToken)
-        {
-            return provider.AcquireCodeContainerAsync(onlineCodeContainer, downloadProgress, cancellationToken);
+            return services.GetGitHubContainerProvider();
         }
     }
 }