Revert "Revert "Stop using the rename dashboard""

Author: CyrusNajmabadi

src/EditorFeatures/Core.Wpf/InlineRename/CommandHandlers/RenameCommandHandler.cs

@@ -38,14 +38,6 @@ internal partial class RenameCommandHandler(
         IAsynchronousOperationListenerProvider asynchronousOperationListenerProvider)
         : AbstractRenameCommandHandler(threadingContext, renameService, globalOptionService, asynchronousOperationListenerProvider.GetListener(FeatureAttribute.Rename))
     {
-        protected override bool AdornmentShouldReceiveKeyboardNavigation(ITextView textView)
-            => GetAdornment(textView) switch
-            {
-                RenameDashboard dashboard => dashboard.ShouldReceiveKeyboardNavigation,
-                RenameFlyout => true, // Always receive keyboard navigation for the inline adornment
-                _ => false
-            };
-
         protected override void SetFocusToTextView(ITextView textView)
         {
             (textView as IWpfTextView)?.VisualElement.Focus();
@@ -59,22 +51,6 @@ protected override void SetFocusToAdornment(ITextView textView)
             }
         }
 
-        protected override void SetAdornmentFocusToNextElement(ITextView textView)
-        {
-            if (GetAdornment(textView) is RenameDashboard dashboard)
-            {
-                dashboard.FocusNextElement();
-            }
-        }
-
-        protected override void SetAdornmentFocusToPreviousElement(ITextView textView)
-        {
-            if (GetAdornment(textView) is RenameDashboard dashboard)
-            {
-                dashboard.FocusNextElement();
-            }
-        }
-
         private static InlineRenameAdornment? GetAdornment(ITextView textView)
         {
             // If our adornment layer somehow didn't get composed, GetAdornmentLayer will throw.

src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml.cs

@@ -26,19 +26,15 @@ internal partial class RenameFlyout : InlineRenameAdornment
         private const int DefaultMinWidth = 200;
 
         private readonly RenameFlyoutViewModel _viewModel;
-        private readonly IEditorFormatMap _editorFormatMap;
         private readonly IWpfTextView _textView;
-        private readonly IWpfThemeService? _wpfThemeService;
         private readonly IAsyncQuickInfoBroker _asyncQuickInfoBroker;
         private readonly IAsynchronousOperationListener _listener;
         private readonly IThreadingContext _threadingContext;
 
         public RenameFlyout(
             RenameFlyoutViewModel viewModel,
             IWpfTextView textView,
-            IWpfThemeService? themeService,
             IAsyncQuickInfoBroker asyncQuickInfoBroker,
-            IEditorFormatMapService editorFormatMapService,
             IThreadingContext threadingContext,
             IAsynchronousOperationListenerProvider listenerProvider)
         {
@@ -50,11 +46,11 @@ public RenameFlyout(
             _textView.ViewportWidthChanged += TextView_ViewPortChanged;
             _listener = listenerProvider.GetListener(FeatureAttribute.InlineRenameFlyout);
             _threadingContext = threadingContext;
-            _wpfThemeService = themeService;
 
             RenameUserInput = _viewModel.SmartRenameViewModel is null ? new RenameUserInputTextBox(_viewModel) : new SmartRenameUserInputComboBox(_viewModel);
 
             // On load focus the first tab target
+            var token1 = _listener.BeginAsyncOperation(nameof(RenameUserInput.GotFocus));
             Loaded += (s, e) =>
             {
                 // Wait until load to position adornment for space negotiation
@@ -64,6 +60,7 @@ public RenameFlyout(
                 RenameUserInput.SelectText(_viewModel.StartingSelection.Start, _viewModel.StartingSelection.Length);
                 RenameUserInput.TextSelectionChanged += RenameUserInput_TextSelectionChanged;
                 RenameUserInput.GotFocus += RenameUserInput_GotFocus;
+                token1.Dispose();
             };
 
             InitializeComponent();
@@ -79,14 +76,12 @@ public RenameFlyout(
                 MainPanel.Children.Insert(index + 1, smartRenameControl);
             }
 
-            _editorFormatMap = editorFormatMapService.GetEditorFormatMap("text");
-
             // Dismiss any current tooltips. Note that this does not disable tooltips
             // from showing up again, so if a user has the mouse unmoved another
             // tooltip will pop up. https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1611398
             // tracks when we can handle this with IFeaturesService in VS
-            var token = _listener.BeginAsyncOperation(nameof(DismissToolTipsAsync));
-            _ = DismissToolTipsAsync().CompletesAsyncOperation(token);
+            var token2 = _listener.BeginAsyncOperation(nameof(DismissToolTipsAsync));
+            _ = DismissToolTipsAsync().CompletesAsyncOperation(token2);
         }
 
         internal IRenameUserInput RenameUserInput { get; }

src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornmentManager.cs

@@ -6,7 +6,6 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Editor.InlineRename;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.EditorFeatures.Lightup;
 using Microsoft.CodeAnalysis.Internal.Log;
@@ -20,15 +19,14 @@
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
-    internal class InlineRenameAdornmentManager : IDisposable
+    internal sealed class InlineRenameAdornmentManager : IDisposable
     {
         private readonly IWpfTextView _textView;
         private readonly IGlobalOptionService _globalOptionService;
         private readonly IWpfThemeService? _themeService;
         private readonly IAsyncQuickInfoBroker _asyncQuickInfoBroker;
         private readonly IAsynchronousOperationListenerProvider _listenerProvider;
         private readonly InlineRenameService _renameService;
-        private readonly IEditorFormatMapService _editorFormatMapService;
         private readonly IInlineRenameColorUpdater? _dashboardColorUpdater;
         private readonly IThreadingContext _threadingContext;
 #pragma warning disable CS0618 // Editor team use Obsolete attribute to mark potential changing API
@@ -42,7 +40,6 @@ internal class InlineRenameAdornmentManager : IDisposable
 
         public InlineRenameAdornmentManager(
             InlineRenameService renameService,
-            IEditorFormatMapService editorFormatMapService,
             IInlineRenameColorUpdater? dashboardColorUpdater,
             IWpfTextView textView,
             IGlobalOptionService globalOptionService,
@@ -55,7 +52,6 @@ public InlineRenameAdornmentManager(
 #pragma warning restore CS0618
         {
             _renameService = renameService;
-            _editorFormatMapService = editorFormatMapService;
             _dashboardColorUpdater = dashboardColorUpdater;
             _textView = textView;
             _globalOptionService = globalOptionService;
@@ -118,59 +114,43 @@ private void UpdateAdornments()
                 return null;
             }
 
-            var useInlineAdornment = _globalOptionService.GetOption(InlineRenameUIOptionsStorage.UseInlineAdornment);
-            LogAdornmentChoice(useInlineAdornment);
-            if (useInlineAdornment)
+            if (!_textView.HasAggregateFocus)
             {
-                if (!_textView.HasAggregateFocus)
-                {
-                    // For the rename flyout, the adornment is dismissed on focus lost. There's
-                    // no need to keep an adornment on every textview for show/hide behaviors
-                    return null;
-                }
-
-                // Get the active selection to make sure the rename text is selected in the same way
-                var originalSpan = _renameService.ActiveSession.TriggerSpan;
-                var selectionSpan = _textView.Selection.SelectedSpans.First();
-
-                var start = selectionSpan.IsEmpty
-                    ? 0
-                    : selectionSpan.Start - originalSpan.Start; // The length from the identifier to the start of selection
-
-                var length = selectionSpan.IsEmpty
-                    ? originalSpan.Length
-                    : selectionSpan.Length;
-
-                var identifierSelection = new TextSpan(start, length);
-
-                var adornment = new RenameFlyout(
-                    (RenameFlyoutViewModel)s_createdViewModels.GetValue(
-                        _renameService.ActiveSession,
-                        session => new RenameFlyoutViewModel(session,
-                            identifierSelection,
-                            registerOleComponent: true,
-                            _globalOptionService,
-                            _threadingContext,
-                            _listenerProvider,
-                            _smartRenameSessionFactory)),
-                    _textView,
-                    _themeService,
-                    _asyncQuickInfoBroker,
-                    _editorFormatMapService,
-                    _threadingContext,
-                    _listenerProvider);
-
-                return adornment;
+                // For the rename flyout, the adornment is dismissed on focus lost. There's
+                // no need to keep an adornment on every textview for show/hide behaviors
+                return null;
             }
-            else
-            {
-                var newAdornment = new RenameDashboard(
-                    (RenameDashboardViewModel)s_createdViewModels.GetValue(_renameService.ActiveSession, session => new RenameDashboardViewModel(session, _threadingContext, _textView)),
-                    _editorFormatMapService,
-                    _textView);
 
-                return newAdornment;
-            }
+            // Get the active selection to make sure the rename text is selected in the same way
+            var originalSpan = _renameService.ActiveSession.TriggerSpan;
+            var selectionSpan = _textView.Selection.SelectedSpans.First();
+
+            var start = selectionSpan.IsEmpty
+                ? 0
+                : selectionSpan.Start - originalSpan.Start; // The length from the identifier to the start of selection
+
+            var length = selectionSpan.IsEmpty
+                ? originalSpan.Length
+                : selectionSpan.Length;
+
+            var identifierSelection = new TextSpan(start, length);
+
+            var adornment = new RenameFlyout(
+                (RenameFlyoutViewModel)s_createdViewModels.GetValue(
+                    _renameService.ActiveSession,
+                    session => new RenameFlyoutViewModel(session,
+                        identifierSelection,
+                        registerOleComponent: true,
+                        _globalOptionService,
+                        _threadingContext,
+                        _listenerProvider,
+                        _smartRenameSessionFactory)),
+                _textView,
+                _asyncQuickInfoBroker,
+                _threadingContext,
+                _listenerProvider);
+
+            return adornment;
         }
 
         private static bool ViewIncludesBufferFromWorkspace(IWpfTextView textView, Workspace workspace)
@@ -184,13 +164,5 @@ private static bool ViewIncludesBufferFromWorkspace(IWpfTextView textView, Works
             Workspace.TryGetWorkspace(textContainer, out var workspace);
             return workspace;
         }
-
-        private static void LogAdornmentChoice(bool useInlineAdornment)
-        {
-            TelemetryLogging.Log(FunctionId.InlineRenameAdornmentChoice, KeyValueLogMessage.Create(m =>
-            {
-                m[nameof(useInlineAdornment)] = useInlineAdornment;
-            }));
-        }
     }
 }

src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornmentProvider.cs

@@ -27,7 +27,6 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
     internal class InlineRenameAdornmentProvider : IWpfTextViewConnectionListener
     {
         private readonly InlineRenameService _renameService;
-        private readonly IEditorFormatMapService _editorFormatMapService;
         private readonly IInlineRenameColorUpdater? _dashboardColorUpdater;
         private readonly IWpfThemeService? _themeingService;
         private readonly IGlobalOptionService _globalOptionService;
@@ -56,7 +55,6 @@ internal class InlineRenameAdornmentProvider : IWpfTextViewConnectionListener
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public InlineRenameAdornmentProvider(
             InlineRenameService renameService,
-            IEditorFormatMapService editorFormatMapService,
             [Import(AllowDefault = true)] IInlineRenameColorUpdater? dashboardColorUpdater,
             [Import(AllowDefault = true)] IWpfThemeService? themeingService,
             IGlobalOptionService globalOptionService,
@@ -68,7 +66,6 @@ public InlineRenameAdornmentProvider(
 #pragma warning restore CS0618
         {
             _renameService = renameService;
-            _editorFormatMapService = editorFormatMapService;
             _dashboardColorUpdater = dashboardColorUpdater;
             _themeingService = themeingService;
             _globalOptionService = globalOptionService;
@@ -85,7 +82,8 @@ public InlineRenameAdornmentProvider(
         public void SubjectBuffersConnected(IWpfTextView textView, ConnectionReason reason, Collection<ITextBuffer> subjectBuffers)
         {
             // Create it for the view if we don't already have one
-            textView.GetOrCreateAutoClosingProperty(v => new InlineRenameAdornmentManager(_renameService, _editorFormatMapService, _dashboardColorUpdater, v, _globalOptionService, _themeingService, _asyncQuickInfoBroker, _listenerProvider, _threadingContext, _smartRenameSessionFactory));
+            textView.GetOrCreateAutoClosingProperty(v => new InlineRenameAdornmentManager(
+                _renameService, _dashboardColorUpdater, v, _globalOptionService, _themeingService, _asyncQuickInfoBroker, _listenerProvider, _threadingContext, _smartRenameSessionFactory));
         }
 
         public void SubjectBuffersDisconnected(IWpfTextView textView, ConnectionReason reason, Collection<ITextBuffer> subjectBuffers)

src/EditorFeatures/Core/InlineRename/AbstractInlineRenameUndoManager.cs

@@ -29,7 +29,6 @@ protected class ActiveSpanState
     }
 
     protected readonly InlineRenameService InlineRenameService;
-    private readonly IGlobalOptionService _globalOptionService;
     protected readonly Dictionary<ITextBuffer, TBufferState> UndoManagers = [];
     protected readonly Stack<ActiveSpanState> UndoStack = new Stack<ActiveSpanState>();
     protected readonly Stack<ActiveSpanState> RedoStack = new Stack<ActiveSpanState>();
@@ -39,10 +38,9 @@ protected class ActiveSpanState
 
     private InlineRenameSession _trackedSession;
 
-    public AbstractInlineRenameUndoManager(InlineRenameService inlineRenameService, IGlobalOptionService globalOptionService)
+    public AbstractInlineRenameUndoManager(InlineRenameService inlineRenameService)
     {
         this.InlineRenameService = inlineRenameService;
-        _globalOptionService = globalOptionService;
 
         InlineRenameService.ActiveSessionChanged += InlineRenameService_ActiveSessionChanged;
     }
@@ -54,17 +52,6 @@ private void InlineRenameService_ActiveSessionChanged(object sender, InlineRenam
             _trackedSession.ReplacementTextChanged -= InlineRenameSession_ReplacementTextChanged;
         }
 
-        if (!_globalOptionService.GetOption(InlineRenameUIOptionsStorage.UseInlineAdornment))
-        {
-            // If the user is typing directly into the editor as the only way to change 
-            // the replacement text then we don't need to respond to text changes. The 
-            // listener on the textview that calls UpdateCurrentState will handle
-            // this correctly. This option cannot change when we are currently in a session, so
-            // only hook up as needed
-            _trackedSession = null;
-            return;
-        }
-
         _trackedSession = InlineRenameService.ActiveSession;
 
         if (_trackedSession is not null)

src/EditorFeatures/Core/InlineRename/CommandHandlers/AbstractRenameCommandHandler.cs

@@ -26,16 +26,10 @@ internal abstract partial class AbstractRenameCommandHandler(
 {
     public string DisplayName => EditorFeaturesResources.Rename;
 
-    protected abstract bool AdornmentShouldReceiveKeyboardNavigation(ITextView textView);
-
     protected abstract void SetFocusToTextView(ITextView textView);
 
     protected abstract void SetFocusToAdornment(ITextView textView);
 
-    protected abstract void SetAdornmentFocusToPreviousElement(ITextView textView);
-
-    protected abstract void SetAdornmentFocusToNextElement(ITextView textView);
-
     private CommandState GetCommandState(Func<CommandState> nextHandler)
     {
         if (renameService.ActiveSession != null)