Avoid rooting documents for languages that support syntax trees #67960
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
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
...rFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs
Show resolved
Hide resolved
...rFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs
Outdated
Show resolved
Hide resolved
|
I need to look at this in front of a computer. However, my recollection is that this type exists only for c#/vb. But I def could be wrong on that. If this is only for those two, we can likely simplify this. |
I definitely agree, but it seems like that could be a follow-up item. |
...rFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs
Outdated
Show resolved
Hide resolved
...rFeatures/Core/Classification/Syntactic/SyntacticClassificationTaggerProvider.TagComputer.cs
Outdated
Show resolved
Hide resolved
|
i'm ok with the general approach here (storing the root instead of the doc). But i feel you did the PR a disservice both with the nullability change and the static change. it just makes it a slog of passing data around :) |
| @@ -272,15 +282,18 @@ private async ValueTask ProcessChangesAsync(ImmutableSegmentedList<ITextSnapshot | |||
| Contract.ThrowIfTrue(snapshots.IsDefault || snapshots.IsEmpty); | |||
| var currentSnapshot = GetLatest(snapshots); | |||
|
|
|||
| var classificationService = TryGetClassificationService(currentSnapshot); | |||
| if (classificationService == null) | |||
| if (TryGetClassificationService(currentSnapshot) is not (var solutionServices, var classificationService)) | |||
| return; | |||
|
|
|||
| var currentDocument = currentSnapshot.GetOpenDocumentInCurrentContextWithChanges(); | |||
| if (currentDocument == null) | |||
There was a problem hiding this comment.
aside, this whole pattern is wonky. we get the document or not... so we dont need the helper for getting the classificationservice/solution-service. We could always just get that from currentDocument. Would simplify a lot it seems.
| @@ -69,7 +71,7 @@ internal partial class TagComputer | |||
| // get called. | |||
|
|
|||
| private readonly object _gate = new(); | |||
| private (ITextSnapshot? lastSnapshot, Document? lastDocument, SyntaxNode? lastRoot) _lastProcessedData; | |||
| private (ITextSnapshot lastSnapshot, SumType<SyntaxNode, Document> lastDocumentOrRoot)? _lastProcessedData; | |||
There was a problem hiding this comment.
i would intentionally doc that we want to drop teh Doc in the case where we have the root to ensure we're not holding onto old solutions. Then maybe a note that this could potentially be bad for other languages, but we can revisit as needed.
| { | ||
| // We don't have a syntax tree yet. Just do a lexical classification of the document. | ||
| AddLexicalClassifications(classificationService, span, classifiedSpans); | ||
| return; | ||
| } | ||
|
|
||
| // If we have a document, we must have a snapshot as well. | ||
| Contract.ThrowIfNull(lastProcessedSnapshot); |
There was a problem hiding this comment.
ok. i see why you made the invariant change. i'm ok with it :)
| else | ||
| classificationService.AddSyntacticClassifications(document.Project.Solution.Services, root, span.Span.ToTextSpan(), tempList, cancellationToken); | ||
| classificationService.AddSyntacticClassifications(solutionServices, root, span.Span.ToTextSpan(), tempList, cancellationToken); |
There was a problem hiding this comment.
nit, either consider flipping the if/else, or just do TryGetSecond in the above. but i don't feel strongly, something just minorly confused me here.
CyrusNajmabadi
approved these changes
Apr 25, 2023
|
all the feedback is nits, except the part about documenting things. i would ask that that be done :) |
|
@dotnet/roslyn-compiler I'm getting hit hard by this problem locally, but I'm not able to get the fix merged because bootstrap build is failing with this assertion. Can I get some help resolving it? |
jjonescz
reviewed
Apr 26, 2023
| @@ -291,7 +301,7 @@ private async ValueTask ProcessChangesAsync(ImmutableSegmentedList<ITextSnapshot | |||
|
|
|||
| lock (_gate) | |||
| { | |||
| _lastProcessedData = (currentSnapshot, currentDocument, currentRoot); | |||
| _lastProcessedData = (currentSnapshot, currentRoot is not null ? currentRoot : currentDocument); | |||
There was a problem hiding this comment.
I'm getting hit hard by this problem locally, but I'm not able to get the fix merged because bootstrap build is failing with this assertion. Can I get some help resolving it?
Looking. The assertion is hit when nullable walker visits this conditional operator. If you want a workaround, I guess you could try changing the code, e.g.:
Suggested change
| _lastProcessedData = (currentSnapshot, currentRoot is not null ? currentRoot : currentDocument); | |
| _lastProcessedData = (currentSnapshot, currentRoot ?? currentDocument); |
There was a problem hiding this comment.
Ah, this expression is special. I'll see if adding explicit casts helps.
There was a problem hiding this comment.
I filed #67975 and added the explicit casts, but then I realized I can use a modified version with ?? and switched to that.
ghost
added this to the 
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.
Addresses 17GB memory overhead observed in a local heap dump where 50+ documents were open.