Remove fallbacks (3) (#74323)

dotnet · Jul 11, 2024 · c649fbb · c649fbb
1 parent 718c6b5
commit c649fbb
Show file tree

Hide file tree

Showing 33 changed files with 126 additions and 503 deletions.
diff --git a/src/EditorFeatures/TestUtilities/Utilities/CSharpCodeActionOptions.cs b/src/EditorFeatures/TestUtilities/Utilities/CSharpCodeActionOptions.cs
@@ -4,7 +4,6 @@
 
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CSharp.CodeGeneration;
-using Microsoft.CodeAnalysis.CSharp.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.Formatting;
 using Microsoft.CodeAnalysis.CSharp.Simplification;
 
@@ -20,6 +19,5 @@ internal static class CSharpCodeActionOptions
             SimplifierOptions = CSharpSimplifierOptions.Default
         },
         CodeGenerationOptions = CSharpCodeGenerationOptions.Default,
-        CodeStyleOptions = CSharpIdeCodeStyleOptions.Default
     };
 }
diff --git a/src/EditorFeatures/TestUtilities/Utilities/VisualBasicCodeActionOptions.cs b/src/EditorFeatures/TestUtilities/Utilities/VisualBasicCodeActionOptions.cs
@@ -5,7 +5,6 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.ImplementType;
 using Microsoft.CodeAnalysis.VisualBasic.CodeGeneration;
-using Microsoft.CodeAnalysis.VisualBasic.CodeStyle;
 using Microsoft.CodeAnalysis.VisualBasic.Formatting;
 using Microsoft.CodeAnalysis.VisualBasic.Simplification;
 
@@ -21,7 +20,6 @@ internal static class VisualBasicCodeActionOptions
             SimplifierOptions = VisualBasicSimplifierOptions.Default,
         },
         CodeGenerationOptions = VisualBasicCodeGenerationOptions.Default,
-        CodeStyleOptions = VisualBasicIdeCodeStyleOptions.Default
     };
 
     public static CodeActionOptions With(this CodeActionOptions options, VisualBasicSyntaxFormattingOptions value)

diff --git a/...EditorFeatures/VisualBasic/ImplementAbstractClass/ImplementAbstractClassCommandHandler.vb b/...EditorFeatures/VisualBasic/ImplementAbstractClass/ImplementAbstractClassCommandHandler.vb
@@ -33,7 +33,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.ImplementAbstractClass
 
         Protected Overrides Function TryGetNewDocument(
             document As Document,
-            options As ImplementTypeGenerationOptions,
+            options As ImplementTypeOptions,
             typeSyntax As TypeSyntax,
             cancellationToken As CancellationToken
         ) As Document

diff --git a/src/EditorFeatures/VisualBasic/ImplementInterface/ImplementInterfaceCommandHandler.vb b/src/EditorFeatures/VisualBasic/ImplementInterface/ImplementInterfaceCommandHandler.vb
@@ -33,7 +33,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.ImplementInterface
 
         Protected Overrides Function TryGetNewDocument(
             document As Document,
-            options As ImplementTypeGenerationOptions,
+            options As ImplementTypeOptions,
             typeSyntax As TypeSyntax,
             cancellationToken As CancellationToken
         ) As Document

diff --git a/...asic/Utilities/CommandHandlers/AbstractImplementAbstractClassOrInterfaceCommandHandler.vb b/...asic/Utilities/CommandHandlers/AbstractImplementAbstractClassOrInterfaceCommandHandler.vb
@@ -41,7 +41,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities.CommandHandlers
 
         Protected MustOverride Overloads Function TryGetNewDocument(
             document As Document,
-            options As ImplementTypeGenerationOptions,
+            options As ImplementTypeOptions,
             typeSyntax As TypeSyntax,
             cancellationToken As CancellationToken) As Document
 
@@ -165,7 +165,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Utilities.CommandHandlers
                 Return False
             End If
 
-            Dim newDocument = TryGetNewDocument(document, _globalOptions.GetImplementTypeGenerationOptions(document.Project.Services), identifier, cancellationToken)
+            Dim newDocument = TryGetNewDocument(document, _globalOptions.GetImplementTypeOptions(document.Project.Language), identifier, cancellationToken)
 
             If newDocument Is Nothing Then
                 Return False

