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

Reduce allocations in AbstractAsynchronousTaggerProvider.ComputeDifference #75639

Merged
merged 1 commit into from
Nov 4, 2024
Merged

Reduce allocations in AbstractAsynchronousTaggerProvider.ComputeDifference #75639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions src/EditorFeatures/Core/Shared/Tagging/Utilities/TagSpanIntervalTree.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,14 @@ public void AddAllSpans(ITextSnapshot textSnapshot, SegmentedList<TagSpan<TTag>>
tagSpans.Add(GetTranslatedTagSpan(tagSpan, textSnapshot));
}

/// <inheritdoc cref="AddAllSpans(ITextSnapshot, HashSet{TagSpan{TTag}})"/>
/// <remarks>Spans will be added in sorted order</remarks>
public void AddAllSpans(ITextSnapshot textSnapshot, SegmentedList<(SnapshotSpan, TTag)> tagSpans)
{
foreach (var tagSpan in _tree)
tagSpans.Add((GetTranslatedSpan(tagSpan, textSnapshot, _spanTrackingMode), tagSpan.Tag));
}

/// <summary>
/// Removes from <paramref name="tagSpans"/> all the tags spans in <see langword="this"/> that intersect with any of
/// the spans in <paramref name="snapshotSpansToRemove"/>.
Expand Down
16 changes: 8 additions & 8 deletions src/EditorFeatures/Core/Tagging/AbstractAsynchronousTaggerProvider.TagSource_ProduceTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,8 @@ private DiffResult ComputeDifference(
TagSpanIntervalTree<TTag> latestTree,
TagSpanIntervalTree<TTag> previousTree)
{
using var _1 = SegmentedListPool.GetPooledList<TagSpan<TTag>>(out var latestSpans);
using var _2 = SegmentedListPool.GetPooledList<TagSpan<TTag>>(out var previousSpans);
using var _1 = SegmentedListPool.GetPooledList<(SnapshotSpan, TTag)>(out var latestSpans);
using var _2 = SegmentedListPool.GetPooledList<(SnapshotSpan, TTag)>(out var previousSpans);

using var _3 = ArrayBuilder<SnapshotSpan>.GetInstance(out var added);
using var _4 = ArrayBuilder<SnapshotSpan>.GetInstance(out var removed);
Expand All @@ -646,8 +646,8 @@ private DiffResult ComputeDifference(

while (latest != null && previous != null)
{
var latestSpan = latest.Span;
var previousSpan = previous.Span;
var latestSpan = latest.Value.Span;
var previousSpan = previous.Value.Span;

if (latestSpan.Start < previousSpan.Start)
{
Expand Down Expand Up @@ -675,7 +675,7 @@ private DiffResult ComputeDifference(
}
else
{
if (!_dataSource.TagEquals(latest.Tag, previous.Tag))
if (!_dataSource.TagEquals(latest.Value.Tag, previous.Value.Tag))
added.Add(latestSpan);

latest = NextOrNull(ref latestEnumerator);
Expand All @@ -686,19 +686,19 @@ private DiffResult ComputeDifference(

while (latest != null)
{
added.Add(latest.Span);
added.Add(latest.Value.Span);
latest = NextOrNull(ref latestEnumerator);
}

while (previous != null)
{
removed.Add(previous.Span);
removed.Add(previous.Value.Span);
previous = NextOrNull(ref previousEnumerator);
}

return new DiffResult(new(added), new(removed));

static TagSpan<TTag>? NextOrNull(ref SegmentedList<TagSpan<TTag>>.Enumerator enumerator)
static (SnapshotSpan Span, TTag Tag)? NextOrNull(ref SegmentedList<(SnapshotSpan, TTag)>.Enumerator enumerator)
=> enumerator.MoveNext() ? enumerator.Current : null;
}

Expand Down
Loading