h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-28 04:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fix "commandline --paging-mode" false negative when there is no room for pager, attempt 2

Browse Source 
The previous fix was reverted because it broke another scenario.  Add tests
for both scenarios.

The first test exposes another problem: autosuggestions are sometimes not
recomputed after selecting the first completion with Tab Tab. Fix that too.
This commit is contained in:
Johannes Altmanninger
2022-07-31 07:06:10 +02:00
parent 7b18a70724
commit 095c093af6
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/reader.cpp
View File

@@ -1978,7 +1978,7 @@ void reader_data_t::update_autosuggestion() {
// This is also the main mechanism by which readline commands that don't change the command line
// text avoid recomputing the autosuggestion.
const editable_line_t &el = command_line;
if (!autosuggestion.empty() &&
if (autosuggestion.text.size() > el.text().size() &&
(autosuggestion.icase
? string_prefixes_string_case_insensitive(el.text(), autosuggestion.text)
: string_prefixes_string(el.text(), autosuggestion.text))) {
@@ -2913,7 +2913,7 @@ void reader_data_t::update_commandline_state() const {
snapshot->cursor_pos = this->command_line.position();
snapshot->history = this->history;
snapshot->selection = this->get_selection();
snapshot->pager_mode = !this->current_page_rendering.screen_data.empty();
snapshot->pager_mode = !this->pager.empty();
snapshot->pager_fully_disclosed = this->current_page_rendering.remaining_to_disclose == 0;
snapshot->search_mode = this->history_search.active();
snapshot->initialized = true;