From 9a496237215dc09ef8f639fc79f7e63e2309c080 Mon Sep 17 00:00:00 2001
From: MilanVasko
Date: Wed, 27 Jul 2022 11:02:19 +0200
Subject: Use OR of all selections in search_selection command (#3138)

Closes #2312---
 helix-term/src/commands.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'helix-term')

diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index 3adb1f29..1c5cbf40 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -1748,10 +1748,16 @@ fn extend_search_prev(cx: &mut Context) {
 fn search_selection(cx: &mut Context) {
     let (view, doc) = current!(cx.editor);
     let contents = doc.text().slice(..);
-    let query = doc.selection(view.id).primary().fragment(contents);
-    let regex = regex::escape(&query);
+
+    let regex = doc
+        .selection(view.id)
+        .iter()
+        .map(|selection| regex::escape(&selection.fragment(contents)))
+        .collect::<Vec<_>>()
+        .join("|");
+
+    let msg = format!("register '{}' set to '{}'", '/', &regex);
     cx.editor.registers.get_mut('/').push(regex);
-    let msg = format!("register '{}' set to '{}'", '/', query);
     cx.editor.set_status(msg);
 }
 
-- 
cgit v1.2.3-70-g09d2