Merge branch 'master' into spike/zero-impact-2019

Author: jcansdale

.gitignore

@@ -26,9 +26,10 @@ build/
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
 
-#NUNIT
+# NUnit
 *.VisualState.xml
 TestResult.xml
+nunit-*.xml
 
 # Build Results of an ATL Project
 [Dd]ebugPS/
@@ -238,8 +239,14 @@ coverage.xml
 #Msbuild binary log output
 output.binlog
 
+# KDiff3
+*_BACKUP_*
+*_BASE_*
+*_LOCAL_*
+*_REMOTE_*
+*.orig
+
 AkavacheSqliteLinkerOverride.cs
 NuGetBuild
 WiX.Toolset.DummyFile.txt
-nunit-*.xml
 GitHubVS.sln.DotSettings

src/GitHub.Resources/Resources.Designer.cs

@@ -499,7 +499,7 @@ https://git-scm.com/download/win</value>
     <value>Private Repository</value>
   </data>
   <data name="localPathText" xml:space="preserve">
-    <value>Local path</value>
+    <value>Local path:</value>
   </data>
   <data name="licenseListText" xml:space="preserve">
     <value>License</value>
@@ -878,4 +878,4 @@ https://git-scm.com/download/win</value>
   <data name="RepositorySelectContributedRepositories" xml:space="preserve">
     <value>Contributed to repositories</value>
   </data>
-</root>
+</root>

src/GitHub.Resources/Resources.resx

@@ -9,6 +9,7 @@
              xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.14.0"
              Background="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowBackgroundBrushKey}}"
              Foreground="{DynamicResource {x:Static vs:EnvironmentColors.ToolWindowTextBrushKey}}"
+             Margin="12,12"
              mc:Ignorable="d" d:DesignHeight="414" d:DesignWidth="440">
     <d:DesignData.DataContext>
         <ghfvs:RepositoryCloneViewModelDesigner/>
@@ -19,35 +20,36 @@
     </Control.Resources>
 
     <DockPanel>
-        <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" HorizontalAlignment="Center">
+        <StackPanel Orientation="Horizontal" DockPanel.Dock="Bottom" HorizontalAlignment="Right" Margin="0,18,0,0">
             <Button
-                Margin="12"
                 HorizontalAlignment="Center"
                 IsDefault="True"
                 Command="{Binding Clone}"
                 Content="Clone"
-                AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.CloneRepositoryButton}"/>
+                AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.CloneRepositoryButton}"
+                KeyboardNavigation.TabIndex="5" />
 
             <Button
-                Margin="12"
+                Margin="6,0,0,0"
                 HorizontalAlignment="Center"
                 IsDefault="True"
                 Command="{Binding Open}"
                 Content="Open"
-                AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.OpenRepositoryButton}"/>
+                AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.OpenRepositoryButton}"
+                KeyboardNavigation.TabIndex="6"/>
         </StackPanel>
 
-        <DockPanel DockPanel.Dock="Bottom"
-                   Margin="16">
-            <Label DockPanel.Dock="Left" Content="{x:Static ghfvs:Resources.localPathText}"/>
+        <DockPanel DockPanel.Dock="Bottom" Margin="0,9,0,0">
+            <Label DockPanel.Dock="Left" Content="{x:Static ghfvs:Resources.localPathText}" />
             <Button DockPanel.Dock="Right"
                     Command="{Binding Browse}"
-                    Style="{DynamicResource GitHubLinkButton}"
-                    VerticalContentAlignment="Center">
-                Browse
+                    VerticalContentAlignment="Center"
+                    KeyboardNavigation.TabIndex="4">
+                Browse...
             </Button>
-            <TextBox Text="{Binding Path, UpdateSourceTrigger=PropertyChanged}"
-                     VerticalContentAlignment="Center" />
+            <TextBox Text="{Binding Path, UpdateSourceTrigger=PropertyChanged}" Margin="6,0"
+                     VerticalContentAlignment="Center"
+                     KeyboardNavigation.TabIndex="3" />
         </DockPanel>
 
         <uic:InfoPanel Message="{Binding PathWarning}"

src/GitHub.VisualStudio.UI/Views/Dialog/Clone/RepositoryCloneView.xaml

@@ -14,17 +14,20 @@
     </Control.Resources>
 
     <DockPanel>
