Merge branch 'features/check-suite-annotations-inline' of https://github.com/github/VisualStudio into features/check-suite-annotations-inline

Author: donokuda

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

@@ -1,5 +1,7 @@
 using System.Reactive;
+using System.Reactive.Linq;
 using GitHub.Models;
+using GitHub.Services;
 using ReactiveUI;
 
 namespace GitHub.ViewModels.GitHubPane

src/GitHub.App/ViewModels/PullRequestReviewCommentThreadViewModel.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.ComponentModel.Composition;
 using System.Globalization;
 using System.Linq;
@@ -75,9 +76,8 @@ public bool IsNewThread
         public bool NeedsPush => needsPush.Value;
 
         /// <inheritdoc/>
-        public async Task InitializeAsync(
-            IPullRequestSession session,
-            IInlineAnnotationViewModel[] annotations,
+        public async Task InitializeAsync(IPullRequestSession session,
+            IReadOnlyList<IInlineAnnotationViewModel> annotations,
             IPullRequestSessionFile file,
             IInlineCommentThreadModel thread,
             bool addPlaceholder)

src/GitHub.Exports.Reactive/ViewModels/IPullRequestReviewCommentThreadViewModel.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.Collections.Generic;
+using System.Threading.Tasks;
 using GitHub.Models;
 using GitHub.Services;
 
@@ -45,14 +46,14 @@ public interface IPullRequestReviewCommentThreadViewModel : ICommentThreadViewMo
         /// Initializes the view model with data.
         /// </summary>
         /// <param name="session">The pull request session.</param>
+        /// <param name="annotations"></param>
         /// <param name="file">The file that the comment is on.</param>
         /// <param name="thread">The thread.</param>
         /// <param name="addPlaceholder">
-        /// Whether to add a placeholder comment at the end of the thread.
+        ///     Whether to add a placeholder comment at the end of the thread.
         /// </param>
-        Task InitializeAsync(
-            IPullRequestSession session,
-            IInlineAnnotationViewModel[] annotations,
+        Task InitializeAsync(IPullRequestSession session,
+            IReadOnlyList<IInlineAnnotationViewModel> annotations,
             IPullRequestSessionFile file,
             IInlineCommentThreadModel thread,
             bool addPlaceholder);

src/GitHub.InlineReviews/Tags/InlineCommentTagger.cs

@@ -110,8 +110,7 @@ public IEnumerable<ITagSpan<InlineCommentTag>> GetTags(NormalizedSnapshotSpanCol
                         var snapshot = span.Snapshot;
                         var snapshotLine = snapshot.GetLineFromLineNumber(line);
 
-                        IInlineCommentThreadModel thread;
-                        if (spanThreadsByLine.TryGetValue(line, out thread))
+                        if (spanThreadsByLine.TryGetValue(line, out var thread))
                         {
                             var isThreadDeleteSide = thread.DiffLineType == DiffChangeType.Delete;
                             var sidesMatch = side == DiffSide.Left && isThreadDeleteSide || side == DiffSide.Right && !isThreadDeleteSide;

src/GitHub.InlineReviews/Tags/ShowInlineCommentTag.cs

@@ -15,8 +15,8 @@ public class ShowInlineCommentTag : InlineCommentTag
         /// Initializes a new instance of the <see cref="ShowInlineCommentTag"/> class.
         /// </summary>
         /// <param name="session">The pull request session.</param>
-        /// <param name="lineNumber"></param>
-        /// <param name="diffLineType"></param>
+        /// <param name="lineNumber">0-based index of the inline tag</param>
+        /// <param name="diffLineType">The diff type for the inline comment</param>
         public ShowInlineCommentTag(IPullRequestSession session, int lineNumber, DiffChangeType diffLineType)
             : base(session, lineNumber, diffLineType)
         {

src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml

@@ -104,9 +104,7 @@
         <ScrollViewer Name="threadScroller"
                       VerticalScrollBarVisibility="Auto"
                       Background="{DynamicResource GitHubPeekViewBackground}">
-            <StackPanel>
-                <ghfvs:CommentThreadView x:Name="threadView" DataContext="{Binding Thread}"/>
-            </StackPanel>
+            <ghfvs:CommentThreadView x:Name="threadView" DataContext="{Binding Thread}"/>
         </ScrollViewer>
     </DockPanel>
 </UserControl>

src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestCheckView.xaml

@@ -24,12 +24,10 @@
 
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" SharedSizeGroup="ColumnZero" />
-            <ColumnDefinition Width="*" SharedSizeGroup="ColumnOne" />
-            <ColumnDefinition Width="Auto" SharedSizeGroup="ColumnTwo" />
+            <ColumnDefinition Width="Auto"/>
             <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="Auto" SharedSizeGroup="ColumnFour" />
-            <ColumnDefinition MinWidth="50" Width="Auto" SharedSizeGroup="ColumnFive" />
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
         </Grid.ColumnDefinitions>
 
         <Grid.RowDefinitions>
@@ -40,16 +38,19 @@
         <ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="x" Foreground="#cb2431" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Failure}}"/>
         <ghfvs:OcticonImage Grid.Column="0" Margin="0 0 4 0" Icon="primitive_dot" Foreground="#f1c647" Visibility="{Binding Status, Converter={ghfvs:EqualsToVisibilityConverter Pending}}"/>
 
+        <Label Grid.Column="1" Foreground="{DynamicResource VsBrush.WindowText}">
+            <TextBlock TextTrimming="CharacterEllipsis" Text="{Binding Title}" />
+        </Label>
 
-        <Label Grid.Column="2" Foreground="{DynamicResource VsBrush.WindowText}" Content="{Binding Title}"/>
-        <Label Grid.Column="3" HorizontalAlignment="Right">
-            <ghfvs:OcticonButton Command="{Binding Path=DataContext.ShowAnnotations, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:PullRequestDetailView}}}"
-                                 CommandParameter="{Binding}"
-                                 Visibility="{Binding HasAnnotations, Converter={ghfvs:BooleanToVisibilityConverter}}"
-                                 Margin="0 0 0 0" Icon="file_code" Foreground="Black" />
+        <Label Grid.Column="2" HorizontalContentAlignment="Stretch" Visibility="{Binding HasAnnotations, Converter={ghfvs:BooleanToVisibilityConverter}}">
+            <Hyperlink ToolTip="View checks"
+                           Command="{Binding Path=DataContext.ShowAnnotations, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type local:PullRequestDetailView}}}"
+                           CommandParameter="{Binding}">
+                Checks
+            </Hyperlink>
         </Label>
-        <Label Grid.Column="4" HorizontalAlignment="Right"
-               Visibility="{Binding DetailsUrl, Converter={ghfvs:NullToVisibilityConverter}}">
+        
+        <Label Grid.Column="3" HorizontalContentAlignment="Stretch" Visibility="{Binding DetailsUrl, Converter={ghfvs:NullToVisibilityConverter}}">
             <Hyperlink ToolTip="{Binding DetailsUrl}"  Command="{Binding OpenDetailsUrl}">Details</Hyperlink>
         </Label>
     </Grid>

src/GitHub.VisualStudio.UI/Views/GitHubPane/PullRequestDetailView.xaml

@@ -252,7 +252,7 @@
                     <ItemsControl ItemsSource="{Binding Checks}" Margin="0 4 12 4">
                         <ItemsControl.ItemsPanel>
                             <ItemsPanelTemplate>
-                                <StackPanel Grid.IsSharedSizeScope="True" />
+                                <StackPanel Orientation="Vertical" HorizontalAlignment="Stretch"/>
                             </ItemsPanelTemplate>
                         </ItemsControl.ItemsPanel>
                     </ItemsControl>

src/GitHub.VisualStudio.UI/Views/InlineAnnotationView.xaml

@@ -6,7 +6,6 @@
              xmlns:ghfvs="https://github.com/github/VisualStudio"
              xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
              xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"  
-             xmlns:markdig="clr-namespace:Markdig.Wpf;assembly=Markdig.Wpf"
              mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300">
 
     <d:DesignProperties.DataContext>

src/GitHub.VisualStudio.UI/Views/InlineAnnotationView.xaml.cs

@@ -9,7 +9,6 @@ public partial class InlineAnnotationView : UserControl
         public InlineAnnotationView()
         {
             InitializeComponent();
-            PreviewMouseWheel += ScrollViewerUtilities.FixMouseWheelScroll;
         }
     }
 }