From 4418924ec34c28e43ce34809edaac4ce4fd9f72c Mon Sep 17 00:00:00 2001 From: Bob Date: Wed, 13 Jul 2022 23:01:42 +0800 Subject: [PATCH] respect count for selecting next/previous match (#3056) --- helix-term/src/commands.rs | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs index cb223faf..dad3db86 100644 --- a/helix-term/src/commands.rs +++ b/helix-term/src/commands.rs @@ -1687,6 +1687,7 @@ fn searcher(cx: &mut Context, 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 scrolloff = config.scrolloff; 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) .build() { - search_impl( - doc, - view, - &contents, - ®ex, - movement, - direction, - scrolloff, - wrap_around, - ); + for _ in 0..count { + search_impl( + doc, + view, + &contents, + ®ex, + movement, + direction, + scrolloff, + wrap_around, + ); + } } else { let error = format!("Invalid regex: {}", query); cx.editor.set_error(error);