Simplify passing around of FAR symbol groups #74358
Merged
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
CyrusNajmabadi
commented
Jul 11, 2024
| { | ||
| cancellationToken.ThrowIfCancellationRequested(); | ||
|
|
||
| using (Logger.LogBlock(FunctionId.FindReference_ProcessDocumentAsync, cancellationToken)) | ||
| { | ||
| // This is safe to just blindly read. We can only ever get here after the call to ReportGroupsAsync | ||
| // happened. So there must be a group for this symbol in our map. | ||
| var group = _symbolToGroup[symbol]; |
There was a problem hiding this comment.
the crux of hte change is that instead of having a collection be blindly written and read from from disparate locations, we just take t6he point that we write the data initially and pass that data along all the way to here so we're never out of sync.
CyrusNajmabadi
commented
Jul 11, 2024
.../Portable/FindSymbols/FindReferences/FindReferencesSearchEngine_FindReferencesInDocuments.cs
Outdated
Show resolved
Hide resolved
CyrusNajmabadi
commented
Jul 11, 2024
.../Portable/FindSymbols/FindReferences/FindReferencesSearchEngine_FindReferencesInDocuments.cs
Outdated
Show resolved
Hide resolved
…ferencesSearchEngine_FindReferencesInDocuments.cs
CyrusNajmabadi
commented
Jul 11, 2024
| /// </summary> | ||
| private readonly ConcurrentDictionary<ISymbol, SymbolGroup> _symbolToGroup = new(MetadataUnifyingEquivalenceComparer.Instance); |
There was a problem hiding this comment.
removed this from being ambient state to just being a normal scratch buffer created within the Far algorithm (like all the other maps/sets/lists it has.
CyrusNajmabadi
commented
Jul 11, 2024
| foreach (var symbol in symbols) | ||
| await ReportGroupAsync(symbol, cancellationToken).ConfigureAwait(false); | ||
| result.Add((symbol, await ReportGroupSeriallyAsync(symbol, symbolToGroup, cancellationToken).ConfigureAwait(false))); |
There was a problem hiding this comment.
here we ensure that the symbol and its group always travel together.
…ferencesSearchEngine_FindReferencesInDocuments.cs
|
@dibarbet ptal. |
dibarbet
reviewed
Jul 11, 2024
| } | ||
| private static readonly ObjectPool<Dictionary<ISymbol, SymbolGroup>> s_symbolToGroupPool = new(() => new(MetadataUnifyingEquivalenceComparer.Instance)); | ||
|
|
||
| private readonly Solution _solution = solution; |
There was a problem hiding this comment.
why do these need to be reassigned?
src/Workspaces/Core/Portable/FindSymbols/FindReferences/FindReferencesSearchEngine.cs
Outdated
Show resolved
Hide resolved
dibarbet
approved these changes
Jul 11, 2024
This was referenced Jul 16, 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.
Fixes #70850
Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2135708