Only use formatter annotation.

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

@@ -10,9 +10,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeActions.ReplaceProp
     public class ReplacePropertyWithMethodsTests : AbstractCSharpCodeActionTest
     {
         protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace)
-        {
-            return new ReplacePropertyWithMethodsCodeRefactoringProvider();
-        }
+            => new ReplacePropertyWithMethodsCodeRefactoringProvider();
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplacePropertyWithMethods)]
         public async Task TestGetWithBody()
@@ -658,7 +656,7 @@ public async Task TestIndentation()
 }",
 @"class C
 {
-    int GetFoo()
+    private int GetFoo()
     {
         int count;
         foreach (var x in y)

src/EditorFeatures/VisualBasicTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.vb

@@ -622,7 +622,7 @@ end class")
 end class",
 "class C
     Public ReadOnly Property Prop As Integer
-        Get 
+        Get
             dim count = 0
             for each x in y
                 count = count + z

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

@@ -111,7 +111,7 @@ public override SyntaxNode GetPropertyDeclaration(SyntaxToken token)
             var statements = new List<SyntaxNode>();
             if (setAccessorDeclaration?.Body != null)
             {
-                statements.AddRange(setAccessorDeclaration.Body.Statements.Select(WithMarkerAndAnnotation));
+                statements.AddRange(setAccessorDeclaration.Body.Statements.Select(WithFormattingAnnotation));
             }
             else if (propertyBackingField != null)
             {
@@ -124,9 +124,8 @@ public override SyntaxNode GetPropertyDeclaration(SyntaxToken token)
             return generator.MethodDeclaration(setMethod, desiredSetMethodName, statements);
         }
 
-        private static StatementSyntax WithMarkerAndAnnotation(StatementSyntax statement)
-            => statement.WithPrependedLeadingTrivia(SyntaxFactory.ElasticMarker)
-                        .WithAdditionalAnnotations(Formatter.Annotation);
+        private static StatementSyntax WithFormattingAnnotation(StatementSyntax statement)
+            => statement.WithAdditionalAnnotations(Formatter.Annotation);
 
         private static SyntaxNode GetGetMethod(
             SyntaxGenerator generator,
@@ -154,7 +153,7 @@ private static StatementSyntax WithMarkerAndAnnotation(StatementSyntax statement
                 var getAccessorDeclaration = (AccessorDeclarationSyntax)getMethod.DeclaringSyntaxReferences[0].GetSyntax(cancellationToken);
                 if (getAccessorDeclaration?.Body != null)
                 {
-                    statements.AddRange(getAccessorDeclaration.Body.Statements.Select(WithMarkerAndAnnotation));
+                    statements.AddRange(getAccessorDeclaration.Body.Statements.Select(WithFormattingAnnotation));
                 }
                 else if (propertyBackingField != null)
                 {

src/Features/VisualBasic/Portable/ReplacePropertyWithMethods/VisualBasicReplacePropertyWithMethods.vb

@@ -111,7 +111,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.ReplaceMethodWithP
 
             If TypeOf getAccessorDeclaration?.Parent Is AccessorBlockSyntax Then
                 Dim block = DirectCast(getAccessorDeclaration.Parent, AccessorBlockSyntax)
-                statements.AddRange(block.Statements.Select(AddressOf WithMarkerAndAnnotation))
+                statements.AddRange(block.Statements.Select(AddressOf WithFormattingAnnotation))
             ElseIf propertyBackingField IsNot Nothing Then
                 Dim fieldReference = GetFieldReference(generator, propertyBackingField)
                 statements.Add(generator.ReturnStatement(fieldReference))
@@ -120,9 +120,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.ReplaceMethodWithP
             Return generator.MethodDeclaration(getMethod, desiredGetMethodName, statements)
         End Function
 
-        Private Shared Function WithMarkerAndAnnotation(statement As StatementSyntax) As StatementSyntax
-            Return statement.WithPrependedLeadingTrivia(SyntaxFactory.ElasticMarker).
-                             WithAdditionalAnnotations(Formatter.Annotation)
+        Private Shared Function WithFormattingAnnotation(statement As StatementSyntax) As StatementSyntax
+            Return statement.WithAdditionalAnnotations(Formatter.Annotation)
         End Function
 
         Private Function GetSetMethod(
@@ -140,7 +139,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeRefactorings.ReplaceMethodWithP
 
             If TypeOf setAccessorDeclaration?.Parent Is AccessorBlockSyntax Then
                 Dim block = DirectCast(setAccessorDeclaration.Parent, AccessorBlockSyntax)
-                statements.AddRange(block.Statements.Select(AddressOf WithMarkerAndAnnotation))
+                statements.AddRange(block.Statements.Select(AddressOf WithFormattingAnnotation))
             ElseIf propertyBackingField IsNot Nothing Then
                 Dim fieldReference = GetFieldReference(generator, propertyBackingField)
                 statements.Add(generator.AssignmentStatement(