feat: add ellipsis when truncating strings and only apply max_len for terminal output

Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-08-26 08:45:48 -03:00
parent 2a233b3d43
commit a92c22b58c
2 changed files with 75 additions and 39 deletions

View File

@@ -46,7 +46,30 @@ pub fn string_column(s: String, column_width: usize) -> String {
if column_width > 0 { if column_width > 0 {
match s.char_indices().nth(column_width) { match s.char_indices().nth(column_width) {
None => s.to_string(), None => s.to_string(),
Some((idx, _)) => s[..idx].to_string(), Some((idx, _)) => {
if column_width > 1 {
// Find where to cut to fit the ellipsis
let mut cut_idx = idx;
// We need to make room for the ellipsis character
// Find the character boundary before the cut index
for i in (0..idx).rev() {
if s.is_char_boundary(i) {
if idx - i >= 3 { // Make sure we have enough room
cut_idx = i;
break;
}
}
}
// If we can't find a good place, just truncate without ellipsis
if cut_idx >= 3 {
format!("{}", &s[..cut_idx - 1])
} else {
s[..idx].to_string()
}
} else {
s[..idx].to_string()
}
}
} }
} else { } else {
s.to_string() s.to_string()

View File

@@ -62,26 +62,33 @@ pub fn mode_list(
return show_list_structured(items_with_meta, data_path, settings, output_format); return show_list_structured(items_with_meta, data_path, settings, output_format);
} }
// Check if output is a terminal
let is_terminal = stdout().is_terminal();
debug!("Output is terminal: {}", is_terminal);
// Get terminal width once, default to 80 if not available // Get terminal width once, default to 80 if not available
let term_width = if let Ok(columns_env) = env::var("COLUMNS") { // Only use max_len when output is a terminal
debug!("COLUMNS environment variable: {:?}", columns_env); let term_width = if is_terminal {
columns_env.parse::<usize>().unwrap_or(80) if let Ok(columns_env) = env::var("COLUMNS") {
} else if stdout().is_terminal() { debug!("COLUMNS environment variable: {:?}", columns_env);
// Try to get terminal size using termsize columns_env.parse::<usize>().unwrap_or(80)
match termsize::get() { } else {
Some(size) => { // Try to get terminal size using termsize
let width = size.cols as usize; match termsize::get() {
debug!("Terminal size detected: {} columns", width); Some(size) => {
width let width = size.cols as usize;
} debug!("Terminal size detected: {} columns", width);
None => { width
debug!("Failed to get terminal size, defaulting to 80"); }
80 None => {
debug!("Failed to get terminal size, defaulting to 80");
80
}
} }
} }
} else { } else {
debug!("Not a terminal, defaulting to 80"); debug!("Not a terminal, max_len will be ignored");
80 0 // Use 0 to indicate no truncation
}; };
debug!("Terminal width: {}", term_width); debug!("Terminal width: {}", term_width);
@@ -114,33 +121,39 @@ pub fn mode_list(
let mut meta_name: Option<&str> = None; let mut meta_name: Option<&str> = None;
// Parse max_len, handling numbers, percentages, and negative values // Parse max_len, handling numbers, percentages, and negative values
let column_width = if let Some(max_len_str) = &column.max_len { // Only apply max_len when output is a terminal
debug!("Processing max_len for column '{}': {}", column.name, max_len_str); let column_width = if is_terminal {
// Check if it's a negative number if let Some(max_len_str) = &column.max_len {
if max_len_str.starts_with('-') { debug!("Processing max_len for column '{}': {}", column.name, max_len_str);
// Parse as negative number // Check if it's a negative number
let abs_value = max_len_str[1..].parse::<usize>().unwrap_or(0); if max_len_str.starts_with('-') {
if abs_value > term_width { // Parse as negative number
0 let abs_value = max_len_str[1..].parse::<usize>().unwrap_or(0);
if abs_value > term_width {
0
} else {
term_width - abs_value
}
} else if max_len_str.ends_with('%') {
// Parse percentage
let percent_str = max_len_str.trim_end_matches('%');
let percent = percent_str.parse::<f64>().unwrap_or(0.0);
debug!("Percentage: {}%", percent);
let computed_width = (term_width as f64 * percent / 100.0) as usize;
debug!("Computed width: {}", computed_width);
computed_width
} else { } else {
term_width - abs_value // Parse absolute number
let absolute_width = max_len_str.parse::<usize>().unwrap_or(0);
debug!("Absolute width: {}", absolute_width);
absolute_width
} }
} else if max_len_str.ends_with('%') {
// Parse percentage
let percent_str = max_len_str.trim_end_matches('%');
let percent = percent_str.parse::<f64>().unwrap_or(0.0);
debug!("Percentage: {}%", percent);
let computed_width = (term_width as f64 * percent / 100.0) as usize;
debug!("Computed width: {}", computed_width);
computed_width
} else { } else {
// Parse absolute number debug!("No max_len specified for column '{}'", column.name);
let absolute_width = max_len_str.parse::<usize>().unwrap_or(0); 0
debug!("Absolute width: {}", absolute_width);
absolute_width
} }
} else { } else {
debug!("No max_len specified for column '{}'", column.name); debug!("Output is not a terminal, ignoring max_len");
0 0
}; };