提交 e4d788ef 编写于 作者: C Cyrus Najmabadi

Remove origina name parameter. it's redundant.

上级 fe728891
......@@ -40,8 +40,8 @@ private InlineRenameLocation ConvertLocation(RenameLocation location)
public async Task<IInlineRenameReplacementInfo> GetReplacementsAsync(string replacementText, OptionSet optionSet, CancellationToken cancellationToken)
{
var conflicts = await ConflictResolver.ResolveConflictsAsync(
_renameLocationSet, _renameLocationSet.Symbol.Name,
_renameInfo.GetFinalSymbolName(replacementText), nonConflictSymbols: null, cancellationToken: cancellationToken).ConfigureAwait(false);
_renameLocationSet, _renameInfo.GetFinalSymbolName(replacementText),
nonConflictSymbols: null, cancellationToken: cancellationToken).ConfigureAwait(false);
return new InlineRenameReplacementInfo(conflicts);
}
......
......@@ -79,7 +79,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
Dim locations = RenameLocations.FindAsync(symbolAndProjectId, workspace.CurrentSolution, optionSet, CancellationToken.None).Result
Dim originalName = symbol.Name.Split("."c).Last()
Dim result = ConflictResolver.ResolveConflictsAsync(locations, originalName, renameTo, nonConflictSymbols:=Nothing, cancellationToken:=CancellationToken.None).Result
Dim result = ConflictResolver.ResolveConflictsAsync(locations, renameTo, nonConflictSymbols:=Nothing, cancellationToken:=CancellationToken.None).Result
engineResult = New RenameEngineResult(workspace, result, renameTo)
engineResult.AssertUnlabeledSpansRenamedAndHaveNoConflicts()
......
......@@ -56,14 +56,13 @@ private class Session
public Session(
RenameLocations renameLocationSet,
Location renameSymbolDeclarationLocation,
string originalText,
string replacementText,
ImmutableHashSet<ISymbol> nonConflictSymbols,
CancellationToken cancellationToken)
{
_renameLocationSet = renameLocationSet;
_renameSymbolDeclarationLocation = renameSymbolDeclarationLocation;
_originalText = originalText;
_originalText = renameLocationSet.Symbol.Name;
_replacementText = replacementText;
_optionSet = renameLocationSet.Options;
_nonConflictSymbols = nonConflictSymbols;
......
......@@ -41,7 +41,6 @@ internal static partial class ConflictResolver
/// resolves them where possible.
/// </summary>
/// <param name="renameLocationSet">The locations to perform the renaming at.</param>
/// <param name="originalText">The original name of the identifier.</param>
/// <param name="replacementText">The new name of the identifier</param>
/// <param name="nonConflictSymbols">Used after renaming references. References that now bind to any of these
/// symbols are not considered to be in conflict. Useful for features that want to rename existing references to
......@@ -51,7 +50,6 @@ internal static partial class ConflictResolver
/// <returns>A conflict resolution containing the new solution.</returns>
public static Task<ConflictResolution> ResolveConflictsAsync(
RenameLocations renameLocationSet,
string originalText,
string replacementText,
ImmutableHashSet<ISymbol> nonConflictSymbols,
CancellationToken cancellationToken)
......@@ -68,8 +66,7 @@ internal static partial class ConflictResolver
var session = new Session(
renameLocationSet, renameSymbolDeclarationLocation,
originalText, replacementText,
nonConflictSymbols, cancellationToken);
replacementText, nonConflictSymbols, cancellationToken);
return session.ResolveConflictsAsync();
}
......
......@@ -61,8 +61,7 @@ public static class Renamer
cancellationToken.ThrowIfCancellationRequested();
var conflictResolution = await ConflictResolver.ResolveConflictsAsync(
locations, locations.SymbolAndProjectId.Symbol.Name, newName,
nonConflictSymbols, cancellationToken).ConfigureAwait(false);
locations, newName, nonConflictSymbols, cancellationToken).ConfigureAwait(false);
return conflictResolution.NewSolution;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册