Improve text search

pop-os · Dec 21, 2024 · 647d291 · 647d291
1 parent 39eb454
commit 647d291
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/tab.rs b/src/tab.rs
@@ -219,7 +219,10 @@ impl EditorTab {
                 regex
                     .find_iter(buffer.lines[cursor.line].text())
                     .filter_map(|m| {
-                        if cursor.line != start_line || m.start() >= cursor.index {
+                        if cursor.line != start_line
+                            || m.start() >= cursor.index
+                            || m.start() < cursor.index && wrapped == true
+                        {
                             Some((m.start(), m.len()))
                         } else {
                             None
@@ -263,14 +266,19 @@ impl EditorTab {
         let mut cursor = editor.cursor();
         let mut wrapped = false; // Keeps track of whether the search has wrapped around yet.
         let start_line = cursor.line;
+        let current_selection = editor.selection();
 
         if forwards {
             while cursor.line < editor.with_buffer(|buffer| buffer.lines.len()) {
                 if let Some((start, end)) = editor.with_buffer(|buffer| {
                     regex
                         .find_iter(buffer.lines[cursor.line].text())
                         .filter_map(|m| {
-                            if cursor.line != start_line || m.start() > cursor.index {
+                            if cursor.line != start_line
+                                || m.start() > cursor.index
+                                || m.start() == cursor.index && current_selection == Selection::None
+                                || m.start() < cursor.index && wrapped == true
+                            {
                                 Some((m.start(), m.end()))
                             } else {
                                 None
@@ -309,7 +317,11 @@ impl EditorTab {
                     regex
                         .find_iter(buffer.lines[cursor.line].text())
                         .filter_map(|m| {
-                            if cursor.line != start_line || m.start() < cursor.index {
+                            if cursor.line != start_line
+                                || m.start() < cursor.index
+                                || m.start() == cursor.index && current_selection == Selection::None
+                                || m.start() > cursor.index && wrapped == true
+                            {
                                 Some((m.start(), m.end()))
                             } else {
                                 None