Merge pull request #42714 from YairHalberstadt/unique-name-replace-method-with-property

GenerateUniqueName for ReplaceMethodWithProperty

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

@@ -2335,6 +2335,30 @@ int GetGoo()
 }");
         }
 
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)]
+        [WorkItem(42699, "https://github.com/dotnet/roslyn/issues/42699")]
+        public async Task TestSameNameMemberAsProperty()
+        {
+            await TestInRegularAndScript1Async(
+@"class C
+{
+    int Goo;
+    [||]int GetGoo()
+    {
+    }
+}",
+@"class C
+{
+    int Goo;
+    int Goo1
+    {
+        get
+        {
+        }
+    }
+}");
+        }
+
         private async Task TestWithAllCodeStyleOff(
             string initialMarkup, string expectedMarkup,
             ParseOptions parseOptions = null, int index = 0)

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

@@ -911,5 +911,41 @@ end class")
     End Function
 end class")
         End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)>
+        <WorkItem(42699, "https://github.com/dotnet/roslyn/issues/42699")>
+        Public Async Function TestSameNameMemberAsProperty() As Task
+            Await TestInRegularAndScriptAsync(
+"class C
+    Public Goo as integer
+    function [||]GetGoo() as integer
+    End function
+End class",
+"class C
+    Public Goo as integer
+    ReadOnly Property Goo1 as integer
+        Get
+        End Get
+    End Property
+End class")
+        End Function
+
+        <Fact, Trait(Traits.Feature, Traits.Features.CodeActionsReplaceMethodWithProperty)>
+        <WorkItem(42699, "https://github.com/dotnet/roslyn/issues/42699")>
+        Public Async Function TestSameNameMemberAsPropertyDifferentCase() As Task
+            Await TestInRegularAndScriptAsync(
+"class C
+    Public goo as integer
+    function [||]GetGoo() as integer
+    End function
+End class",
+"class C
+    Public goo as integer
+    ReadOnly Property Goo1 as integer
+        Get
+        End Get
+    End Property
+End class")
+        End Function
     End Class
 End Namespace

src/Features/Core/Portable/ReplaceMethodWithProperty/ReplaceMethodWithPropertyCodeRefactoringProvider.cs

@@ -14,6 +14,7 @@
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.FindSymbols;
 using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Shared.Utilities;
 using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.ReplaceMethodWithProperty
@@ -58,7 +59,9 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
 
             var hasGetPrefix = HasGetPrefix(methodName);
             var propertyName = hasGetPrefix
-                ? methodName.Substring(GetPrefix.Length)
+                ? NameGenerator.GenerateUniqueName(
+                    methodName.Substring(GetPrefix.Length),
+                    n => !methodSymbol.ContainingType.GetMembers(n).Any())
                 : methodName;
             var nameChanged = hasGetPrefix;