Merge branch 'master' into refactor/pr-list-0.6-update

Author: grokys

src/GitHub.InlineReviews/GitHub.InlineReviews.csproj

@@ -404,6 +404,9 @@
       <HintPath>..\..\packages\Rx-PlatformServices.2.2.5-custom\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml" />

src/GitHub.InlineReviews/Services/PullRequestSessionService.cs

@@ -434,23 +434,12 @@ public async Task<PullRequestDetailModel> CreatePendingReview(
         {
             var address = HostAddress.Create(localRepository.CloneUrl.Host);
             var graphql = await graphqlFactory.CreateConnection(address);
+            var (_, owner, number) = await CreatePendingReviewCore(localRepository, pullRequestId);
+            var detail = await ReadPullRequestDetail(address, owner, localRepository.Name, number);
 
-            var review = new AddPullRequestReviewInput
-            {
-                PullRequestId = new ID(pullRequestId),
-            };
-
-            var mutation = new Mutation()
-                .AddPullRequestReview(review)
-                .Select(x => new
-                {
-                    x.PullRequestReview.Repository.Owner.Login,
-                    x.PullRequestReview.PullRequest.Number
-                });
-
-            var result = await graphql.Run(mutation);
             await usageTracker.IncrementCounter(x => x.NumberOfPRReviewDiffViewInlineCommentStartReview);
-            return await ReadPullRequestDetail(address, result.Login, localRepository.Name, result.Number);
+
+            return detail;
         }
 
         /// <inheritdoc/>
@@ -652,9 +641,9 @@ public async Task<PullRequestDetailModel> PostStandaloneReviewCommentReply(
             string body,
             string inReplyTo)
         {
-            var review = await CreatePendingReview(localRepository, pullRequestId);
-            var comment = await PostPendingReviewCommentReply(localRepository, review.Id, body, inReplyTo);
-            return await SubmitPendingReview(localRepository, review.Id, null, PullRequestReviewEvent.Comment);
+            var (id, _, _) = await CreatePendingReviewCore(localRepository, pullRequestId);
+            var comment = await PostPendingReviewCommentReply(localRepository, id, body, inReplyTo);
+            return await SubmitPendingReview(localRepository, id, null, PullRequestReviewEvent.Comment);
         }
 
         /// <inheritdoc/>
@@ -702,6 +691,29 @@ public async Task<PullRequestDetailModel> EditComment(ILocalRepositoryModel loca
             return await ReadPullRequestDetail(address, result.Login, localRepository.Name, result.Number);
         }
 
+        async Task<(string id, string owner, int number)> CreatePendingReviewCore(ILocalRepositoryModel localRepository, string pullRequestId)
+        {
+            var address = HostAddress.Create(localRepository.CloneUrl.Host);
+            var graphql = await graphqlFactory.CreateConnection(address);
+
+            var input = new AddPullRequestReviewInput
+            {
+                PullRequestId = new ID(pullRequestId),
+            };
+
+            var mutation = new Mutation()
+                .AddPullRequestReview(input)
+                .Select(x => new
+                {
+                    Id = x.PullRequestReview.Id.Value,
+                    Owner = x.PullRequestReview.Repository.Owner.Login,
+                    x.PullRequestReview.PullRequest.Number
+                });
+
+            var result = await graphql.Run(mutation);
+            return (result.Id, result.Owner, result.Number);
+        }
+
         int GetUpdatedLineNumber(IInlineCommentThreadModel thread, IEnumerable<DiffChunk> diff)
         {
             var line = DiffUtilities.Match(diff, thread.DiffMatch);
@@ -724,7 +736,7 @@ Task<IRepository> GetRepository(ILocalRepositoryModel repository)
         static void BuildPullRequestThreads(PullRequestDetailModel model)
         {
             var commentsByReplyId = new Dictionary<string, List<CommentAdapter>>();
-
+           
             // Get all comments that are not replies.
             foreach (CommentAdapter comment in model.Reviews.SelectMany(x => x.Comments))
             {
@@ -744,7 +756,6 @@ static void BuildPullRequestThreads(PullRequestDetailModel model)
                     if (commentsByReplyId.TryGetValue(comment.ReplyTo, out thread))
                     {
                         thread.Add(comment);
-                        break;
                     }
                 }
             }

src/GitHub.InlineReviews/Views/CommentView.xaml

@@ -154,7 +154,8 @@
                               Text="{Binding Body, UpdateSourceTrigger=PropertyChanged}"
                               TextWrapping="Wrap"
                               VerticalAlignment="Center"
-                              GotFocus="ReplyPlaceholder_GotFocus">
+                              GotFocus="ReplyPlaceholder_GotFocus"
+                              SpellCheck.IsEnabled="True">
                 <ui:PromptTextBox.Style>
                     <Style TargetType="ui:PromptTextBox" BasedOn="{StaticResource RoundedPromptTextBox}">
                         <Setter Property="Foreground" Value="{DynamicResource GitHubVsToolWindowText}" />

src/GitHub.InlineReviews/packages.config

@@ -42,6 +42,7 @@
   <package id="Rx-PlatformServices" version="2.2.5-custom" targetFramework="net461" />
   <package id="Serilog" version="2.5.0" targetFramework="net461" />
   <package id="SerilogAnalyzer" version="0.12.0.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
   <package id="VSSDK.ComponentModelHost" version="12.0.4" targetFramework="net461" />
   <package id="VSSDK.IDE.12" version="12.0.4" targetFramework="net461" />
 </packages>

src/GitHub.UI/Assets/Controls.xaml

@@ -19,13 +19,6 @@
     Styles for standard windows controls
     -->
 
-     <ContextMenu x:Key="DefaultContextMenu">
-        <MenuItem Header="Cut" Command="ApplicationCommands.Cut"/>
-        <MenuItem Header="Copy" Command="ApplicationCommands.Copy"/>
-        <MenuItem Header="Paste" Command="ApplicationCommands.Paste"/>
-    </ContextMenu>
-    <!--End ContextMenu-->
-    
     <!-- ProgressBar -->
     <Style x:Key="GitHubProgressBar" TargetType="{x:Type ui:GitHubProgressBar}">
         <Setter Property="Foreground" Value="#999999" />

src/GitHub.UI/Assets/Controls/FilterTextBox.xaml

@@ -14,7 +14,6 @@
         <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
         <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
         <Setter Property="Padding" Value="3,3,18,3" />
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultContextMenu}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ui:FilterTextBox}">

