Skip to content

Don't apply delta to enormously large buffers #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't apply delta to enormously large buffers #27

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 34 additions & 17 deletions magit-delta.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,13 @@ will be added if not present."
(const :tag "Show" nil))
:group 'magit-delta)

(defcustom magit-delta-max-lines 1000
"Don't use delta if length of the buffer is greater than specified.
This setting is needed to avoid situations when delta will freezes
the whole Emacs when trying to process extremely large diff"
:type 'integer
:group 'magit-delta)

(defun magit-delta--make-delta-args ()
"Make final list of delta command-line arguments."
(let ((args magit-delta-delta-args))
Expand All @@ -86,36 +93,46 @@ will be added if not present."

https://github.com/dandavison/delta"
:lighter " Δ"

(cond
(magit-delta-mode
(add-hook 'magit-diff-wash-diffs-hook #'magit-delta-apply-delta-to-diffs-maybe)
(setq magit-delta--magit-diff-refine-hunk--orig-value
magit-diff-refine-hunk))
('deactivate
(remove-hook 'magit-diff-wash-diffs-hook #'magit-delta-apply-delta-to-diffs-maybe))))

(defun magit-delta-apply-delta-to-diffs-maybe ()
"Apply delta to diffs in current magit buffer.

If buffer length is more than `magit-delta-max-lines' lines,
fall back to default diff highlighting."
(let ((magit-faces-to-override
'(magit-diff-context-highlight
magit-diff-added
magit-diff-added-highlight
magit-diff-removed
magit-diff-removed-highlight)))
(cond
(magit-delta-mode
(add-hook 'magit-diff-wash-diffs-hook #'magit-delta-call-delta-and-convert-ansi-escape-sequences)
(setq magit-delta--magit-diff-refine-hunk--orig-value
magit-diff-refine-hunk

magit-diff-refine-hunk
(if (and magit-delta-max-lines
(> (line-number-at-pos (point-max)) magit-delta-max-lines))
(progn (message "Buffer is too large, diff preview with delta disabled!")
(setq magit-diff-refine-hunk
magit-delta--magit-diff-refine-hunk--orig-value

face-remapping-alist
(--remove (member (car it) magit-faces-to-override)
face-remapping-alist)))
(setq magit-diff-refine-hunk
nil

face-remapping-alist
(nconc
(--remove (member (car it) magit-faces-to-override)
face-remapping-alist)
(--map (cons it 'default) magit-faces-to-override))))
('deactivate
(remove-hook 'magit-diff-wash-diffs-hook #'magit-delta-call-delta-and-convert-ansi-escape-sequences)
(setq magit-diff-refine-hunk
magit-delta--magit-diff-refine-hunk--orig-value

face-remapping-alist
(--remove (member (car it) magit-faces-to-override)
face-remapping-alist))))))
(--map (cons it 'default) magit-faces-to-override)))
(magit-delta--call-delta-and-convert-ansi-escape-sequences))))

(defun magit-delta-call-delta-and-convert-ansi-escape-sequences ()
(defun magit-delta--call-delta-and-convert-ansi-escape-sequences ()
"Call delta on buffer contents and convert ANSI escape sequences to overlays.

The input buffer contents are expected to be raw git output."
Expand Down