fix: Fix bug in origin location computation.

KarelPeeters · KarelPeeters · commit 87c8d408c419 · 2024-10-16T23:08:31.000+02:00
diff --git a/src/renderer/display_list.rs b/src/renderer/display_list.rs
@@ -1149,7 +1149,7 @@ fn format_header<'a>(
                 ..
             } = item
             {
-                if main_range >= range.0 && main_range <= range.1 + end_line.len() {
+                if main_range >= range.0 && main_range < range.1 + max(*end_line as usize, 1) {
                     let char_column = text[0..(main_range - range.0).min(text.len())]
                         .chars()
                         .count();
diff --git a/tests/formatter.rs b/tests/formatter.rs
@@ -918,7 +918,7 @@ fn origin_correct_start_line() {
 
     let expected = str![[r#"
 error: title
- --> origin.txt:2:4
+ --> origin.txt:3:1
   |
 1 | aaa
 2 | bbb

Original file line number	Diff line number	Diff line change
`@@ -1149,7 +1149,7 @@ fn format_header<'a>(`
`1149`	`1149`	`..`
`1150`	`1150`	`} = item`
`1151`	`1151`	`{`
`1152`		`- if main_range >= range.0 && main_range <= range.1 + end_line.len() {`
	`1152`	`+ if main_range >= range.0 && main_range < range.1 + max(*end_line as usize, 1) {`
`1153`	`1153`	`let char_column = text[0..(main_range - range.0).min(text.len())]`
`1154`	`1154`	`.chars()`
`1155`	`1155`	`.count();`