branch: elpa/evil-args
commit 916f1bc81b437a9fae2064a07ca53d3af3bb1bde
Author: wcsmith <wconnorsm...@gmail.com>
Commit: wcsmith <wconnorsm...@gmail.com>
Enabled customization of openers/closers/delimiters.
---
evil-args.el | 122 +++++++++++++++++++++++++++++++++++------------------------
1 file changed, 72 insertions(+), 50 deletions(-)
diff --git a/evil-args.el b/evil-args.el
index 18b53cc462..d4e3d89bd3 100644
--- a/evil-args.el
+++ b/evil-args.el
@@ -11,65 +11,78 @@
(require 'evil)
+(defgroup evil-args nil
+ "Motions and text objects for delimited arguments in Evil.")
-(defvar evil-arg-openers '("(" "{" "["))
-(defvar evil-arg-closers '(")" "}" "]"))
-(defvar evil-arg-delimiters '("," ";"))
+(defcustom evil-args-openers '("(" "{" "[")
+ "Argument openers"
+ :type '(sexp))
-(setq evil-arg-openers-regexp (regexp-opt evil-arg-openers))
-(setq evil-arg-closers-regexp (regexp-opt evil-arg-closers))
-(setq evil-arg-delimiters-regexp (regexp-opt evil-arg-delimiters))
+(defcustom evil-args-closers '(")" "}" "]")
+ "Argument closers."
+ :type '(sexp))
-(setq evil-arg-search-regexp
- (regexp-opt (append evil-arg-openers
- evil-arg-closers
- evil-arg-delimiters)))
+(defcustom evil-args-delimiters '("," ";")
+ "Argument delimiters."
+ :type '(sexp))
(defun evil-args--backward-delimiter (&optional count)
- (let ((begin -1)
+ (let ((openers-regexp (regexp-opt evil-args-openers))
+ (closers-regexp (regexp-opt evil-args-closers))
+ (delimiters-regexp (regexp-opt evil-args-delimiters))
+ (all-regexp (regexp-opt (append evil-args-openers
+ evil-args-closers
+ evil-args-delimiters)))
+ (begin -1)
(count (or count 1)))
(save-excursion
(while (and (< begin 0)
(> count 0))
;; search backwards for delimiter, opener, or closer
- (if (not (re-search-backward evil-arg-search-regexp nil t))
+ (if (not (re-search-backward all-regexp nil t))
;; not found
(setq begin (- (point-at-bol) 1))
;; found:
;; skip over any matching pairs if necessary
- (while (looking-at-p evil-arg-closers-regexp)
+ (while (looking-at-p closers-regexp)
(evil-jump-item)
(backward-char))
;; if looking at an opener, stop
- (if (looking-at-p evil-arg-openers-regexp)
+ (if (looking-at-p openers-regexp)
(setq begin (point))
;; looking at a delimiter: decrement count and check if done
- (when (and (looking-at-p evil-arg-delimiters-regexp)
+ (when (and (looking-at-p delimiters-regexp)
(<= (setq count (- count 1)) 0))
(setq begin (point)))))))
(if begin (goto-char begin))))
(defun evil-args--forward-delimiter (&optional count)
- (let ((end -1)
+ (let ((openers-regexp (regexp-opt evil-args-openers))
+ (closers-regexp (regexp-opt evil-args-closers))
+ (delimiters-regexp (regexp-opt evil-args-delimiters))
+ (all-regexp (regexp-opt (append evil-args-openers
+ evil-args-closers
+ evil-args-delimiters)))
+ (end -1)
(count (or count 1)))
(save-excursion
(while (and (< end 0)
(> count 0))
;; search forward for a delimiter, opener, or closer
- (if (not (re-search-forward evil-arg-search-regexp nil t))
+ (if (not (re-search-forward all-regexp nil t))
;; not found
(setq end (point-at-eol))
;; found:
;; skip over any matching pairs if necessary
(backward-char)
- (while (looking-at-p evil-arg-openers-regexp)
+ (while (looking-at-p openers-regexp)
(evil-jump-item)
(forward-char))
;; if looking at a closer, stop
- (if (looking-at-p evil-arg-closers-regexp)
+ (if (looking-at-p closers-regexp)
(setq end (point))
;; looking at a delimiter: decrement count and check if done
- (when (looking-at-p evil-arg-delimiters-regexp)
+ (when (looking-at-p delimiters-regexp)
(if (<= (setq count (- count 1)) 0)
(setq end (point))
(forward-char)))))))
@@ -86,19 +99,21 @@
(evil-first-non-blank)))
(evil-define-motion evil-backward-arg (count)
- (evil-args--backward-arg-no-skip
- (+ (if (looking-back (concat evil-arg-delimiters-regexp
- "[\t\n ]*")) 1 0) (or count 1))))
+ (let ((delimiters-regexp (regexp-opt evil-args-delimiters)))
+ (evil-args--backward-arg-no-skip
+ (+ (if (looking-back (concat delimiters-regexp
+ "[\t\n ]*")) 1 0) (or count 1)))))
(evil-define-motion evil-forward-arg (count)
+ (let ((closers-regexp (regexp-opt evil-args-closers)))
(evil-args--forward-delimiter (or count 1))
- (when (not (looking-at-p evil-arg-closers-regexp))
+ (when (not (looking-at-p closers-regexp))
(forward-char)
(when (looking-at " ")
(forward-char))
(when (looking-at "\n")
(evil-next-line)
- (evil-first-non-blank))))
+ (evil-first-non-blank)))))
(evil-define-text-object evil-inner-arg (count &optional beg end type)
"Select inner delimited argument."
@@ -108,19 +123,20 @@
(evil-define-text-object evil-outer-arg (count &optional beg end type)
"Select a delimited argument."
- (let ((begin nil)
+ (let ((openers-regexp (regexp-opt evil-args-openers))
+ (begin nil)
(end-on-closer nil)
(end nil))
(save-excursion
(evil-args--forward-delimiter)
- (if (member (string (char-after)) evil-arg-delimiters)
+ (if (member (string (char-after)) evil-args-delimiters)
(evil-forward-arg 1)
(setq end-on-closer t))
(setq end (point)))
(save-excursion
(evil-args--backward-arg-no-skip 1)
(if (and end-on-closer
- (not (looking-back (concat evil-arg-openers-regexp
+ (not (looking-back (concat openers-regexp
"[\t\n ]*"))))
(progn (evil-args--backward-delimiter)
(setq begin (point)))
@@ -129,27 +145,33 @@
(evil-define-motion evil-jump-out-args (count)
(setq count (or count 1))
- (while (> count 0)
- (let ((begin -1)
- (success nil))
- (save-excursion
- (while (< begin 0)
- (if (not (re-search-backward evil-arg-search-regexp nil t))
- (setq begin (- (point-at-bol)) 1)
- (while (looking-at-p evil-arg-closers-regexp)
+ (let ((openers-regexp (regexp-opt evil-args-openers))
+ (closers-regexp (regexp-opt evil-args-closers))
+ (delimiters-regexp (regexp-opt evil-args-delimiters))
+ (all-regexp (regexp-opt (append evil-args-openers
+ evil-args-closers
+ evil-args-delimiters))))
+ (while (> count 0)
+ (let ((begin -1)
+ (success nil))
+ (save-excursion
+ (while (< begin 0)
+ (if (not (re-search-backward all-regexp nil t))
+ (setq begin (- (point-at-bol)) 1)
+ (while (looking-at-p closers-regexp)
+ (evil-jump-item)
+ (backward-char))
+ (when (looking-at-p openers-regexp)
+ (setq begin (point))
+ (setq success t))))
+ (when success
+ (evil-backward-word-end)
+ (if (not (looking-at closers-regexp))
+ (evil-backward-word-begin)
(evil-jump-item)
- (backward-char))
- (when (looking-at-p evil-arg-openers-regexp)
- (setq begin (point))
- (setq success t))))
- (when success
- (evil-backward-word-end)
- (if (not (looking-at evil-arg-closers-regexp))
- (evil-backward-word-begin)
- (evil-jump-item)
- (forward-char))
- (setq begin (point))))
- (if begin (goto-char begin)))
- (setq count (- count 1))))
+ (forward-char))
+ (setq begin (point))))
+ (if begin (goto-char begin)))
+ (setq count (- count 1)))))
- (provide 'evil-args)
+(provide 'evil-args)
