Fix coalescing of multi-line edits - #46220
Merged
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
maxbrunsfeld
enabled auto-merge (squash)
January 7, 2026 01:54
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
I was seeing some surprising un-coalesced edits in the edit history when looking at captured examples. I realized that we were only coalescing based on the *ends* of edit ranges, but I think we want to combine hunks where there are 8 or less unchanged lines in between changes. This PR implements that. Release Notes: - N/A
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
I was seeing some surprising un-coalesced edits in the edit history when looking at captured examples. I realized that we were only coalescing based on the *ends* of edit ranges, but I think we want to combine hunks where there are 8 or less unchanged lines in between changes. This PR implements that. Release Notes: - N/A
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
1 participant
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 was seeing some surprising un-coalesced edits in the edit history when looking at captured examples. I realized that we were only coalescing based on the ends of edit ranges, but I think we want to combine hunks where there are 8 or less unchanged lines in between changes. This PR implements that.
Release Notes: