Merge branch 'master' into fixes/resizeable-peek-view

Author: grokys

src/GitHub.App/Services/DialogService.cs

@@ -32,7 +32,7 @@ public Task<CloneDialogResult> ShowCloneDialog(IConnection connection)
             {
                 var vm = x.View.ViewModel as IBaseCloneViewModel;
 
-                vm.Done.Subscribe(_ =>
+                vm?.Done.Subscribe(_ =>
                 {
                     basePath = vm?.BaseRepositoryPath;
                     repository = vm?.SelectedRepository;

src/GitHub.VisualStudio/Menus/LinkMenuBase.cs

@@ -33,10 +33,12 @@ protected async Task<bool> IsCurrentFileInGitHubRepository()
 
         protected Task<UriString> GenerateLink(LinkType linkType)
         {
-            var repo = ActiveRepo;
             var activeDocument = ServiceProvider.TryGetService<IActiveDocumentSnapshot>();
             if (activeDocument == null)
                 return null;
+
+            var repo = GetRepositoryByPath(activeDocument.Name);
+
             return repo.GenerateUrl(linkType, activeDocument.Name, activeDocument.StartLine, activeDocument.EndLine);
         }
 

src/GitHub.VisualStudio/Menus/MenuBase.cs

@@ -46,6 +46,24 @@ protected MenuBase(IGitHubServiceProvider serviceProvider)
             apiFactory = new Lazy<ISimpleApiClientFactory>(() => ServiceProvider.TryGetService<ISimpleApiClientFactory>());
         }
 
+        protected ILocalRepositoryModel GetRepositoryByPath(string path)
+        {
+            try
+            {
+                if (!string.IsNullOrEmpty(path))
+                {
+                    var repo = ServiceProvider.TryGetService<IGitService>().GetRepository(path);
+                    return new LocalRepositoryModel(repo.Info.WorkingDirectory.TrimEnd('\\'));
+                }
+            }
+            catch (Exception ex)
+            {
+                VsOutputLogger.WriteLine(string.Format(CultureInfo.CurrentCulture, "Error loading the repository from '{0}'. {1}", path, ex));
+            }
+
+            return null;
+        }
+
         protected ILocalRepositoryModel GetActiveRepo()
         {
             var activeRepo = ServiceProvider.TryGetService<ITeamExplorerServiceHolder>()?.ActiveRepo;