github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 08:56:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop history searches with no results to allow up-or-search to move the cursor

Browse Source 
Enter a multiline commandline, for example using

	commandline -i echo echo

And press down-arrow. This will start a new history search which fails.
Then press up-arrow. I expect the cursor to move up, however, because we
are still in history search mode, up-or-search will search instead of moving
the cursor. Correct that by stopping history searches that don't have any results.
This commit is contained in:
Johannes Altmanninger 2020-08-29 10:59:20 +02:00
parent a20721a278
commit ac60522373
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/reader.cpp
View File

@ -3053,6 +3053,8 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
? reader_history_search_t::prefix
: reader_history_search_t::line;
bool was_active_before = history_search.active();
if (history_search.is_at_end()) {
const editable_line_t *el = &command_line;
if (mode == reader_history_search_t::token) {
@ -3086,7 +3088,12 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
c == rl::history_prefix_search_backward)
? history_search_direction_t::backward
: history_search_direction_t::forward;
if (history_search.move_in_direction(dir) ||
bool found = history_search.move_in_direction(dir);
if (!found && !was_active_before) {
history_search.reset();
break;
}
if (found ||
(dir == history_search_direction_t::forward && history_search.is_at_end())) {
update_command_line_from_history_search();
}