Remove parameter

Author: CyrusNajmabadi

src/EditorFeatures/Test2/Rename/RenameEngineResult.vb

@@ -136,7 +136,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
                 Dim locations = Renamer.FindRenameLocationsAsync(
                     solution, symbol, renameOptions, CancellationToken.None).GetAwaiter().GetResult()
 
-                Return locations.ResolveConflictsAsync(symbol, renameTo, nonConflictSymbolKeys:=Nothing, CancellationToken.None).GetAwaiter().GetResult()
+                Return locations.ResolveConflictsAsync(symbol, renameTo, CancellationToken.None).GetAwaiter().GetResult()
             Else
                 ' This tests that rename properly works when the entire call is remoted to OOP and the final result is
                 ' marshaled back.

src/Features/Core/Portable/EncapsulateField/AbstractEncapsulateFieldService.cs

@@ -287,7 +287,7 @@ private static async Task<Solution> RenameAsync(
         // edit the files in the current project
         var resolution = await initialLocations
             .Filter((documentId, span) => !linkedProjectIds.Contains(documentId.ProjectId) && filter(documentId, span))
-            .ResolveConflictsAsync(field, finalName, nonConflictSymbolKeys: default, cancellationToken).ConfigureAwait(false);
+            .ResolveConflictsAsync(field, finalName, cancellationToken).ConfigureAwait(false);
 
         Contract.ThrowIfFalse(resolution.IsSuccessful);
 

src/LanguageServer/Protocol/Handler/Rename/RenameHandler.cs

@@ -54,9 +54,7 @@ internal sealed class RenameHandler() : ILspServiceDocumentRequestHandler<LSP.Re
             cancellationToken).ConfigureAwait(false);
 
         var renameReplacementInfo = await renameLocationSet.ResolveConflictsAsync(
-            symbolicRenameInfo.Symbol, symbolicRenameInfo.GetFinalSymbolName(newName),
-            nonConflictSymbolKeys: default,
-            cancellationToken).ConfigureAwait(false);
+            symbolicRenameInfo.Symbol, symbolicRenameInfo.GetFinalSymbolName(newName), cancellationToken).ConfigureAwait(false);
 
         if (!renameReplacementInfo.IsSuccessful ||
             !renameReplacementInfo.ReplacementTextValid)

src/Workspaces/Core/Portable/Rename/LightweightRenameLocations.cs

@@ -114,7 +114,7 @@ public static async Task<LightweightRenameLocations> FindRenameLocationsAsync(
             renameLocations.ReferencedSymbols.SelectAsArray(sym => SerializableSymbolAndProjectId.Dehydrate(solution, sym, cancellationToken)));
     }
 
-    public Task<ConflictResolution> ResolveConflictsAsync(ISymbol symbol, string replacementText, ImmutableArray<SymbolKey> nonConflictSymbolKeys, CancellationToken cancellationToken)
+    public Task<ConflictResolution> ResolveConflictsAsync(ISymbol symbol, string replacementText, CancellationToken cancellationToken)
         => ConflictResolver.ResolveLightweightConflictsAsync(symbol, this, replacementText, cancellationToken);
 
     public LightweightRenameLocations Filter(Func<DocumentId, TextSpan, bool> filter)