Merge pull request #1090 from github/revert-1025

Revert pull request #1025 from github/feature/inline-reviews-tooltip

Author: shana

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -92,11 +92,6 @@
     <Compile Include="Peek\InlineCommentPeekResultPresentation.cs" />
     <Compile Include="Peek\InlineCommentPeekResultPresenter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="SampleData\CommentThreadViewModelDesigner.cs" />
     <Compile Include="SampleData\DiffCommentThreadViewModelDesigner.cs" />
     <Compile Include="SampleData\PullRequestCommentsViewModelDesigner.cs" />
@@ -119,10 +114,6 @@
     <Compile Include="ViewModels\IPullRequestCommentsViewModel.cs" />
     <Compile Include="ViewModels\IssueCommentThreadViewModel.cs" />
     <Compile Include="ViewModels\PullRequestCommentsViewModel.cs" />
-    <Compile Include="ViewModels\TooltipCommentThreadViewModel.cs" />
-    <Compile Include="Views\TooltipCommentThreadView.xaml.cs">
-      <DependentUpon>TooltipCommentThreadView.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Views\DiffCommentThreadView.xaml.cs">
       <DependentUpon>DiffCommentThreadView.xaml</DependentUpon>
     </Compile>
@@ -388,21 +379,13 @@
     </VSCTCompile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
     <EmbeddedResource Include="VSPackage.resx">
       <MergeWithCTO>true</MergeWithCTO>
       <ManifestResourceName>VSPackage</ManifestResourceName>
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Page Include="Views\TooltipCommentThreadView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="Views\DiffCommentThreadView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

src/GitHub.InlineReviews/Resources.Designer.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Reactive;
-using ReactiveUI;
 using GitHub.InlineReviews.ViewModels;
 using GitHub.Models;
 using GitHub.SampleData;
 using GitHub.UI;
+using ReactiveUI;
 
 namespace GitHub.InlineReviews.SampleData
 {

src/GitHub.InlineReviews/Resources.resx

@@ -70,7 +70,6 @@ public UIElement GenerateGlyph(IWpfTextViewLine line, InlineCommentTag tag)
         {
             var glyph = CreateGlyph(tag);
             glyph.DataContext = tag;
-
             glyph.MouseLeftButtonUp += (s, e) =>
             {
                 if (OpenThreadView(tag)) e.Handled = true;

src/GitHub.InlineReviews/SampleData/CommentViewModelDesigner.cs

@@ -3,17 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             mc:Ignorable="d"
-             ToolTipService.ShowDuration="600000" ToolTipService.HasDropShadow="True">
+             mc:Ignorable="d">
 
     <UserControl.Resources>
         <!-- This will be the color of an added/deleted word in the diff view or the indicator margin color -->
         <SolidColorBrush x:Key="DiffChangeBackground" Color="DarkSlateGray" />
     </UserControl.Resources>
 
-    <UserControl.ToolTip>
-        <ToolTip x:Name="CommentToolTip" />
-    </UserControl.ToolTip>
 
     <Grid Background="{DynamicResource DiffChangeBackground}">
         <Viewbox>

src/GitHub.InlineReviews/Tags/InlineCommentGlyphFactory.cs

@@ -1,9 +1,5 @@
 using System;
 using System.Windows.Controls;
-using GitHub.InlineReviews.Views;
-using GitHub.InlineReviews.ViewModels;
-using System.Linq;
-using GitHub.Models;
 
 namespace GitHub.InlineReviews.Tags
 {
@@ -14,29 +10,5 @@ public ShowInlineCommentGlyph()
             InitializeComponent();
         }
 
-        protected override void OnToolTipOpening(ToolTipEventArgs e)
-        {
-            var tag = DataContext as ShowInlineCommentTag;
-            if (tag != null)
-            {
-                var comments = tag.Thread.Comments.Select(comment => new PullRequestReviewCommentModel
-                {
-                    User = comment.User,
-                    Body = comment.Body,
-                    CreatedAt = comment.CreatedAt
-                });
-
-                var viewModel = new TooltipCommentThreadViewModel(comments);
-                var view = new TooltipCommentThreadView();
-                view.DataContext = viewModel;
-
-                CommentToolTip.Content = view;
-            }
-        }
-
-        protected override void OnToolTipClosing(ToolTipEventArgs e)
-        {
-            CommentToolTip.Content = null;
-        }
     }
 }

src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml

@@ -17,10 +17,12 @@ public abstract class CommentThreadViewModel : ReactiveObject, ICommentThreadVie
         /// <summary>
         /// Intializes a new instance of the <see cref="CommentThreadViewModel"/> class.
         /// </summary>
-        /// <param name="currentUser">The current user on null if not required.</param>
+        /// <param name="currentUser">The current user.</param>
         /// <param name="commentModels">The thread comments.</param>
-        public CommentThreadViewModel(IAccount currentUser = null)
+        public CommentThreadViewModel(IAccount currentUser)
         {
+            Guard.ArgumentNotNull(currentUser, nameof(currentUser));
+
             Comments = new ObservableCollection<ICommentViewModel>();
             CurrentUser = currentUser;
         }

src/GitHub.InlineReviews/Tags/ShowInlineCommentGlyph.xaml.cs

@@ -26,7 +26,7 @@ public class CommentViewModel : ReactiveObject, ICommentViewModel
         /// Initializes a new instance of the <see cref="CommentViewModel"/> class.
         /// </summary>
         /// <param name="thread">The thread that the comment is a part of.</param>
-        /// <param name="currentUser">The current user or null if not used.</param>
+        /// <param name="currentUser">The current user.</param>
         /// <param name="commentId">The ID of the comment.</param>
         /// <param name="body">The comment body.</param>
         /// <param name="state">The comment edit state.</param>
@@ -42,6 +42,7 @@ public CommentViewModel(
             DateTimeOffset updatedAt)
         {
             Guard.ArgumentNotNull(thread, nameof(thread));
+            Guard.ArgumentNotNull(currentUser, nameof(currentUser));
             Guard.ArgumentNotNull(body, nameof(body));
             Guard.ArgumentNotNull(user, nameof(user));