diff --git a/src/Features/CSharp/Portable/ImplementInterface/CSharpImplementInterfaceCodeFixProvider.cs b/src/Features/CSharp/Portable/ImplementInterface/CSharpImplementInterfaceCodeFixProvider.cs
@@ -54,7 +54,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
 
         var actions = token.Parent.GetAncestorsOrThis<TypeSyntax>()
                                   .Where(_interfaceName)
-                                  .Select(n => service.GetCodeActions(document, context.Options.GetImplementTypeGenerationOptions(document.Project.Services), model, n, cancellationToken))
+                                  .Select(n => service.GetCodeActions(document, context.Options.GetImplementTypeOptions(document.Project.Services), model, n, cancellationToken))
                                   .FirstOrDefault(a => !a.IsEmpty);
 
         if (actions.IsDefaultOrEmpty)

diff --git a/...res/Core/Portable/ImplementAbstractClass/AbstractImplementAbstractClassCodeFixProvider.cs b/...res/Core/Portable/ImplementAbstractClass/AbstractImplementAbstractClassCodeFixProvider.cs
@@ -39,7 +39,7 @@ public sealed override async Task RegisterCodeFixesAsync(CodeFixContext context)
             return;
 
         var data = await ImplementAbstractClassData.TryGetDataAsync(
-            document, classNode, GetClassIdentifier(classNode), context.Options.GetImplementTypeGenerationOptions(document.Project.Services), cancellationToken).ConfigureAwait(false);
+            document, classNode, GetClassIdentifier(classNode), context.Options.GetImplementTypeOptions(document.Project.Services), cancellationToken).ConfigureAwait(false);
         if (data == null)
             return;
 

