suimeng
/
helix
mirror of https://github.com/helix-editor/helix
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Respect mode when starting a search (#10505) 

Currently the editor mode has no effect on the behavior of `search` and
`rsearch`. We can pass in the right movement for the editor mode to make
the behavior or `search` and `rsearch` match `search_next` and
`search_prev` in select mode.
pull/10527/head
Michael Davis 2024-04-19 21:25:11 -04:00 committed by GitHub
parent 18d5cacea6
commit 211f368064
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
helix-term/src/commands.rs
View File

@ -2080,6 +2080,11 @@ fn searcher(cx: &mut Context, direction: Direction) {
let config = cx.editor.config(); let config = cx.editor.config();
let scrolloff = config.scrolloff; let scrolloff = config.scrolloff;
let wrap_around = config.search.wrap_around; let wrap_around = config.search.wrap_around;
let movement = if cx.editor.mode() == Mode::Select {
Movement::Extend
} else {
Movement::Move
};
// TODO: could probably share with select_on_matches? // TODO: could probably share with select_on_matches?
let completions = search_completions(cx, Some(reg)); let completions = search_completions(cx, Some(reg));
@ -2104,7 +2109,7 @@ fn searcher(cx: &mut Context, direction: Direction) {
search_impl( search_impl(
cx.editor, cx.editor,
&regex, &regex,
Movement::Move, movement,
direction, direction,
scrolloff, scrolloff,
wrap_around, wrap_around,