Merge pull request #48231 from louis-z/issue-48133

CSharpConvertAutoPropertyToFullProperty... handles init accessor
dotnet · Oct 2, 2020 · e4c91a3 · e4c91a3
2 parents 2e37d69 + ae519a8
commit e4c91a3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/...es/CSharpTest/ConvertAutoPropertyToFullProperty/ConvertAutoPropertyToFullPropertyTests.cs b/...es/CSharpTest/ConvertAutoPropertyToFullProperty/ConvertAutoPropertyToFullPropertyTests.cs
@@ -22,32 +22,34 @@ public partial class ConvertAutoPropertyToFullPropertyTests : AbstractCSharpCode
         protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace, TestParameters parameters)
             => new CSharpConvertAutoPropertyToFullPropertyCodeRefactoringProvider();
 
-        [Fact, Trait(Traits.Feature, Traits.Features.ConvertAutoPropertyToFullProperty)]
-        public async Task SimpleAutoPropertyTest()
+        [Theory, Trait(Traits.Feature, Traits.Features.ConvertAutoPropertyToFullProperty)]
+        [InlineData("set"), InlineData("init")]
+        [WorkItem(48133, "https://github.com/dotnet/roslyn/issues/48133")]
+        public async Task SimpleAutoPropertyTest(string setter)
         {
-            var text = @"
+            var text = $@"
 class TestClass
-{
-    public int G[||]oo { get; set; }
-}
+{{
+    public int G[||]oo {{ get; {setter}; }}
+}}
 ";
-            var expected = @"
+            var expected = $@"
 class TestClass
-{
+{{
     private int goo;
 
     public int Goo
-    {
+    {{
         get
-        {
+        {{
             return goo;
-        }
-        set
-        {
+        }}
+        {setter}
+        {{
             goo = value;
-        }
-    }
-}
+        }}
+    }}
+}}
 ";
             await TestInRegularAndScriptAsync(text, expected, options: DoNotPreferExpressionBodiedAccessors);
         }

diff --git a/...oPropertyToFullProperty/CSharpConvertAutoPropertyToFullPropertyCodeRefactoringProvider.cs b/...oPropertyToFullProperty/CSharpConvertAutoPropertyToFullPropertyCodeRefactoringProvider.cs
@@ -72,7 +72,8 @@ internal override (SyntaxNode newGetAccessor, SyntaxNode newSetAccessor) GetNewA
         private static (AccessorDeclarationSyntax getAccessor, AccessorDeclarationSyntax setAccessor)
             GetExistingAccessors(AccessorListSyntax accessorListSyntax)
             => (accessorListSyntax.Accessors.FirstOrDefault(a => a.IsKind(SyntaxKind.GetAccessorDeclaration)),
-                accessorListSyntax.Accessors.FirstOrDefault(a => a.IsKind(SyntaxKind.SetAccessorDeclaration)));
+                accessorListSyntax.Accessors.FirstOrDefault(a => a.IsKind(SyntaxKind.SetAccessorDeclaration) ||
+                                                                 a.IsKind(SyntaxKind.InitAccessorDeclaration)));
 
         private static SyntaxNode GetUpdatedAccessor(DocumentOptionSet options,
             SyntaxNode accessor, SyntaxNode statement)