2016-12-20 23:02:48 -05:00
|
|
|
;;; whitespace-tests.el --- Test suite for whitespace -*- lexical-binding: t -*-
|
|
|
|
|
2023-01-01 05:31:12 -05:00
|
|
|
;; Copyright (C) 2016-2023 Free Software Foundation, Inc.
|
2016-12-20 23:02:48 -05:00
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 15:52:52 -07:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2016-12-20 23:02:48 -05:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(require 'ert)
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(require 'ert-x)
|
|
|
|
(require 'faceup)
|
2016-12-20 23:02:48 -05:00
|
|
|
(require 'whitespace)
|
|
|
|
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(defmacro whitespace-tests--with-test-buffer (style &rest body)
|
|
|
|
"Run BODY in a buffer with `whitespace-mode' style STYLE.
|
|
|
|
The buffer is displayed in `selected-window', and
|
2022-09-26 02:12:41 -04:00
|
|
|
`noninteractive' is set to nil even in batch mode. If STYLE is
|
|
|
|
nil, `whitespace-mode' is left disabled."
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(declare (debug ((style form) def-body))
|
|
|
|
(indent 1))
|
|
|
|
`(ert-with-test-buffer-selected ()
|
|
|
|
;; In case global-*-mode is enabled.
|
|
|
|
(whitespace-mode -1)
|
|
|
|
(font-lock-mode -1)
|
|
|
|
(let ((noninteractive nil)
|
|
|
|
(whitespace-style ,style))
|
|
|
|
(font-lock-mode 1)
|
2022-09-26 02:12:41 -04:00
|
|
|
,(when style
|
|
|
|
'(whitespace-mode 1))
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
,@body)))
|
|
|
|
|
|
|
|
(defun whitespace-tests--faceup (&rest lines)
|
|
|
|
"Convenience wrapper around `faceup-test-font-lock-buffer'.
|
|
|
|
Returns non-nil if the concatenated LINES match the current
|
|
|
|
buffer's content."
|
|
|
|
(faceup-test-font-lock-buffer nil (apply #'concat lines)))
|
|
|
|
(let ((x (get 'faceup-test-font-lock-buffer 'ert-explainer)))
|
|
|
|
(put 'whitespace-tests--faceup 'ert-explainer
|
|
|
|
(lambda (&rest lines) (funcall x nil (apply #'concat lines)))))
|
|
|
|
|
2016-12-20 23:02:48 -05:00
|
|
|
(defun whitespace-tests--cleanup-string (string)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert string)
|
|
|
|
(whitespace-cleanup)
|
|
|
|
(buffer-string)))
|
|
|
|
|
|
|
|
(ert-deftest whitespace-cleanup-eob ()
|
|
|
|
(let ((whitespace-style '(empty)))
|
|
|
|
(should (equal (whitespace-tests--cleanup-string "a\n")
|
|
|
|
"a\n"))
|
|
|
|
(should (equal (whitespace-tests--cleanup-string "a\n\n")
|
|
|
|
"a\n"))
|
|
|
|
(should (equal (whitespace-tests--cleanup-string "a\n\t\n")
|
|
|
|
"a\n"))
|
|
|
|
(should (equal (whitespace-tests--cleanup-string "a\n\t \n")
|
|
|
|
"a\n"))
|
|
|
|
(should (equal (whitespace-tests--cleanup-string "a\n\t \n\n")
|
|
|
|
"a\n"))
|
|
|
|
(should (equal (whitespace-tests--cleanup-string "\n\t\n")
|
|
|
|
""))
|
|
|
|
;; Whitespace at end of non-empty line is not covered by the
|
|
|
|
;; `empty' style.
|
|
|
|
(should (equal (whitespace-tests--cleanup-string "a \n\t \n\n")
|
|
|
|
"a \n"))))
|
|
|
|
|
2017-05-19 15:20:59 +03:00
|
|
|
|
|
|
|
;; We cannot call whitespace-mode because it will do nothing in batch
|
|
|
|
;; mode. So we call its innards instead.
|
|
|
|
(defun whitespace-tests-whitespace-mode-on ()
|
2021-09-26 01:53:56 +02:00
|
|
|
"Turn `whitespace-mode' on even in batch mode."
|
2022-07-15 12:15:26 +02:00
|
|
|
(setq whitespace-mode t)
|
2017-05-19 15:20:59 +03:00
|
|
|
(whitespace-turn-on)
|
2022-07-15 12:15:26 +02:00
|
|
|
(whitespace-action-when-on))
|
2017-05-19 15:20:59 +03:00
|
|
|
|
|
|
|
(ert-deftest whitespace-tests-display-tables ()
|
|
|
|
"Test whitespace stores and restores the buffer display table - bug26892."
|
|
|
|
(with-temp-buffer
|
|
|
|
(whitespace-mode -1) ; turn off in case global ws mode is active
|
|
|
|
(let ((whitespace-style '(space-mark tab-mark newline-mark))
|
|
|
|
(whitespace-display-mappings '((space-mark 32 [183] [46])
|
|
|
|
(space-mark 160 [164] [95])
|
|
|
|
(newline-mark 10 [36 10])
|
|
|
|
(tab-mark 9 [187 9] [92 9])))
|
|
|
|
(buffer-display-table nil))
|
|
|
|
;test the display table actually changes
|
|
|
|
(should-not (equal nil
|
|
|
|
(progn (whitespace-tests-whitespace-mode-on)
|
|
|
|
buffer-display-table)))
|
|
|
|
;test the display table restores correctly
|
|
|
|
(should (equal nil
|
|
|
|
(progn (whitespace-turn-off)
|
|
|
|
buffer-display-table)))
|
|
|
|
;test the stored display table is preserved
|
|
|
|
(should (equal nil
|
|
|
|
(progn (whitespace-tests-whitespace-mode-on)
|
|
|
|
(whitespace-turn-off)
|
|
|
|
buffer-display-table))))))
|
|
|
|
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(ert-deftest whitespace-tests--empty-bob ()
|
|
|
|
(whitespace-tests--with-test-buffer '(face empty)
|
|
|
|
(electric-indent-mode -1)
|
|
|
|
|
|
|
|
;; Insert some empty lines. None of the lines should be
|
|
|
|
;; highlighted even though point is on the last line because the
|
|
|
|
;; entire buffer is empty lines.
|
|
|
|
(execute-kbd-macro (kbd "SPC RET C-q TAB RET RET SPC"))
|
|
|
|
(should (equal (buffer-string) " \n\t\n\n "))
|
|
|
|
(should (equal (line-number-at-pos) 4))
|
|
|
|
(should (whitespace-tests--faceup " \n"
|
|
|
|
"\t\n"
|
|
|
|
"\n"
|
|
|
|
" "))
|
|
|
|
|
|
|
|
;; Adding content on the last line (and keeping point there)
|
|
|
|
;; should cause the previous lines to be highlighted. Note that
|
|
|
|
;; the `whitespace-empty' face applies to the newline just before
|
|
|
|
;; the last line, which has the desired property of extending the
|
|
|
|
;; highlight the full width of the window.
|
|
|
|
(execute-kbd-macro (kbd "x"))
|
|
|
|
(should (equal (buffer-string) " \n\t\n\n x"))
|
|
|
|
(should (equal (line-number-at-pos) 4))
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty: \n"
|
|
|
|
"\t\n"
|
|
|
|
"\n"
|
|
|
|
"» x"))
|
|
|
|
|
|
|
|
;; Lines should become un-highlighted as point moves up into the
|
|
|
|
;; empty lines.
|
|
|
|
(execute-kbd-macro (kbd "<up>"))
|
|
|
|
(should (equal (line-number-at-pos) 3))
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty: \n"
|
|
|
|
"\t\n"
|
|
|
|
"»\n"
|
|
|
|
" x"))
|
|
|
|
(execute-kbd-macro (kbd "<up>"))
|
|
|
|
(should (equal (line-number-at-pos) 2))
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty: \n"
|
|
|
|
"»\t\n"
|
|
|
|
"\n"
|
|
|
|
" x"))
|
2022-09-13 15:37:56 +02:00
|
|
|
(execute-kbd-macro (kbd "<up> C-a"))
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(should (equal (point) 1))
|
|
|
|
(should (whitespace-tests--faceup " \n"
|
|
|
|
"\t\n"
|
|
|
|
"\n"
|
|
|
|
" x"))
|
|
|
|
|
|
|
|
;; Line 1 should be un-highlighted when point is in line 1 even if
|
|
|
|
;; point is not bobp.
|
|
|
|
(execute-kbd-macro (kbd "<right>"))
|
|
|
|
(should (equal (line-number-at-pos) 1))
|
|
|
|
(should (> (point) 1))
|
|
|
|
(should (whitespace-tests--faceup " \n"
|
|
|
|
"\t\n"
|
|
|
|
"\n"
|
|
|
|
" x"))
|
|
|
|
|
|
|
|
;; Make sure lines become re-highlighted as point moves down.
|
|
|
|
(execute-kbd-macro (kbd "<down>"))
|
|
|
|
(should (equal (line-number-at-pos) 2))
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty: \n"
|
|
|
|
"»\t\n"
|
|
|
|
"\n"
|
|
|
|
" x"))
|
|
|
|
(execute-kbd-macro (kbd "<down>"))
|
|
|
|
(should (equal (line-number-at-pos) 3))
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty: \n"
|
|
|
|
"\t\n"
|
|
|
|
"»\n"
|
|
|
|
" x"))
|
|
|
|
(execute-kbd-macro (kbd "<down>"))
|
|
|
|
(should (equal (line-number-at-pos) 4))
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty: \n"
|
|
|
|
"\t\n"
|
|
|
|
"\n"
|
|
|
|
"» x"))
|
|
|
|
|
|
|
|
;; Inserting content on line 2 should un-highlight lines 2 and 3.
|
2022-09-13 15:37:56 +02:00
|
|
|
(execute-kbd-macro (kbd "<up> <up> C-e"))
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(should (equal (line-number-at-pos) 2))
|
|
|
|
(should (equal (- (point) (line-beginning-position)) 1))
|
|
|
|
(execute-kbd-macro (kbd "y <down> <down>"))
|
|
|
|
(should (equal (line-number-at-pos) 4))
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty: \n"
|
|
|
|
"»\ty\n"
|
|
|
|
"\n"
|
|
|
|
" x"))
|
|
|
|
|
|
|
|
;; Removing the content on line 2 should re-highlight lines 2 and
|
|
|
|
;; 3.
|
2022-09-13 15:37:56 +02:00
|
|
|
(execute-kbd-macro (kbd "<up> <up> C-e"))
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(should (equal (line-number-at-pos) 2))
|
|
|
|
(should (equal (- (point) (line-beginning-position)) 2))
|
|
|
|
(execute-kbd-macro (kbd "DEL <down> <down>"))
|
|
|
|
(should (equal (line-number-at-pos) 4))
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty: \n"
|
|
|
|
"\t\n"
|
|
|
|
"\n"
|
|
|
|
"» x"))))
|
|
|
|
|
|
|
|
(ert-deftest whitespace-tests--empty-eob ()
|
|
|
|
(whitespace-tests--with-test-buffer '(face empty)
|
|
|
|
(electric-indent-mode -1)
|
|
|
|
|
|
|
|
;; Insert some empty lines. None of the lines should be
|
|
|
|
;; highlighted even though point is on line 1 because the entire
|
|
|
|
;; buffer is empty lines.
|
|
|
|
(execute-kbd-macro (kbd "RET RET C-q TAB RET SPC C-<home>"))
|
|
|
|
(should (equal (buffer-string) "\n\n\t\n "))
|
|
|
|
(should (equal (line-number-at-pos) 1))
|
|
|
|
(should (whitespace-tests--faceup "\n"
|
|
|
|
"\n"
|
|
|
|
"\t\n"
|
|
|
|
" "))
|
|
|
|
|
|
|
|
;; Adding content on the first line (and keeping point there)
|
|
|
|
;; should cause the subsequent lines to be highlighted.
|
|
|
|
(execute-kbd-macro (kbd "x"))
|
|
|
|
(should (equal (buffer-string) "x\n\n\t\n "))
|
|
|
|
(should (equal (line-number-at-pos) 1))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"«:whitespace-empty:\n"
|
|
|
|
"\t\n"
|
|
|
|
" »"))
|
|
|
|
|
|
|
|
;; Lines should become un-highlighted as point moves down into the
|
|
|
|
;; empty lines.
|
|
|
|
(execute-kbd-macro (kbd "<down>"))
|
|
|
|
(should (equal (line-number-at-pos) 2))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"\n"
|
|
|
|
"«:whitespace-empty:\t\n"
|
|
|
|
" »"))
|
|
|
|
(execute-kbd-macro (kbd "<down>"))
|
|
|
|
(should (equal (line-number-at-pos) 3))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"\n"
|
|
|
|
"\t\n"
|
|
|
|
"«:whitespace-empty: »"))
|
|
|
|
(execute-kbd-macro (kbd "C-<end>"))
|
|
|
|
(should (equal (line-number-at-pos) 4))
|
|
|
|
(should (eobp))
|
|
|
|
(should (equal (- (point) (line-beginning-position)) 1))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"\n"
|
|
|
|
"\t\n"
|
|
|
|
" "))
|
|
|
|
|
|
|
|
;; The last line should be un-highlighted when point is in that
|
|
|
|
;; line even if point is not eobp.
|
|
|
|
(execute-kbd-macro (kbd "<left>"))
|
|
|
|
(should (equal (line-number-at-pos) 4))
|
|
|
|
(should (not (eobp)))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"\n"
|
|
|
|
"\t\n"
|
|
|
|
" "))
|
|
|
|
|
|
|
|
;; Make sure lines become re-highlighted as point moves up.
|
|
|
|
(execute-kbd-macro (kbd "<up>"))
|
|
|
|
(should (equal (line-number-at-pos) 3))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"\n"
|
|
|
|
"\t\n"
|
|
|
|
"«:whitespace-empty: »"))
|
|
|
|
(execute-kbd-macro (kbd "<up>"))
|
|
|
|
(should (equal (line-number-at-pos) 2))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"\n"
|
|
|
|
"«:whitespace-empty:\t\n"
|
|
|
|
" »"))
|
|
|
|
(execute-kbd-macro (kbd "<up>"))
|
|
|
|
(should (equal (line-number-at-pos) 1))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"«:whitespace-empty:\n"
|
|
|
|
"\t\n"
|
|
|
|
" »"))
|
|
|
|
|
|
|
|
;; Inserting content on line 3 should un-highlight lines 2 and 3.
|
2022-09-13 15:37:56 +02:00
|
|
|
(execute-kbd-macro (kbd "<down> <down> C-a"))
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(should (equal (line-number-at-pos) 3))
|
|
|
|
(should (equal (- (point) (line-beginning-position)) 0))
|
|
|
|
(execute-kbd-macro (kbd "y <up> <up>"))
|
|
|
|
(should (equal (line-number-at-pos) 1))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"\n"
|
|
|
|
"y\t\n"
|
|
|
|
"«:whitespace-empty: »"))
|
|
|
|
|
|
|
|
;; Removing the content on line 3 should re-highlight lines 2 and
|
|
|
|
;; 3.
|
2022-09-13 15:37:56 +02:00
|
|
|
(execute-kbd-macro (kbd "<down> <down> C-a"))
|
whitespace: Redo BoB/EoB empty line highlighting
* lisp/whitespace.el (whitespace--empty-at-bob-matcher,
whitespace--empty-at-eob-matcher, whitespace--update-bob-eob,
whitespace-color-off, whitespace-color-on,
whitespace-empty-at-bob-regexp, whitespace-empty-at-eob-regexp,
whitespace-looking-back, whitespace-post-command-hook): Redo the
`empty' line highlighting logic to ensure that a buffer change causes
all affected `empty' lines to become (un)highlighted (bug#37467).
Also, for improved UX, don't highlight BoB empty lines at or below
point (not just when point is at 1), or EoB empty lines at or above
point (not just when point is `eobp').
(whitespace-bob-marker, whitespace-eob-marker): Clarify documentation.
* test/lisp/whitespace-tests.el (whitespace--with-test-buffer,
whitespace--fu, whitespace-tests--empty-bob,
whitespace-tests--empty-eob): Add tests.
2022-06-28 16:25:43 -04:00
|
|
|
(should (equal (line-number-at-pos) 3))
|
|
|
|
(should (equal (- (point) (line-beginning-position)) 0))
|
|
|
|
(execute-kbd-macro (kbd "<deletechar> <up> <up>"))
|
|
|
|
(should (equal (line-number-at-pos) 1))
|
|
|
|
(should (whitespace-tests--faceup "x\n"
|
|
|
|
"«:whitespace-empty:\n"
|
|
|
|
"\t\n"
|
|
|
|
" »"))))
|
|
|
|
|
2022-09-26 02:12:41 -04:00
|
|
|
(ert-deftest whitespace-tests--empty-bob-eob-read-only-buffer ()
|
|
|
|
(whitespace-tests--with-test-buffer '()
|
|
|
|
(insert "\nx\n\n")
|
|
|
|
(should (equal (buffer-string) "\nx\n\n"))
|
|
|
|
(setq-local buffer-read-only t)
|
|
|
|
(goto-char 2)
|
|
|
|
(should (equal (line-number-at-pos) 2))
|
|
|
|
(should (equal (- (point) (line-beginning-position)) 0))
|
|
|
|
(let ((whitespace-style '(face empty)))
|
|
|
|
(whitespace-mode 1)
|
|
|
|
(should (whitespace-tests--faceup "«:whitespace-empty:\n"
|
|
|
|
"»x\n"
|
|
|
|
"«:whitespace-empty:\n"
|
|
|
|
"»")))))
|
|
|
|
|
2022-12-18 23:04:00 -05:00
|
|
|
(ert-deftest whitespace-tests--empty-bob-eob-modified ()
|
|
|
|
"Regression test for Bug#60066."
|
|
|
|
(whitespace-tests--with-test-buffer '()
|
|
|
|
(insert "\nx\n\n")
|
|
|
|
(goto-char 2)
|
|
|
|
(set-buffer-modified-p nil)
|
|
|
|
(let ((whitespace-style '(face empty)))
|
|
|
|
(whitespace-mode 1)
|
|
|
|
(should (not (buffer-modified-p))))))
|
|
|
|
|
2022-12-13 01:33:43 -05:00
|
|
|
(ert-deftest whitespace-tests--indirect-clone-breaks-base-markers ()
|
|
|
|
"Specific regression test for Bug#59618."
|
|
|
|
(whitespace-tests--with-test-buffer '(face empty)
|
|
|
|
(insert "\nx\n\n")
|
|
|
|
(let ((base (current-buffer))
|
|
|
|
;; `unwind-protect' is not used to clean up `indirect'
|
|
|
|
;; because the buffer should only be killed on success.
|
|
|
|
(indirect (clone-indirect-buffer (buffer-name) nil)))
|
|
|
|
(should (eq (marker-buffer whitespace-bob-marker) base))
|
|
|
|
(should (eq (marker-buffer whitespace-eob-marker) base))
|
2022-12-18 00:24:16 -05:00
|
|
|
(ert-with-buffer-selected indirect
|
2022-12-13 01:33:43 -05:00
|
|
|
;; Mutate the indirect buffer to update its bob/eob markers.
|
|
|
|
(execute-kbd-macro (kbd "z RET M-< a")))
|
|
|
|
;; With Bug#59618, the above mutation would cause the base
|
|
|
|
;; buffer's markers to point inside the indirect buffer because
|
|
|
|
;; the indirect buffer erroneously shared marker objects with
|
|
|
|
;; the base buffer. Killing the indirect buffer would then
|
|
|
|
;; invalidate those markers (make them point nowhere).
|
|
|
|
(kill-buffer indirect)
|
|
|
|
(should (eq (marker-buffer whitespace-bob-marker) base))
|
|
|
|
(should (eq (marker-buffer whitespace-eob-marker) base)))))
|
|
|
|
|
|
|
|
(defun whitespace-tests--check-markers (buf bpos epos)
|
|
|
|
(with-current-buffer buf
|
|
|
|
(should (eq (marker-buffer whitespace-bob-marker) buf))
|
|
|
|
(should (eq (marker-position whitespace-bob-marker) bpos))
|
|
|
|
(should (eq (marker-buffer whitespace-eob-marker) buf))
|
|
|
|
(should (eq (marker-position whitespace-eob-marker) epos))))
|
|
|
|
|
|
|
|
(ert-deftest whitespace-tests--indirect-clone-markers ()
|
|
|
|
"Test `whitespace--clone' on indirect clones."
|
|
|
|
(whitespace-tests--with-test-buffer '(face empty)
|
|
|
|
(insert "\nx\n\n")
|
|
|
|
(let ((base (current-buffer))
|
|
|
|
;; `unwind-protect' is not used to clean up `indirect'
|
|
|
|
;; because the buffer should only be killed on success.
|
|
|
|
(indirect (clone-indirect-buffer nil nil)))
|
|
|
|
(whitespace-tests--check-markers base 2 4)
|
2022-12-18 00:24:16 -05:00
|
|
|
(ert-with-buffer-selected indirect
|
2022-12-13 01:33:43 -05:00
|
|
|
(whitespace-tests--check-markers indirect 2 4)
|
|
|
|
;; Mutate the buffer to trigger `after-change-functions' and
|
|
|
|
;; thus `whitespace--update-bob-eob'.
|
|
|
|
(execute-kbd-macro (kbd "z RET M-< a"))
|
|
|
|
(whitespace-tests--check-markers indirect 1 8))
|
|
|
|
(kill-buffer indirect)
|
|
|
|
;; When the buffer was modified above, the new "a" character at
|
|
|
|
;; the beginning moved the base buffer's markers by one. Emacs
|
|
|
|
;; did not run the base buffer's `after-change-functions' after
|
|
|
|
;; the indirect buffer was edited (Bug#46982), so the end result
|
|
|
|
;; is just the shift by one.
|
|
|
|
(whitespace-tests--check-markers base 3 5))))
|
|
|
|
|
|
|
|
(ert-deftest whitespace-tests--regular-clone-markers ()
|
|
|
|
"Test `whitespace--clone' on regular clones."
|
|
|
|
(whitespace-tests--with-test-buffer '(face empty)
|
|
|
|
(insert "\nx\n\n")
|
|
|
|
(let ((orig (current-buffer))
|
|
|
|
;; `unwind-protect' is not used to clean up `clone' because
|
|
|
|
;; the buffer should only be killed on success.
|
|
|
|
(clone (clone-buffer)))
|
|
|
|
(whitespace-tests--check-markers orig 2 4)
|
2022-12-18 00:24:16 -05:00
|
|
|
(ert-with-buffer-selected clone
|
2022-12-13 01:33:43 -05:00
|
|
|
(whitespace-tests--check-markers clone 2 4)
|
|
|
|
(execute-kbd-macro (kbd "z RET M-< a"))
|
|
|
|
(whitespace-tests--check-markers clone 1 8))
|
|
|
|
(kill-buffer clone)
|
|
|
|
(whitespace-tests--check-markers orig 2 4))))
|
|
|
|
|
2016-12-20 23:02:48 -05:00
|
|
|
(provide 'whitespace-tests)
|
|
|
|
|
|
|
|
;;; whitespace-tests.el ends here
|