Merge branch 'master' into feature/show-current-pr

Author: jcansdale

src/GitHub.App/SampleData/PullRequestListViewModelDesigner.cs

@@ -58,7 +58,7 @@ public PullRequestListViewModelDesigner()
 
         public IReadOnlyList<IRemoteRepositoryModel> Repositories { get; }
         public IRemoteRepositoryModel SelectedRepository { get; set; }
-
+        public IPullRequestModel CheckedOutPullRequest { get; set; }
         public ITrackingCollection<IPullRequestModel> PullRequests { get; set; }
         public IPullRequestModel SelectedPullRequest { get; set; }
 

src/GitHub.App/ViewModels/GitHubPane/PullRequestListViewModel.cs

@@ -41,10 +41,12 @@ public class PullRequestListViewModel : PanePageViewModelBase, IPullRequestListV
         public PullRequestListViewModel(
             IModelServiceFactory modelServiceFactory,
             IPackageSettings settings,
+            IPullRequestSessionManager sessionManager,
             IVisualStudioBrowser visualStudioBrowser)
         {
             Guard.ArgumentNotNull(modelServiceFactory, nameof(modelServiceFactory));
             Guard.ArgumentNotNull(settings, nameof(settings));
+            Guard.ArgumentNotNull(sessionManager, nameof(sessionManager));
             Guard.ArgumentNotNull(visualStudioBrowser, nameof(visualStudioBrowser));
 
             constructing = true;
@@ -100,6 +102,19 @@ public PullRequestListViewModel(
             OpenPullRequestOnGitHub = ReactiveCommand.Create();
             OpenPullRequestOnGitHub.Subscribe(x => DoOpenPullRequestOnGitHub((int)x));
 
+            // Get the current pull request session and the selected repository. When the session's
+            // repository is the same as our selected repository set CheckedOutPullRequest to the
+            // current session's model, so that the checked out PR can be highlighted.
+            Observable.CombineLatest(
+                sessionManager.WhenAnyValue(x => x.CurrentSession),
+                this.WhenAnyValue(x => x.SelectedRepository),
+                (s, r) => new { Session = s, Repository = r })
+                .Subscribe(x =>
+                {
+                    CheckedOutPullRequest = x.Session?.RepositoryOwner == x.Repository?.Owner ?
+                        x.Session?.PullRequest : null;
+                });
+
             constructing = false;
         }
 
@@ -245,6 +260,13 @@ public IPullRequestModel SelectedPullRequest
             set { this.RaiseAndSetIfChanged(ref selectedPullRequest, value); }
         }
 
