Reduce LOH allocs when applying code fixes. #73424
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
May 10, 2024
| @@ -16,7 +16,7 @@ internal abstract class AbstractLinkedFileMergeConflictCommentAdditionService : | |||
| { | |||
| internal abstract string GetConflictCommentText(string header, string beforeString, string afterString); | |||
|
|
|||
| public IEnumerable<TextChange> CreateEdits(SourceText originalSourceText, IEnumerable<UnmergedDocumentChanges> unmergedChanges) | |||
| public List<TextChange> CreateEdits(SourceText originalSourceText, List<UnmergedDocumentChanges> unmergedChanges) | |||
There was a problem hiding this comment.
changed a lot of the APIs to not be IEnumerable-bases (as it's impossible to tell what is lazy and waht isn't). this also means things like enumerations don't allocate.
CyrusNajmabadi
commented
May 10, 2024
| var textchanges = await textDiffService.GetTextChangesAsync(oldDocument, newDocument, cancellationToken).ConfigureAwait(false); | ||
| foreach (var change in textchanges) | ||
| var textChanges = await textDiffService.GetTextChangesAsync( | ||
| oldDocument, newDocument, TextDifferenceTypes.Line, cancellationToken).ConfigureAwait(false); |
There was a problem hiding this comment.
switching to Line-based-diff is a major win here. We normally do word-based, which leads to massive allocations in hte VS side (they're the impl of this service).
|
@ToddGrun ptal. |
ToddGrun
reviewed
May 10, 2024
| @@ -9,9 +9,9 @@ | |||
|
|
|||
| namespace Microsoft.CodeAnalysis; | |||
|
|
|||
| internal sealed class UnmergedDocumentChanges(IEnumerable<TextChange> unmergedChanges, string projectName, DocumentId documentId) | |||
ToddGrun
reviewed
May 10, 2024
| oldDocument.Project.Name, | ||
| oldDocument.Id)); | ||
| } | ||
|
|
||
| return successfullyMergedChanges.ToImmutableAndFree(); | ||
| return successfullyMergedChanges.ToImmutable(); |
CyrusNajmabadi
commented
May 10, 2024
src/Workspaces/Core/Portable/LinkedFileDiffMerging/LinkedFileDiffMergingSession.cs
Outdated
Show resolved
Hide resolved
…iffMergingSession.cs
ToddGrun
reviewed
May 10, 2024
| @@ -309,7 +309,7 @@ public void LogLinkedFileResult(LinkedFileGroupSessionInfo info) | |||
| => LinkedFileGroups.Add(info); | |||
| } | |||
|
|
|||
| internal class LinkedFileGroupSessionInfo | |||
| internal sealed class LinkedFileGroupSessionInfo | |||
This was referenced May 15, 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.
Drops LOH allocs from 1.1GB:
to around 50mb: