Merge pull request #44819 from dotnet/merges/master-to-master-vs-deps

Merge master to master-vs-deps

Author: msftbot[bot]

src/EditorFeatures/CSharpTest/GenerateConstructor/GenerateConstructorTests.cs

@@ -44,6 +44,50 @@ End Class",
 End Class")
         End Function
 
+        <WorkItem(44537, "https://github.com/dotnet/roslyn/issues/44537")>
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateConstructor)>
+        Public Async Function TestGenerateIntoContainingType_WithProperties() As Task
+            Await TestInRegularAndScriptAsync(
+"Class C
+    Sub Main()
+        Dim f = New C([|4|], 5, 6)
+    End Sub
+End Class",
+"Class C
+    Public Sub New(v1 As Integer, v2 As Integer, v3 As Integer)
+        Me.V1 = v1
+        Me.V2 = v2
+        Me.V3 = v3
+    End Sub
+
+    Public ReadOnly Property V1 As Integer
+    Public ReadOnly Property V2 As Integer
+    Public ReadOnly Property V3 As Integer
+
+    Sub Main()
+        Dim f = New C(4, 5, 6)
+    End Sub
+End Class", index:=1)
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateConstructor)>
+        Public Async Function TestGenerateIntoContainingType_NoMembers() As Task
+            Await TestInRegularAndScriptAsync(
+"Class C
+    Sub Main()
+        Dim f = New C([|4|], 5, 6)
+    End Sub
+End Class",
+"Class C
+    Public Sub New(v1 As Integer, v2 As Integer, v3 As Integer)
+    End Sub
+
+    Sub Main()
+        Dim f = New C(4, 5, 6)
+    End Sub
+End Class", index:=2)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateConstructor)>
         Public Async Function TestInvokingFromInsideAnotherConstructor() As Task
             Await TestInRegularAndScriptAsync(

src/EditorFeatures/VisualBasicTest/GenerateConstructor/GenerateConstructorTests.vb

@@ -172,7 +172,7 @@ protected override ITypeSymbol GetAttributeArgumentType(
         protected override bool IsConversionImplicit(Compilation compilation, ITypeSymbol sourceType, ITypeSymbol targetType)
             => compilation.ClassifyConversion(sourceType, targetType).IsImplicit;
 
-        internal override IMethodSymbol GetDelegatingConstructor(
+        protected override IMethodSymbol GetDelegatingConstructor(
             State state,
             SemanticDocument document,
             int argumentCount,

src/Features/CSharp/Portable/GenerateConstructor/CSharpGenerateConstructorService.cs

@@ -1129,9 +1129,6 @@ This version used in: {2}</value>
   <data name="Convert_to_full_property" xml:space="preserve">
     <value>Convert to full property</value>
   </data>
-  <data name="Generate_constructor_in_0_without_fields" xml:space="preserve">
-    <value>Generate constructor in '{0}' (without fields)</value>
-  </data>
   <data name="Warning_Method_overrides_symbol_from_metadata" xml:space="preserve">
     <value>Warning: Method overrides symbol from metadata</value>
   </data>
@@ -2768,4 +2765,10 @@ Zero-width positive lookbehind assertions are typically used at the beginning of
   <data name="Document_must_be_contained_in_the_workspace_that_created_this_service" xml:space="preserve">
     <value>Document must be contained in the workspace that created this service</value>
   </data>
+  <data name="Generate_constructor_in_0_with_fields" xml:space="preserve">
+    <value>Generate constructor in '{0}' (with fields)</value>
+  </data>
+  <data name="Generate_constructor_in_0_with_properties" xml:space="preserve">
+    <value>Generate constructor in '{0}' (with properties)</value>
+  </data>
 </root>

src/Features/Core/Portable/FeaturesResources.resx

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -42,11 +42,9 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
                 //
                 // Otherwise, just generate a normal constructor that assigns any provided
                 // parameters into fields.
-                var parameterToExistingFieldMap = new Dictionary<string, ISymbol>();
+                var parameterToExistingFieldMap = ImmutableDictionary.CreateBuilder<string, ISymbol>();
                 for (var i = 0; i < _state.Parameters.Length; i++)
-                {
                     parameterToExistingFieldMap[_state.Parameters[i].Name] = _state.SelectedMembers[i];
-                }
 
                 var factory = _document.GetLanguageService<SyntaxGenerator>();
 
@@ -55,15 +53,16 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
                 var options = await _document.GetOptionsAsync(cancellationToken).ConfigureAwait(false);
                 var preferThrowExpression = _service.PrefersThrowExpression(options);
 
-                var (fields, constructor) = factory.CreateFieldDelegatingConstructor(
+                var members = factory.CreateMemberDelegatingConstructor(
                     semanticModel,
                     _state.ContainingType.Name,
                     _state.ContainingType,
                     _state.Parameters,
-                    parameterToExistingFieldMap,
-                    parameterToNewFieldMap: null,
+                    parameterToExistingFieldMap.ToImmutable(),
+                    parameterToNewMemberMap: null,
                     addNullChecks: _addNullChecks,
-                    preferThrowExpression: preferThrowExpression);
+                    preferThrowExpression: preferThrowExpression,
+                    generateProperties: false);
 
                 // If the user has selected a set of members (i.e. TextSpan is not empty), then we will
                 // choose the right location (i.e. null) to insert the constructor.  However, if they're 
@@ -76,7 +75,7 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
                 var result = await CodeGenerator.AddMemberDeclarationsAsync(
                     _document.Project.Solution,
                     _state.ContainingType,
-                    fields.Concat(constructor),
+                    members,
                     new CodeGenerationOptions(
                         contextLocation: syntaxTree.GetLocation(_state.TextSpan),
                         afterThisLocation: afterThisLocation),