mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-19 10:22:27 +00:00
Code Issues Releases Activity

Make sure indent-sexp stops at end of sexp (Bug#26878)

Browse Source 
* lisp/emacs-lisp/lisp-mode.el (indent-sexp): Check endpos before
indenting.
* test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp-stop): New
test.
This commit is contained in:
Noam Postavsky 2017-05-11 18:12:40 -04:00
parent 24d06313c4
commit 750f0e2e79
2 changed files with 32 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lisp/emacs-lisp/lisp-mode.el
View File

@ -1184,21 +1184,24 @@ ENDPOS is encountered."
;; after point.
(save-excursion (forward-sexp 1) (point)))))
(save-excursion
(while (< (point) endpos)
(let ((indent (lisp-indent-calc-next parse-state)))
;; If the line contains a comment indent it now with
;; `indent-for-comment'.
(when (nth 4 (lisp-indent-state-ppss parse-state))
(save-excursion
(goto-char (lisp-indent-state-ppss-point parse-state))
(indent-for-comment)
(setf (lisp-indent-state-ppss-point parse-state)
(line-end-position))))
;; But not if the line is blank, or just a comment (we
;; already called `indent-for-comment' above).
(skip-chars-forward " \t")
(unless (or (eolp) (eq (char-syntax (char-after)) ?<) (not indent))
(indent-line-to indent)))))
(while (let ((indent (lisp-indent-calc-next parse-state))
(ppss (lisp-indent-state-ppss parse-state)))
;; If the line contains a comment indent it now with
;; `indent-for-comment'.
(when (and (nth 4 ppss) (<= (nth 8 ppss) endpos))
(save-excursion
(goto-char (lisp-indent-state-ppss-point parse-state))
(indent-for-comment)
(setf (lisp-indent-state-ppss-point parse-state)
(line-end-position))))
(when (< (point) endpos)
;; Indent the next line, unless it's blank, or just a
;; comment (we will `indent-for-comment' the latter).
(skip-chars-forward " \t")
(unless (or (eolp) (not indent)
(eq (char-syntax (char-after)) ?<))
(indent-line-to indent))
t))))
(move-marker endpos nil)))
(defun indent-pp-sexp (&optional arg)

14
test/lisp/emacs-lisp/lisp-mode-tests.el
View File

@ -99,6 +99,20 @@ noindent\" 3
(indent-sexp)
(should (equal (buffer-string) correct)))))
(ert-deftest indent-sexp-stop ()
"Make sure `indent-sexp' stops at the end of the sexp."
;; See https://debbugs.gnu.org/cgi/bugreport.cgi?bug=26878.
(with-temp-buffer
(emacs-lisp-mode)
(insert "(a ()\n)")
(let ((original (buffer-string)))
(search-backward "a ")
(goto-char (match-end 0))
(indent-sexp)
;; The final paren should not be indented, because the sexp
;; we're indenting ends on the previous line.
(should (equal (buffer-string) original)))))
(ert-deftest lisp-indent-region ()
"Test basics of `lisp-indent-region'."
(with-temp-buffer