Skip to content
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

Jump to bottom

Reduce allocations in AbstractStructureTaggerProvider.GetMultiLineRegions #74619

Merged
merged 2 commits into from
Jul 31, 2024
Merged

Reduce allocations in AbstractStructureTaggerProvider.GetMultiLineRegions #74619

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c827b23
Reduce allocations in AbstractStructureTaggerProvider.GetMultiLineReg…
ToddGrun Jul 31, 2024
c2980a3
Add comment for reasoning on why not using arraybuilder
ToddGrun Jul 31, 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
15 changes: 8 additions & 7 deletions src/EditorFeatures/Core/Structure/AbstractStructureTaggerProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,13 @@ private void ProcessSpans(
ImmutableArray<BlockSpan> spans)
{
var snapshot = snapshotSpan.Snapshot;
spans = GetMultiLineRegions(outliningService, spans, snapshot);

foreach (var span in spans)
// Use the returned enumerable directly instead of allocating into an array. The returned
// enumeration can contain a fairly large number of items for large files, so even
// using an ArrayBuilder could result in allocation issues without using a custom pool.
var multiLineSpans = GetMultiLineRegions(outliningService, spans, snapshot);
ToddGrun marked this conversation as resolved.
Show resolved Hide resolved

foreach (var span in multiLineSpans)
{
var tag = new StructureTag(this, span, snapshot);
context.AddTag(new TagSpan<IContainerStructureTag>(span.TextSpan.ToSnapshotSpan(snapshot), tag));
Expand All @@ -226,12 +230,11 @@ protected override bool TagEquals(IContainerStructureTag tag1, IContainerStructu

private static bool s_exceptionReported = false;

private static ImmutableArray<BlockSpan> GetMultiLineRegions(
private static IEnumerable<BlockSpan> GetMultiLineRegions(
BlockStructureService service,
ImmutableArray<BlockSpan> regions, ITextSnapshot snapshot)
{
// Remove any spans that aren't multiline.
var multiLineRegions = ArrayBuilder<BlockSpan>.GetInstance();
foreach (var region in regions)
{
if (region.TextSpan.Length > 0)
Expand Down Expand Up @@ -262,12 +265,10 @@ private static ImmutableArray<BlockSpan> GetMultiLineRegions(
var endLine = snapshot.GetLineNumberFromPosition(region.TextSpan.End);
if (startLine != endLine)
{
multiLineRegions.Add(region);
yield return region;
}
}
}

return multiLineRegions.ToImmutableAndFree();
}

#region Creating Preview Buffers
Expand Down
Loading