mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-28 07:45:00 +00:00
9f505c476e
* lisp/simple.el (blink-paren-open-paren-line-string): Extract functionality that shows the open paren line in the echo area into its own function, to reuse it from paren.el. (blink-matching-open): Use blink-paren-open-paren-line-string. * lisp/paren.el (show-paren-context-when-offscreen): New option show-paren-context-when-offscreen. (show-paren-function): Implement it using blink-paren-open-paren-line-string. * lisp/emacs-lisp/eldoc.el (eldoc-display-message-no-interference-p): Make sure the feature works well with eldoc. * test/lisp/paren-tests.el (paren-tests-open-paren-line): Test blink-paren-open-paren-line-string. * doc/emacs/programs.texi (Matching): Update the documentation. * etc/NEWS: And announce the new feature.
153 lines
5.0 KiB
EmacsLisp
153 lines
5.0 KiB
EmacsLisp
;;; paren-tests.el --- Tests for paren.el -*- lexical-binding: t; -*-
|
|
|
|
;; Copyright (C) 2019-2021 Free Software Foundation, Inc.
|
|
|
|
;; Author: Simen Heggestøyl <simenheg@gmail.com>
|
|
;; Keywords:
|
|
|
|
;; 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:
|
|
|
|
;;
|
|
|
|
;;; Code:
|
|
|
|
(require 'ert)
|
|
(require 'paren)
|
|
|
|
(ert-deftest paren-tests-unescaped-p ()
|
|
(with-temp-buffer
|
|
(insert "(insert)")
|
|
(backward-char)
|
|
(should (show-paren--unescaped-p (point)))
|
|
(insert "\\")
|
|
(should-not (show-paren--unescaped-p (point)))))
|
|
|
|
(ert-deftest paren-tests-categorize-paren ()
|
|
(with-temp-buffer
|
|
(insert "(insert)")
|
|
(backward-char)
|
|
(should (equal (show-paren--categorize-paren (point))
|
|
(cons -1 (+ (point) 1))))
|
|
(goto-char (point-min))
|
|
(should (equal (show-paren--categorize-paren (point))
|
|
(cons 1 (point))))))
|
|
|
|
(ert-deftest paren-tests-locate-near-paren ()
|
|
(with-temp-buffer
|
|
(let ((show-paren-when-point-inside-paren nil)
|
|
(show-paren-when-point-in-periphery nil))
|
|
(insert "(insert)")
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons -1 (point))))
|
|
(backward-char)
|
|
(should-not (show-paren--locate-near-paren))
|
|
(goto-char (point-min))
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons 1 (point-min))))
|
|
(forward-char)
|
|
(should-not (show-paren--locate-near-paren)))))
|
|
|
|
(ert-deftest paren-tests-locate-near-paren-inside ()
|
|
(with-temp-buffer
|
|
(let ((show-paren-when-point-inside-paren t)
|
|
(show-paren-when-point-in-periphery nil))
|
|
(insert "(insert)")
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons -1 (point))))
|
|
(backward-char)
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons -1 (+ (point) 1))))
|
|
(goto-char (point-min))
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons 1 (point-min))))
|
|
(forward-char)
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons 1 (point-min)))))))
|
|
|
|
(ert-deftest paren-tests-locate-near-paren-in-periphery ()
|
|
(with-temp-buffer
|
|
(let ((show-paren-when-point-inside-paren nil)
|
|
(show-paren-when-point-in-periphery t))
|
|
(insert " (insert) ")
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons -1 (- (point) 1))))
|
|
(backward-char 2)
|
|
(should-not (show-paren--locate-near-paren))
|
|
(goto-char (point-min))
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons 1 (+ (point) 1))))
|
|
(forward-char)
|
|
(should (equal (show-paren--locate-near-paren)
|
|
(cons 1 (point))))
|
|
(forward-char)
|
|
(should-not (show-paren--locate-near-paren)))))
|
|
|
|
(ert-deftest paren-tests-default ()
|
|
(with-temp-buffer
|
|
(insert "(insert")
|
|
(goto-char (point-min))
|
|
(should (equal (show-paren--default)
|
|
(list (point) (+ (point) 1)
|
|
nil nil
|
|
t)))
|
|
(goto-char (point-max))
|
|
(insert ")")
|
|
(should (equal (show-paren--default)
|
|
(list (- (point) 1) (point)
|
|
(point-min) (+ (point-min) 1)
|
|
nil)))
|
|
(goto-char (point-min))
|
|
(should (equal (show-paren--default)
|
|
(list (point) (+ (point) 1)
|
|
(- (point-max) 1) (point-max)
|
|
nil)))))
|
|
|
|
(ert-deftest paren-tests-open-paren-line ()
|
|
(cl-flet ((open-paren-line ()
|
|
(let* ((data (show-paren--default))
|
|
(here-beg (nth 0 data))
|
|
(there-beg (nth 2 data)))
|
|
(blink-paren-open-paren-line-string
|
|
(min here-beg there-beg)))))
|
|
;; Lisp-like
|
|
(with-temp-buffer
|
|
(insert "(defun foo ()
|
|
(dummy))")
|
|
(goto-char (point-max))
|
|
(should (string= "(defun foo ()" (open-paren-line))))
|
|
|
|
;; C-like
|
|
(with-temp-buffer
|
|
(insert "int foo() {
|
|
int blah;
|
|
}")
|
|
(goto-char (point-max))
|
|
(should (string= "int foo() {" (open-paren-line))))
|
|
|
|
;; C-like with hanging {
|
|
(with-temp-buffer
|
|
(insert "int foo()
|
|
{
|
|
int blah;
|
|
}")
|
|
(goto-char (point-max))
|
|
(should (string= "int foo()...{" (open-paren-line))))))
|
|
|
|
(provide 'paren-tests)
|
|
;;; paren-tests.el ends here
|