From af1f72ebdc0ab84ef51328f059cacd3c63c2efe3 Mon Sep 17 00:00:00 2001
From: Andrew Hall <ryzngard@live.com>
Date: Thu, 19 May 2022 23:08:05 -0700
Subject: [PATCH] Fix binding for checkbox text in rename dialogs (#61430)

Previously text was bound to properties on the control type using x:Name. This restores that
---
 .../Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml  | 1 +
 .../InlineRename/UI/Dashboard/RenameDashboard.xaml        | 1 +
 .../Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs     | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml
index 133d27528bc6b..a991bac80d70d 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Adornment/RenameFlyout.xaml
@@ -16,6 +16,7 @@
              GotKeyboardFocus="Adornment_GotKeyboardFocus"
              Focusable="False"
              UseLayoutRounding="True"
+             x:Name="control"
              Background="{DynamicResource {x:Static rename:InlineRenameColors.BackgroundBrushKey}}">
 
     <UserControl.Resources>
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml
index 0cbe0c93e247f..6e78eb41115aa 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/Dashboard/RenameDashboard.xaml
@@ -11,6 +11,7 @@
              MinWidth="300"
              Cursor="Arrow"
              Focusable="True"
+             x:Name="dashboard"
              AutomationProperties.AutomationId="Microsoft.CodeAnalysis.EditorFeatures.InlineRenameDialog" 
              UseLayoutRounding="True">
     <!-- 
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs b/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs
index 58e5e9d917ce5..07b12ae79df0d 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/UI/InlineRenameAdornment.cs
@@ -11,8 +11,12 @@
 
 namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
 {
-    internal abstract class InlineRenameAdornment : UserControl, IDisposable
+    /// <summary>
+    /// A base class for rename controls. Needs to have a default constructor so the 
+    /// type can be used in ResourceDictionaries in XAML
+    /// </summary>
+    internal class InlineRenameAdornment : UserControl, IDisposable
     {
-        public abstract void Dispose();
+        public virtual void Dispose() { }
     }
 }