Factor out GetExportProvider

Author: jcansdale

src/GitHub.VisualStudio.16/Sync/PublishSection.cs

@@ -18,6 +18,8 @@
 using Microsoft.VisualStudio.Threading;
 using ReactiveUI;
 using Task = System.Threading.Tasks.Task;
+using Microsoft.VisualStudio.Shell;
+using System.ComponentModel.Composition.Hosting;
 
 namespace Microsoft.TeamExplorerSample.Sync
 {
@@ -80,27 +82,15 @@ public override void Initialize(object sender, SectionInitializeEventArgs e)
                 }
             }
 
-            PublishToGitHub = new RelayCommand(o => DoPublishToGitHub().Forget());
+            PublishToGitHub = new RelayCommand(o => ShowPublishDialog());
         }
 
-        async Task DoPublishToGitHub()
+        void ShowPublishDialog()
         {
-            var componentModel = ServiceProvider.GetService(typeof(SComponentModel)) as IComponentModel;
-            ShowPublishDialog(componentModel);
-        }
-
-        void ShowPublishDialog(IComponentModel componentModel)
-        {
-            /*
-            var factory = ServiceProvider.GetService<IViewViewModelFactory>();
-            var viewModel = ServiceProvider.GetService<IRepositoryPublishViewModel>();
-            */
+            var exportProvide = GetExportProvider();
 
-            var compositionServices = new CompositionServices();
-            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
-
-            var factory = compositionContainer.GetExportedValue<IViewViewModelFactory>();
-            var viewModel = compositionContainer.GetExportedValue<IRepositoryPublishViewModel>();
+            var factory = exportProvide.GetExportedValue<IViewViewModelFactory>();
+            var viewModel = exportProvide.GetExportedValue<IRepositoryPublishViewModel>();
 
             var busy = viewModel.WhenAnyValue(x => x.IsBusy).Subscribe(x => IsBusy = x);
 
@@ -138,6 +128,15 @@ void ShowPublishDialog(IComponentModel componentModel)
             */
         }
 
+        ExportProvider GetExportProvider()
+        {
+            var componentModel = ServiceProvider.GetService(typeof(SComponentModel)) as IComponentModel;
+            Assumes.Present(componentModel);
+            var compositionServices = new CompositionServices();
+            var compositionContainer = compositionServices.CreateVisualStudioCompositionContainer(componentModel.DefaultExportProvider);
+            return compositionContainer;
+        }
+
         void HandleCreatedRepo(LocalRepositoryModel newrepo)
         {
             var msg = String.Format(CultureInfo.CurrentCulture, Constants.Notification_RepoCreated, newrepo.Name, newrepo.CloneUrl);