Merge branch 'johan/illustrate-eol-at-eof'

README.md

@@ -101,6 +101,7 @@ If you want to test the release script without actually releasing anything, do:
 
 ## Misc
 
+- Render ESC characters in the diff as Unicode ␛
 - `--help`: Only print installing-into-`$PATH` help if we aren't already being
   executed from inside of the `$PATH`
 - Do `git show 5e0a1b2b13528f40299e78e3bfa590d9f96637af` and scroll to the end.

src/refiner.rs

@@ -105,8 +105,15 @@ fn format_split(old_text: &str, new_text: &str) -> Option<(Vec<String>, Vec<Stri
     let mut new_collector = TokenCollector::create(StyledToken::new("+".to_string(), Style::New));
 
     // Tokenize adds and removes before diffing them
-    let tokenized_old = tokenizer::tokenize(old_text);
-    let tokenized_new = tokenizer::tokenize(new_text);
+    let mut tokenized_old = tokenizer::tokenize(old_text);
+    let mut tokenized_new = tokenizer::tokenize(new_text);
+
+    // Help visualize what actually happens in "No newline at end of file" diffs
+    if old_text.ends_with('\n') && !new_text.ends_with('\n') {
+        tokenized_old.insert(tokenized_old.len() - 1, "⏎");
+    } else if new_text.ends_with('\n') && !old_text.ends_with('\n') {
+        tokenized_new.insert(tokenized_new.len() - 1, "⏎");
+    }
 
     let diff = tokenized_old.diff(&tokenized_new);
     match diff {

testdata/add-trailing-newline.diff

@@ -0,0 +1,3 @@
+-apor
+\ No newline at end of file
++apor

testdata/add-trailing-newline.riff-output

@@ -0,0 +1,3 @@
+-apor
+\ No newline at end of file
++apor⏎

testdata/changed-lines-without-newlines.diff

@@ -0,0 +1,4 @@
+-apor
+\ No newline at end of file
++aporna
+\ No newline at end of file

testdata/changed-lines-without-newlines.riff-output

@@ -0,0 +1,4 @@
+-apor
+\ No newline at end of file
++aporna
+\ No newline at end of file

testdata/remove-trailing-newline.riff-output

@@ -1,3 +1,3 @@
--apor
+-apor⏎
 +apor
 \ No newline at end of file