From fd9a5f808b4982f7595e232beb5e6f508a9bb8f8 Mon Sep 17 00:00:00 2001
From: Jason Malinowski <jason.malinowski@microsoft.com>
Date: Tue, 31 Aug 2021 15:42:25 -0700
Subject: [PATCH 1/2] #nullable enable a bit of the rename dashboard

---
 .../InlineRename/Dashboard/DashboardAdornmentManager.cs       | 4 +---
 .../InlineRename/Dashboard/DashboardAdornmentProvider.cs      | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentManager.cs b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentManager.cs
index 3ae7ef9e9af79..1ce59d0756f1a 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentManager.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentManager.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Linq;
 using System.Runtime.CompilerServices;
@@ -75,7 +73,7 @@ private static bool ViewIncludesBufferFromWorkspace(IWpfTextView textView, Works
                                        .Any();
         }
 
-        private static Workspace GetWorkspace(SourceTextContainer textContainer)
+        private static Workspace? GetWorkspace(SourceTextContainer textContainer)
         {
             Workspace.TryGetWorkspace(textContainer, out var workspace);
             return workspace;
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentProvider.cs b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentProvider.cs
index a178abce22309..38fba9146b530 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentProvider.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentProvider.cs
@@ -2,8 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel.Composition;
@@ -36,7 +34,7 @@ internal class DashboardAdornmentProvider : IWpfTextViewConnectionListener
         [Order(After = PredefinedAdornmentLayers.TextMarker)]
         [Order(After = PredefinedAdornmentLayers.CurrentLineHighlighter)]
         [Order(After = PredefinedAdornmentLayers.Squiggle)]
-        internal readonly AdornmentLayerDefinition AdornmentLayer;
+        internal readonly AdornmentLayerDefinition? AdornmentLayer;
 
         [ImportingConstructor]
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]

From 074fe49d50ae7c0d44404af1b517cdd1045ebaf4 Mon Sep 17 00:00:00 2001
From: Jason Malinowski <jason.malinowski@microsoft.com>
Date: Tue, 31 Aug 2021 15:46:24 -0700
Subject: [PATCH 2/2] Don't reference VS Shell binaries in EditorFeatures.Wpf

EditorFeatures.Wpf is supposed to be independent of the VS Shell, the
idea is this layer can be hosted in other applications using the
VS editor but not VS itself. This re-adds indirection for fetching
the dashboard colors, but now only does it when the dashboard is
opened.

While I was here I ended up renaming CodeAnalysisColors to
DashboardColors which is a bit clearer what it is.
---
 .../Core.Wpf/CodeAnalysisColors.cs            | 20 -----------
 .../InlineRename/Dashboard/Dashboard.xaml     | 14 ++++----
 .../Dashboard/DashboardAdornmentManager.cs    |  6 ++++
 .../Dashboard/DashboardAdornmentProvider.cs   |  8 +++--
 .../InlineRename/Dashboard/DashboardColors.cs | 24 ++++++++++++++
 .../{Colors.xaml => DashboardColors.xaml}     |  4 +++
 .../Dashboard/IDashboardColorUpdater.cs       | 14 ++++++++
 ...oft.CodeAnalysis.EditorFeatures.Wpf.csproj |  2 --
 .../InlineRename/DashboardColorUpdater.cs     | 33 +++++++++++++++++++
 9 files changed, 93 insertions(+), 32 deletions(-)
 delete mode 100644 src/EditorFeatures/Core.Wpf/CodeAnalysisColors.cs
 create mode 100644 src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardColors.cs
 rename src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/{Colors.xaml => DashboardColors.xaml} (67%)
 create mode 100644 src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/IDashboardColorUpdater.cs
 create mode 100644 src/VisualStudio/Core/Def/Implementation/InlineRename/DashboardColorUpdater.cs

