Merge pull request #87 from ikappaki/issue/win-view-ediff-empty

Support MS-windows line edings in view_ediff

Author: ericdallo

.github/workflows/test.yml

@@ -35,6 +35,9 @@ jobs:
     - name: Run tests
       run: |
         eask install-deps
+
+        eask test buttercup
+
         eask package
         eask install
         eask compile

.gitignore

@@ -3,3 +3,4 @@
 dist
 .eask
 *.elc
+*~

CHANGELOG.md

@@ -0,0 +1,5 @@
+# Changelog
+
+## Unreleased
+
+- Fix issue with `view_ediff` displaying empty buffers in ediff. #86

eca-diff.el

@@ -51,7 +51,9 @@ ROOTS may be passed for path relativization if desired.
 
 This function tries to be Doom-compatible when Emacs runs Doom popup
 system (it ignores those popup rules for the generated ediff buffers)."
-  (let* ((parsed        (eca-diff-parse-unified-diff diff))
+  (let* (;; ediff expects `\n` line endings.
+         (diff (replace-regexp-in-string "\r\n" "\n" diff))
+         (parsed        (eca-diff-parse-unified-diff diff))
          (orig          (plist-get parsed :original))
          (new           (plist-get parsed :new))
          (buf-orig      (generate-new-buffer (format "*eca-diff-orig:%s*" path)))

test/eca-diff-test.el

@@ -0,0 +1,39 @@
+;;; -*- lexical-binding: t; -*-
+(require 'buttercup)
+(require 'eca-diff)
+
+(defconst native-eol
+  (if (eq system-type 'windows-nt)
+      "\r\n"
+    "\n")
+  "Native end-of-line string for the current operating system.")
+
+(describe "eca-diff-show-ediff"
+          :var ((insert-orig (symbol-function 'insert))
+                (contents '()))
+          (before-each
+           (spy-on 'insert
+                   :and-call-fake (lambda (&rest args)
+                                    (apply insert-orig args)
+                                    (push (list (buffer-name) (buffer-string)) contents )
+                                    )))
+          (it "can display unified diffs with native EOLs"
+              (let* ((inhibit-message t)
+                     (path "/a/path")
+                     (diff (string-join '("@@ -1,3 +1,4 @@"
+                                          "-Line 1"
+                                          "-Line 2"
+                                          "+Line 1 modified"
+                                          "+Line 2"
+                                          "+Line 3 added")
+                                        native-eol)))
+
+                ;; We expect this function to call `insert` twice.
+                (eca-diff-show-ediff path diff)
+                (expect (reverse contents)
+                        :to-equal
+                        `((,(format "*eca-diff-orig:%s*" path) "Line 1
+Line 2")
+                          (,(format "*eca-diff-new:%s*" path) "Line 1 modified
+Line 2
+Line 3 added"))))))