Skip to content
Merged
Changes from all commits
Commits
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
40 changes: 36 additions & 4 deletions crates/edit_prediction_cli/src/progress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,17 @@ impl Progress {
inner.last_line_is_logging = true;
}

eprintln!("{}", message);
let max_width = inner.terminal_width.saturating_sub(MARGIN);
for line in message.lines() {
let truncated = truncate_to_visible_width(line, max_width);
if truncated.len() < line.len() {
eprintln!("{}…", truncated);
} else {
eprintln!("{}", truncated);
}
}

Self::print_status_lines(&mut inner);
}

pub fn start(self: &Arc<Self>, step: Step, example_name: &str) -> StepProgress {
Expand Down Expand Up @@ -533,12 +543,34 @@ fn strip_ansi_len(s: &str) -> usize {
len
}

fn truncate_with_ellipsis(s: &str, max_len: usize) -> String {
fn truncate_with_ellipsis(s: &str, max_len: usize) -> Cow<'_, str> {
if s.len() <= max_len {
s.to_string()
Cow::Borrowed(s)
} else {
format!("{}…", &s[..max_len.saturating_sub(1)])
Cow::Owned(format!("{}…", &s[..max_len.saturating_sub(1)]))
}
}

fn truncate_to_visible_width(s: &str, max_visible_len: usize) -> &str {
let mut visible_len = 0;
let mut in_escape = false;
let mut last_byte_index = 0;
for (byte_index, c) in s.char_indices() {
if c == '\x1b' {
in_escape = true;
} else if in_escape {
if c == 'm' {
in_escape = false;
}
} else {
if visible_len >= max_visible_len {
return &s[..last_byte_index];
}
visible_len += 1;
}
last_byte_index = byte_index + c.len_utf8();
}
s
}

fn format_duration(duration: Duration) -> String {
Expand Down