diff --git a/src/EditorFeatures/Core.Wpf/CodeAnalysisColors.cs b/src/EditorFeatures/Core.Wpf/CodeAnalysisColors.cs
deleted file mode 100644
index 50fba1f95cbcd..0000000000000
--- a/src/EditorFeatures/Core.Wpf/CodeAnalysisColors.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.VisualStudio.PlatformUI;
-using Microsoft.VisualStudio.Shell;
-
-namespace Microsoft.CodeAnalysis.Editor.Shared.Utilities
-{
-    internal static class CodeAnalysisColors
-    {
-        // Use VS color keys in order to support theming.
-        public static object SystemCaptionTextColorKey => EnvironmentColors.SystemWindowTextColorKey;
-        public static object CheckBoxTextBrushKey => EnvironmentColors.SystemWindowTextBrushKey;
-        public static object SystemCaptionTextBrushKey => EnvironmentColors.SystemWindowTextBrushKey;
-        public static object BackgroundBrushKey => VsBrushes.CommandBarGradientBeginKey;
-        public static object ButtonStyleKey => VsResourceKeys.ButtonStyleKey;
-        public static object AccentBarColorKey => EnvironmentColors.FileTabInactiveDocumentBorderEdgeBrushKey;
-    }
-}
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/Dashboard.xaml b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/Dashboard.xaml
index a9bc286f46dd5..18c0b5beaba69 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/Dashboard.xaml
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/Dashboard.xaml
@@ -4,11 +4,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:me="clr-namespace:Microsoft.CodeAnalysis.Editor"
              xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
              xmlns:imagecatalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
              xmlns:rename="clr-namespace:Microsoft.CodeAnalysis.Editor.Implementation.InlineRename"
-             xmlns:utilities="clr-namespace:Microsoft.CodeAnalysis.Editor.Shared.Utilities"
              x:ClassModifier="internal"
              mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300"
              MinWidth="300"
@@ -26,15 +24,15 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Colors.xaml"/>
+                <ResourceDictionary Source="DashboardColors.xaml"/>
             </ResourceDictionary.MergedDictionaries>
 
             <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
 
-            <SolidColorBrush x:Key="ForegroundText" Color="{DynamicResource {x:Static utilities:CodeAnalysisColors.SystemCaptionTextColorKey}}"/>
+            <SolidColorBrush x:Key="ForegroundText" Color="{DynamicResource {x:Static rename:DashboardColors.SystemCaptionTextColorKey}}"/>
 
             <Style TargetType="CheckBox">
-                <Setter Property="Foreground" Value="{DynamicResource {x:Static utilities:CodeAnalysisColors.CheckBoxTextBrushKey}}"/>
+                <Setter Property="Foreground" Value="{DynamicResource {x:Static rename:DashboardColors.CheckBoxTextBrushKey}}"/>
             </Style>
 
             <Style TargetType="TextBlock">
@@ -58,7 +56,7 @@
         </Grid.RowDefinitions>
 
         <Border Grid.Row="0" BorderBrush="Transparent"
-            Background="{DynamicResource {x:Static utilities:CodeAnalysisColors.BackgroundBrushKey}}"  
+            Background="{DynamicResource {x:Static rename:DashboardColors.BackgroundBrushKey}}"  
             BorderThickness="0" 
             Padding="7">
             <StackPanel>
@@ -246,12 +244,12 @@
 
                 <Button Name="ApplyButton" Click="Apply_Click" IsDefault="True" MinWidth="75" MinHeight="23" Padding="10,1,10,1" Margin="0,8,0,0" HorizontalAlignment="Right"
                     ToolTip="{Binding ElementName=dashboard, Path=ApplyToolTip}"
-                    Style="{DynamicResource {x:Static utilities:CodeAnalysisColors.ButtonStyleKey}}"
+                    Style="{DynamicResource {x:Static rename:DashboardColors.ButtonStyleKey}}"
                     Content="{Binding ElementName=dashboard, Path=ApplyRename}"
                     AutomationProperties.Name="{Binding ElementName=dashboard, Path=ApplyRename}"/>
             </StackPanel>
         </Border>
 
-        <Rectangle Name="DashboardAccentBar" Grid.Row="1" Height="4" Fill="{DynamicResource {x:Static utilities:CodeAnalysisColors.AccentBarColorKey}}" />
+        <Rectangle Name="DashboardAccentBar" Grid.Row="1" Height="4" Fill="{DynamicResource {x:Static rename:DashboardColors.AccentBarColorKey}}" />
     </Grid>
 </UserControl>
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentManager.cs b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentManager.cs
index 1ce59d0756f1a..0c7f58eb8679b 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentManager.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentManager.cs
@@ -17,6 +17,8 @@ internal class DashboardAdornmentManager : IDisposable
         private readonly IWpfTextView _textView;
         private readonly InlineRenameService _renameService;
         private readonly IEditorFormatMapService _editorFormatMapService;
