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

Added wrap around feature to find menu

Browse source
This commit is contained in:
RaspberryProgramming 2024-10-05 21:04:22 -04:00 • committed by Jeremy Soller
parent a23a95b609
commit 5070f0c696
4 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/tab.rs
View file

@ -245,10 +245,12 @@ impl EditorTab {
}
// Code adapted from cosmic-text ViEditor search
pub fn search(&self, regex: &Regex, forwards: bool) -> bool {
pub fn search(&self, regex: &Regex, forwards: bool, wrap_around: bool) -> bool {
let mut editor = self.editor.lock().unwrap();
let mut cursor = editor.cursor();
let mut wrapped = false; // Keeps track of whether the search has wrapped around yet.
let start_line = cursor.line;
if forwards {
while cursor.line < editor.with_buffer(|buffer| buffer.lines.len()) {
if let Some(index) = editor.with_buffer(|buffer| {
@ -269,6 +271,13 @@ impl EditorTab {
}
cursor.line += 1;
// If we haven't wrapped yet and we've reached the last line, reset cursor line to 0 and
// set wrapped to true so we don't wrap again
if wrap_around && !wrapped && cursor.line == editor.with_buffer(|buffer| buffer.lines.len()) {
cursor.line = 0;
wrapped = true;
}
}
} else {
cursor.line += 1;
@ -291,6 +300,13 @@ impl EditorTab {
editor.set_cursor(cursor);
return true;
}
// If we haven't wrapped yet and we've reached the first line, reset cursor line to the
// last line and set wrapped to true so we don't wrap again
if wrap_around && !wrapped && cursor.line == 0 {
cursor.line = editor.with_buffer(|buffer| buffer.lines.len());
wrapped = true;
}
}
}
false