mergeEditor: optimize removeDiffs from O(K*N) to single-pass O(N)#304404
Merged
hediet merged 1 commit intomicrosoft:mainfrom Mar 25, 2026
Merged
mergeEditor: optimize removeDiffs from O(K*N) to single-pass O(N)#304404hediet merged 1 commit intomicrosoft:mainfrom
hediet merged 1 commit intomicrosoft:mainfrom
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
This PR optimizes TextModelDiffs.removeDiffs() in the merge editor model to avoid repeated full-array passes when removing multiple diffs, aiming to improve responsiveness when accepting/rejecting many conflicts.
Changes:
- Replaces the per-diff
filter+maploop with a single-pass rebuild of the diffs array. - Adds a pre-validation step to ensure all diffs-to-remove exist before applying edits.
- Keeps bottom-up edit application to avoid range shifting during
pushEditOperations.
src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
Outdated
Show resolved
Hide resolved
src/vs/workbench/contrib/mergeEditor/browser/model/textModelDiffs.ts
Outdated
Show resolved
Hide resolved
cd1d14c to
ab1d609
Compare
ab1d609 to
6cfc3d5
Compare
hediet
approved these changes
Mar 25, 2026
ulugbekna
approved these changes
Mar 25, 2026
This file contains hidden or 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
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.
Problem
removeDiffs()processes each diff removal with two full-array passes (filter+map), creating 2K temporary arrays for K removals. Complexity is O(K * N) where N is the total diff count.When accepting/rejecting all changes in a complex merge with 50+ conflicts, this becomes noticeable. Marked
// TODO improve performancein the code.Fix
Replace the per-removal loop with a single-pass algorithm:
Setfor O(1) lookupComplexity drops to O(N + K log K) with one array allocation instead of 2K.