[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 30bbb57 2/2: Add more indentation tests for Emacs Lisp mode
From: |
Lars Ingebrigtsen |
Subject: |
master 30bbb57 2/2: Add more indentation tests for Emacs Lisp mode |
Date: |
Fri, 1 Oct 2021 06:18:29 -0400 (EDT) |
branch: master
commit 30bbb5735cbc5df67c6229d6f1151adf2eb56f5c
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Add more indentation tests for Emacs Lisp mode
---
.../elisp-mode-resources/elisp-indents.erts | 50 ++++++++++++++++++++++
test/lisp/progmodes/elisp-mode-tests.el | 26 ++---------
2 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/test/lisp/progmodes/elisp-mode-resources/elisp-indents.erts
b/test/lisp/progmodes/elisp-mode-resources/elisp-indents.erts
new file mode 100644
index 0000000..69d2598
--- /dev/null
+++ b/test/lisp/progmodes/elisp-mode-resources/elisp-indents.erts
@@ -0,0 +1,50 @@
+Code:
+ (lambda ()
+ (emacs-lisp-mode)
+ (indent-region (point-min) (point-max)))
+
+Name: defun
+
+=-=
+(defun foo ()
+"doc"
+(+ 1 2))
+=-=
+(defun foo ()
+ "doc"
+ (+ 1 2))
+=-=-=
+
+Name: function call
+
+=-=
+(foo zot
+bar
+(zot bar))
+=-=
+(foo zot
+ bar
+ (zot bar))
+=-=-=
+
+Name: lisp data
+
+=-=
+( foo zot
+bar
+(zot bar))
+=-=
+( foo zot
+ bar
+ (zot bar))
+=-=-=
+
+Name: defun-space
+
+=-=
+(defun x ()
+ (print (quote ( thingy great
+ stuff)))
+ (print (quote (thingy great
+ stuff))))
+=-=-=
diff --git a/test/lisp/progmodes/elisp-mode-tests.el
b/test/lisp/progmodes/elisp-mode-tests.el
index bc94aaa..3c76f86 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -26,6 +26,7 @@
(require 'ert-x)
(require 'xref)
(eval-when-compile (require 'cl-lib))
+(require 'ert-x)
;;; Completion
@@ -843,18 +844,6 @@ to (xref-elisp-test-descr-to-target xref)."
(insert "?\\N{HEAVY CHECK MARK}")
(should (equal (elisp--preceding-sexp) ?\N{HEAVY CHECK MARK}))))
-(ert-deftest elisp-indent-basic ()
- (with-temp-buffer
- (emacs-lisp-mode)
- (let ((orig "(defun x ()
- (print (quote ( thingy great
- stuff)))
- (print (quote (thingy great
- stuff))))"))
- (insert orig)
- (indent-region (point-min) (point-max))
- (should (equal (buffer-string) orig)))))
-
(defun test--font (form search)
(with-temp-buffer
(emacs-lisp-mode)
@@ -1095,17 +1084,8 @@ evaluation of BODY."
(should (= 84 (funcall (intern-soft "f-test4---"))))
(should (unintern "f-test4---"))))
-(ert-deftest test-cl-flet-indentation ()
- :expected-result :failed ; FIXME: bug#9622
- (should (equal
- (with-temp-buffer
- (emacs-lisp-mode)
- (insert "(cl-flet ((bla (x)\n(* x x)))\n(bla 42))")
- (indent-region (point-min) (point-max))
- (buffer-string))
- "(cl-flet ((bla (x)
- (* x x)))
- (bla 42))")))
+(ert-deftest test-indentation ()
+ (ert-test-erts-file (ert-resource-file "elisp-indents.erts")))
(provide 'elisp-mode-tests)
;;; elisp-mode-tests.el ends here