editor: Fix DisplayMap::highlight_text not always sorting its ranges - #58260
Merged
Conversation
cla-bot
Bot
added
the
cla-signed
zed-community-bot
Bot
added
the
staff
Anthony-Eid
reviewed
Jun 1, 2026
Comment on lines
+1160
to
+1168
| None => { | ||
| ranges.sort_by(|a, b| a.start.cmp(&b.start, &multi_buffer_snapshot)); | ||
| slot.insert(Arc::new((style, ranges))); | ||
| } | ||
| }, | ||
| Entry::Vacant(slot) => _ = slot.insert(Arc::new((style, ranges))), | ||
| Entry::Vacant(slot) => { | ||
| ranges.sort_by(|a, b| a.start.cmp(&b.start, &multi_buffer_snapshot)); | ||
| slot.insert(Arc::new((style, ranges))); | ||
| } |
Contributor
There was a problem hiding this comment.
I wonder if there's a debug assert we could put somewhere to make sure the ranges are always sorted
Anthony-Eid
approved these changes
Jun 1, 2026
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 2, 2026
zed-industries#58260) Release Notes: - N/A or Added/Fixed/Improved ...
This was referenced Jun 10, 2026
This was referenced Jun 18, 2026
Closed
This was referenced Jul 1, 2026
This was referenced Jul 10, 2026
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
zed-industries#58260) Release Notes: - N/A or Added/Fixed/Improved ...
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
zed-industries#58260) Release Notes: - N/A or Added/Fixed/Improved ...
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
2 participants
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.
Release Notes: