X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/942850b99d7ea8c4c527ecdba60f09c6e7ca55fc..1a3ec404888b7cfd4a721768c802c26ff64af72d:/packages/aggressive-indent/aggressive-indent.el diff --git a/packages/aggressive-indent/aggressive-indent.el b/packages/aggressive-indent/aggressive-indent.el index a4424cbbe..ac3ff96fa 100644 --- a/packages/aggressive-indent/aggressive-indent.el +++ b/packages/aggressive-indent/aggressive-indent.el @@ -1,10 +1,10 @@ ;;; aggressive-indent.el --- Minor mode to aggressively keep your code always indented -*- lexical-binding:t -*- -;; Copyright (C) 2014, 2015 Free Software Foundation, Inc +;; Copyright (C) 2014, 2015, 2016 Free Software Foundation, Inc ;; Author: Artur Malabarba -;; URL: http://github.com/Malabarba/aggressive-indent-mode -;; Version: 1.4 +;; URL: https://github.com/Malabarba/aggressive-indent-mode +;; Version: 1.7 ;; Package-Requires: ((emacs "24.1") (cl-lib "0.5")) ;; Keywords: indent lisp maint tools ;; Prefix: aggressive-indent @@ -79,12 +79,6 @@ ;; GNU General Public License for more details. ;; -;;; Change Log: -;; 0.3.1 - 2014/10/30 - Define new delete-backward bound to backspace. -;; 0.3 - 2014/10/23 - Implement a smarter engine for non-lisp modes. -;; 0.2 - 2014/10/20 - Reactivate `electric-indent-mode'. -;; 0.2 - 2014/10/19 - Add variable `aggressive-indent-dont-indent-if', so the user can prevent indentation. -;; 0.1 - 2014/10/15 - Release. ;;; Code: (require 'cl-lib) @@ -92,6 +86,7 @@ (defgroup aggressive-indent nil "Customization group for aggressive-indent." :prefix "aggressive-indent-" + :group 'electricity :group 'indent) (defun aggressive-indent-bug-report () @@ -105,7 +100,7 @@ Please include this in your report!" (require 'lisp-mnt) (lm-version))) emacs-version) - (browse-url "https://github.com/Bruce-Connor/aggressive-indent-mode/issues/new")) + (browse-url "https://github.com/Malabarba/aggressive-indent-mode/issues/new")) (defvar aggressive-indent-mode) @@ -132,6 +127,7 @@ Please include this in your report!" jabber-chat-mode haml-mode haskell-mode + haskell-interactive-mode image-mode makefile-mode makefile-gmake-mode @@ -194,14 +190,13 @@ change." (null (buffer-modified-p)) (and (boundp 'smerge-mode) smerge-mode) (let ((line (thing-at-point 'line))) - (when (stringp line) - (or (string-match "\\`[[:blank:]]*\n?\\'" line) - ;; If the user is starting to type a comment. - (and (stringp comment-start) - (string-match (concat "\\`[[:blank:]]*" - (substring comment-start 0 1) - "[[:blank:]]*$") - line))))) + (and (stringp line) + ;; If the user is starting to type a comment. + (stringp comment-start) + (string-match (concat "\\`[[:blank:]]*" + (substring comment-start 0 1) + "[[:blank:]]*$") + line))) (let ((sp (syntax-ppss))) ;; Comments. (or (and (not aggressive-indent-comments-too) (elt sp 4)) @@ -234,6 +229,10 @@ This is for internal use only. For user customization, use '(when (boundp 'iedit-mode) (add-to-list 'aggressive-indent--internal-dont-indent-if 'iedit-mode))) +(eval-after-load 'evil + '(when (boundp 'iedit-mode) + (add-to-list 'aggressive-indent--internal-dont-indent-if + 'iedit-mode))) (eval-after-load 'coq '(add-to-list 'aggressive-indent--internal-dont-indent-if '(and (derived-mode-p 'coq-mode) @@ -301,8 +300,7 @@ messages. L and R passed to `aggressive-indent-indent-defun'." Call `indent-region' between L and R, and then keep indenting until nothing more happens." (interactive "r") - (let ((p (point-marker)) - was-begining-of-line) + (let ((p (point-marker))) (set-marker-insertion-type p t) (unwind-protect (progn @@ -335,7 +333,7 @@ until nothing more happens." ;; not at all, stop at the limit. (< (point) point-limit)))) (forward-line 1) - (skip-chars-forward "[:blank:]\n\r\xc")))) + (skip-chars-forward "[:blank:]\n\r\f")))) (goto-char p)))) (defun aggressive-indent--softly-indent-region-and-on (l r &rest _) @@ -350,32 +348,57 @@ or messages." "List of (left right) limit of regions changed in the last command loop.") (make-variable-buffer-local 'aggressive-indent--changed-list) +(defvar aggressive-indent--balanced-parens t + "Non-nil if the current-buffer has balanced parens.") +(make-variable-buffer-local 'aggressive-indent--balanced-parens) + +(defun aggressive-indent--proccess-changed-list-and-indent () + "Indent the regions in `aggressive-indent--changed-list'." + (let ((inhibit-modification-hooks t) + (inhibit-point-motion-hooks t) + (indent-function + (if (cl-member-if #'derived-mode-p aggressive-indent-modes-to-prefer-defun) + #'aggressive-indent--softly-indent-defun #'aggressive-indent--softly-indent-region-and-on))) + ;; Take the 10 most recent changes. + (let ((cell (nthcdr 10 aggressive-indent--changed-list))) + (when cell (setcdr cell nil))) + ;; (message "----------") + (while aggressive-indent--changed-list + ;; (message "%S" (car aggressive-indent--changed-list)) + (apply indent-function (car aggressive-indent--changed-list)) + (setq aggressive-indent--changed-list + (cdr aggressive-indent--changed-list))))) + (defun aggressive-indent--indent-if-changed () "Indent any region that changed in the last command loop." - (when aggressive-indent--changed-list - (unless (or (run-hook-wrapped 'aggressive-indent--internal-dont-indent-if #'eval) - (aggressive-indent--run-user-hooks)) - (while-no-input - (let ((inhibit-modification-hooks t) - (inhibit-point-motion-hooks t) - (indent-function - (if (cl-member-if #'derived-mode-p aggressive-indent-modes-to-prefer-defun) - #'aggressive-indent--softly-indent-defun #'aggressive-indent--softly-indent-region-and-on))) - (while aggressive-indent--changed-list - (apply indent-function (car aggressive-indent--changed-list)) - (setq aggressive-indent--changed-list - (cdr aggressive-indent--changed-list)))))))) + (when (and aggressive-indent--changed-list aggressive-indent--balanced-parens) + (save-excursion + (save-selected-window + (unless (or (run-hook-wrapped 'aggressive-indent--internal-dont-indent-if #'eval) + (aggressive-indent--run-user-hooks)) + (while-no-input + (redisplay) + (aggressive-indent--proccess-changed-list-and-indent))))))) + +(defun aggressive-indent--check-parens () + "Check if parens are balanced in the current buffer. +Store result in `aggressive-indent--balanced-parens'." + (setq aggressive-indent--balanced-parens + (save-excursion + (ignore-errors + (zerop (car (syntax-ppss (point-max)))))))) (defun aggressive-indent--keep-track-of-changes (l r &rest _) "Store the limits (L and R) of each change in the buffer." (when aggressive-indent-mode - (push (list l r) aggressive-indent--changed-list))) + (push (list l r) aggressive-indent--changed-list) + (aggressive-indent--check-parens))) ;;; Minor modes ;;;###autoload (define-minor-mode aggressive-indent-mode nil nil " =>" - '(("" . aggressive-indent-indent-defun) + `((,(kbd "C-c C-q") . aggressive-indent-indent-defun) ([backspace] menu-item "maybe-delete-indentation" ignore :filter (lambda (&optional _) @@ -391,15 +414,18 @@ or messages." (memq major-mode '(text-mode fundamental-mode)) buffer-read-only)) (aggressive-indent-mode -1) - ;; Should electric indent be ON or OFF? + ;; Should electric indent be ON or OFF? (if (or (eq aggressive-indent-dont-electric-modes t) (cl-member-if #'derived-mode-p aggressive-indent-dont-electric-modes)) (aggressive-indent--local-electric nil) (aggressive-indent--local-electric t)) + (aggressive-indent--check-parens) (add-hook 'after-change-functions #'aggressive-indent--keep-track-of-changes nil 'local) + (add-hook 'before-save-hook #'aggressive-indent--proccess-changed-list-and-indent nil 'local) (add-hook 'post-command-hook #'aggressive-indent--indent-if-changed nil 'local)) ;; Clean the hooks (remove-hook 'after-change-functions #'aggressive-indent--keep-track-of-changes 'local) + (remove-hook 'before-save-hook #'aggressive-indent--proccess-changed-list-and-indent 'local) (remove-hook 'post-command-hook #'aggressive-indent--indent-if-changed 'local) (remove-hook 'post-command-hook #'aggressive-indent--softly-indent-defun 'local)))