Merge pull request #45118 from JoeRobich/dont-default-colors

Don't default classifications if colors have been customized
dotnet · Jun 13, 2020 · 18b41d0 · 18b41d0
2 parents e7663ec + d83908d
commit 18b41d0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...tudio/Core/Def/Implementation/ColorSchemes/ColorSchemeApplier.ForegroundColorDefaulter.cs b/...tudio/Core/Def/Implementation/ColorSchemes/ColorSchemeApplier.ForegroundColorDefaulter.cs
@@ -246,14 +246,14 @@ private bool IsForegroundTheSchemeColor(Guid themeId, ImmutableDictionary<string
             /// <summary>
             /// Reverts Classifications to their default state.
             /// </summary>
-            public void DefaultClassifications()
+            public void DefaultClassifications(bool isThemeCustomized)
             {
                 AssertIsForeground();
 
                 var themeId = _settings.GetThemeId();
 
-                // Make no changes when in high contast mode, in unknown theme, or if theme has been defaulted.
-                if (SystemParameters.HighContrast || !IsSupportedTheme(themeId) || _settings.HasThemeBeenDefaulted[themeId])
+                // Make no changes when in high contast mode, in unknown theme, in customized theme, or if theme has been defaulted.
+                if (SystemParameters.HighContrast || !IsSupportedTheme(themeId) || isThemeCustomized || _settings.HasThemeBeenDefaulted[themeId])
                 {
                     return;
                 }

diff --git a/src/VisualStudio/Core/Def/Implementation/ColorSchemes/ColorSchemeApplier.cs b/src/VisualStudio/Core/Def/Implementation/ColorSchemes/ColorSchemeApplier.cs
@@ -128,7 +128,7 @@ private void UpdateColorScheme(bool themeChanged = false)
             if (themeChanged)
             {
                 // Default Foreground colors if they match our theme colors.
-                _colorDefaulter.DefaultClassifications();
+                _colorDefaulter.DefaultClassifications(IsThemeCustomized());
             }
 
             // If the color scheme has updated, apply the scheme.