-        <ghfvs:PromptTextBox DockPanel.Dock="Top"
-                             Margin="0,4"
-                             PromptText="Search or enter a URL"
-                             Text="{Binding Filter, UpdateSourceTrigger=PropertyChanged, Delay=300}"/>
+        <ghfvs:PromptTextBox Name="SearchTextBox"
+                             DockPanel.Dock="Top"
+                             Margin="0,9"
+                             PromptText="Search or enter a URL"                             
+                             Text="{Binding Filter, UpdateSourceTrigger=PropertyChanged, Delay=300}"
+                             KeyboardNavigation.TabIndex="1" />
 
         <Grid>
             <ListView BorderThickness="0"
                       ItemsSource="{Binding ItemsView}"
                       SelectedItem="{Binding SelectedItem}"
                       VirtualizingPanel.IsVirtualizing="True"
-                      VirtualizingPanel.IsVirtualizingWhenGrouping="True">
+                      VirtualizingPanel.IsVirtualizingWhenGrouping="True"
+                      KeyboardNavigation.TabIndex="2">
                 <ListView.GroupStyle>
                     <GroupStyle>
                         <GroupStyle.HeaderTemplate>

src/GitHub.VisualStudio.UI/Views/Dialog/Clone/SelectPageView.xaml

@@ -1,6 +1,8 @@
-using System.ComponentModel.Composition;
+using System;
+using System.ComponentModel.Composition;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Threading;
 using GitHub.Exports;
 using GitHub.ViewModels.Dialog.Clone;
 
@@ -13,6 +15,16 @@ public partial class SelectPageView : UserControl
         public SelectPageView()
         {
             InitializeComponent();
+
+            // See Douglas Stockwell's suggestion:
+            // https://social.msdn.microsoft.com/Forums/vstudio/en-US/30ed27ce-f7b7-48ae-8adc-0400b9b9ec78
+            IsVisibleChanged += (sender, e) =>
+            {
+                if (IsVisible)
+                {
+                    Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action)(() => SearchTextBox.Focus()));
+                }
+            };
         }
 
         protected override void OnPreviewMouseDown(MouseButtonEventArgs e)

src/GitHub.VisualStudio.UI/Views/Dialog/Clone/SelectPageView.xaml.cs

@@ -237,6 +237,45 @@ public void InvalidDiffLineChangeChar(string line, string expectMessage)
 
                 Assert.That(expectMessage, Is.EqualTo(e.Message));
             }
+
+            [Test]
+            public void ShouldParsePr960()
+            {
+                var result = DiffUtilities.ParseFragment(Properties.Resources.pr_960_diff).ToList();
+
+                Assert.That(4, Is.EqualTo(result.Count));
+
+                Assert.That(11, Is.EqualTo(result[0].OldLineNumber));
+                Assert.That(11, Is.EqualTo(result[0].NewLineNumber));
+                Assert.That(24, Is.EqualTo(result[0].Lines.Count));
+
+                Assert.That(61, Is.EqualTo(result[1].OldLineNumber));
+                Assert.That(61, Is.EqualTo(result[1].NewLineNumber));
+                Assert.That(21, Is.EqualTo(result[1].Lines.Count));
+
+                Assert.That(244, Is.EqualTo(result[2].OldLineNumber));
+                Assert.That(247, Is.EqualTo(result[2].NewLineNumber));
+                Assert.That(15, Is.EqualTo(result[2].Lines.Count));
+
+                Assert.That(268, Is.EqualTo(result[3].OldLineNumber));
+                Assert.That(264, Is.EqualTo(result[3].NewLineNumber));
+                Assert.That(15, Is.EqualTo(result[3].Lines.Count));
+
+                // -    public class UsageTracker : IUsageTracker
+                Assert.That(17, Is.EqualTo(result[0].Lines[7].OldLineNumber));
+                Assert.That(-1, Is.EqualTo(result[0].Lines[7].NewLineNumber));
+                Assert.That(8, Is.EqualTo(result[0].Lines[7].DiffLineNumber));
+
+                // +    public sealed class UsageTracker : IUsageTracker, IDisposable
+                Assert.That(-1, Is.EqualTo(result[0].Lines[8].OldLineNumber));
+                Assert.That(18, Is.EqualTo(result[0].Lines[8].NewLineNumber));
+                Assert.That(9, Is.EqualTo(result[0].Lines[8].DiffLineNumber));
+
+                //      IConnectionManager connectionManager;
+                Assert.That(26, Is.EqualTo(result[0].Lines[17].OldLineNumber));
+                Assert.That(25, Is.EqualTo(result[0].Lines[17].NewLineNumber));
+                Assert.That(18, Is.EqualTo(result[0].Lines[17].DiffLineNumber));
+            }
         }
 
         public class TheMatchMethod

