procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix more flymake-diag-region eob corner cases and add tests (bug#29201)

Browse source 
* lisp/progmodes/flymake.el (flymake-diag-region): Correct
more eob corner cases.

* test/lisp/progmodes/flymake-tests.el
(eob-region-and-trailing-newline): New test.
This commit is contained in:
João Távora 2017-11-11 23:44:52 +00:00
parent 9533d76b0b
commit e286b3381f
2 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lisp/progmodes/flymake.el
View file

@ -318,7 +318,11 @@ region is invalid."
(goto-char (point-min))
(forward-line (1- line))
(cl-flet ((fallback-bol
() (progn (back-to-indentation) (point)))
()
(back-to-indentation)
(if (eobp)
(line-beginning-position 0)
(point)))
(fallback-eol
(beg)
(progn
@ -335,11 +339,11 @@ region is invalid."
(not (= sexp-end beg))
sexp-end)
(and (< (goto-char (1+ beg)) (point-max))
(point))))
(safe-end (or end
(fallback-eol beg))))
(cons (if end beg (fallback-bol))
safe-end))
(point)))))
(if end
(cons beg end)
(cons (setq beg (fallback-bol))
(fallback-eol beg))))
(let* ((beg (fallback-bol))
(end (fallback-eol beg)))
(cons beg end)))))))

32
test/lisp/progmodes/flymake-tests.el
View file

@ -333,6 +333,38 @@ SEVERITY-PREDICATE is used to setup
(should-error (flymake-goto-prev-error nil nil t))
)))))
(ert-deftest eob-region-and-trailing-newline ()
"`flymake-diag-region' at eob with varying trailing newlines."
(cl-flet ((diag-region-substring
(line col)
(pcase-let
((`(,a . ,b) (flymake-diag-region (current-buffer) line col)))
(buffer-substring a b))))
(with-temp-buffer
(insert "beg\nmmm\nend")
(should (equal
(diag-region-substring 3 3)
"d"))
(should (equal
(diag-region-substring 3 nil)
"end"))
(insert "\n")
(should (equal
(diag-region-substring 4 1)
"end"))
(should (equal
(diag-region-substring 4 nil)
"end"))
(insert "\n")
(should (equal
(diag-region-substring 5 1)
"\n"))
(should (equal
(diag-region-substring 5 nil)
"\n")))))
(provide 'flymake-tests)
;;; flymake.el ends here