Merge pull request #441 from github/shana/431-fix-vs-hang-some-more

Avoid calling ActiveRepositories in the main thread, it blocks on startup

Author: haacked

src/GitHub.App/Services/RepositoryPublishService.cs

@@ -4,6 +4,7 @@
 using System.Reactive.Linq;
 using GitHub.Api;
 using GitHub.Models;
+using LibGit2Sharp;
 
 namespace GitHub.Services
 {
@@ -12,24 +13,21 @@ namespace GitHub.Services
     public class RepositoryPublishService : IRepositoryPublishService
     {
         readonly IGitClient gitClient;
-        readonly IVSServices services;
+        readonly Repository activeRepository;
 
         [ImportingConstructor]
         public RepositoryPublishService(IGitClient gitClient, IVSServices services)
         {
             this.gitClient = gitClient;
-            this.services = services;
+            this.activeRepository = services.GetActiveRepo();
         }
 
         public string LocalRepositoryName
         {
             get
             {
-                var repo = services.GetActiveRepo();
-                if (repo != null && repo.Info != null && !string.IsNullOrEmpty(repo.Info.WorkingDirectory))
-                {
-                    return new DirectoryInfo(repo.Info.WorkingDirectory).Name ?? "";
-                }
+                if (!string.IsNullOrEmpty(activeRepository?.Info?.WorkingDirectory))
+                    return new DirectoryInfo(activeRepository.Info.WorkingDirectory).Name ?? "";
                 return string.Empty;
             }
         }
@@ -39,7 +37,7 @@ public string LocalRepositoryName
             IAccount account,
             IApiClient apiClient)
         {
-            return Observable.Defer(() => Observable.Return(services.GetActiveRepo()))
+            return Observable.Defer(() => Observable.Return(activeRepository))
                 .SelectMany(r => apiClient.CreateRepository(newRepository, account.Login, account.IsUser)
                     .Select(gitHubRepo => Tuple.Create(gitHubRepo, r)))
                     .SelectMany(repo => gitClient.SetRemote(repo.Item2, "origin", new Uri(repo.Item1.CloneUrl)).Select(_ => repo))

src/GitHub.Exports/Services/VSServices.cs

@@ -82,13 +82,8 @@ public string GetActiveRepoPath()
             var gitExt = serviceProvider.GetService<IGitExt>();
             if (gitExt.ActiveRepositories.Count > 0)
                 return gitExt.ActiveRepositories.First().RepositoryPath;
-            else
-            {
-                var repo = serviceProvider.GetSolution().GetRepoFromSolution();
-                if (repo != null)
-                    return repo.Info.Path;
-            }
-            return string.Empty;
+            var repo = serviceProvider.GetSolution().GetRepoFromSolution();
+            return repo?.Info?.Path ?? string.Empty;
         }
 
         static string PokeTheRegistryForLocalClonePath()

src/GitHub.VisualStudio/Base/TeamExplorerServiceHolder.cs

@@ -17,7 +17,7 @@ namespace GitHub.VisualStudio.Base
     [PartCreationPolicy(CreationPolicy.Shared)]
     public class TeamExplorerServiceHolder : ITeamExplorerServiceHolder
     {
-        Dictionary<object, Action<IGitRepositoryInfo>> activeRepoHandlers = new Dictionary<object, Action<IGitRepositoryInfo>>();
+        readonly Dictionary<object, Action<IGitRepositoryInfo>> activeRepoHandlers = new Dictionary<object, Action<IGitRepositoryInfo>>();
         IGitRepositoryInfo activeRepo;
         bool activeRepoNotified = false;
 
@@ -115,7 +115,7 @@ void UIContextChanged(object sender, UIContextChangedEventArgs e)
             UIContextChanged(e.Activated);
         }
 
-        void UIContextChanged(bool active)
+        async void UIContextChanged(bool active)
         {
             Debug.Assert(ServiceProvider != null, "UIContextChanged called before service provider is set");
             if (ServiceProvider == null)
@@ -125,25 +125,26 @@ void UIContextChanged(bool active)
             {
                 GitService = GitService ?? ServiceProvider.GetService<IGitExt>();
                 if (ActiveRepo == null)
-                    ActiveRepo = gitService.ActiveRepositories.FirstOrDefault();
+                    ActiveRepo = await System.Threading.Tasks.Task.Run(() => GitService.ActiveRepositories.FirstOrDefault());
             }
             else
                 ActiveRepo = null;
         }
 
         void CheckAndUpdate(object sender, System.ComponentModel.PropertyChangedEventArgs e)
         {
+            if (e.PropertyName != "ActiveRepositories")
+                return;
+
             var service = GitService;
             if (service == null)
                 return;
 
-            if (e.PropertyName == "ActiveRepositories")
-            {
-                var repo = service.ActiveRepositories.FirstOrDefault();
-                if (!repo.Compare(ActiveRepo))
-                    // so annoying that this is on the wrong thread
-                    syncContext.Post(r => ActiveRepo = r as IGitRepositoryInfo, repo);
-            }
+            var repo = service.ActiveRepositories.FirstOrDefault();
+            // this comparison is safe, the extension method supports null instances
+            if (!repo.Compare(ActiveRepo))
+                // so annoying that this is on the wrong thread
+                syncContext.Post(r => ActiveRepo = r as IGitRepositoryInfo, repo);
         }
 
         public IGitAwareItem HomeSection