+        private readonly IDashboardColorUpdater? _dashboardColorUpdater;
+
         private readonly IAdornmentLayer _adornmentLayer;
 
         private static readonly ConditionalWeakTable<InlineRenameSession, DashboardViewModel> s_createdViewModels =
@@ -25,10 +27,12 @@ internal class DashboardAdornmentManager : IDisposable
         public DashboardAdornmentManager(
             InlineRenameService renameService,
             IEditorFormatMapService editorFormatMapService,
+            IDashboardColorUpdater? dashboardColorUpdater,
             IWpfTextView textView)
         {
             _renameService = renameService;
             _editorFormatMapService = editorFormatMapService;
+            _dashboardColorUpdater = dashboardColorUpdater;
             _textView = textView;
 
             _adornmentLayer = textView.GetAdornmentLayer(DashboardAdornmentProvider.AdornmentLayerName);
@@ -58,6 +62,8 @@ private void UpdateAdornments()
             if (_renameService.ActiveSession != null &&
                 ViewIncludesBufferFromWorkspace(_textView, _renameService.ActiveSession.Workspace))
             {
+                _dashboardColorUpdater?.UpdateColors();
+
                 var newAdornment = new Dashboard(
                     s_createdViewModels.GetValue(_renameService.ActiveSession, session => new DashboardViewModel(session)),
                     _editorFormatMapService,
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentProvider.cs b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentProvider.cs
index 38fba9146b530..ad5ce483b0f44 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentProvider.cs
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardAdornmentProvider.cs
@@ -23,6 +23,8 @@ internal class DashboardAdornmentProvider : IWpfTextViewConnectionListener
     {
         private readonly InlineRenameService _renameService;
         private readonly IEditorFormatMapService _editorFormatMapService;
+        private readonly IDashboardColorUpdater? _dashboardColorUpdater;
+
         public const string AdornmentLayerName = "RoslynRenameDashboard";
 
         [Export]
@@ -40,16 +42,18 @@ internal class DashboardAdornmentProvider : IWpfTextViewConnectionListener
         [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
         public DashboardAdornmentProvider(
             InlineRenameService renameService,
-            IEditorFormatMapService editorFormatMapService)
+            IEditorFormatMapService editorFormatMapService,
+            [Import(AllowDefault = true)] IDashboardColorUpdater? dashboardColorUpdater)
         {
             _renameService = renameService;
             _editorFormatMapService = editorFormatMapService;
+            _dashboardColorUpdater = dashboardColorUpdater;
         }
 
         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 DashboardAdornmentManager(_renameService, _editorFormatMapService, v));
+            textView.GetOrCreateAutoClosingProperty(v => new DashboardAdornmentManager(_renameService, _editorFormatMapService, _dashboardColorUpdater, v));
         }
 
         public void SubjectBuffersDisconnected(IWpfTextView textView, ConnectionReason reason, Collection<ITextBuffer> subjectBuffers)
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardColors.cs b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardColors.cs
new file mode 100644
index 0000000000000..36a7b6c50bed0
--- /dev/null
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardColors.cs
@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
+{
+    internal static class DashboardColors
+    {
+        // In the Dashboard XAML, we bind to these keys to provide the correct color resources.
+        // The default values of these fields match the names of the keys in DashboardColors.xaml,
+        // but in Visual Studio we will change these keys (since they are settable) to the keys for
+        // the actual Visual Studio resource keys.
+        //
+        // Each entry here should have a corresponding entry in DashboardColors.xaml to specify the
+        // default color.
+
+        public static object SystemCaptionTextColorKey { get; set; } = "SystemCaptionTextColor";
+        public static object SystemCaptionTextBrushKey { get; set; } = "SystemCaptionTextBrush";
+        public static object CheckBoxTextBrushKey { get; set; } = "CheckBoxTextBrush";
+        public static object BackgroundBrushKey { get; set; } = "BackgroundBrush";
+        public static object AccentBarColorKey { get; set; } = "AccentBarBrush";
+        public static object ButtonStyleKey { get; set; } = "ButtonStyle";
+    }
+}
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/Colors.xaml b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardColors.xaml
similarity index 67%
rename from src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/Colors.xaml
rename to src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardColors.xaml
index f6c767b1f1241..aac0a4e806db8 100644
--- a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/Colors.xaml
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/DashboardColors.xaml
@@ -2,6 +2,10 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
+    <!-- These resources provide the default colors for the dashboard if we're not hosted
+         in a specific host that will override them, like Visual Studio. Each resource here
+         corresponds to an entry in DashboardColors.cs, where it can be overwritten by a host. -->
+    
     <Color x:Key="SystemCaptionTextColor">Black</Color>
     <SolidColorBrush x:Key="SystemCaptionTextBrush"  Color="Black"/>
     <SolidColorBrush x:Key="CheckBoxTextBrush"  Color="Black"/>
diff --git a/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/IDashboardColorUpdater.cs b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/IDashboardColorUpdater.cs
new file mode 100644
index 0000000000000..14204ebbee980
--- /dev/null
+++ b/src/EditorFeatures/Core.Wpf/InlineRename/Dashboard/IDashboardColorUpdater.cs
@@ -0,0 +1,14 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace Microsoft.CodeAnalysis.Editor.Implementation.InlineRename
+{
+    internal interface IDashboardColorUpdater
+    {
+        /// <summary>
+        /// Implemented by a host to set the properties on <see cref="DashboardColors"/>.
+        /// </summary>
+        public void UpdateColors();
+    }
+}
diff --git a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
index d70361b582dd4..262d2810aadb1 100644
--- a/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
+++ b/src/EditorFeatures/Core.Wpf/Microsoft.CodeAnalysis.EditorFeatures.Wpf.csproj
@@ -33,11 +33,9 @@
     <PackageReference Include="Microsoft.VisualStudio.Imaging" Version="$(MicrosoftVisualStudioImagingVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="$(MicrosoftVisualStudioImagingInterop140DesignTimeVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.InteractiveWindow" Version="$(MicrosoftVisualStudioInteractiveWindowVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Interop" Version="$(MicrosoftVisualStudioInteropVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="$(MicrosoftVisualStudioLanguageNavigateToInterfacesVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Language.StandardClassification" Version="$(MicrosoftVisualStudioLanguageStandardClassificationVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Language.Intellisense" Version="$(MicrosoftVisualStudioLanguageIntellisenseVersion)" />
-    <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(MicrosoftVisualStudioShell150Version)" />
     <PackageReference Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="$(MicrosoftVisualStudioTextUIWpfVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
   </ItemGroup>
diff --git a/src/VisualStudio/Core/Def/Implementation/InlineRename/DashboardColorUpdater.cs b/src/VisualStudio/Core/Def/Implementation/InlineRename/DashboardColorUpdater.cs
new file mode 100644
index 0000000000000..d46fbd3827ce1
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/InlineRename/DashboardColorUpdater.cs
@@ -0,0 +1,33 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.ComponentModel.Composition;
+using Microsoft.CodeAnalysis.Editor.Implementation.InlineRename;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.VisualStudio.PlatformUI;
+using Microsoft.VisualStudio.Shell;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.InlineRename
+{
+    [Export(typeof(IDashboardColorUpdater))]
+    internal class DashboardColorUpdater : IDashboardColorUpdater
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public DashboardColorUpdater()
+        {
+        }
+
+        public void UpdateColors()
+        {
+            DashboardColors.SystemCaptionTextColorKey = EnvironmentColors.SystemWindowTextColorKey;
+            DashboardColors.SystemCaptionTextBrushKey = EnvironmentColors.SystemWindowTextBrushKey;
+            DashboardColors.CheckBoxTextBrushKey = EnvironmentColors.SystemWindowTextBrushKey;
+            DashboardColors.BackgroundBrushKey = VsBrushes.CommandBarGradientBeginKey;
+            DashboardColors.AccentBarColorKey = EnvironmentColors.FileTabInactiveDocumentBorderEdgeBrushKey;
+            DashboardColors.ButtonStyleKey = VsResourceKeys.ButtonStyleKey;
+        }
+    }
+}