Change SupportedPlatformData to use ImmutableArrays #76658
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
I'm looking at a different change to completion and the usage of IEnumerable and List in SupportedPlatformData was tripping it up. It's easy enough to just have it use ImmutableArrays instead. One concern would be additional allocations due to the IEnumerable -> ImmutableArray conversion. However, I don't think is an issue as the IEnumerable member is always passed in from a List except from AbstractSignatureHelpProvider. In that case, it's a constructed Linq Select/Concat expression, which is reused multiple times (and potentially enumerated multiple times in SupportedPlatformData). It's extremely likely that it's better to just realize that array once.
dotnet-issue-labeler
bot
added
Area-IDE
untriaged
CyrusNajmabadi
approved these changes
Jan 7, 2025
| { | ||
| SupportedPlatformData? supportedPlatformData = null; | ||
| if (invalidProjectMap != null) | ||
| { | ||
| List<ProjectId>? invalidProjects = null; | ||
| ArrayBuilder<ProjectId>? invalidProjects = null; |
There was a problem hiding this comment.
Preference is the using form for me
There was a problem hiding this comment.
Will change the other ones, I don't think this one can be changed as it doesn't own the builders.
| @@ -299,7 +299,7 @@ private async Task<ImmutableArray<CompletionItem>> GetItemsAsync( | |||
| if (relatedDocumentIds.IsEmpty) | |||
| { | |||
| var itemsForCurrentDocument = await GetSymbolsAsync(completionContext, syntaxContext, position, options, cancellationToken).ConfigureAwait(false); | |||
| return CreateItems(completionContext, itemsForCurrentDocument, _ => syntaxContext, invalidProjectMap: null, totalProjects: null); | |||
| return CreateItems(completionContext, itemsForCurrentDocument, _ => syntaxContext, invalidProjectMap: null, totalProjects: ImmutableArray<ProjectId>.Empty); | |||
| @@ -395,17 +400,17 @@ protected async Task<ImmutableArray<SymbolAndSelectionInfo>> TryGetSymbolsForCon | |||
| /// <param name="symbolToContext">The symbols recommended in the active context.</param> | |||
| /// <param name="linkedContextSymbolLists">The symbols recommended in linked documents</param> | |||
| /// <returns>The list of projects each recommended symbol did NOT appear in.</returns> | |||
| private static Dictionary<ISymbol, List<ProjectId>> FindSymbolsMissingInLinkedContexts( | |||
| private static Dictionary<ISymbol, ArrayBuilder<ProjectId>> FindSymbolsMissingInLinkedContexts( | |||
There was a problem hiding this comment.
Does the consumer return these?
There was a problem hiding this comment.
caller (line 317) owns the freeing of these builders
| // We calculate the set of supported projects | ||
| var invalidProjects = ArrayBuilder<ProjectId>.GetInstance(); |
| @@ -277,7 +277,7 @@ symbolKeyItem.SymbolKey is not SymbolKey symbolKey || | |||
| symbolKey = SymbolKey.Create(methodSymbol.OriginalDefinition, cancellationToken); | |||
| } | |||
|
|
|||
| var invalidProjectsForCurrentSymbol = new List<ProjectId>(); | |||
| var invalidProjectsForCurrentSymbol = ArrayBuilder<ProjectId>.GetInstance(); | |||
This was referenced Jan 14, 2025
This was referenced Jan 23, 2025
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.
I'm looking at a different change to completion and the usage of IEnumerable and List in SupportedPlatformData was tripping it up. It's easy enough to just have it use ImmutableArrays instead.
One concern would be additional allocations due to the IEnumerable -> ImmutableArray conversion. However, I don't think this is an issue as the IEnumerable member is always passed in from a List except from AbstractSignatureHelpProvider. In that case, it's a constructed Linq Select/Concat expression, which is reused multiple times (and potentially enumerated multiple times in SupportedPlatformData). It's extremely likely that it's better to just realize that array once.