Rename FadingOptions

AlekseyTs · Feb 22, 2023 · 09fb3ce · 09fb3ce
1 parent 1f04902
commit 09fb3ce
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/...s/CSharp/Analyzers/RemoveUnreachableCode/CSharpRemoveUnreachableCodeDiagnosticAnalyzer.cs b/...s/CSharp/Analyzers/RemoveUnreachableCode/CSharpRemoveUnreachableCodeDiagnosticAnalyzer.cs
@@ -25,7 +25,7 @@ public CSharpRemoveUnreachableCodeDiagnosticAnalyzer()
             : base(IDEDiagnosticIds.RemoveUnreachableCodeDiagnosticId,
                    EnforceOnBuildValues.RemoveUnreachableCode,
                    option: null,
-                   fadingOption: FadingOptions.FadeOutUnreachableCode,
+                   fadingOption: FadingOptionsStorage.FadeOutUnreachableCode,
                    new LocalizableResourceString(nameof(CSharpAnalyzersResources.Unreachable_code_detected), CSharpAnalyzersResources.ResourceManager, typeof(CSharpAnalyzersResources)),
                    configurable: false)
         {

diff --git a/.../Analyzers/RemoveUnnecessaryImports/AbstractRemoveUnnecessaryImportsDiagnosticAnalyzer.cs b/.../Analyzers/RemoveUnnecessaryImports/AbstractRemoveUnnecessaryImportsDiagnosticAnalyzer.cs
@@ -29,7 +29,7 @@ internal abstract class AbstractRemoveUnnecessaryImportsDiagnosticAnalyzer<TSynt
         private readonly DiagnosticDescriptor _generatedCodeClassificationIdDescriptor;
 
         protected AbstractRemoveUnnecessaryImportsDiagnosticAnalyzer(LocalizableString titleAndMessage)
-            : base(GetDescriptors(titleAndMessage, out var classificationIdDescriptor, out var generatedCodeClassificationIdDescriptor), FadingOptions.FadeOutUnusedImports)
+            : base(GetDescriptors(titleAndMessage, out var classificationIdDescriptor, out var generatedCodeClassificationIdDescriptor), FadingOptionsStorage.FadeOutUnusedImports)
         {
             _classificationIdDescriptor = classificationIdDescriptor;
             _generatedCodeClassificationIdDescriptor = generatedCodeClassificationIdDescriptor;

diff --git a/src/EditorFeatures/Test/Diagnostics/DiagnosticsClassificationTaggerProviderTests.cs b/src/EditorFeatures/Test/Diagnostics/DiagnosticsClassificationTaggerProviderTests.cs
@@ -169,8 +169,8 @@ public async Task Test_FadingOptions(string diagnosticId, bool fadingOptionValue
         private static PerLanguageOption2<bool> GetFadingOptionForDiagnostic(string diagnosticId)
             => diagnosticId switch
             {
-                IDEDiagnosticIds.RemoveUnnecessaryImportsDiagnosticId => FadingOptions.FadeOutUnusedImports,
-                IDEDiagnosticIds.RemoveUnreachableCodeDiagnosticId => FadingOptions.FadeOutUnreachableCode,
+                IDEDiagnosticIds.RemoveUnnecessaryImportsDiagnosticId => FadingOptionsStorage.FadeOutUnusedImports,
+                IDEDiagnosticIds.RemoveUnreachableCodeDiagnosticId => FadingOptionsStorage.FadeOutUnreachableCode,
                 _ => throw ExceptionUtilities.UnexpectedValue(diagnosticId),
             };
     }

diff --git a/src/Features/LanguageServer/ProtocolUnitTests/Diagnostics/PullDiagnosticTests.cs b/src/Features/LanguageServer/ProtocolUnitTests/Diagnostics/PullDiagnosticTests.cs
@@ -700,7 +700,7 @@ class A
 }";
             await using var testLspServer = await CreateTestWorkspaceWithDiagnosticsAsync(markup, BackgroundAnalysisScope.OpenFiles, useVSDiagnostics);
             var firstLocation = testLspServer.GetLocations("first").Single().Range;
-            testLspServer.TestWorkspace.GlobalOptions.SetGlobalOption(FadingOptions.FadeOutUnusedImports, LanguageNames.CSharp, true);
+            testLspServer.TestWorkspace.GlobalOptions.SetGlobalOption(FadingOptionsStorage.FadeOutUnusedImports, LanguageNames.CSharp, true);
 
             var document = testLspServer.GetCurrentSolution().Projects.Single().Documents.Single();
 
@@ -739,7 +739,7 @@ class A
 }";
             await using var testLspServer = await CreateTestWorkspaceWithDiagnosticsAsync(markup, BackgroundAnalysisScope.OpenFiles, useVSDiagnostics);
             var firstLocation = testLspServer.GetLocations("first").Single().Range;
-            testLspServer.TestWorkspace.GlobalOptions.SetGlobalOption(FadingOptions.FadeOutUnusedImports, LanguageNames.CSharp, false);
+            testLspServer.TestWorkspace.GlobalOptions.SetGlobalOption(FadingOptionsStorage.FadeOutUnusedImports, LanguageNames.CSharp, false);
 
             var document = testLspServer.GetCurrentSolution().Projects.Single().Documents.Single();
 

diff --git a/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs b/src/VisualStudio/CSharp/Impl/Options/AdvancedOptionPageControl.xaml.cs
@@ -115,8 +115,8 @@ public AdvancedOptionPageControl(OptionStore optionStore, IComponentModel compon
             BindToOption(Collapse_regions_when_collapsing_to_definitions, BlockStructureOptionsStorage.CollapseRegionsWhenCollapsingToDefinitions, LanguageNames.CSharp);
 
             // Fading
-            BindToOption(Fade_out_unused_usings, FadingOptions.FadeOutUnusedImports, LanguageNames.CSharp);
-            BindToOption(Fade_out_unreachable_code, FadingOptions.FadeOutUnreachableCode, LanguageNames.CSharp);
+            BindToOption(Fade_out_unused_usings, FadingOptionsStorage.FadeOutUnusedImports, LanguageNames.CSharp);
+            BindToOption(Fade_out_unreachable_code, FadingOptionsStorage.FadeOutUnreachableCode, LanguageNames.CSharp);
 
             // Block Structure Guides
             BindToOption(Show_guides_for_declaration_level_constructs, BlockStructureOptionsStorage.ShowBlockStructureGuidesForDeclarationLevelConstructs, LanguageNames.CSharp);

diff --git a/src/VisualStudio/CSharp/Impl/Options/AutomationObject/AutomationObject.Fading.cs b/src/VisualStudio/CSharp/Impl/Options/AutomationObject/AutomationObject.Fading.cs
@@ -10,14 +10,14 @@ public partial class AutomationObject
     {
         public int Fading_FadeOutUnreachableCode
         {
-            get { return GetBooleanOption(FadingOptions.FadeOutUnreachableCode); }
-            set { SetBooleanOption(FadingOptions.FadeOutUnreachableCode, value); }
+            get { return GetBooleanOption(FadingOptionsStorage.FadeOutUnreachableCode); }
+            set { SetBooleanOption(FadingOptionsStorage.FadeOutUnreachableCode, value); }
         }
 
         public int Fading_FadeOutUnusedImports
         {
-            get { return GetBooleanOption(FadingOptions.FadeOutUnusedImports); }
-            set { SetBooleanOption(FadingOptions.FadeOutUnusedImports, value); }
+            get { return GetBooleanOption(FadingOptionsStorage.FadeOutUnusedImports); }
+            set { SetBooleanOption(FadingOptionsStorage.FadeOutUnusedImports, value); }
         }
     }
 }
diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb b/src/VisualStudio/VisualBasic/Impl/Options/AdvancedOptionPageControl.xaml.vb
@@ -107,7 +107,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
             BindToOption(Collapse_regions_when_collapsing_to_definitions, BlockStructureOptionsStorage.CollapseRegionsWhenCollapsingToDefinitions, LanguageNames.VisualBasic)
 
             ' Fading
-            BindToOption(Fade_out_unused_imports, FadingOptions.FadeOutUnusedImports, LanguageNames.VisualBasic)
+            BindToOption(Fade_out_unused_imports, FadingOptionsStorage.FadeOutUnusedImports, LanguageNames.VisualBasic)
 
             ' Block structure guides
             BindToOption(Show_guides_for_declaration_level_constructs, BlockStructureOptionsStorage.ShowBlockStructureGuidesForDeclarationLevelConstructs, LanguageNames.VisualBasic)

diff --git a/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.Fading.vb b/src/VisualStudio/VisualBasic/Impl/Options/AutomationObject/AutomationObject.Fading.vb
@@ -8,19 +8,19 @@ Namespace Microsoft.VisualStudio.LanguageServices.VisualBasic.Options
     Partial Public Class AutomationObject
         Public Property Fading_FadeOutUnreachableCode As Boolean
             Get
-                Return GetBooleanOption(FadingOptions.FadeOutUnreachableCode)
+                Return GetBooleanOption(FadingOptionsStorage.FadeOutUnreachableCode)
             End Get
             Set(value As Boolean)
-                SetBooleanOption(FadingOptions.FadeOutUnreachableCode, value)
+                SetBooleanOption(FadingOptionsStorage.FadeOutUnreachableCode, value)
             End Set
         End Property
 
         Public Property Fading_FadeOutUnusedImports As Boolean
             Get
-                Return GetBooleanOption(FadingOptions.FadeOutUnusedImports)
+                Return GetBooleanOption(FadingOptionsStorage.FadeOutUnusedImports)
             End Get
             Set(value As Boolean)
-                SetBooleanOption(FadingOptions.FadeOutUnusedImports, value)
+                SetBooleanOption(FadingOptionsStorage.FadeOutUnusedImports, value)
             End Set
         End Property
     End Class

diff --git a/.../Compiler/Core/CodeStyle/FadingOptions.cs → ...er/Core/CodeStyle/FadingOptionsStorage.cs b/.../Compiler/Core/CodeStyle/FadingOptions.cs → ...er/Core/CodeStyle/FadingOptionsStorage.cs
@@ -7,7 +7,7 @@
 
 namespace Microsoft.CodeAnalysis.CodeStyle
 {
-    internal static class FadingOptions
+    internal static class FadingOptionsStorage
     {
         public static readonly PerLanguageOption2<bool> FadeOutUnusedImports = new("dotnet_fade_out_unused_imports", defaultValue: true);
         public static readonly PerLanguageOption2<bool> FadeOutUnreachableCode = new("dotnet_fade_out_unreachable_code", defaultValue: true);