Unify user experience with disparate 'generate constructor' features (#…

…76328)

src/Analyzers/CSharp/Tests/GenerateDefaultConstructors/GenerateDefaultConstructorsTests.cs

@@ -4,9 +4,9 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.GenerateConstructors;
 using Microsoft.CodeAnalysis.CSharp.GenerateDefaultConstructors;
 using Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions;
-using Microsoft.CodeAnalysis.GenerateDefaultConstructors;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Microsoft.CodeAnalysis.Testing;
 using Roslyn.Test.Utilities;
@@ -20,11 +20,11 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.GenerateDefaultConstruc
 
 #if !CODE_STYLE
 using VerifyRefactoring = CSharpCodeRefactoringVerifier<
-    GenerateDefaultConstructorsCodeRefactoringProvider>;
+    CSharpGenerateConstructorsCodeRefactoringProvider>;
 #endif
 
 [UseExportProvider]
-public class GenerateDefaultConstructorsTests
+public sealed class GenerateDefaultConstructorsTests
 {
 #if !CODE_STYLE
     private static async Task TestRefactoringAsync(string source, string fixedSource, int index = 0)
@@ -1514,7 +1514,8 @@ protected B(int x)
                 {
                 }
             }
-            """);
+            """,
+            index: 1);
     }
 
     [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateDefaultConstructors)]

src/Analyzers/Core/CodeFixes/GenerateDefaultConstructors/IGenerateDefaultConstructorsService.cs

@@ -6,7 +6,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
-using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Text;
 

src/EditorFeatures/CSharpTest/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs → src/EditorFeatures/CSharpTest/GenerateConstructors/GenerateConstructorsTests.cs

@@ -7,21 +7,21 @@
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.CodeStyle;
-using Microsoft.CodeAnalysis.CSharp.GenerateConstructorFromMembers;
+using Microsoft.CodeAnalysis.CSharp.GenerateConstructors;
 using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
 using Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics.NamingStyles;
 using Microsoft.CodeAnalysis.PickMembers;
 using Microsoft.CodeAnalysis.Test.Utilities;
 using Roslyn.Test.Utilities;
 using Xunit;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.GenerateConstructorFromMembers;
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.GenerateConstructors;
 
 [Trait(Traits.Feature, Traits.Features.CodeActionsGenerateConstructorFromMembers)]
-public sealed class GenerateConstructorFromMembersTests : AbstractCSharpCodeActionTest
+public sealed class GenerateConstructorsTests : AbstractCSharpCodeActionTest
 {
     protected override CodeRefactoringProvider CreateCodeRefactoringProvider(EditorTestWorkspace workspace, TestParameters parameters)
-        => new CSharpGenerateConstructorFromMembersCodeRefactoringProvider((IPickMembersService)parameters.fixProviderData);
+        => new CSharpGenerateConstructorsCodeRefactoringProvider((IPickMembersService)parameters.fixProviderData);
 
     private readonly NamingStylesTestOptionSets options = new(LanguageNames.CSharp);
 
@@ -74,7 +74,7 @@ class Z
                 public Z(int a{|Navigation:)|} => this.a = a;
             }
             """,
-options: Option(CSharpCodeStyleOptions.PreferExpressionBodiedConstructors, CSharpCodeStyleOptions.WhenPossibleWithSilentEnforcement));
+            options: Option(CSharpCodeStyleOptions.PreferExpressionBodiedConstructors, CSharpCodeStyleOptions.WhenPossibleWithSilentEnforcement));
     }
 
     [Fact]
@@ -99,7 +99,7 @@ class Z
                 public Z(int a{|Navigation:)|} => this.a = a;
             }
             """,
-options: Option(CSharpCodeStyleOptions.PreferExpressionBodiedConstructors, CSharpCodeStyleOptions.WhenOnSingleLineWithSilentEnforcement));
+            options: Option(CSharpCodeStyleOptions.PreferExpressionBodiedConstructors, CSharpCodeStyleOptions.WhenOnSingleLineWithSilentEnforcement));
     }
 
     [Fact]
