Skip to content

Commit

Permalink
Merge pull request #73275 from dotnet/merges/release/dev17.10-to-rele…
Browse files Browse the repository at this point in the history
…ase/dev17.11

Merge release/dev17.10 to release/dev17.11
  • Loading branch information
dotnet-bot authored Apr 30, 2024
2 parents b894251 + d2a7a59 commit 28985c0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ private void ItemsPresenter_PreviewMouseUp(object sender, MouseButtonEventArgs e

private void InnerTextBox_GotFocus(object sender, RoutedEventArgs e)
{
e.Handled = true; // Prevent selecting all the text
if (!_smartRenameViewModel.IsUsingDropdown)
{
return;
Expand All @@ -185,8 +186,7 @@ private void InnerTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
{
Assumes.NotNull(_dropDownPopup);
if ((e.Key is Key.Escape or Key.Space or Key.Enter)
&& (_dropDownPopup.IsOpen // Handle these keystrokes when dropdown is present
|| _smartRenameViewModel.IsUsingResultPanel && this.TextSelectionLength < this.Text.Length)) // Or when panel is present and text is not yet selected
&& _dropDownPopup.IsOpen) // Handle these keystrokes when dropdown is present
{
_dropDownPopup.IsOpen = false;
SelectAllText();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeActions;
using Microsoft.CodeAnalysis.Options;
using Microsoft.CodeAnalysis.Shared.Extensions;
using Microsoft.CodeAnalysis.Text;

namespace Microsoft.CodeAnalysis.Diagnostics;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// See the LICENSE file in the project root for more information.

using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Linq;
using System.Runtime.CompilerServices;
Expand Down

0 comments on commit 28985c0

Please sign in to comment.