Preserve trailing trivia in 'Replace Proprty with Methods'

src/EditorFeatures/CSharpTest/CodeActions/ReplacePropertyWithMethods/ReplacePropertyWithMethodsTests.cs

@@ -280,6 +280,23 @@ public async Task TestComputedProp()
 }");
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplacePropertyWithMethods)]
+        public async Task TestComputedPropWithTrailingTrivia()
+        {
+            await TestAsync(
+@"class C
+{
+    int [||]Prop => 1; // Comment
+}",
+@"class C
+{
+    private int GetProp()
+    {
+        return 1; // Comment
+    }
+}", compareTokens: false);
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplacePropertyWithMethods)]
         public async Task TestAbstractProperty()
         {

src/Features/CSharp/Portable/ReplacePropertyWithMethods/CSharpReplacePropertyWithMethodsService.cs

@@ -63,7 +63,8 @@ public override SyntaxNode GetPropertyDeclaration(SyntaxToken token)
 
         private List<SyntaxNode> ConvertPropertyToMembers(
             SyntaxGenerator generator, 
-            IPropertySymbol property, PropertyDeclarationSyntax propertyDeclaration,
+            IPropertySymbol property,
+            PropertyDeclarationSyntax propertyDeclaration,
             IFieldSymbol propertyBackingField,
             string desiredGetMethodName,
             string desiredSetMethodName,
@@ -134,7 +135,9 @@ public override SyntaxNode GetPropertyDeclaration(SyntaxToken token)
 
             if (propertyDeclaration.ExpressionBody != null)
             {
-                statements.Add(generator.ReturnStatement(propertyDeclaration.ExpressionBody.Expression));
+                var returnStatement = SyntaxFactory.ReturnStatement(propertyDeclaration.ExpressionBody.Expression)
+                                                   .WithSemicolonToken(propertyDeclaration.SemicolonToken);
+                statements.Add(returnStatement);
             }
             else
             {