From 7d36760364f28faeb4b8cab8b22b673a10d05eb2 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:54:28 -0600 Subject: [PATCH] Fix reverse selections always being cleared (cherry-pick #14150) (#14231) Cherry-picked Fix reverse selections always being cleared (#14150) When I implemented #13701, I kinda messed up with the reversed selections, thinking that their anchors are flipped, so I flipped them again. This caused the reverse selections to always be cleared Release Notes: - Fix reverse selections always being cleared, even if the right click was performed inside Co-authored-by: Stanislav Alekseev <43210583+WeetHet@users.noreply.github.com> --- crates/editor/src/mouse_context_menu.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/crates/editor/src/mouse_context_menu.rs b/crates/editor/src/mouse_context_menu.rs index 56645ee25520cee68247b5c56db14584d0226d8a..82e8878b31371292bfda2acdfa2592d8461c94ef 100644 --- a/crates/editor/src/mouse_context_menu.rs +++ b/crates/editor/src/mouse_context_menu.rs @@ -49,13 +49,11 @@ fn display_ranges<'a>( .pending .as_ref() .map(|pending| &pending.selection); - selections.disjoint.iter().chain(pending).map(move |s| { - if s.reversed { - s.end.to_display_point(&display_map)..s.start.to_display_point(&display_map) - } else { - s.start.to_display_point(&display_map)..s.end.to_display_point(&display_map) - } - }) + selections + .disjoint + .iter() + .chain(pending) + .map(move |s| s.start.to_display_point(&display_map)..s.end.to_display_point(&display_map)) } pub fn deploy_context_menu(