+        IPullRequestModel checkedOutPullRequest;
+        public IPullRequestModel CheckedOutPullRequest
+        {
+            get { return checkedOutPullRequest; }
+            set { this.RaiseAndSetIfChanged(ref checkedOutPullRequest, value); }
+        }
+
         IReadOnlyList<PullRequestState> states;
         public IReadOnlyList<PullRequestState> States
         {

src/GitHub.Exports.Reactive/ViewModels/GitHubPane/IPullRequestListViewModel.cs

@@ -33,6 +33,7 @@ public interface IPullRequestListViewModel : ISearchablePageViewModel, IOpenInBr
         IRemoteRepositoryModel SelectedRepository { get; set; }
         ITrackingCollection<IPullRequestModel> PullRequests { get; }
         IPullRequestModel SelectedPullRequest { get; }
+        IPullRequestModel CheckedOutPullRequest { get; }
         IReadOnlyList<PullRequestState> States { get; set; }
         PullRequestState SelectedState { get; set; }
         ObservableCollection<IAccount> Authors { get; }

src/GitHub.Exports/Primitives/UriString.cs

@@ -129,10 +129,12 @@ bool ParseScpSyntax(string scpString)
         public bool IsValidUri => url != null;
 
         /// <summary>
-        /// Attempts a best-effort to convert the remote origin to a GitHub Repository URL.
+        /// Attempts a best-effort to convert the remote origin to a GitHub Repository URL,
+        /// optionally changing the owner.
         /// </summary>
+        /// <param name="owner">The owner to use, if null uses <see cref="Owner"/>.</param>
         /// <returns>A converted uri, or the existing one if we can't convert it (which might be null)</returns>
-        public Uri ToRepositoryUrl()
+        public Uri ToRepositoryUrl(string owner = null)
         {
             // we only want to process urls that represent network resources
             if (!IsScpUri && (!IsValidUri || IsFileUri)) return url;
@@ -141,11 +143,15 @@ public Uri ToRepositoryUrl()
                 ? url.Scheme
                 : Uri.UriSchemeHttps;
 
+            var nameWithOwner = owner != null && Owner != null ?
+                string.Format(CultureInfo.InvariantCulture, "{0}/{1}", owner, RepositoryName) :
+                NameWithOwner;
+
             return new UriBuilder
             {
                 Scheme = scheme,
                 Host = Host,
-                Path = NameWithOwner,
+                Path = nameWithOwner,
                 Port = url?.Port == 80
                     ? -1
                     : (url?.Port ?? -1)

src/GitHub.InlineReviews/ViewModels/InlineCommentThreadViewModel.cs

@@ -54,7 +54,7 @@ public override Uri GetCommentUrl(int id)
             return new Uri(string.Format(
                 CultureInfo.InvariantCulture,
                 "{0}/pull/{1}#discussion_r{2}",
-                Session.LocalRepository.CloneUrl.ToRepositoryUrl(),
+                Session.LocalRepository.CloneUrl.ToRepositoryUrl(Session.RepositoryOwner),
                 Session.PullRequest.Number,
                 id));
         }

src/GitHub.UI/Converters/EqualityConverter.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Globalization;
+using System.Windows;
+
+namespace GitHub.UI
+{
+    [Localizability(LocalizationCategory.NeverLocalize)]
+    public sealed class EqualityConverter : MultiValueConverterMarkupExtension<EqualityConverter>
+    {
+        public override object Convert(
+            object[] value,
+            Type targetType,
+            object parameter,
+            CultureInfo culture)
+        {
+            if (value.Length == 2)
+            {
+                return Equals(value[0], value[1]);
+            }
+
+            return false;
+        }
+
+        public override object[] ConvertBack(
+            object value,
+            Type[] targetType,
+            object parameter,
+            CultureInfo culture)
+        {
+            return null;
+        }
+    }
+}

src/GitHub.UI/GitHub.UI.csproj

@@ -89,6 +89,7 @@
       <DependentUpon>Spinner.xaml</DependentUpon>
     </Compile>
     <Compile Include="Converters\AllCapsConverter.cs" />
+    <Compile Include="Converters\EqualityConverter.cs" />
     <Compile Include="Converters\EqualsToVisibilityConverter.cs" />
     <Compile Include="Converters\MultiBooleanToVisibilityConverter.cs" />
     <Compile Include="Converters\NullToVisibilityConverter.cs" />

src/GitHub.VisualStudio.UI/Styles/ThemeBlue.xaml

@@ -63,4 +63,5 @@
   <SolidColorBrush x:Key="GitHubDiffGlyphFill.None" Color="#9EC7FF" />
 
   <SolidColorBrush x:Key="GitHubPeekViewBackground" Color="#F5F5F5" />
+  <SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB"/>
 </ResourceDictionary>

src/GitHub.VisualStudio.UI/Styles/ThemeDark.xaml

@@ -63,4 +63,5 @@
   <SolidColorBrush x:Key="GitHubDiffGlyphFill.None" Color="#569CD6" />
 
   <SolidColorBrush x:Key="GitHubPeekViewBackground" Color="#252526" />
+  <SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FF3F3F46"/>
 </ResourceDictionary>

src/GitHub.VisualStudio.UI/Styles/ThemeLight.xaml

@@ -63,4 +63,5 @@
   <SolidColorBrush x:Key="GitHubDiffGlyphFill.None" Color="#9EC7FF" />
 
   <SolidColorBrush x:Key="GitHubPeekViewBackground" Color="#F5F5F5" />
+  <SolidColorBrush x:Key="GitHubMultilineListItemActiveBrush" Color="#FFCCCEDB"/>
 </ResourceDictionary>