Reduce time spent in ConflictResolver.Session.GetNodesOrTokensToCheckForConflicts #74101
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ForConflicts This method previoulsy realized/walked the whole tree to try to find annotations to search for in it's AnnotationTable. Instead, use the GetAnnotatedNodesAndTokens to limit the search to only those areas of the tree that contain annotations. This showed up in a profile I took of a lightbulb session which showed the preview window.
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
| { | ||
| foreach (var lambda in lambdas) | ||
| if (_conflictLocations.Any(cf => cf.Contains(lambda.Span))) |
There was a problem hiding this comment.
no 'any' that takes an arg?
There was a problem hiding this comment.
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.
| @@ -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) | |||
| @@ -505,9 +505,13 @@ private async Task DebugVerifyNoErrorsAsync(MutableConflictResolution conflictRe | |||
| private IEnumerable<(SyntaxNodeOrToken syntax, RenameActionAnnotation annotation)> GetNodesOrTokensToCheckForConflicts( | |||
| SyntaxNode syntaxRoot) | |||
| { | |||
| return syntaxRoot.DescendantNodesAndTokens(descendIntoTrivia: true) | |||
CyrusNajmabadi
approved these changes
Jun 25, 2024
This was referenced Jul 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This method previoulsy realized/walked the whole tree to try to find annotations to search for in it's AnnotationTable. Instead, use the GetAnnotatedNodesAndTokens to limit the search to only those areas of the tree that contain annotations.
This showed up in a profile I took of a lightbulb session which showed the preview window.