mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-06 22:41:06 -08:00
0ac21120cf
Update the `fill-region-as-paragraph-semlf' function to follow the `fill-region-as-paragraph-function' protocol. This allows us to reimplement the `fill-paragraph-semlf' function using `fill-paragraph' and `fill-region-as-paragraph-function'. * lisp/textmodes/fill.el (fill-region-as-paragraph-semlf): Make this function compatible with `fill-region-as-paragraph-function'. Avoid narrowing. (fill-paragraph-semlf): Reimplement using `fill-paragraph' and `fill-region-as-paragraph-function'. * test/lisp/textmodes/fill-tests.el (fill-test-semlf-fill-region): Add test. (fill-test-fill-paragraph-semlf-fill-paragraph-function): Remove test. (fill-test-fill-paragraph-semlf, fill-test-semlf) (fill-test-fill-paragraph-semlf-justify, fill-test-semlf-justify) (fill-test-fill-paragraph-semlf-sentence-end-double-space) (fill-test-semlf-sentence-end-double-space) (fill-test-fill-paragraph-semlf-fill-column, fill-test-semlf-fill-column) (fill-test-fill-paragraph-semlf-punctuation-marks) (fill-test-semlf-punctuation-marks, fill-test-fill-paragraph-semlf-twice) (fill-test-semlf-twice, fill-test-fill-paragraph-semlf-fill-prefix) (fill-test-semlf-fill-prefix) (fill-test-fill-paragraph-semlf-indented-block) (fill-test-semlf-indented-block, fill-test-fill-paragraph-semlf-revert) (fill-test-semlf-revert, fill-test-fill-paragraph-semlf-emacs-lisp-mode) (fill-test-semlf-emacs-lisp-mode, fill-test-fill-paragraph-semlf-c-mode) (fill-test-semlf-c-mode, fill-test-fill-paragraph-semlf-org-mode) (fill-test-semlf-org-mode, fill-test-fill-paragraph-semlf-markdown-mode) (fill-test-semlf-markdown-mode): User shorter function names consistent with erts file names. * test/lisp/textmodes/fill-resources/semlf-fill-region.erts: Add test data. * test/lisp/textmodes/fill-resources/semlf-fill-paragraph-function.erts: Delete file. * test/lisp/textmodes/fill-resources/semlf-emacs-lisp-mode.erts: Remove newlines around indented block. * doc/lispref/text.texi (Filling): Highlight that `fill-region-as-paragraph-function' changes the behavior of `fill-paragraph'.
257 lines
8.8 KiB
EmacsLisp
257 lines
8.8 KiB
EmacsLisp
;;; fill-tests.el --- ERT tests for fill.el -*- lexical-binding: t -*-
|
|
|
|
;; Copyright (C) 2017-2025 Free Software Foundation, Inc.
|
|
|
|
;; Author: Marcin Borkowski <mbork@mbork.pl>
|
|
;; Keywords: text
|
|
|
|
;; 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
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; This package defines tests for the filling feature, specifically
|
|
;; the `fill-polish-nobreak-p' function.
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'ert-x)
|
|
|
|
(ert-deftest fill-test-no-fill-polish-nobreak-p nil
|
|
"Tests of the `fill-polish-nobreak-p' function."
|
|
(with-temp-buffer
|
|
(insert "Abc d efg (h ijk).")
|
|
(setq fill-column 8)
|
|
(setq-local fill-nobreak-predicate '())
|
|
(fill-paragraph)
|
|
(should (string= (buffer-string) "Abc d\nefg (h\nijk).")))
|
|
(with-temp-buffer
|
|
(insert "Abc d efg (h ijk).")
|
|
(setq fill-column 8)
|
|
(setq-local fill-nobreak-predicate '(fill-polish-nobreak-p))
|
|
(fill-paragraph)
|
|
(should (string= (buffer-string) "Abc\nd efg\n(h ijk)."))))
|
|
|
|
(ert-deftest fill-test-unbreakable-paragraph ()
|
|
;; See bug#45720 and bug#53537.
|
|
:expected-result :failed
|
|
(with-temp-buffer
|
|
(let ((string "aaa = baaaaaaaaaaaaaaaaaaaaaaaaaaaa\n"))
|
|
(insert string)
|
|
(goto-char (point-min))
|
|
(search-forward "b")
|
|
(let* ((pos (point))
|
|
(beg (pos-bol))
|
|
(end (pos-eol))
|
|
(fill-prefix (make-string (- pos beg) ?\s))
|
|
;; `fill-column' is too small to accommodate the current line
|
|
(fill-column (- end beg 10)))
|
|
(fill-region-as-paragraph beg end nil nil pos))
|
|
(should (equal (buffer-string) string)))))
|
|
|
|
(ert-deftest fill-test-breakable-paragraph ()
|
|
(with-temp-buffer
|
|
(let ((string "aaa = baaaaaaaa aaaaaaaaaa aaaaaaaaaa\n"))
|
|
(insert string)
|
|
(goto-char (point-min))
|
|
(search-forward "b")
|
|
(let* ((pos (point))
|
|
(beg (pos-bol))
|
|
(end (pos-eol))
|
|
(fill-prefix (make-string (- pos beg) ?\s))
|
|
;; `fill-column' is too small to accommodate the current line
|
|
(fill-column (- end beg 10)))
|
|
(fill-region-as-paragraph beg end nil nil pos))
|
|
(should (equal
|
|
(buffer-string)
|
|
"aaa = baaaaaaaa aaaaaaaaaa\n aaaaaaaaaa\n")))))
|
|
|
|
(ert-deftest test-fill-end-period ()
|
|
(should
|
|
(equal
|
|
(with-temp-buffer
|
|
(text-mode)
|
|
(auto-fill-mode)
|
|
(insert "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eius.")
|
|
(self-insert-command 1 ?\s)
|
|
(buffer-string))
|
|
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eius. "))
|
|
(should
|
|
(equal
|
|
(with-temp-buffer
|
|
(text-mode)
|
|
(auto-fill-mode)
|
|
(insert "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eius.Foo")
|
|
(forward-char -3)
|
|
(self-insert-command 1 ?\s)
|
|
(buffer-string))
|
|
"Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do
|
|
eius. Foo")))
|
|
|
|
(ert-deftest test-fill-haskell ()
|
|
(should
|
|
(equal
|
|
(with-temp-buffer
|
|
(asm-mode)
|
|
(dolist (line '(" ;; a b c"
|
|
" ;; d e f"
|
|
" ;; x y z"
|
|
" ;; w"))
|
|
(insert line "\n"))
|
|
(goto-char (point-min))
|
|
(end-of-line)
|
|
(setf fill-column 10)
|
|
(fill-paragraph nil)
|
|
(buffer-string))
|
|
" ;; a b c
|
|
;; d e f
|
|
;; x y z
|
|
;; w
|
|
")))
|
|
|
|
(ert-deftest fill-test-fill-region ()
|
|
"Test the `fill-region' function."
|
|
(ert-test-erts-file (ert-resource-file "fill-region.erts")
|
|
(lambda ()
|
|
(fill-region
|
|
(point)
|
|
(progn
|
|
(goto-char (point-max))
|
|
(forward-line -1)
|
|
(beginning-of-line)
|
|
(point))))))
|
|
|
|
(ert-deftest fill-test-fill-region-as-paragraph-semlf ()
|
|
"Test the `fill-region-as-paragraph-semlf' function."
|
|
(ert-test-erts-file (ert-resource-file "semlf-fill-region-as-paragraph.erts")
|
|
(lambda ()
|
|
(setq-local fill-column 35)
|
|
(fill-region-as-paragraph-semlf
|
|
(point)
|
|
(progn
|
|
(goto-char (point-max))
|
|
(forward-line -1)
|
|
(beginning-of-line)
|
|
(point))))))
|
|
|
|
(ert-deftest fill-test-semlf-fill-region ()
|
|
"Test `fill-region' with `fill-region-as-paragraph-semlf'."
|
|
(ert-test-erts-file (ert-resource-file "semlf-fill-region.erts")
|
|
(lambda ()
|
|
(setq-local fill-region-as-paragraph-function
|
|
#'fill-region-as-paragraph-semlf)
|
|
(fill-region
|
|
(point)
|
|
(progn
|
|
(goto-char (point-max))
|
|
(forward-line -1)
|
|
(beginning-of-line)
|
|
(point))))))
|
|
|
|
(ert-deftest fill-test-semlf ()
|
|
"Test semantic-linefeed filling."
|
|
(ert-test-erts-file (ert-resource-file "semlf.erts")
|
|
(lambda ()
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-justify ()
|
|
"Test semantic-linefeed filling with text justification."
|
|
(ert-test-erts-file (ert-resource-file "semlf-justify.erts")
|
|
(lambda ()
|
|
(fill-paragraph-semlf 'justify))))
|
|
|
|
(ert-deftest fill-test-semlf-sentence-end-double-space ()
|
|
"Test semantic-linefeed filling with `sentence-end-double-space'."
|
|
(ert-test-erts-file (ert-resource-file "semlf-sentence-end-double-space.erts")
|
|
(lambda ()
|
|
(setq-local sentence-end-double-space nil)
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-fill-column ()
|
|
"Test semantic-linefeed filling with `fill-column'."
|
|
(ert-test-erts-file (ert-resource-file "semlf-fill-column.erts")
|
|
(lambda ()
|
|
(setq-local fill-column 35)
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-punctuation-marks ()
|
|
"Test semantic-linefeed filling with different punctuation marks."
|
|
(ert-test-erts-file (ert-resource-file "semlf-punctuation-marks.erts")
|
|
(lambda ()
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-twice ()
|
|
"Test filling the same text twice using semantic linefeeds."
|
|
(ert-test-erts-file (ert-resource-file "semlf-twice.erts")
|
|
(lambda ()
|
|
(goto-char (point-min))
|
|
(fill-paragraph-semlf)
|
|
(goto-char (point-min))
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-fill-prefix ()
|
|
"Test semantic-linefeed filling with different fill prefixes."
|
|
(ert-test-erts-file (ert-resource-file "semlf-fill-prefix.erts")
|
|
(lambda ()
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-indented-block ()
|
|
"Test semantic-linefeed filling with an indented block."
|
|
(ert-test-erts-file (ert-resource-file "semlf-indented-block.erts")
|
|
(lambda ()
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-revert ()
|
|
"Test that semantic-linefeed filling can be reverted."
|
|
(ert-test-erts-file (ert-resource-file "semlf-revert.erts")
|
|
(lambda ()
|
|
(fill-paragraph)
|
|
(fill-paragraph-semlf)
|
|
(fill-paragraph))))
|
|
|
|
(ert-deftest fill-test-semlf-emacs-lisp-mode ()
|
|
"Test semantic-linefeed filling with `emacs-lisp-mode'."
|
|
(ert-test-erts-file (ert-resource-file "semlf-emacs-lisp-mode.erts")
|
|
(lambda ()
|
|
(emacs-lisp-mode)
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-c-mode ()
|
|
"Test semantic-linefeed filling with `c-mode'."
|
|
(ert-test-erts-file (ert-resource-file "semlf-c-mode.erts")
|
|
(lambda ()
|
|
(c-mode)
|
|
(fill-paragraph-semlf))))
|
|
|
|
(ert-deftest fill-test-semlf-org-mode ()
|
|
"Test semantic-linefeed filling with `org-mode'."
|
|
(ert-test-erts-file (ert-resource-file "semlf-org-mode.erts")
|
|
(lambda ()
|
|
(org-mode)
|
|
(fill-paragraph-semlf))))
|
|
|
|
(declare-function markdown-mode "markdown-mode")
|
|
(ert-deftest fill-test-semlf-markdown-mode ()
|
|
"Test semantic-linefeed filling with `markdown-mode'."
|
|
(skip-unless (functionp 'markdown-mode))
|
|
(ert-test-erts-file (ert-resource-file "semlf-markdown-mode.erts")
|
|
(lambda ()
|
|
(markdown-mode)
|
|
(fill-paragraph-semlf))))
|
|
|
|
(provide 'fill-tests)
|
|
|
|
;;; fill-tests.el ends here
|