Jan 8, 2025
diff --git a/src/renderer/display_list.rs b/src/renderer/display_list.rs

                    // On long lines, we strip the source line, accounting for unicode.
                    let mut taken = 0;
                    letcode: String =text
    .chars()
    .skip(left)
 .take_while(|ch| {
 //Make sure that the trimmingonthe right will fall within the terminal width.
    // FIXME: `unicode_width` sometimesdisagrees with terminals on how wide a `char`
 //is. For now, just accept that sometimes the code line will be longer than
    // desired.
    let next = unicode_width::UnicodeWidthChar::width(*ch).unwrap_or(1);
 if taken + next > right - left {
    return false;
 }
 taken += next;
    true
    })
                        .collect();
                    letmut was_cut_right =false;
 let mut code = String::new();
 for ch in text.chars().skip(left) {
 // Make sure that the trimming on the right will fall within the terminal width.
                        //FIXME: `unicode_width` sometimes disagrees with terminalsonhow wide a `char`
 // is. For now, just accept that sometimesthe code line will be longer than
                        //desired.
 let next = unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1);
 if taken + next > right - left {
 was_cut_right = true;
 break;
                        }
                        taken += next;
 code.push(ch);
 }

                    buffer.puts(line_offset, code_offset, &code, Style::new());
                    if self.margin.was_cut_left() {
                        // We have stripped some code/whitespace from the beginning, make it clear.
                        buffer.puts(line_offset, code_offset, "...", *lineno_color);
                    }
                    ifself.margin.was_cut_right(line_len) {
                    if was_cut_right {
                        buffer.puts(line_offset, code_offset + taken - 3, "...", *lineno_color);
                    }

diff --git a/src/renderer/margin.rs b/src/renderer/margin.rs
        self.computed_left > 0
    }

    pub(crate) fn was_cut_right(&self, line_len: usize) -> bool {
        let right =
            if self.computed_right == self.span_right || self.computed_right == self.label_right {
                // Account for the "..." padding given above. Otherwise we end up with code lines that
                // do fit but end in "..." as if they were trimmed.
                self.computed_right - ELLIPSIS_PASSING
            } else {
                self.computed_right
            };
        right < line_len && self.computed_left + self.term_width < line_len
    }

    fn compute(&mut self, max_line_len: usize) {
        // When there's a lot of whitespace (>20), we want to trim it as it is useless.
        self.computed_left = if self.whitespace_left > LONG_WHITESPACE {
diff --git a/tests/formatter.rs b/tests/formatter.rs

 use snapbox::{assert_data_eq, str};

 // This tests that an ellipsis is not inserted into Unicode text when a line
 // wasn't actually trimmed.
 //
 // This is a regression test where `...` was inserted because the code wasn't
 // properly accounting for the *rendered* length versus the length in bytes in
 // all cases.
 #[test]
 fn unicode_cut_handling() {
    let source = "version = \"0.1.0\"\n# Ensure that the spans from toml handle utf-8 correctly\nauthors = [\n    { name = \"Z\u{351}\u{36b}\u{343}\u{36a}\u{302}\u{36b}\u{33d}\u{34f}\u{334}\u{319}\u{324}\u{31e}\u{349}\u{35a}\u{32f}\u{31e}\u{320}\u{34d}A\u{36b}\u{357}\u{334}\u{362}\u{335}\u{31c}\u{330}\u{354}L\u{368}\u{367}\u{369}\u{358}\u{320}G\u{311}\u{357}\u{30e}\u{305}\u{35b}\u{341}\u{334}\u{33b}\u{348}\u{34d}\u{354}\u{339}O\u{342}\u{30c}\u{30c}\u{358}\u{328}\u{335}\u{339}\u{33b}\u{31d}\u{333}\", email = 1 }\n]\n";
    let input = Level::Error.title("title").snippet(
        Snippet::source(source)
            .fold(false)
            .annotation(Level::Error.span(85..228).label("annotation")),
    );
    let expected = "\
 error: title
  |
 1 |   version = \"0.1.0\"
 2 |   # Ensure that the spans from toml handle utf-8 correctly
 3 |   authors = [
  |  ___________^
 4 | |     { name = \"Z\u{351}\u{36b}\u{343}\u{36a}\u{302}\u{36b}\u{33d}\u{34f}\u{334}\u{319}\u{324}\u{31e}\u{349}\u{35a}\u{32f}\u{31e}\u{320}\u{34d}A\u{36b}\u{357}\u{334}\u{362}\u{335}\u{31c}\u{330}\u{354}L\u{368}\u{367}\u{369}\u{358}\u{320}G\u{311}\u{357}\u{30e}\u{305}\u{35b}\u{341}\u{334}\u{33b}\u{348}\u{34d}\u{354}\u{339}O\u{342}\u{30c}\u{30c}\u{358}\u{328}\u{335}\u{339}\u{33b}\u{31d}\u{333}\", email = 1 }
 5 | | ]
  | |_^ annotation
  |\
 ";
    let renderer = Renderer::plain();
    assert_data_eq!(renderer.render(input).to_string(), expected);
 }

 #[test]
 fn test_i_29() {
    let snippets = Level::Error.title("oops").snippet(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -331,28 +331,28 @@ impl DisplaySet<'_> {

		// On long lines, we strip the source line, accounting for unicode.
		let mut taken = 0;
		letcode: String =text
		.chars()
		.skip(left)
		.take_while(\|ch\| {
		//Make sure that the trimmingonthe right will fall within the terminal width.
		// FIXME: `unicode_width` sometimesdisagrees with terminals on how wide a `char`
		//is. For now, just accept that sometimes the code line will be longer than
		// desired.
		let next = unicode_width::UnicodeWidthChar::width(*ch).unwrap_or(1);
		if taken + next > right - left {
		return false;
		}
		taken += next;
		true
		})
		.collect();
		letmut was_cut_right =false;
		let mut code = String::new();
		for ch in text.chars().skip(left) {
		// Make sure that the trimming on the right will fall within the terminal width.
		//FIXME: `unicode_width` sometimes disagrees with terminalsonhow wide a `char`
		// is. For now, just accept that sometimesthe code line will be longer than
		//desired.
		let next = unicode_width::UnicodeWidthChar::width(ch).unwrap_or(1);
		if taken + next > right - left {
		was_cut_right = true;
		break;
		}
		taken += next;
		code.push(ch);
		}

		buffer.puts(line_offset, code_offset, &code, Style::new());
		if self.margin.was_cut_left() {
		// We have stripped some code/whitespace from the beginning, make it clear.
		buffer.puts(line_offset, code_offset, "...", *lineno_color);
		}
		ifself.margin.was_cut_right(line_len) {
		if was_cut_right {
		buffer.puts(line_offset, code_offset + taken - 3, "...", *lineno_color);
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,18 +58,6 @@ impl Margin {
		self.computed_left > 0
		}

		pub(crate) fn was_cut_right(&self, line_len: usize) -> bool {
		let right =
		if self.computed_right == self.span_right \|\| self.computed_right == self.label_right {
		// Account for the "..." padding given above. Otherwise we end up with code lines that
		// do fit but end in "..." as if they were trimmed.
		self.computed_right - ELLIPSIS_PASSING
		} else {
		self.computed_right
		};
		right < line_len && self.computed_left + self.term_width < line_len
		}

		fn compute(&mut self, max_line_len: usize) {
		// When there's a lot of whitespace (>20), we want to trim it as it is useless.
		self.computed_left = if self.whitespace_left > LONG_WHITESPACE {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,36 @@ use annotate_snippets::{Level, Renderer, Snippet};

		use snapbox::{assert_data_eq, str};

		// This tests that an ellipsis is not inserted into Unicode text when a line
		// wasn't actually trimmed.
		//
		// This is a regression test where `...` was inserted because the code wasn't
		// properly accounting for the rendered length versus the length in bytes in
		// all cases.
		#[test]
		fn unicode_cut_handling() {
		let source = "version = \"0.1.0\"\n# Ensure that the spans from toml handle utf-8 correctly\nauthors = [\n { name = \"Z\u{351}\u{36b}\u{343}\u{36a}\u{302}\u{36b}\u{33d}\u{34f}\u{334}\u{319}\u{324}\u{31e}\u{349}\u{35a}\u{32f}\u{31e}\u{320}\u{34d}A\u{36b}\u{357}\u{334}\u{362}\u{335}\u{31c}\u{330}\u{354}L\u{368}\u{367}\u{369}\u{358}\u{320}G\u{311}\u{357}\u{30e}\u{305}\u{35b}\u{341}\u{334}\u{33b}\u{348}\u{34d}\u{354}\u{339}O\u{342}\u{30c}\u{30c}\u{358}\u{328}\u{335}\u{339}\u{33b}\u{31d}\u{333}\", email = 1 }\n]\n";
		let input = Level::Error.title("title").snippet(
		Snippet::source(source)
		.fold(false)
		.annotation(Level::Error.span(85..228).label("annotation")),
		);
		let expected = "\
		error: title
		\|
		1 \| version = \"0.1.0\"
		2 \| # Ensure that the spans from toml handle utf-8 correctly
		3 \| authors = [
		\| ___________^
		4 \| \| { name = \"Z\u{351}\u{36b}\u{343}\u{36a}\u{302}\u{36b}\u{33d}\u{34f}\u{334}\u{319}\u{324}\u{31e}\u{349}\u{35a}\u{32f}\u{31e}\u{320}\u{34d}A\u{36b}\u{357}\u{334}\u{362}\u{335}\u{31c}\u{330}\u{354}L\u{368}\u{367}\u{369}\u{358}\u{320}G\u{311}\u{357}\u{30e}\u{305}\u{35b}\u{341}\u{334}\u{33b}\u{348}\u{34d}\u{354}\u{339}O\u{342}\u{30c}\u{30c}\u{358}\u{328}\u{335}\u{339}\u{33b}\u{31d}\u{333}\", email = 1 }
		5 \| \| ]
		\| \|_^ annotation
		\|\
		";
		let renderer = Renderer::plain();
		assert_data_eq!(renderer.render(input).to_string(), expected);
		}

		#[test]
		fn test_i_29() {
		let snippets = Level::Error.title("oops").snippet(
Expand Down