From b81a5544248633d84615952ec6130f5104998c18 Mon Sep 17 00:00:00 2001
From: Blaž Hrastnik
Date: Sat, 6 Nov 2021 17:41:30 +0900
Subject: Retain range direction on search

Co-authored-by: CossonLeo <20379044+cossonleo@users.noreply.github.com>
---
 helix-term/src/commands.rs | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'helix-term/src')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index e3ebd128..752b5900 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1223,11 +1223,18 @@ fn search_impl(
             // skip empty matches that don't make sense
             return;
         }
+
+        // Determine range direction based on the primary range
+        let primary = selection.primary();
+        let range = if primary.head < primary.anchor {
+            Range::new(end, start)
+        } else {
+            Range::new(start, end)
+        };
+
         let selection = match movement {
-            Movement::Extend => selection.clone().push(Range::new(start, end)),
-            Movement::Move => selection
-                .clone()
-                .replace(selection.primary_index(), Range::new(start, end)),
+            Movement::Extend => selection.clone().push(range),
+            Movement::Move => selection.clone().replace(selection.primary_index(), range),
         };
 
         doc.set_selection(view.id, selection);
-- 
cgit v1.2.3-70-g09d2