diff --git a/src/Features/Core/Portable/ImplementAbstractClass/ImplementAbstractClassData.cs b/src/Features/Core/Portable/ImplementAbstractClass/ImplementAbstractClassData.cs
@@ -24,12 +24,12 @@
 namespace Microsoft.CodeAnalysis.ImplementAbstractClass;
 
 internal sealed class ImplementAbstractClassData(
-    Document document, ImplementTypeGenerationOptions options, SyntaxNode classNode, SyntaxToken classIdentifier,
+    Document document, ImplementTypeOptions options, SyntaxNode classNode, SyntaxToken classIdentifier,
     INamedTypeSymbol classType, INamedTypeSymbol abstractClassType,
     ImmutableArray<(INamedTypeSymbol type, ImmutableArray<ISymbol> members)> unimplementedMembers)
 {
     private readonly Document _document = document;
-    private readonly ImplementTypeGenerationOptions _options = options;
+    private readonly ImplementTypeOptions _options = options;
     private readonly SyntaxNode _classNode = classNode;
     private readonly SyntaxToken _classIdentifier = classIdentifier;
     private readonly ImmutableArray<(INamedTypeSymbol type, ImmutableArray<ISymbol> members)> _unimplementedMembers = unimplementedMembers;
@@ -38,7 +38,7 @@ internal sealed class ImplementAbstractClassData(
     public readonly INamedTypeSymbol AbstractClassType = abstractClassType;
 
     public static async Task<ImplementAbstractClassData?> TryGetDataAsync(
-        Document document, SyntaxNode classNode, SyntaxToken classIdentifier, ImplementTypeGenerationOptions options, CancellationToken cancellationToken)
+        Document document, SyntaxNode classNode, SyntaxToken classIdentifier, ImplementTypeOptions options, CancellationToken cancellationToken)
     {
         var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
         if (semanticModel.GetDeclaredSymbol(classNode, cancellationToken) is not INamedTypeSymbol classType)
@@ -68,7 +68,7 @@ internal sealed class ImplementAbstractClassData(
     }
 
     public static async Task<Document?> TryImplementAbstractClassAsync(
-        Document document, SyntaxNode classNode, SyntaxToken classIdentifier, ImplementTypeGenerationOptions options, CancellationToken cancellationToken)
+        Document document, SyntaxNode classNode, SyntaxToken classIdentifier, ImplementTypeOptions options, CancellationToken cancellationToken)
     {
         var data = await TryGetDataAsync(document, classNode, classIdentifier, options, cancellationToken).ConfigureAwait(false);
         if (data == null)
@@ -81,8 +81,8 @@ public async Task<Document> ImplementAbstractClassAsync(
         ISymbol? throughMember, bool? canDelegateAllMembers, CancellationToken cancellationToken)
     {
         var compilation = await _document.Project.GetRequiredCompilationAsync(cancellationToken).ConfigureAwait(false);
-        var memberDefinitions = GenerateMembers(compilation, throughMember, _options.ImplementTypeOptions.PropertyGenerationBehavior, cancellationToken);
-        var groupMembers = _options.ImplementTypeOptions.InsertionBehavior == ImplementTypeInsertionBehavior.WithOtherMembersOfTheSameKind;
+        var memberDefinitions = GenerateMembers(compilation, throughMember, _options.PropertyGenerationBehavior, cancellationToken);
+        var groupMembers = _options.InsertionBehavior == ImplementTypeInsertionBehavior.WithOtherMembersOfTheSameKind;
 
         // If we're implementing through one of our members, but we can't delegate all members
         // through it, then give an error message on the class decl letting the user know.

diff --git a/...Features/Core/Portable/ImplementInterface/AbstractImplementInterfaceService.CodeAction.cs b/...Features/Core/Portable/ImplementInterface/AbstractImplementInterfaceService.CodeAction.cs
@@ -30,15 +30,15 @@ internal partial class ImplementInterfaceCodeAction : CodeAction
         private readonly bool _onlyRemaining;
         protected readonly ISymbol? ThroughMember;
         protected readonly Document Document;
-        protected readonly ImplementTypeGenerationOptions Options;
+        protected readonly ImplementTypeOptions Options;
         protected readonly State State;
         protected readonly AbstractImplementInterfaceService Service;
         private readonly string _equivalenceKey;
 
         internal ImplementInterfaceCodeAction(
             AbstractImplementInterfaceService service,
             Document document,
-            ImplementTypeGenerationOptions options,
+            ImplementTypeOptions options,
             State state,
             bool explicitly,
             bool abstractly,
@@ -59,7 +59,7 @@ internal ImplementInterfaceCodeAction(
         public static ImplementInterfaceCodeAction CreateImplementAbstractlyCodeAction(
             AbstractImplementInterfaceService service,
             Document document,
-            ImplementTypeGenerationOptions options,
+            ImplementTypeOptions options,
             State state)
         {
             return new ImplementInterfaceCodeAction(service, document, options, state, explicitly: false, abstractly: true, onlyRemaining: true, throughMember: null);
@@ -68,7 +68,7 @@ public static ImplementInterfaceCodeAction CreateImplementAbstractlyCodeAction(
         public static ImplementInterfaceCodeAction CreateImplementCodeAction(
             AbstractImplementInterfaceService service,
             Document document,
-            ImplementTypeGenerationOptions options,
+            ImplementTypeOptions options,
             State state)
         {
             return new ImplementInterfaceCodeAction(service, document, options, state, explicitly: false, abstractly: false, onlyRemaining: true, throughMember: null);
@@ -77,7 +77,7 @@ public static ImplementInterfaceCodeAction CreateImplementCodeAction(
         public static ImplementInterfaceCodeAction CreateImplementExplicitlyCodeAction(
             AbstractImplementInterfaceService service,
             Document document,
-            ImplementTypeGenerationOptions options,
+            ImplementTypeOptions options,
             State state)
         {
             return new ImplementInterfaceCodeAction(service, document, options, state, explicitly: true, abstractly: false, onlyRemaining: false, throughMember: null);
@@ -86,7 +86,7 @@ public static ImplementInterfaceCodeAction CreateImplementExplicitlyCodeAction(
         public static ImplementInterfaceCodeAction CreateImplementThroughMemberCodeAction(
             AbstractImplementInterfaceService service,
             Document document,
-            ImplementTypeGenerationOptions options,
+            ImplementTypeOptions options,
             State state,
             ISymbol throughMember)
         {
@@ -96,7 +96,7 @@ public static ImplementInterfaceCodeAction CreateImplementThroughMemberCodeActio
         public static ImplementInterfaceCodeAction CreateImplementRemainingExplicitlyCodeAction(
             AbstractImplementInterfaceService service,
             Document document,
-            ImplementTypeGenerationOptions options,
+            ImplementTypeOptions options,
             State state)
         {
             return new ImplementInterfaceCodeAction(service, document, options, state, explicitly: true, abstractly: false, onlyRemaining: true, throughMember: null);
@@ -197,13 +197,13 @@ protected async Task<Document> GetUpdatedDocumentAsync(
             var isComImport = unimplementedMembers.Any(static t => t.type.IsComImport);
 
             var memberDefinitions = GenerateMembers(
-                compilation, tree.Options, unimplementedMembers, Options.ImplementTypeOptions.PropertyGenerationBehavior);
+                compilation, tree.Options, unimplementedMembers, Options.PropertyGenerationBehavior);
 
             // Only group the members in the destination if the user wants that *and* 
             // it's not a ComImport interface.  Member ordering in ComImport interfaces 
             // matters, so we don't want to much with them.
             var groupMembers = !isComImport &&
-                Options.ImplementTypeOptions.InsertionBehavior == ImplementTypeInsertionBehavior.WithOtherMembersOfTheSameKind;
+                Options.InsertionBehavior == ImplementTypeInsertionBehavior.WithOtherMembersOfTheSameKind;
 
             return await CodeGenerator.AddMemberDeclarationsAsync(
                 new CodeGenerationSolutionContext(

diff --git a/...Portable/ImplementInterface/AbstractImplementInterfaceService.DisposePatternCodeAction.cs b/...Portable/ImplementInterface/AbstractImplementInterfaceService.DisposePatternCodeAction.cs
@@ -88,7 +88,7 @@ private static bool ShouldImplementDisposePattern(State state, bool explicitly)
     private sealed class ImplementInterfaceWithDisposePatternCodeAction(
         AbstractImplementInterfaceService service,
         Document document,
-        ImplementTypeGenerationOptions options,
+        ImplementTypeOptions options,
         State state,
         bool explicitly,
         bool abstractly,
@@ -97,7 +97,7 @@ private sealed class ImplementInterfaceWithDisposePatternCodeAction(
         public static ImplementInterfaceWithDisposePatternCodeAction CreateImplementWithDisposePatternCodeAction(
             AbstractImplementInterfaceService service,
             Document document,
-            ImplementTypeGenerationOptions options,
+            ImplementTypeOptions options,
             State state)
         {
             return new ImplementInterfaceWithDisposePatternCodeAction(service, document, options, state, explicitly: false, abstractly: false, throughMember: null);
@@ -106,7 +106,7 @@ public static ImplementInterfaceWithDisposePatternCodeAction CreateImplementWith
         public static ImplementInterfaceWithDisposePatternCodeAction CreateImplementExplicitlyWithDisposePatternCodeAction(
             AbstractImplementInterfaceService service,
             Document document,
-            ImplementTypeGenerationOptions options,
+            ImplementTypeOptions options,
             State state)
         {
             return new ImplementInterfaceWithDisposePatternCodeAction(service, document, options, state, explicitly: true, abstractly: false, throughMember: null);

diff --git a/src/Features/Core/Portable/ImplementInterface/AbstractImplementInterfaceService.cs b/src/Features/Core/Portable/ImplementInterface/AbstractImplementInterfaceService.cs
@@ -38,7 +38,7 @@ protected AbstractImplementInterfaceService()
     protected abstract SyntaxNode CreateFinalizer(SyntaxGenerator generator, INamedTypeSymbol classType, string disposeMethodDisplayString);
 
     public async Task<Document> ImplementInterfaceAsync(
-        Document document, ImplementTypeGenerationOptions options, SyntaxNode node, CancellationToken cancellationToken)
+        Document document, ImplementTypeOptions options, SyntaxNode node, CancellationToken cancellationToken)
     {
         using (Logger.LogBlock(FunctionId.Refactoring_ImplementInterface, cancellationToken))
         {
@@ -60,14 +60,14 @@ public async Task<Document> ImplementInterfaceAsync(
         }
     }
 
-    public ImmutableArray<CodeAction> GetCodeActions(Document document, ImplementTypeGenerationOptions options, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken)
+    public ImmutableArray<CodeAction> GetCodeActions(Document document, ImplementTypeOptions options, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken)
     {
         var state = State.Generate(this, document, model, node, cancellationToken);
         return GetActions(document, options, state, cancellationToken).ToImmutableArray();
     }
 
     private IEnumerable<CodeAction> GetActions(
-        Document document, ImplementTypeGenerationOptions options, State state, CancellationToken cancellationToken)
+        Document document, ImplementTypeOptions options, State state, CancellationToken cancellationToken)
     {
         if (state == null)
         {

diff --git a/src/Features/Core/Portable/ImplementInterface/IImplementInterfaceService.cs b/src/Features/Core/Portable/ImplementInterface/IImplementInterfaceService.cs
@@ -13,6 +13,6 @@ namespace Microsoft.CodeAnalysis.ImplementInterface;
 
 internal interface IImplementInterfaceService : ILanguageService
 {
-    Task<Document> ImplementInterfaceAsync(Document document, ImplementTypeGenerationOptions options, SyntaxNode node, CancellationToken cancellationToken);
-    ImmutableArray<CodeAction> GetCodeActions(Document document, ImplementTypeGenerationOptions options, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken);
+    Task<Document> ImplementInterfaceAsync(Document document, ImplementTypeOptions options, SyntaxNode node, CancellationToken cancellationToken);
+    ImmutableArray<CodeAction> GetCodeActions(Document document, ImplementTypeOptions options, SemanticModel model, SyntaxNode node, CancellationToken cancellationToken);
 }
diff --git a/...s/VisualBasic/Portable/ImplementInterface/VisualBasicImplementInterfaceCodeFixProvider.vb b/...s/VisualBasic/Portable/ImplementInterface/VisualBasicImplementInterfaceCodeFixProvider.vb
@@ -62,7 +62,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ImplementInterface
             Dim service = document.GetLanguageService(Of IImplementInterfaceService)()
             Dim actions = service.GetCodeActions(
                 document,
-                context.Options.GetImplementTypeGenerationOptions(document.Project.Services),
+                context.Options.GetImplementTypeOptions(document.Project.Services),
                 Await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(False),
                 typeNode,
                 cancellationToken)

diff --git a/src/LanguageServer/Protocol/Features/Options/CodeActionOptionsStorage.cs b/src/LanguageServer/Protocol/Features/Options/CodeActionOptionsStorage.cs
@@ -5,9 +5,7 @@
 using System.Collections.Immutable;
 using Microsoft.CodeAnalysis.CodeCleanup;
 using Microsoft.CodeAnalysis.CodeGeneration;
-using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.Completion;
-using Microsoft.CodeAnalysis.ExtractMethod;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.ImplementType;
 using Microsoft.CodeAnalysis.Options;
@@ -22,7 +20,6 @@ public static CodeActionOptions GetCodeActionOptions(this IGlobalOptionService g
             {
                 CleanupOptions = globalOptions.GetCodeCleanupOptions(languageServices),
                 CodeGenerationOptions = globalOptions.GetCodeGenerationOptions(languageServices),
-                CodeStyleOptions = globalOptions.GetCodeStyleOptions(languageServices),
                 SearchOptions = globalOptions.GetSymbolSearchOptions(languageServices.Language),
                 ImplementTypeOptions = globalOptions.GetImplementTypeOptions(languageServices.Language),
                 HideAdvancedMembers = globalOptions.GetOption(CompletionOptionsStorage.HideAdvancedMembers, languageServices.Language),

diff --git a/src/LanguageServer/Protocol/Features/Options/CodeStyleOptionsStorage.cs b/src/LanguageServer/Protocol/Features/Options/CodeStyleOptionsStorage.cs
diff --git a/src/LanguageServer/Protocol/Features/Options/ImplementTypeOptionsStorage.cs b/src/LanguageServer/Protocol/Features/Options/ImplementTypeOptionsStorage.cs
@@ -2,7 +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.
 
-using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Options;
 
 namespace Microsoft.CodeAnalysis.ImplementType
@@ -16,10 +15,6 @@ public static ImplementTypeOptions GetImplementTypeOptions(this IGlobalOptionSer
               PropertyGenerationBehavior = globalOptions.GetOption(PropertyGenerationBehavior, language)
           };
 
-        public static ImplementTypeGenerationOptions GetImplementTypeGenerationOptions(this IGlobalOptionService globalOptions, LanguageServices languageServices)
-          => new(globalOptions.GetImplementTypeOptions(languageServices.Language),
-                 globalOptions.CreateProvider());
-
         private static readonly OptionGroup s_implementTypeGroup = new(name: "implement_type", description: "");
 
         public static readonly PerLanguageOption2<ImplementTypeInsertionBehavior> InsertionBehavior =