test/GitHub.InlineReviews.UnitTests/Models/DiffUtilitiesTests.cs

@@ -1,57 +1,41 @@
-using System;
-using System.IO;
-using System.Linq;
+using System.Threading.Tasks;
 using GitHub.InlineReviews.Services;
-using GitHub.InlineReviews.UnitTests.Properties;
 using GitHub.Services;
-using GitHub.Models;
 using NSubstitute;
+using NSubstitute.ReturnsExtensions;
 using NUnit.Framework;
 
 namespace GitHub.InlineReviews.UnitTests.Services
 {
     public class DiffServiceTests
     {
-        public class TheParseFragmentMethod
+        public class TheDiffMethod
         {
             [Test]
-            public void ShouldParsePr960()
+            public async Task DiffReturnsEmptyList()
             {
-                var target = new DiffService(Substitute.For<IGitService>());
-                var result = DiffUtilities.ParseFragment(Properties.Resources.pr_960_diff).ToList();
+                var gitService = Substitute.For<IGitService>();
+                gitService.Compare(null, null, null, null).ReturnsNull();
+                var target = new DiffService(gitService);
 
-                Assert.That(4, Is.EqualTo(result.Count));
+                var result = await target.Diff(null, null, null, null);
 
-                Assert.That(11, Is.EqualTo(result[0].OldLineNumber));
-                Assert.That(11, Is.EqualTo(result[0].NewLineNumber));
-                Assert.That(24, Is.EqualTo(result[0].Lines.Count));
-
-                Assert.That(61, Is.EqualTo(result[1].OldLineNumber));
-                Assert.That(61, Is.EqualTo(result[1].NewLineNumber));
-                Assert.That(21, Is.EqualTo(result[1].Lines.Count));
-
-                Assert.That(244, Is.EqualTo(result[2].OldLineNumber));
-                Assert.That(247, Is.EqualTo(result[2].NewLineNumber));
-                Assert.That(15, Is.EqualTo(result[2].Lines.Count));
-
-                Assert.That(268, Is.EqualTo(result[3].OldLineNumber));
-                Assert.That(264, Is.EqualTo(result[3].NewLineNumber));
-                Assert.That(15, Is.EqualTo(result[3].Lines.Count));
+                Assert.That(result, Is.Empty);
+            }
+        }
 
-                // -    public class UsageTracker : IUsageTracker
-                Assert.That(17, Is.EqualTo(result[0].Lines[7].OldLineNumber));
-                Assert.That(-1, Is.EqualTo(result[0].Lines[7].NewLineNumber));
-                Assert.That(8, Is.EqualTo(result[0].Lines[7].DiffLineNumber));
+        public class TheDiffOverloadMethod
+        {
+            [Test]
+            public async Task DiffReturnsEmptyList()
+            {
+                var gitService = Substitute.For<IGitService>();
+                gitService.CompareWith(null, null, null, null, null).ReturnsNull();
+                var target = new DiffService(gitService);
 
-                // +    public sealed class UsageTracker : IUsageTracker, IDisposable
-                Assert.That(-1, Is.EqualTo(result[0].Lines[8].OldLineNumber));
-                Assert.That(18, Is.EqualTo(result[0].Lines[8].NewLineNumber));
-                Assert.That(9, Is.EqualTo(result[0].Lines[8].DiffLineNumber));
+                var result = await target.Diff(null, null, null, null, null);
 
-                //      IConnectionManager connectionManager;
-                Assert.That(26, Is.EqualTo(result[0].Lines[17].OldLineNumber));
-                Assert.That(25, Is.EqualTo(result[0].Lines[17].NewLineNumber));
-                Assert.That(18, Is.EqualTo(result[0].Lines[17].DiffLineNumber));
+                Assert.That(result, Is.Empty);
             }
         }
     }