mirror of
https://github.com/fish-shell/fish-shell
synced 2024-12-25 12:23:09 +00:00
remove some lint from pager.cpp
The primary pupose of this change is to make OpenSUSE builds happy by adding a `DIE()` call so its build toolchain knows we won't fall off the end of function `selection_direction_is_cardinal()`.
This commit is contained in:
parent
06b2775131
commit
ce61ada623
1 changed files with 18 additions and 18 deletions
|
@ -55,12 +55,13 @@ inline bool selection_direction_is_cardinal(selection_direction_t dir) {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
DIE("should never reach this statement");
|
||||
}
|
||||
|
||||
/// Returns numer / denom, rounding up. As a "courtesy" 0/0 is 0.
|
||||
static size_t divide_round_up(size_t numer, size_t denom) {
|
||||
if (numer == 0) return 0;
|
||||
|
||||
assert(denom > 0);
|
||||
bool has_rem = (numer % denom) != 0;
|
||||
return numer / denom + (has_rem ? 1 : 0);
|
||||
|
@ -449,7 +450,6 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
|
|||
print = true;
|
||||
} else {
|
||||
// Compute total preferred width, plus spacing
|
||||
assert(cols > 0);
|
||||
size_t total_width_needed = std::accumulate(width_by_column, width_by_column + cols, 0);
|
||||
total_width_needed += (cols - 1) * PAGER_SPACER_STRING_WIDTH;
|
||||
print = (total_width_needed <= term_width);
|
||||
|
@ -508,7 +508,10 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
|
|||
print_max(progress_text, spec, term_width, true /* has_more */, &line);
|
||||
}
|
||||
|
||||
if (search_field_shown) {
|
||||
if (!search_field_shown) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Add the search field.
|
||||
wcstring search_field_text = search_field_line.text;
|
||||
// Append spaces to make it at least the required width.
|
||||
|
@ -521,11 +524,8 @@ bool pager_t::completion_try_print(size_t cols, const wcstring &prefix, const co
|
|||
size_t search_field_remaining = term_width - 1;
|
||||
search_field_remaining -= print_max(SEARCH_FIELD_PROMPT, highlight_spec_normal,
|
||||
search_field_remaining, false, search_field);
|
||||
|
||||
search_field_remaining -= print_max(search_field_text, highlight_modifier_force_underline,
|
||||
search_field_remaining, false, search_field);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue