Merge pull request #446 from epage/simd

fix(simd): Fix indentation with trailing newline

Author: Muscraft

src/renderer/render.rs

@@ -2736,7 +2736,10 @@ fn pre_process<'a>(
 fn newline_count(body: &str) -> usize {
     #[cfg(feature = "simd")]
     {
-        memchr::memchr_iter(b'\n', body.as_bytes()).count()
+        // Trailing newlines do not count towards the number of lines
+        // (this is based into `str::lines`)
+        let trailing_newline = body.ends_with('\n');
+        memchr::memchr_iter(b'\n', body.as_bytes()).count() - usize::from(trailing_newline)
     }
     #[cfg(not(feature = "simd"))]
     {
@@ -2782,9 +2785,20 @@ mod test {
                 [dependencies]
                 bar = { base = '^^not-valid^^', path = 'bar' }
             "#;
-        let actual_count = newline_count(source);
-        let expected_count = 10;
+        assert_eq!(newline_count(source), 10);
 
-        assert_eq!(expected_count, actual_count);
+        assert_eq!(newline_count(""), 0);
+
+        assert_eq!(newline_count("one"), 0);
+
+        assert_eq!(newline_count("one\n"), 0);
+
+        assert_eq!(newline_count("one\ntwo"), 1);
+
+        assert_eq!(newline_count("one\ntwo\n"), 1);
+
+        assert_eq!(newline_count("one\n\n"), 1);
+
+        assert_eq!(newline_count("one\r\ntwo\r\n"), 1);
     }
 }

tests/formatter.rs

@@ -5234,3 +5234,43 @@ error[test-diagnostics]: main diagnostic message
     let renderer = renderer.decor_style(DecorStyle::Unicode);
     assert_data_eq!(renderer.render(input), expected_unicode);
 }
+
+#[test]
+fn consistent_indentation_with_trailing_newline() {
+    let input = &[Level::ERROR
+        .primary_title("main diagnostic message")
+        .id("test-diagnostic")
+        .element(
+            Snippet::source("dog\nelephant\nfinch\n")
+                .path("spacey-animals")
+                .fold(false)
+                .line_start(7)
+                .annotation(AnnotationKind::Primary.span(4..12)),
+        )];
+    let expected_ascii = str![[r#"
+error[test-diagnostic]: main diagnostic message
+ --> spacey-animals:8:1
+  |
+7 | dog
+8 | elephant
+  | ^^^^^^^^
+9 | finch
+  |
+"#]];
+
+    let renderer = Renderer::plain();
+    assert_data_eq!(renderer.render(input), expected_ascii);
+
+    let expected_unicode = str![[r#"
+error[test-diagnostic]: main diagnostic message
+  ╭▸ spacey-animals:8:1
+  │
+7 │ dog
+8 │ elephant
+  │ ━━━━━━━━
+9 │ finch
+  ╰╴
+"#]];
+    let renderer = renderer.decor_style(DecorStyle::Unicode);
+    assert_data_eq!(renderer.render(input), expected_unicode);
+}