@@ -130,7 +130,7 @@ public Z(int a, int b{|Navigation:)|}
                 }
             }
             """,
-options: Option(CSharpCodeStyleOptions.PreferExpressionBodiedConstructors, CSharpCodeStyleOptions.WhenOnSingleLineWithSilentEnforcement));
+            options: Option(CSharpCodeStyleOptions.PreferExpressionBodiedConstructors, CSharpCodeStyleOptions.WhenOnSingleLineWithSilentEnforcement));
     }
 
     [Fact]
@@ -974,7 +974,7 @@ public Program(int field{|Navigation:)|}
                 }
             }
             """,
-options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOption2.TrueWithSuggestionEnforcement));
+            options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOption2.TrueWithSuggestionEnforcement));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/13944")]
@@ -1001,7 +1001,7 @@ protected Contribution(string title, int number{|Navigation:)|}
                 public int Number { get; }
             }
             """,
-options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOption2.TrueWithSuggestionEnforcement));
+            options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOption2.TrueWithSuggestionEnforcement));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/13944")]
@@ -1015,7 +1015,7 @@ abstract class Contribution
                 public int Number { get; }|]
             }
             """,
-new TestParameters(options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOption2.TrueWithSuggestionEnforcement)));
+            new TestParameters(options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOption2.TrueWithSuggestionEnforcement)));
     }
 
     [Fact]
@@ -1044,7 +1044,7 @@ public Z(int a{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["a"]);
+            chosenSymbols: ["a"]);
     }
 
     [Fact]
@@ -1072,7 +1072,7 @@ public Z(int a{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["a"]);
+            chosenSymbols: ["a"]);
     }
 
     [Fact]
@@ -1115,7 +1115,7 @@ public Z({|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: []);
+            chosenSymbols: []);
     }
 
     [Fact]
@@ -1147,7 +1147,7 @@ public Z(string b, int a{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["b", "a"]);
+            chosenSymbols: ["b", "a"]);
     }
 
     [Fact]
@@ -1181,8 +1181,8 @@ public Z(int a, string b{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["a", "b"],
-optionsCallback: options => options[0].Value = true);
+            chosenSymbols: ["a", "b"],
+            optionsCallback: options => options[0].Value = true);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41428")]
@@ -1221,8 +1221,8 @@ public Z(int a, string b, string? c{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["a", "b", "c"],
-optionsCallback: options => options[0].Value = true);
+            chosenSymbols: ["a", "b", "c"],
+            optionsCallback: options => options[0].Value = true);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/41428")]
@@ -1261,8 +1261,8 @@ public Z(int a, string b, T? c{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["a", "b", "c"],
-optionsCallback: options => options[0].Value = true);
+            chosenSymbols: ["a", "b", "c"],
+            optionsCallback: options => options[0].Value = true);
     }
 
     [Fact]
@@ -1301,9 +1301,9 @@ public Z(int a, string b{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["a", "b"],
-optionsCallback: options => options[0].Value = true,
-parameters: new TestParameters(options:
+            chosenSymbols: ["a", "b"],
+            optionsCallback: options => options[0].Value = true,
+            parameters: new TestParameters(options:
 Option(CSharpCodeStyleOptions.PreferThrowExpression, CodeStyleOption2.FalseWithSilentEnforcement)));
     }
 
@@ -1338,10 +1338,10 @@ public Z(int a, int? b{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["a", "b"],
-optionsCallback: options => options[0].Value = true,
-parameters: new TestParameters(options:
-Option(CSharpCodeStyleOptions.PreferThrowExpression, CodeStyleOption2.FalseWithSilentEnforcement)));
+            chosenSymbols: ["a", "b"],
+            optionsCallback: options => options[0].Value = true,
+            parameters: new TestParameters(options:
+                Option(CSharpCodeStyleOptions.PreferThrowExpression, CodeStyleOption2.FalseWithSilentEnforcement)));
     }
 
     [Fact]
