Merge branch 'master' into fixes/1049-surface-pr-errors

Author: grokys

src/GitHub.InlineReviews/Commands/InlineCommentNavigationCommand.cs

@@ -49,7 +49,7 @@ public override bool IsEnabled
             get
             {
                 var tags = GetTags(GetCurrentTextViews());
-                return tags.Count > 1;
+                return tags.Count > 0;
             }
         }
 

src/GitHub.UI/GitHub.UI.csproj

@@ -100,6 +100,7 @@
     <Compile Include="Helpers\LoadingResourceDictionary.cs" />
     <Compile Include="Helpers\ScrollViewerUtilities.cs" />
     <Compile Include="Helpers\SharedDictionaryManager.cs" />
+    <Compile Include="Helpers\TreeViewExtensions.cs" />
     <Compile Include="Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

src/GitHub.UI/Helpers/TreeViewExtensions.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Windows.Controls;
+
+namespace GitHub.UI.Helpers
+{
+    /// <summary>
+    /// Extensions for TreeView control.
+    /// </summary>
+    public static class TreeViewExtensions
+    {
+        /// <summary>
+        /// Gets the TreeViewItem for an item in the TreeView.
+        /// </summary>
+        /// <param name="tree">The tree view.</param>
+        /// <param name="item">The item to search for.</param>
+        /// <returns>The TreeViewItem or null if the item was null or not found.</returns>
+        public static TreeViewItem GetTreeViewItem(this TreeView tree, object item)
+        {
+            if (item == null)
+            {
+                return null;
+            }
+
+            return GetTreeViewItem(tree.ItemContainerGenerator, item);
+        }
+
+        static TreeViewItem GetTreeViewItem(ItemContainerGenerator itemContainerGenerator, object item)
+        {
+            var container = (TreeViewItem)itemContainerGenerator.ContainerFromItem(item);
+
+            if (container == null)
+            {
+                foreach (var childItem in itemContainerGenerator.Items)
+                {
+                    var node = (TreeViewItem)itemContainerGenerator.ContainerFromItem(childItem);
+                    container = GetTreeViewItem(node.ItemContainerGenerator, item);
+
+                    if (container != null)
+                    {
+                        return container;
+                    }
+                }
+            }
+
+            return container;
+        }
+    }
+}

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

@@ -236,7 +236,7 @@
         <Rectangle DockPanel.Dock="Top" Style="{StaticResource Separator}" Height="2" Margin="-8,5,-8,0"/>
 
         <ScrollViewer VerticalScrollBarVisibility="Auto" Margin="0,0,-8,0">
-            <Grid Margin="0 5 0 0">
+            <Grid Name="bodyGrid" Margin="0 5 0 0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*"/>
                 </Grid.ColumnDefinitions>
@@ -297,7 +297,8 @@
                             </Grid.Resources>
 
                             <!-- Tree View -->
-                            <TreeView ItemsSource="{Binding ChangedFilesTree}"
+                            <TreeView Name="changesTree"
+                                      ItemsSource="{Binding ChangedFilesTree}"
                                       ContextMenuOpening="TreeView_ContextMenuOpening"
                                       ContextMenu="{StaticResource FileContextMenu}"
                                       Background="Transparent"

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

@@ -24,6 +24,7 @@
 using ReactiveUI;
 using Task = System.Threading.Tasks.Task;
 using GitHub.InlineReviews.Commands;
+using GitHub.UI.Helpers;
 
 namespace GitHub.VisualStudio.UI.Views
 {
@@ -47,6 +48,8 @@ public PullRequestDetailView()
                 d(ViewModel.OpenFile.Subscribe(x => DoOpenFile((IPullRequestFileNode)x)));
                 d(ViewModel.DiffFile.Subscribe(x => DoDiffFile((IPullRequestFileNode)x).Forget()));
             });
+
+            bodyGrid.RequestBringIntoView += BodyFocusHack;
         }
 
         [Import]
@@ -197,6 +200,18 @@ void ApplyContextMenuBinding<TItem>(object sender, ContextMenuEventArgs e) where
             }
         }
 
+        void BodyFocusHack(object sender, RequestBringIntoViewEventArgs e)
+        {
+            if (e.TargetObject == bodyMarkdown)
+            {
+                // Hack to prevent pane scrolling to top. Instead focus selected tree view item.
+                // See https://github.com/github/VisualStudio/issues/1042
+                var node = changesTree.GetTreeViewItem(changesTree.SelectedItem);
+                node?.Focus();
+                e.Handled = true;
+            }
+        }
+
         void ViewCommentsClick(object sender, RoutedEventArgs e)
         {
             var model = (object)ViewModel.Model;