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

Author: donokuda

src/GitHub.App/SampleData/CommentThreadViewModelDesigner.cs

@@ -12,58 +12,6 @@ public class CommentThreadViewModelDesigner : ViewModelBase, ICommentThreadViewM
     {
         public CommentThreadViewModelDesigner()
         {
-
-            var checkRunAnnotationModel1 = new CheckRunAnnotationModel
-            {
-                AnnotationLevel = CheckAnnotationLevel.Failure,
-                Path = "SomeFile.cs",
-                EndLine = 12,
-                StartLine = 12,
-                Message = "CS12345: ; expected",
-                Title = "CS12345"
-            };
-
-            var checkRunAnnotationModel2 = new CheckRunAnnotationModel
-            {
-                AnnotationLevel = CheckAnnotationLevel.Warning,
-                Path = "SomeFile.cs",
-                EndLine = 12,
-                StartLine = 12,
-                Message = "CS12345: ; expected",
-                Title = "CS12345"
-            };
-
-            var checkRunAnnotationModel3 = new CheckRunAnnotationModel
-            {
-                AnnotationLevel = CheckAnnotationLevel.Notice,
-                Path = "SomeFile.cs",
-                EndLine = 12,
-                StartLine = 12,
-                Message = "CS12345: ; expected",
-                Title = "CS12345"
-            };
-
-            var checkRunModel =
-                new CheckRunModel
-                {
-                    Annotations = new List<CheckRunAnnotationModel> { checkRunAnnotationModel1, checkRunAnnotationModel2 },
-                    Name = "MSBuildLog Analyzer"
-                };
-
-            var checkSuiteModel = new CheckSuiteModel()
-            {
-                HeadSha = "ed6198c37b13638e902716252b0a17d54bd59e4a",
-                CheckRuns = new List<CheckRunModel> { checkRunModel },
-                ApplicationName = "My Awesome Check Suite"
-            };
-
-            Annotations = new[]
-            {
-                new InlineAnnotationViewModel(new InlineAnnotationModel(checkSuiteModel, checkRunModel, checkRunAnnotationModel1)),
-                new InlineAnnotationViewModel(new InlineAnnotationModel(checkSuiteModel, checkRunModel, checkRunAnnotationModel2)),
-                new InlineAnnotationViewModel(new InlineAnnotationModel(checkSuiteModel, checkRunModel, checkRunAnnotationModel3)),
-            };
-
             Comments = new ReactiveList<ICommentViewModel>(){new CommentViewModelDesigner()
             {
                 Author = new ActorViewModel{ Login = "shana"},
@@ -75,8 +23,6 @@ public CommentThreadViewModelDesigner()
         public IReadOnlyReactiveList<ICommentViewModel> Comments { get; }
             = new ReactiveList<ICommentViewModel>();
 
-        public IReadOnlyList<IInlineAnnotationViewModel> Annotations { get; }
-
         public IActorViewModel CurrentUser { get; set; }
             = new ActorViewModel { Login = "shana" };
 

src/GitHub.App/ViewModels/CommentThreadViewModel.cs

@@ -57,9 +57,6 @@ public CommentThreadViewModel(
         /// <inheritdoc/>
         public IActorViewModel CurrentUser { get; private set; }
 
-        /// <inheritdoc/>
-        public IReadOnlyList<IInlineAnnotationViewModel> Annotations { get; private set; }
-
         /// <inheritdoc/>
         IReadOnlyReactiveList<ICommentViewModel> ICommentThreadViewModel.Comments => comments;
 
@@ -95,10 +92,8 @@ protected IDisposable AddPlaceholder(ICommentViewModel placeholder)
         /// Intializes a new instance of the <see cref="CommentThreadViewModel"/> class.
         /// </summary>
         /// <param name="currentUser">The current user.</param>
-        /// <param name="annotations"></param>
-        protected Task InitializeAsync(ActorModel currentUser, IReadOnlyList<IInlineAnnotationViewModel> annotations)
+        protected Task InitializeAsync(ActorModel currentUser)
         {
-            Annotations = annotations;
             Guard.ArgumentNotNull(currentUser, nameof(currentUser));
             CurrentUser = new ActorViewModel(currentUser);
             return Task.CompletedTask;

src/GitHub.App/ViewModels/PullRequestReviewCommentThreadViewModel.cs

@@ -77,14 +77,13 @@ public bool IsNewThread
 
         /// <inheritdoc/>
         public async Task InitializeAsync(IPullRequestSession session,
-            IReadOnlyList<IInlineAnnotationViewModel> annotations,
             IPullRequestSessionFile file,
             IInlineCommentThreadModel thread,
             bool addPlaceholder)
         {
             Guard.ArgumentNotNull(session, nameof(session));
 
-            await base.InitializeAsync(session.User, annotations).ConfigureAwait(true);
+            await base.InitializeAsync(session.User).ConfigureAwait(true);
 
             Session = session;
             File = file;
@@ -129,15 +128,14 @@ await vm.InitializeAsPlaceholderAsync(
         /// <inheritdoc/>
         public async Task InitializeNewAsync(
             IPullRequestSession session,
-            IInlineAnnotationViewModel[] annotations,
             IPullRequestSessionFile file,
             int lineNumber,
             DiffSide side,
             bool isEditing)
         {
             Guard.ArgumentNotNull(session, nameof(session));
 
-            await base.InitializeAsync(session.User, annotations).ConfigureAwait(false);
+            await base.InitializeAsync(session.User).ConfigureAwait(false);
 
             Session = session;
             File = file;

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

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 using ReactiveUI;
 
@@ -37,10 +36,5 @@ public interface ICommentThreadViewModel : IViewModel
         /// </summary>
         /// <param name="comment">The comment to delete.</param>
         Task DeleteComment(ICommentViewModel comment);
-
-        /// <summary>
-        /// Gets the annotations displayed.
-        /// </summary>
-        IReadOnlyList<IInlineAnnotationViewModel> Annotations { get; }
     }
 }

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

@@ -46,14 +46,12 @@ 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.
         /// </param>
         Task InitializeAsync(IPullRequestSession session,
-            IReadOnlyList<IInlineAnnotationViewModel> annotations,
             IPullRequestSessionFile file,
             IInlineCommentThreadModel thread,
             bool addPlaceholder);
@@ -66,9 +64,7 @@ Task InitializeAsync(IPullRequestSession session,
         /// <param name="lineNumber">The 0-based line number of the thread.</param>
         /// <param name="side">The side of the diff.</param>
         /// <param name="isEditing">Whether to start the placeholder in edit state.</param>
-        Task InitializeNewAsync(
-            IPullRequestSession session,
-            IInlineAnnotationViewModel[] annotations,
+        Task InitializeNewAsync(IPullRequestSession session,
             IPullRequestSessionFile file,
             int lineNumber,
             DiffSide side,

src/GitHub.InlineReviews/ViewModels/InlineCommentPeekViewModel.cs

@@ -33,6 +33,7 @@ public sealed class InlineCommentPeekViewModel : ReactiveObject, IDisposable
         IPullRequestSession session;
         IPullRequestSessionFile file;
         IPullRequestReviewCommentThreadViewModel thread;
+        IReadOnlyList<IInlineAnnotationViewModel> annotations;
         IDisposable fileSubscription;
         IDisposable sessionSubscription;
         IDisposable threadSubscription;
@@ -86,6 +87,15 @@ public InlineCommentPeekViewModel(IInlineCommentPeekService peekService,
                 Observable.Return(previousCommentCommand.Enabled));
         }
 
+        /// <summary>
+        /// Gets the annotations displayed.
+        /// </summary>
+        public IReadOnlyList<IInlineAnnotationViewModel> Annotations
+        {
+            get { return annotations; }
+            private set { this.RaiseAndSetIfChanged(ref annotations, value); }
+        }
+
         /// <summary>
         /// Gets the thread of comments to display.
         /// </summary>
@@ -168,6 +178,8 @@ async Task UpdateThread()
             Thread = null;
             threadSubscription?.Dispose();
 
+            Annotations = null;
+
             if (file == null)
                 return;
 
@@ -178,22 +190,22 @@ async Task UpdateThread()
                 x.LineNumber == lineNumber &&
                 ((leftBuffer && x.DiffLineType == DiffChangeType.Delete) || (!leftBuffer && x.DiffLineType != DiffChangeType.Delete)));
 
-            var annotationModels = file.InlineAnnotations?.Where(model => model.EndLine - 1 == lineNumber)
+            Annotations = file.InlineAnnotations?.Where(model => model.EndLine - 1 == lineNumber)
                 .Select(model => new InlineAnnotationViewModel(model))
                 .ToArray();
 
-            var vm = factory.CreateViewModel<IPullRequestReviewCommentThreadViewModel>();
+            var threadModel = factory.CreateViewModel<IPullRequestReviewCommentThreadViewModel>();
 
             if (thread?.Comments.Count > 0)
             {
-                await vm.InitializeAsync(session, annotationModels, file, thread, true);
+                await threadModel.InitializeAsync(session, file, thread, true);
             }
             else
             {
-                await vm.InitializeNewAsync(session, annotationModels, file, lineNumber, side, true);
+                await threadModel.InitializeNewAsync(session, file, lineNumber, side, true);
             }
 
-            Thread = vm;
+            Thread = threadModel;
         }
 
         async Task SessionChanged(IPullRequestSession pullRequestSession)

src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml

@@ -104,7 +104,17 @@
         <ScrollViewer Name="threadScroller"
                       VerticalScrollBarVisibility="Auto"
                       Background="{DynamicResource GitHubPeekViewBackground}">
-            <ghfvs:CommentThreadView x:Name="threadView" DataContext="{Binding Thread}"/>
+            <StackPanel Orientation="Vertical" Margin="0 0 0 4">
+                <ItemsControl x:Name="annotationsView" ItemsSource="{Binding Annotations}">
+                    <ItemsControl.ItemTemplate>
+                        <DataTemplate>
+                            <ghfvs:InlineAnnotationView />
+                        </DataTemplate>
+                    </ItemsControl.ItemTemplate>
+                </ItemsControl>
+
+                <ghfvs:CommentThreadView x:Name="threadView" DataContext="{Binding Thread}"/>
+            </StackPanel>
         </ScrollViewer>
     </DockPanel>
 </UserControl>

src/GitHub.InlineReviews/Views/InlineCommentPeekView.xaml.cs

@@ -15,17 +15,19 @@ public InlineCommentPeekView()
             InitializeComponent();
 
             desiredHeight = new Subject<double>();
-            threadView.LayoutUpdated += ThreadViewLayoutUpdated;
+            threadView.LayoutUpdated += ChildLayoutUpdated;
+            annotationsView.LayoutUpdated += ChildLayoutUpdated;
             threadScroller.PreviewMouseWheel += ScrollViewerUtilities.FixMouseWheelScroll;
         }
 
         public IObservable<double> DesiredHeight => desiredHeight;
 
-        void ThreadViewLayoutUpdated(object sender, EventArgs e)
+        void ChildLayoutUpdated(object sender, EventArgs e)
         {
             var otherControlsHeight = ActualHeight - threadScroller.ActualHeight;
             var threadViewHeight = threadView.DesiredSize.Height + threadView.Margin.Top + threadView.Margin.Bottom;
-            desiredHeight.OnNext(threadViewHeight + otherControlsHeight);
+            var annotationsViewHeight = annotationsView.DesiredSize.Height + annotationsView.Margin.Top + annotationsView.Margin.Bottom;
+            desiredHeight.OnNext(threadViewHeight + annotationsViewHeight + otherControlsHeight);
         }
     }
 }

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

@@ -10,22 +10,12 @@
         <sampleData:CommentThreadViewModelDesigner />
     </d:DesignProperties.DataContext>
 
-    <StackPanel Orientation="Vertical" Margin="0 0 0 4">
-        <ItemsControl ItemsSource="{Binding Annotations}">
-            <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                    <local:InlineAnnotationView />
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
-
-        <ItemsControl ItemsSource="{Binding Comments}">
-            <ItemsControl.ItemTemplate>
-                <DataTemplate>
-                    <local:CommentView Margin="0"/>
-                </DataTemplate>
-            </ItemsControl.ItemTemplate>
-        </ItemsControl>
-    </StackPanel>
+    <ItemsControl ItemsSource="{Binding Comments}">
+        <ItemsControl.ItemTemplate>
+            <DataTemplate>
+                <local:CommentView />
+            </DataTemplate>
+        </ItemsControl.ItemTemplate>
+    </ItemsControl>
 </UserControl>
 

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

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