Skip to content

Reduce time spent in ConflictResolver.Session.GetNodesOrTokensToCheckForConflicts #74101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 25, 2024
Merged

Reduce time spent in ConflictResolver.Session.GetNodesOrTokensToCheckForConflicts #74101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1d3ebf2
Reduce time spent in ConflictResolver.Session.GetNodesOrTokensToCheck…
ToddGrun Jun 21, 2024
6e163a3
Get rid of some Count linq calls that show up in this area too
ToddGrun Jun 21, 2024
03ae6d4
Merge branch 'dotnet:main' into dev/toddgrun/ConflictResolverPerf
ToddGrun Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions src/Workspaces/CSharp/Portable/Rename/CSharpRenameRewriterLanguageService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,12 @@ public RenameRewriter(RenameRewriterParameters parameters)

var isInConflictLambdaBody = false;
var lambdas = node.GetAncestorsOrThis(n => n is SimpleLambdaExpressionSyntax or ParenthesizedLambdaExpressionSyntax);
if (lambdas.Count() != 0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YIKES

foreach (var lambda in lambdas)
{
foreach (var lambda in lambdas)
if (_conflictLocations.Any(cf => cf.Contains(lambda.Span)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no 'any' that takes an arg?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There isn't one available, and the only current extension methods we have on ImmutableHashSet are in the compiler, and I didn't want to change that in this PR.

{
if (_conflictLocations.Any(cf => cf.Contains(lambda.Span)))
{
isInConflictLambdaBody = true;
break;
}
isInConflictLambdaBody = true;
break;
}
}

Expand Down Expand Up @@ -298,7 +295,7 @@ private SyntaxNode Complexify(SyntaxNode originalNode, SyntaxNode newNode)
RoslynDebug.Assert(_speculativeModel != null, "expanding a syntax node which cannot be speculated?");

var oldSpan = originalNode.Span;
var expandParameter = originalNode.GetAncestorsOrThis(n => n is SimpleLambdaExpressionSyntax or ParenthesizedLambdaExpressionSyntax).Count() == 0;
var expandParameter = !originalNode.GetAncestorsOrThis(n => n is SimpleLambdaExpressionSyntax or ParenthesizedLambdaExpressionSyntax).Any();

newNode = _simplificationService.Expand(newNode,
_speculativeModel,
Expand Down
10 changes: 7 additions & 3 deletions src/Workspaces/Core/Portable/Rename/ConflictEngine/ConflictResolver.Session.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,9 +505,13 @@ private static bool IsConflictFreeChange(
private IEnumerable<(SyntaxNodeOrToken syntax, RenameActionAnnotation annotation)> GetNodesOrTokensToCheckForConflicts(
SyntaxNode syntaxRoot)
{
return syntaxRoot.DescendantNodesAndTokens(descendIntoTrivia: true)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

YIKES

.Where(_renameAnnotations.HasAnnotations<RenameActionAnnotation>)
.Select(s => (s, _renameAnnotations.GetAnnotations<RenameActionAnnotation>(s).Single()));
foreach (var nodeOrToken in syntaxRoot.GetAnnotatedNodesAndTokens(RenameAnnotation.Kind))
{
var annotation = _renameAnnotations.GetAnnotations<RenameActionAnnotation>(nodeOrToken).FirstOrDefault();

if (annotation != null)
yield return (nodeOrToken, annotation);
}
}

private async Task<bool> CheckForConflictAsync(
Expand Down