Skip to content

refactor(menu): read display widths through a checked helper #1179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kronberger-droid merged 1 commit into from
Aug 24, 2026
Merged

refactor(menu): read display widths through a checked helper #1179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/menu/columnar_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,19 @@ impl ColumnarMenu {
self.working_details.columns.max(1)
}

/// Width of the suggestion at `index`, 0 when out of range.
///
/// `display_widths` is built from the same `values` in
/// [`CompletionDisplay::new`], so the index holds today; 0 keeps a
/// mismatch painting (unpadded) instead of aborting mid-repaint.
fn display_width(&self, index: usize) -> usize {
self.completions
.display_widths
.get(index)
.copied()
.unwrap_or(0)
}

/// Creates default string that represents one suggestion from the menu
pub fn create_string(
&self,
Expand Down Expand Up @@ -386,7 +399,7 @@ impl ColumnarMenu {
let display_value = suggestion.display_value();

// Calculate the remaining space after the suggestion text
let empty_space = terminal_width.saturating_sub(self.completions.display_widths[index]);
let empty_space = terminal_width.saturating_sub(self.display_width(index));
let marker = if is_selected { ">" } else { "" };
let description = suggestion.description.as_deref().unwrap_or("");

Expand Down Expand Up @@ -424,7 +437,7 @@ impl ColumnarMenu {
let is_selected = index == self.index();
let terminal_width = self.get_width();
let display_value = suggestion.display_value();
let display_width = self.completions.display_widths[index];
let display_width = self.display_width(index);
let color_settings = &self.settings.color;

// TODO(ysthakur): let the user strip quotes, rather than doing it here
Expand Down
Loading