Commit 8c0fcaf6 authored by Noam Postavsky's avatar Noam Postavsky
Browse files

Avoid inefficient regex in diff-refine-hunk (Bug#25410)

* lisp/vc/diff-mode.el (diff--forward-while-leading-char): New function.
(diff-refine-hunk): Use it instead of trying to match multiple lines
with a single lines.
parent 5304cb98
......@@ -2062,6 +2062,15 @@ For use in `add-log-current-defun-function'."
(declare-function smerge-refine-subst "smerge-mode"
(beg1 end1 beg2 end2 props-c &optional preproc props-r props-a))
(defun diff--forward-while-leading-char (char bound)
"Move point until reaching a line not starting with CHAR.
Return new point, if it was moved."
(let ((pt nil))
(while (and (< (point) bound) (eql (following-char) char))
(forward-line 1)
(setq pt (point)))
(defun diff-refine-hunk ()
"Highlight changes of hunk at point at a finer granularity."
......@@ -2081,16 +2090,18 @@ For use in `add-log-current-defun-function'."
(goto-char beg)
(pcase style
(while (re-search-forward
(let ((no-LF-at-eol-re "\\(?:\\\\.*\n\\)?"))
(concat "^\\(?:-.*\n\\)+" no-LF-at-eol-re
"\\(?:\\+.*\n\\)+" no-LF-at-eol-re)))
end t)
(smerge-refine-subst (match-beginning 0) (match-end 1)
(match-end 1) (match-end 0)
nil 'diff-refine-preproc props-r props-a)))
(while (re-search-forward "^-" end t)
(let ((beg-del (progn (beginning-of-line) (point)))
beg-add end-add)
(when (and (diff--forward-while-leading-char ?- end)
;; Allow for "\ No newline at end of file".
(progn (diff--forward-while-leading-char ?\\ end)
(setq beg-add (point)))
(diff--forward-while-leading-char ?+ end)
(progn (diff--forward-while-leading-char ?\\ end)
(setq end-add (point))))
(smerge-refine-subst beg-del beg-add beg-add end-add
nil 'diff-refine-preproc props-r props-a)))))
(let* ((middle (save-excursion (re-search-forward "^---")))
(other middle))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment