Make history pager use more entries #9458
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Like I mentioned in fish-shell#9089, 12 entries is a bit few. So, instead, we do like we do for completions before disclosing and pick half the screen (but at least X, in this case 12). This avoids filling the entire screen, and will avoid an unsightly "X more entries" (which requires scrolling down to fully disclose) because it matches what the pager does. Note: For multiline commands we can be pushed further upwards, and in case of a multi-column layout we could fit more lines. That would require asking the pager to fit as many as possible and give us back the index of the last matching entry and rewinding the history search. That's gonna be left as an exercise for later if it turns out to be necessary.
This could lead to "and 2 more entries" because of the search and the prompt
krobelus
reviewed
Jan 9, 2023
| // | ||
| // We can still push fish further upward in case the first entry is multiline, | ||
| // but that can't really be helped. | ||
| // (subtract 2 for the search line and the prompt) |
There was a problem hiding this comment.
yeah this behavior is definitely much nicer, thanks.
My original concern was that it can be difficult to select things in the pager.
I think that's not really relevant in practice because most searches can easily be refined to match fewer commands.
Also we'll add globbing soon.
krobelus
approved these changes
Jan 9, 2023
|
random future ideas: use the alternate screen like fzf |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Like I mentioned in #9089, 12 entries is a bit few.
So, instead, we do like we do for completions before disclosing and
pick half the screen (but at least X, in this case 12).
This avoids filling the entire screen, and will avoid an unsightly "X
more entries" (which requires scrolling down to fully disclose)
because it matches what the pager does.
Note: For multiline commands we can be pushed further upwards, and in
case of a multi-column layout we could fit more lines. That would
require asking the pager to fit as many as possible and give us back
the index of the last matching entry and rewinding the history search.
That's gonna be left as an exercise for later if it turns out to be necessary.