/// Helper class to track the state necessary for finding/resolving conflicts in a
/// Helper class to track the state necessary for finding/resolving conflicts in a
/// rename session.
/// </summary>
privateclassSession
...
...
@@ -84,7 +84,7 @@ private class Session
privatestructConflictLocationInfo
{
// The span of the Node that needs to be complexified
// The span of the Node that needs to be complexified
publicreadonlyTextSpanComplexifiedSpan;
publicreadonlyDocumentIdDocumentId;
...
...
@@ -129,7 +129,7 @@ public async Task<MutableConflictResolution> ResolveConflictsAsync()
// If the 1st phase results in conflict then we perform then:
// 2nd phase is to expand and simplify only the reference locations with conflicts
// 3rd phase is to expand and simplify all the conflict locations (both reference and non-reference)
// If there are unresolved Conflicts after the 3rd phase then in 4th phase,
// If there are unresolved Conflicts after the 3rd phase then in 4th phase,
// We complexify and resolve locations that were resolvable and for the other locations we perform the normal token replacement like the first the phase.
// If the OptionSet has RenameFile to true, we rename files with the type declaration
for(varphase=0;phase<4;phase++)
...
...
@@ -209,7 +209,7 @@ public async Task<MutableConflictResolution> ResolveConflictsAsync()
}
}
// This rename could break implicit references of this symbol (e.g. rename MoveNext on a collection like type in a
// This rename could break implicit references of this symbol (e.g. rename MoveNext on a collection like type in a