src/GitHub.UI/Assets/TextBlocks.xaml

@@ -15,7 +15,6 @@
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="ToolTipService.ShowDuration" Value="30000" />
         <Setter Property="ToolTipService.ShowOnDisabled" Value="True" />
-        <Setter Property="ContextMenu" Value="{DynamicResource DefaultContextMenu}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TextBox}">

src/GitHub.VisualStudio/Views/Dialog/GistCreationView.xaml

@@ -74,7 +74,7 @@
                 <ghfvs:PromptTextBox x:Name="fileNameTextBox" Grid.Column="1" Grid.Row="0" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.GistFileNameTextBox}" />
 
                 <Label Grid.Column="0" Grid.Row="1" Target="{Binding ElementName=descriptionTextBox}" Content="{x:Static prop:Resources.Description}"/>
-                <ghfvs:PromptTextBox x:Name="descriptionTextBox" Grid.Column="1" Grid.Row="1" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.GistDescriptionTextBlock}"/>
+                <ghfvs:PromptTextBox x:Name="descriptionTextBox" Grid.Column="1" Grid.Row="1" SpellCheck.IsEnabled="True" AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.GistDescriptionTextBlock}"/>
 
                 <StackPanel x:Name="accountStackPanel" Grid.Column="1" Grid.Row="2" Orientation="Horizontal">
                     <Image

src/GitHub.VisualStudio/Views/Dialog/RepositoryCreationView.xaml

@@ -111,6 +111,7 @@
                           Grid.Column="1"
                           MaxLength="{x:Static ghfvs:Constants.MaxRepositoryNameLength}"
                           Text="{Binding RepositoryName, UpdateSourceTrigger=PropertyChanged}" 
+                          SpellCheck.IsEnabled="True"
                           AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.RepositoryNameTextBox}" />
 
                 <StackPanel Grid.Row="1" Grid.Column="1">
@@ -132,6 +133,7 @@
                           Grid.Row="2"
                           Grid.Column="1"
                           Text="{Binding Description, UpdateSourceTrigger=PropertyChanged}" 
+                          SpellCheck.IsEnabled="True"
                           AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.RepositoryDescriptionTextBox}" />
 
         <Label Grid.Row="3"

src/GitHub.VisualStudio/Views/GitHubPane/PullRequestCreationView.xaml

@@ -146,7 +146,8 @@
                             Margin="10,5"
                             Text="{Binding PRTitle, UpdateSourceTrigger=PropertyChanged}"
                             PromptText="{x:Static prop:Resources.TitleRequired}"
-                            Style="{DynamicResource GitHubVsPromptTextBox}" 
+                            Style="{DynamicResource GitHubVsPromptTextBox}"
+                            SpellCheck.IsEnabled="True"
                             AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationTitleTextBox}"/>
 
         <ghfvs:PromptTextBox Grid.Row="2"
@@ -158,6 +159,7 @@
                             Style="{DynamicResource GitHubVsPromptTextBox}"
                             VerticalScrollBarVisibility="Auto"
                             TextWrapping="Wrap"
+                            SpellCheck.IsEnabled="True"
                             AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.PullRequestCreationDescriptionTextBox}"/>
 
         <ghfvs:ValidationMessage x:Name="titleValidationMessage"