@@ -1380,11 +1380,11 @@ public Z(int a, string b{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: ["a", "b"],
-optionsCallback: options => options[0].Value = true,
-parameters: new TestParameters(
-parseOptions: CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp6),
-options: Option(CSharpCodeStyleOptions.PreferThrowExpression, CodeStyleOption2.FalseWithSilentEnforcement)));
+            chosenSymbols: ["a", "b"],
+            optionsCallback: options => options[0].Value = true,
+            parameters: new TestParameters(
+                parseOptions: CSharpParseOptions.Default.WithLanguageVersion(LanguageVersion.CSharp6),
+                options: Option(CSharpCodeStyleOptions.PreferThrowExpression, CodeStyleOption2.FalseWithSilentEnforcement)));
     }
 
     [Fact]
@@ -1492,7 +1492,7 @@ protected C(int prop{|Navigation:)|}
                 public int Prop { get; set; }
             }
             """,
-options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOption2.TrueWithSuggestionEnforcement));
+            options: Option(CodeStyleOptions2.QualifyFieldAccess, CodeStyleOption2.TrueWithSuggestionEnforcement));
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/17643")]
@@ -1517,7 +1517,7 @@ public Program(int f{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: null);
+            chosenSymbols: null);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/25690")]
@@ -1544,7 +1544,7 @@ public Program(int p{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: null);
+            chosenSymbols: null);
     }
 
     [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateEqualsAndGetHashCode)]
@@ -1572,7 +1572,7 @@ public Program(int p, int s{|Navigation:)|}
                 }
             }
             """,
-chosenSymbols: null);
+            chosenSymbols: null);
     }
 
     [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/33601")]

src/EditorFeatures/VisualBasicTest/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.vb → src/EditorFeatures/VisualBasicTest/GenerateConstructors/GenerateConstructorsTests.vb

@@ -4,20 +4,18 @@
 
 Imports Microsoft.CodeAnalysis.CodeRefactorings
 Imports Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions
-Imports Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces
 Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
-Imports Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 Imports Microsoft.CodeAnalysis.Options
 Imports Microsoft.CodeAnalysis.PickMembers
-Imports Microsoft.CodeAnalysis.VisualBasic.GenerateConstructorFromMembers
+Imports Microsoft.CodeAnalysis.VisualBasic.GenerateConstructors
 
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.GenerateConstructorFromMembers
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.GenerateConstructors
     <Trait(Traits.Feature, Traits.Features.CodeActionsGenerateConstructorFromMembers)>
-    Public Class GenerateConstructorFromMembersTests
+    Public NotInheritable Class GenerateConstructorsTests
         Inherits AbstractVisualBasicCodeActionTest
 
         Protected Overrides Function CreateCodeRefactoringProvider(workspace As EditorTestWorkspace, parameters As TestParameters) As CodeRefactoringProvider
-            Return New VisualBasicGenerateConstructorFromMembersCodeRefactoringProvider(DirectCast(parameters.fixProviderData, IPickMembersService))
+            Return New VisualBasicGenerateConstructorsCodeRefactoringProvider(DirectCast(parameters.fixProviderData, IPickMembersService))
         End Function
 
         <Fact>

src/Features/CSharp/Portable/GenerateConstructorFromMembers/CSharpGenerateConstructorFromMembersCodeRefactoringProvider.cs → src/Features/CSharp/Portable/GenerateConstructors/CSharpGenerateConstructorsCodeRefactoringProvider.cs

@@ -10,33 +10,33 @@
 using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.CSharp.Extensions;
 using Microsoft.CodeAnalysis.Features.Intents;
-using Microsoft.CodeAnalysis.GenerateConstructorFromMembers;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.PickMembers;
 using Microsoft.CodeAnalysis.Simplification;
 using Microsoft.CodeAnalysis.CSharp.Simplification;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System.Linq;
+using Microsoft.CodeAnalysis.GenerateConstructors;
 
-namespace Microsoft.CodeAnalysis.CSharp.GenerateConstructorFromMembers;
+namespace Microsoft.CodeAnalysis.CSharp.GenerateConstructors;
 
 [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.GenerateConstructorFromMembers), Shared]
 [ExtensionOrder(Before = PredefinedCodeRefactoringProviderNames.GenerateEqualsAndGetHashCodeFromMembers)]
 [IntentProvider(WellKnownIntents.GenerateConstructor, LanguageNames.CSharp)]
