Merge branch 'master' into fixes/1294-style-treeviewitem

Author: jcansdale

src/GitHub.VisualStudio/Helpers/ActiveDocumentSnapshot.cs

@@ -3,7 +3,6 @@
 using Microsoft.VisualStudio.TextManager.Interop;
 using System;
 using System.ComponentModel.Composition;
-using System.Diagnostics;
 using GitHub.Logging;
 
 namespace GitHub.VisualStudio
@@ -32,6 +31,17 @@ public ActiveDocumentSnapshot([Import(typeof(SVsServiceProvider))] IServiceProvi
             if (ErrorHandler.Succeeded(textManager.GetActiveView(0, null, out view)) &&
                 ErrorHandler.Succeeded(view.GetSelection(out anchorLine, out anchorCol, out endLine, out endCol)))
             {
+                // Ignore the bottom anchor or end line if it has zero width (starts on column 0)
+                // This prevents non-visible parts of the selection from being inclused in the range
+                if (anchorLine < endLine && endCol == 0)
+                {
+                    endLine--;
+                }
+                else if (anchorLine > endLine && anchorCol == 0)
+                {
+                    anchorLine--;
+                }
+
                 StartLine = anchorLine + 1;
                 EndLine = endLine + 1;
             }

src/GitHub.VisualStudio/Views/TeamExplorer/RepositoryPublishView.xaml

@@ -115,16 +115,16 @@
 
     <Grid>
       <ghfvs:PromptTextBox x:Name="description"
-               Height="52"
+               Height="23"
                Margin="0,8,0,0"
-               AcceptsReturn="True"
                Background="{DynamicResource GitHubVsSearchBoxBackground}"
                Foreground="{DynamicResource GitHubVsWindowText}"
                Text="{Binding Description}"
                TextWrapping="WrapWithOverflow"
                PromptText="{x:Static prop:Resources.DescriptionOptional}"
                SpellCheck.IsEnabled="True"
-               AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TeamExplorerPublishRepositoryDescriptionTextBox}" />
+               AutomationProperties.AutomationId="{x:Static ghfvs:AutomationIDs.TeamExplorerPublishRepositoryDescriptionTextBox}"
+               VerticalContentAlignment="Center" />
     </Grid>
 
         <CheckBox x:Name="makePrivate"