leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve text search

Browse source
This commit is contained in:
toftpokk 2024-12-21 22:20:43 +07:00 • committed by Jeremy Soller
parent 39eb454f3b
commit 647d29169e
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tab.rs
View file

@ -219,7 +219,10 @@ impl EditorTab {
regex regex
.find_iter(buffer.lines[cursor.line].text()) .find_iter(buffer.lines[cursor.line].text())
.filter_map(|m| { .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())) Some((m.start(), m.len()))
} else { } else {
None None
@ -263,6 +266,7 @@ impl EditorTab {
let mut cursor = editor.cursor(); let mut cursor = editor.cursor();
let mut wrapped = false; // Keeps track of whether the search has wrapped around yet. let mut wrapped = false; // Keeps track of whether the search has wrapped around yet.
let start_line = cursor.line; let start_line = cursor.line;
let current_selection = editor.selection();
if forwards { if forwards {
while cursor.line < editor.with_buffer(|buffer| buffer.lines.len()) { while cursor.line < editor.with_buffer(|buffer| buffer.lines.len()) {
@ -270,7 +274,11 @@ impl EditorTab {
regex regex
.find_iter(buffer.lines[cursor.line].text()) .find_iter(buffer.lines[cursor.line].text())
.filter_map(|m| { .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())) Some((m.start(), m.end()))
} else { } else {
None None
@ -309,7 +317,11 @@ impl EditorTab {
regex regex
.find_iter(buffer.lines[cursor.line].text()) .find_iter(buffer.lines[cursor.line].text())
.filter_map(|m| { .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())) Some((m.start(), m.end()))
} else { } else {
None None