berkus
/
miette
mirror of https://github.com/zkat/miette.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(reporter): Only inc the line count if we haven't already done so with '\n' or '\r\n' (#37)

This commit is contained in:
Felipe Seré 2021-08-29 19:33:45 +00:00 committed by GitHub
parent 53f5d6d1d6
commit 5a474370dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/printer/graphical_printer.rs
View File

@ -461,6 +461,7 @@ impl GraphicalReportPrinter {
let mut lines = Vec::new(); let mut lines = Vec::new();
while let Some(char) = iter.next() { while let Some(char) = iter.next() {
offset += char.len_utf8(); offset += char.len_utf8();
let mut at_end_of_file = false;
match char { match char {
'\r' => { '\r' => {
if iter.next_if_eq(&'\n').is_some() { if iter.next_if_eq(&'\n').is_some() {
@ -471,8 +472,10 @@ impl GraphicalReportPrinter {
line_str.push(char); line_str.push(char);
column += 1; column += 1;
} }
at_end_of_file = iter.peek().is_none();
} }
'\n' => { '\n' => {
at_end_of_file = iter.peek().is_none();
line += 1; line += 1;
column = 0; column = 0;
} }
@ -481,7 +484,8 @@ impl GraphicalReportPrinter {
column += 1; column += 1;
} }
} }
if iter.peek().is_none() {
if iter.peek().is_none() && !at_end_of_file {
line += 1; line += 1;
} }

4
tests/printer.rs
View File

@ -277,7 +277,7 @@ line5
3 │ ││ line3 3 │ ││ line3
4 │ │├─▶ line4 4 │ │├─▶ line4
· │╰──── block 2 · │╰──── block 2
6 │ ├──▶ line5 5 │ ├──▶ line5
· ╰───── block 1 · ╰───── block 1
‽ try doing it better next time? ‽ try doing it better next time?
@ -329,7 +329,7 @@ line5
2 │ │╭─▶ line2 2 │ │╭─▶ line2
3 │ ││ line3 3 │ ││ line3
4 │ │╰─▶ line4 4 │ │╰─▶ line4
6 │ ├──▶ line5 5 │ ├──▶ line5
· ╰───── block 1 · ╰───── block 1
‽ try doing it better next time? ‽ try doing it better next time?