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

Fixed selection bug when finding or replacing text

Browse source 
Fixed bug where the selection wouldn't reset after finding or replacing text
Also added functionality to find to select text being searched for
This commit is contained in:
Camerin Figueroa 2024-10-07 16:24:47 -04:00 • committed by Jeremy Soller
parent 3fe4380cfe
commit 5546ed9988
1 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/tab.rs
View file

@ -5,7 +5,7 @@ use cosmic::{
widget::icon,
};
use cosmic_files::mime_icon::{mime_for_path, mime_icon, FALLBACK_MIME_ICON};
use cosmic_text::{Attrs, Buffer, Edit, Shaping, SyntaxEditor, ViEditor, Wrap};
use cosmic_text::{Attrs, Buffer, Cursor, Edit, Selection, Shaping, SyntaxEditor, ViEditor, Wrap};
use notify::Watcher;
use regex::Regex;
use std::{
@ -235,6 +235,8 @@ impl EditorTab {
editor.delete_range(cursor, end);
cursor = editor.insert_at(cursor, replace, None);
editor.set_cursor(cursor);
// Need to disable selection to prevent the new cursor showing selection to old location
editor.set_selection(Selection::None);
editor.finish_change();
return true;
@ -261,20 +263,25 @@ impl EditorTab {
if forwards {
while cursor.line < editor.with_buffer(|buffer| buffer.lines.len()) {
if let Some(index) = editor.with_buffer(|buffer| {
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 {
Some(m.start())
Some((m.start(), m.end()))
} else {
None
}
})
.next()
}) {
cursor.index = index;
cursor.index = start;
editor.set_cursor(cursor);
// Highlight searched text
let selection = Selection::Normal(Cursor::new(cursor.line, end));
editor.set_selection(selection);
return true;
}
@ -292,20 +299,25 @@ impl EditorTab {
while cursor.line > 0 {
cursor.line -= 1;
if let Some(index) = editor.with_buffer(|buffer| {
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 {
Some(m.start())
Some((m.start(), m.end()))
} else {
None
}
})
.last()
}) {
cursor.index = index;
cursor.index = start;
editor.set_cursor(cursor);
// Highlight searched text
let selection = Selection::Normal(Cursor::new(cursor.line, end));
editor.set_selection(selection);
return true;
}
@ -334,4 +346,4 @@ fn title_with_parent(path: &std::path::Path, file_name: &str) -> String {
Some(parent) => [parent, "/", file_name].concat(),
None => file_name.to_string(),
}
}
}