|
|
@ -1687,6 +1687,7 @@ fn searcher(cx: &mut Context, direction: Direction) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
|
|
|
|
fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Direction) {
|
|
|
|
|
|
|
|
let count = cx.count();
|
|
|
|
let config = cx.editor.config();
|
|
|
|
let config = cx.editor.config();
|
|
|
|
let scrolloff = config.scrolloff;
|
|
|
|
let scrolloff = config.scrolloff;
|
|
|
|
let (view, doc) = current!(cx.editor);
|
|
|
|
let (view, doc) = current!(cx.editor);
|
|
|
@ -1705,16 +1706,18 @@ fn search_next_or_prev_impl(cx: &mut Context, movement: Movement, direction: Dir
|
|
|
|
.multi_line(true)
|
|
|
|
.multi_line(true)
|
|
|
|
.build()
|
|
|
|
.build()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
search_impl(
|
|
|
|
for _ in 0..count {
|
|
|
|
doc,
|
|
|
|
search_impl(
|
|
|
|
view,
|
|
|
|
doc,
|
|
|
|
&contents,
|
|
|
|
view,
|
|
|
|
®ex,
|
|
|
|
&contents,
|
|
|
|
movement,
|
|
|
|
®ex,
|
|
|
|
direction,
|
|
|
|
movement,
|
|
|
|
scrolloff,
|
|
|
|
direction,
|
|
|
|
wrap_around,
|
|
|
|
scrolloff,
|
|
|
|
);
|
|
|
|
wrap_around,
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
let error = format!("Invalid regex: {}", query);
|
|
|
|
let error = format!("Invalid regex: {}", query);
|
|
|
|
cx.editor.set_error(error);
|
|
|
|
cx.editor.set_error(error);
|
|
|
|