mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(diff-mode-test-font-lock): Fix spurious test failure

Browse source 
* test/lisp/vc/diff-mode-tests.el (diff-mode-test-font-lock):
Don't nitpick about non-face-affecting overlays.
This commit is contained in:
Stefan Monnier 2025-02-15 11:12:36 -05:00
parent b8b7c6fbfd
commit 7f2508e6e1
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
test/lisp/vc/diff-mode-tests.el
View file

@ -389,26 +389,26 @@ baz"))))
124 127 (face diff-context))))
;; Test diff-font-lock-syntax.
(should (equal (mapcar (lambda (o)
(list (- (overlay-start o) diff-beg)
(- (overlay-end o) diff-beg)
(append (and (overlay-get o 'diff-mode)
`(diff-mode ,(overlay-get o 'diff-mode)))
(and (overlay-get o 'face)
`(face ,(overlay-get o 'face))))))
(should (equal
(delq nil
(mapcar (lambda (o)
(when (overlay-get o 'face)
(list (- (overlay-start o) diff-beg)
(- (overlay-end o) diff-beg)
`( diff-mode ,(overlay-get o 'diff-mode)
face ,(overlay-get o 'face)))))
(sort (overlays-in (point-min) (point-max))
(lambda (a b) (< (overlay-start a) (overlay-start b)))))
'((0 127 (diff-mode fine))
(0 127 (diff-mode syntax))
(17 25 (diff-mode syntax face font-lock-preprocessor-face))
(26 35 (diff-mode syntax face font-lock-string-face))
(37 40 (diff-mode syntax face font-lock-type-face))
(41 45 (diff-mode syntax face font-lock-function-name-face))
(61 78 (diff-mode syntax face font-lock-string-face))
(69 74 (diff-mode fine face diff-refine-removed))
(91 108 (diff-mode syntax face font-lock-string-face))
(99 104 (diff-mode fine face diff-refine-added))
(114 120 (diff-mode syntax face font-lock-keyword-face))))))))
(lambda (a b)
(< (overlay-start a) (overlay-start b))))))
'((17 25 (diff-mode syntax face font-lock-preprocessor-face))
(26 35 (diff-mode syntax face font-lock-string-face))
(37 40 (diff-mode syntax face font-lock-type-face))
(41 45 (diff-mode syntax face font-lock-function-name-face))
(61 78 (diff-mode syntax face font-lock-string-face))
(69 74 (diff-mode fine face diff-refine-removed))
(91 108 (diff-mode syntax face font-lock-string-face))
(99 104 (diff-mode fine face diff-refine-added))
(114 120 (diff-mode syntax face font-lock-keyword-face))))))))
(ert-deftest diff-mode-test-font-lock-syntax-one-line ()
"Check diff syntax highlighting for one line with no newline at end."