Skip to content

Fix Search & Replace deadlock #258

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhecker merged 1 commit into from
May 25, 2025
Merged

Fix Search & Replace deadlock #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/buffer/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,11 +1136,10 @@ impl TextBuffer {

fn find_select_next(&mut self, search: &mut ActiveSearch, offset: usize, wrap: bool) {
if search.buffer_generation != self.buffer.generation() {
unsafe { search.regex.set_text(&search.text) };
unsafe { search.regex.set_text(&search.text, offset) };
search.buffer_generation = self.buffer.generation();
}

if search.next_search_offset != offset {
search.next_search_offset = offset;
} else if search.next_search_offset != offset {
search.next_search_offset = offset;
search.regex.reset(offset);
}
Expand Down
9 changes: 6 additions & 3 deletions src/icu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,17 +628,20 @@ impl Regex {
/// # Safety
///
/// The caller must ensure that the given `Text` outlives the `Regex` instance.
pub unsafe fn set_text(&mut self, text: &Text) {
pub unsafe fn set_text(&mut self, text: &Text, offset: usize) {
let f = assume_loaded();
let mut status = icu_ffi::U_ZERO_ERROR;
unsafe { (f.uregex_setUText)(self.0, text.0 as *const _ as *mut _, &mut status) };
// `uregex_setUText` resets the regex to the start of the text.
// Because of this, we must also call `uregex_reset64`.
unsafe { (f.uregex_reset64)(self.0, offset as i64, &mut status) };
Copy link
Member

@DHowett DHowett May 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does setting the offset to the start of the match cause us to deadlock if you Find "a" replace with "a"? Do we need somehow to skip the matched section?

Copy link
Member Author

@lhecker lhecker May 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this case the caller specifies the "current offset" which is past the replaced range.

}

/// Sets the regex to the absolute offset in the underlying text.
pub fn reset(&mut self, index: usize) {
pub fn reset(&mut self, offset: usize) {
let f = assume_loaded();
let mut status = icu_ffi::U_ZERO_ERROR;
unsafe { (f.uregex_reset64)(self.0, index as i64, &mut status) };
unsafe { (f.uregex_reset64)(self.0, offset as i64, &mut status) };
}
}

Expand Down