Skip to content

editor: Fix SelectionsCollection::disjoint not being ordered correctly #40249

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

Merged
Veykril merged 1 commit into from
Oct 15, 2025
Merged

editor: Fix SelectionsCollection::disjoint not being ordered correctly #40249

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
32 changes: 20 additions & 12 deletions crates/editor/src/selections_collection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,21 +610,32 @@ impl<'a> MutableSelectionsCollection<'a> {
self.select(selections);
}

pub fn select<T>(&mut self, mut selections: Vec<Selection<T>>)
pub fn select<T>(&mut self, selections: Vec<Selection<T>>)
where
T: ToOffset + ToPoint + Ord + std::marker::Copy + std::fmt::Debug,
T: ToOffset + std::marker::Copy + std::fmt::Debug,
{
let buffer = self.buffer.read(self.cx).snapshot(self.cx);
let mut selections = selections
.into_iter()
.map(|selection| selection.map(|it| it.to_offset(&buffer)))
.map(|mut selection| {
if selection.start > selection.end {
mem::swap(&mut selection.start, &mut selection.end);
selection.reversed = true
}
selection
})
.collect::<Vec<_>>();
selections.sort_unstable_by_key(|s| s.start);
// Merge overlapping selections.
let mut i = 1;
while i < selections.len() {
if selections[i - 1].end >= selections[i].start {
if selections[i].start <= selections[i - 1].end {
let removed = selections.remove(i);
if removed.start < selections[i - 1].start {
selections[i - 1].start = removed.start;
}
if removed.end > selections[i - 1].end {
if selections[i - 1].end < removed.end {
selections[i - 1].end = removed.end;
}
} else {
Expand Down Expand Up @@ -968,13 +979,10 @@ impl DerefMut for MutableSelectionsCollection<'_> {
}
}

fn selection_to_anchor_selection<T>(
selection: Selection<T>,
fn selection_to_anchor_selection(
selection: Selection<usize>,
buffer: &MultiBufferSnapshot,
) -> Selection<Anchor>
where
T: ToOffset + Ord,
{
) -> Selection<Anchor> {
let end_bias = if selection.start == selection.end {
Bias::Right
} else {
Expand Down Expand Up @@ -1012,7 +1020,7 @@ fn resolve_selections_point<'a>(
})
}

// Panics if passed selections are not in order
/// Panics if passed selections are not in order
fn resolve_selections_display<'a>(
selections: impl 'a + IntoIterator<Item = &'a Selection<Anchor>>,
map: &'a DisplaySnapshot,
Expand Down Expand Up @@ -1044,7 +1052,7 @@ fn resolve_selections_display<'a>(
coalesce_selections(selections)
}

// Panics if passed selections are not in order
/// Panics if passed selections are not in order
pub(crate) fn resolve_selections<'a, D, I>(
selections: I,
map: &'a DisplaySnapshot,
Expand Down
Loading