Cleanup

dotnet · Jul 10, 2024 · 5ec779f · 5ec779f
1 parent 81f28d7
commit 5ec779f
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 91 deletions.
diff --git a/src/EditorFeatures/CSharpTest/CodeActions/ImplementInterface/ImplementInterfaceTests.cs b/src/EditorFeatures/CSharpTest/CodeActions/ImplementInterface/ImplementInterfaceTests.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.ImplementInterface;
@@ -8006,7 +8007,7 @@ void M() { }
                 public int Prop => throw new System.NotImplementedException();
             }
             """,
-            CodeActionOptions = (CSharpCodeActionOptions.Default with
+            CodeActionOptions = (CodeActionOptions.Default with
             {
                 ImplementTypeOptions = new() { InsertionBehavior = ImplementTypeInsertionBehavior.AtTheEnd }
             }).CreateProvider()
@@ -8188,7 +8189,7 @@ class Class : IInterface
                 public int WriteOnlyProp { set => throw new System.NotImplementedException(); }
             }
             """,
-            CodeActionOptions = (CSharpCodeActionOptions.Default with
+            CodeActionOptions = (CodeActionOptions.Default with
             {
                 ImplementTypeOptions = new() { PropertyGenerationBehavior = ImplementTypePropertyGenerationBehavior.PreferAutoProperties }
             }).CreateProvider()

diff --git a/src/EditorFeatures/Test/Options/GlobalOptionsTests.cs b/src/EditorFeatures/Test/Options/GlobalOptionsTests.cs
@@ -184,7 +184,7 @@ public void ReadingOptionsFromGlobalOptions(string language)
         var languageServices = workspace.Services.SolutionServices.GetLanguageServices(language);
 
         VerifyDataMembersHaveNonDefaultValues(globalOptions.GetIdeAnalyzerOptions(languageServices), IdeAnalyzerOptions.GetDefault(languageServices), language);
-        VerifyDataMembersHaveNonDefaultValues(globalOptions.GetCodeActionOptions(languageServices), CodeActionOptions.GetDefault(languageServices), language);
+        VerifyDataMembersHaveNonDefaultValues(globalOptions.GetCodeActionOptions(languageServices), CodeActionOptions.Default, language);
         VerifyDataMembersHaveNonDefaultValues(globalOptions.GetBraceMatchingOptions(language), BraceMatchingOptions.Default, language);
         VerifyDataMembersHaveNonDefaultValues(globalOptions.GetFindUsagesOptions(language), FindUsagesOptions.Default, language);
         VerifyDataMembersHaveNonDefaultValues(globalOptions.GetInlineHintsOptions(language), InlineHintsOptions.Default, language);

diff --git a/src/EditorFeatures/TestUtilities/Utilities/CSharpCodeActionOptions.cs b/src/EditorFeatures/TestUtilities/Utilities/CSharpCodeActionOptions.cs
diff --git a/src/EditorFeatures/TestUtilities/Utilities/VisualBasicCodeActionOptions.cs b/src/EditorFeatures/TestUtilities/Utilities/VisualBasicCodeActionOptions.cs
diff --git a/src/Features/ExternalAccess/OmniSharp/CodeActions/OmniSharpCodeActionOptions.cs b/src/Features/ExternalAccess/OmniSharp/CodeActions/OmniSharpCodeActionOptions.cs
@@ -17,24 +17,12 @@ internal readonly record struct OmniSharpCodeActionOptions(
         OmniSharpImplementTypeOptions ImplementTypeOptions,
         OmniSharpLineFormattingOptions LineFormattingOptions)
     {
+#pragma warning disable IDE0060 // Remove unused parameter
         internal CodeActionOptions GetCodeActionOptions(LanguageServices languageServices)
+#pragma warning restore IDE0060 // Remove unused parameter
         {
-            var defaultOptions = CodeActionOptions.GetDefault(languageServices);
-            return defaultOptions with
+            return CodeActionOptions.Default with
             {
-                CleanupOptions = defaultOptions.CleanupOptions with
-                {
-                    FormattingOptions = defaultOptions.CleanupOptions.FormattingOptions with
-                    {
-                        LineFormatting = new()
-                        {
-                            IndentationSize = LineFormattingOptions.IndentationSize,
-                            TabSize = LineFormattingOptions.TabSize,
-                            UseTabs = LineFormattingOptions.UseTabs,
-                            NewLine = LineFormattingOptions.NewLine,
-                        }
-                    }
-                },
                 ImplementTypeOptions = new()
                 {
                     InsertionBehavior = (ImplementTypeInsertionBehavior)ImplementTypeOptions.InsertionBehavior,

diff --git a/src/LanguageServer/Protocol/Features/Options/CodeActionOptionsStorage.cs b/src/LanguageServer/Protocol/Features/Options/CodeActionOptionsStorage.cs
@@ -18,8 +18,6 @@ internal static class CodeActionOptionsStorage
         public static CodeActionOptions GetCodeActionOptions(this IGlobalOptionService globalOptions, LanguageServices languageServices)
             => new()
             {
-                CleanupOptions = globalOptions.GetCodeCleanupOptions(languageServices),
-                CodeGenerationOptions = globalOptions.GetCodeGenerationOptions(languageServices),
                 SearchOptions = globalOptions.GetSymbolSearchOptions(languageServices.Language),
                 ImplementTypeOptions = globalOptions.GetImplementTypeOptions(languageServices.Language),
                 HideAdvancedMembers = globalOptions.GetOption(CompletionOptionsStorage.HideAdvancedMembers, languageServices.Language),

diff --git a/src/Workspaces/CoreTest/Remote/ServiceDescriptorTests.cs b/src/Workspaces/CoreTest/Remote/ServiceDescriptorTests.cs
@@ -235,7 +235,7 @@ public void OptionsAreMessagePackSerializable(string language)
                 SyntaxFormattingOptions.GetDefault(languageServices),
                 CodeCleanupOptions.GetDefault(languageServices),
                 CodeGenerationOptions.GetDefault(languageServices),
-                CodeActionOptions.GetDefault(languageServices),
+                CodeActionOptions.Default,
                 IndentationOptions.GetDefault(languageServices),
                 ExtractMethodGenerationOptions.GetDefault(languageServices),
 

diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Workspace/Core/CodeFixes/CodeActionOptions.cs
@@ -20,28 +20,13 @@ namespace Microsoft.CodeAnalysis.CodeActions;
 [DataContract]
 internal sealed record class CodeActionOptions
 {
-#if CODE_STYLE
-    public static readonly CodeActionOptionsProvider DefaultProvider = new DelegatingCodeActionOptionsProvider(GetDefault);
-#else
-    public static readonly CodeActionOptionsProvider DefaultProvider = new DelegatingCodeActionOptionsProvider(static ls => GetDefault(ls));
-#endif
+    public static readonly CodeActionOptions Default = new();
+    public static readonly CodeActionOptionsProvider DefaultProvider = Default.CreateProvider();
 
 #if !CODE_STYLE
-    [DataMember] public required CodeCleanupOptions CleanupOptions { get; init; }
-    [DataMember] public required CodeGenerationOptions CodeGenerationOptions { get; init; }
     [DataMember] public SymbolSearchOptions SearchOptions { get; init; } = SymbolSearchOptions.Default;
     [DataMember] public ImplementTypeOptions ImplementTypeOptions { get; init; } = ImplementTypeOptions.Default;
     [DataMember] public bool HideAdvancedMembers { get; init; } = false;
-
-    public static CodeActionOptions GetDefault(LanguageServices languageServices)
-        => new()
-        {
-            CleanupOptions = CodeCleanupOptions.GetDefault(languageServices),
-            CodeGenerationOptions = CodeGenerationOptions.GetDefault(languageServices),
-        };
-#else
-    public static CodeActionOptions GetDefault(LanguageServices languageServices)
-        => new();
 #endif
     public CodeActionOptionsProvider CreateProvider()
         => new DelegatingCodeActionOptionsProvider(_ => this);