-internal sealed class CSharpGenerateConstructorFromMembersCodeRefactoringProvider
-    : AbstractGenerateConstructorFromMembersCodeRefactoringProvider
+internal sealed class CSharpGenerateConstructorsCodeRefactoringProvider
+    : AbstractGenerateConstructorsCodeRefactoringProvider
 {
     [ImportingConstructor]
     [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public CSharpGenerateConstructorFromMembersCodeRefactoringProvider()
+    public CSharpGenerateConstructorsCodeRefactoringProvider()
     {
     }
 
     /// <summary>
     /// For testing purposes only.
     /// </summary>
     [SuppressMessage("RoslynDiagnosticsReliability", "RS0034:Exported parts should have [ImportingConstructor]", Justification = "Used incorrectly by tests")]
-    internal CSharpGenerateConstructorFromMembersCodeRefactoringProvider(IPickMembersService pickMembersService_forTesting)
+    internal CSharpGenerateConstructorsCodeRefactoringProvider(IPickMembersService pickMembersService_forTesting)
         : base(pickMembersService_forTesting)
     {
     }

src/Features/Core/Portable/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersCodeRefactoringProvider.AddConstructorParametersCodeAction.cs

@@ -12,12 +12,15 @@
 using Microsoft.CodeAnalysis.CodeGeneration;
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Formatting;
+using Microsoft.CodeAnalysis.GenerateFromMembers;
 using Microsoft.CodeAnalysis.LanguageService;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.AddConstructorParametersFromMembers;
 
+using static GenerateFromMembersHelpers;
+
 internal sealed partial class AddConstructorParametersFromMembersCodeRefactoringProvider
 {
     private sealed class AddConstructorParametersCodeAction(

src/Features/Core/Portable/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersCodeRefactoringProvider.State.cs

@@ -8,13 +8,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CodeStyle;
+using Microsoft.CodeAnalysis.GenerateFromMembers;
 using Microsoft.CodeAnalysis.PooledObjects;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Shared.Utilities;
 
 namespace Microsoft.CodeAnalysis.AddConstructorParametersFromMembers;
 
+using static GenerateFromMembersHelpers;
+
 internal sealed partial class AddConstructorParametersFromMembersCodeRefactoringProvider
 {
     private sealed class State

src/Features/Core/Portable/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersCodeRefactoringProvider.cs

@@ -21,19 +21,18 @@
 
 namespace Microsoft.CodeAnalysis.AddConstructorParametersFromMembers;
 
+using static GenerateFromMembersHelpers;
+
 [ExportCodeRefactoringProvider(LanguageNames.CSharp, LanguageNames.VisualBasic,
     Name = PredefinedCodeRefactoringProviderNames.AddConstructorParametersFromMembers), Shared]
 [ExtensionOrder(After = PredefinedCodeRefactoringProviderNames.GenerateConstructorFromMembers,
                 Before = PredefinedCodeRefactoringProviderNames.GenerateOverrides)]
 [IntentProvider(WellKnownIntents.AddConstructorParameter, LanguageNames.CSharp)]
-internal sealed partial class AddConstructorParametersFromMembersCodeRefactoringProvider : AbstractGenerateFromMembersCodeRefactoringProvider, IIntentProvider
+[method: ImportingConstructor]
+[method: Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+internal sealed partial class AddConstructorParametersFromMembersCodeRefactoringProvider()
+        : CodeRefactoringProvider, IIntentProvider
 {
-    [ImportingConstructor]
-    [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
-    public AddConstructorParametersFromMembersCodeRefactoringProvider()
-    {
-    }
-
     public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
     {
         var (document, textSpan, cancellationToken) = context;