Bugfix fix.

src/EditorFeatures/CSharpTest/CodeActions/ReplaceMethodWithProperty/ReplaceMethodWithPropertyTests.cs

@@ -162,6 +162,29 @@ int Goo
 }");
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)]
+        public async Task TestMethodWithTrailingTrivia()
+        {
+            await TestWithAllCodeStyleOff(
+@"class C
+{
+    int [||]GetP();
+    bool M()
+    {
+        return GetP() == 0;
+    }
+}",
+@"class C
+{
+    int P { get; }
+
+    bool M()
+    {
+        return P == 0;
+    }
+}");
+        }
+
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)]
         public async Task TestIndentation()
         {

src/Features/CSharp/Portable/ReplaceMethodWithProperty/CSharpReplaceMethodWithPropertyService.cs

@@ -376,11 +376,12 @@ public void ReplaceSetReference(SyntaxEditor editor, SyntaxToken nameToken, stri
                 return;
             }
 
+            var invocation = nameNode?.FirstAncestorOrSelf<InvocationExpressionSyntax>();
+
             var newName = nameChanged
-                ? SyntaxFactory.IdentifierName(SyntaxFactory.Identifier(propertyName).WithTriviaFrom(nameToken))
+                ? SyntaxFactory.IdentifierName(SyntaxFactory.Identifier(propertyName).WithLeadingTrivia(nameToken.LeadingTrivia).WithTrailingTrivia(invocation?.ArgumentList?.CloseParenToken.TrailingTrivia))
                 : nameNode;
 
-            var invocation = nameNode?.FirstAncestorOrSelf<InvocationExpressionSyntax>();
             var invocationExpression = invocation?.Expression;
             if (!IsInvocationName(nameNode, invocationExpression))
             {