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

Show autosuggestions when (left prompt + command) exceed right prompt (#7035)

Browse Source 
* Show autosuggestions when (left prompt + command) exceed right prompt

* Fix indentation whitespace and run build_tools/fish.style on src/screen.cpp
This commit is contained in:
ksralgp
2020-05-24 15:54:00 -04:00
committed by GitHub
parent 1879b4e697
commit f55f98b064
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/screen.cpp
View File

@@ -923,9 +923,11 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
// 2. Left prompt visible, right prompt visible, command line visible, autosuggestion truncated
// (possibly to zero).
//
// 3. Left prompt visible, right prompt hidden, command line visible, autosuggestion hidden.
// 3. Left prompt visible, right prompt hidden, command line visible, autosuggestion visible
//
// 4. Newline separator (left prompt visible, right prompt hidden, command line visible,
// 4. Left prompt visible, right prompt hidden, command line visible, autosuggestion truncated
//
// 5. Newline separator (left prompt visible, right prompt hidden, command line visible,
// autosuggestion visible).
//
// A remark about layout #4: if we've pushed the command line to a new line, why can't we draw
@@ -972,15 +974,36 @@ static screen_layout_t compute_layout(screen_t *s, size_t screen_width,
// Case 3
if (!done) {
calculated_width = left_prompt_width + first_command_line_width;
calculated_width = left_prompt_width + first_command_line_width + autosuggest_total_width;
if (calculated_width < screen_width) {
result.left_prompt = left_prompt;
result.left_prompt_space = left_prompt_width;
result.autosuggestion = autosuggestion;
done = true;
}
}
// Case 4
if (!done) {
calculated_width = left_prompt_width + first_command_line_width;
if (calculated_width < screen_width) {
result.left_prompt = left_prompt;
result.left_prompt_space = left_prompt_width;
// Need at least two characters to show an autosuggestion.
size_t available_autosuggest_space =
screen_width - (left_prompt_width + first_command_line_width);
if (autosuggest_total_width > 0 && available_autosuggest_space > 2) {
size_t truncation_offset = truncation_offset_for_width(
autosuggest_truncated_widths, available_autosuggest_space - 2);
result.autosuggestion = wcstring(autosuggestion, truncation_offset);
result.autosuggestion.push_back(get_ellipsis_char());
}
done = true;
}
}
// Case 5
if (!done) {
result.left_prompt = left_prompt;
result.left_prompt_space = left_prompt_width;