diff options
| -rw-r--r-- | evil-surround.el | 138 | ||||
| -rw-r--r-- | surround.el | 231 |
2 files changed, 231 insertions, 138 deletions
diff --git a/evil-surround.el b/evil-surround.el deleted file mode 100644 index d901d59..0000000 --- a/evil-surround.el +++ /dev/null @@ -1,138 +0,0 @@ -;;; evil-surround.el --- emulate surround.vim in evil - -;; Copyright (C) 2010 Tim Harper -;; -;; Author: Tim Harper <timcharper at gmail dat com> -;; Please send bug reports to the mailing list (see below). -;; Created: August 11, 2011 -;; Ported from vimpulse-surround.git -;; Version: 0.1pre1 -;; Keywords: emulations, evil -;; Human-Keywords: vim, visual-mode, surround.vim -;; Mailing list: <implementations-list at lists.ourproject.org> -;; Subscribe: http://tinyurl.com/implementations-list -;; Newsgroup: nntp://news.gmane.org/gmane.emacs.vim-emulation -;; Archives: http://dir.gmane.org/gmane.emacs.vim-emulation -;; Related: evil.el -;; -;; This file is not part of GNU Emacs. - -;;; Commentary: - -;; `evil-surround' emulates surround.vim, a popular Vim plugin. -;; -;; The functionality is wrapped into a global minor mode, enabled by default. -;; -;; (require 'evil-surround) -;; (evil-mode 1) -;; -;; The code requires a recent evil version. More information on evil -;; and how to get it can be found here: - -;; http://gitorious.org/evil - -;;; Code: -(require 'evil) - -;; Evil-surround -(defgroup evil-surround nil - "surround.vim for Emacs" - :prefix "evil-surround-" - :group 'evil) - -(defcustom evil-surround-pairs - '((")" . ("(" . ")")) - ("(" . ("( " . " )")) - ("]" . ("[" . "]")) - ("[" . ("[ " . " ]")) - ("}" . ("{" . "}")) - ("{" . ("{ " . " }")) - ("#" . ("#{" . "}")) - ("t" . evil-surround-read-tag) - ("<" . evil-surround-read-tag) - (">" . ("<" . ">"))) - "Alist of surround items. -Each item is of the form (TRIGGER . (LEFT . RIGHT)), all strings. -Alternatively, a function can be put in place of (LEFT . RIGHT). -This only affects inserting pairs, not deleting or changing them." - :group 'evil-surround - :type '(repeat (cons (regexp :tag "Key") - (symbol :tag "Surround pair")))) - -(defun evil-surround-char-to-pair (char) - (let ((pair (or (assoc-default char evil-surround-pairs) - (cons char char)))) - (if (functionp pair) - (funcall pair) - pair))) - -(defvar *evil-surrounding* nil - "Internal variable set by `evil-surround-define-text-object'. -It triggers `evil-change'. Nothing to see here, move along.") - -(defvar *evil-surround-start-size* nil) -(defvar *evil-surround-end-size* nil) - -(defvar evil-surround-read-tag-keymap - (let ((map (copy-keymap minibuffer-local-map))) - (define-key map ">" 'exit-minibuffer) - map)) - -(defun evil-surround-read-tag () - (let* ((input (read-from-minibuffer "<" "" evil-surround-read-tag-keymap)) - (_ (string-match "\\([a-z0-9-]+\\)\\(.*?\\)[>]*$" input)) - (tag (match-string 1 input)) - (rest (match-string 2 input))) - (cons (format "<%s%s>" tag rest) (format "</%s>" tag)))) - -(evil-define-operator evil-Surround-region (beg end type register yank-handler) - "Surround selection with input." - (interactive (list evil-this-register (evil-yank-handler))) - (let ((pair (evil-surround-char-to-pair - (format "%c" (evil-read-key)))) - (o (make-overlay beg end))) - (goto-char (overlay-start o)) - (insert (car pair)) - (indent-according-to-mode) - (newline-and-indent) - (goto-char (overlay-end o)) - (newline) - (insert (cdr pair)) - (indent-according-to-mode) - (goto-char (overlay-start o)) - (delete-overlay o))) - -(evil-define-operator evil-surround-region (beg end type register yank-handler) - "Surround region by the input-specified pair" - (interactive (list evil-this-register (evil-yank-handler))) - (if (equal type 'line) - (evil-Surround-region beg end type register yank-handler) - (let ((pair (evil-surround-char-to-pair - (format "%c" (evil-read-key)))) - (o (make-overlay beg end))) - (goto-char (overlay-start o)) - (insert (car pair)) - (goto-char (overlay-end o)) - (insert (cdr pair)) - (goto-char (overlay-start o)) - (delete-overlay o)))) - -(defun evil-surround-zap-whitespace (direction boundary) - (let ((pred (if (= direction 1) - 'looking-at - 'looking-back))) - (while (and (funcall pred "[ \t]") (not (= (point) boundary))) - (delete-char direction) - (when (= direction 1) (setq boundary (1- boundary)))))) - -(defvar evil-surround-mode-map (make-sparse-keymap)) - -(define-minor-mode evil-surround-mode - "Emulate the surround.vim Vim plugin in Evil." - t nil :global t :keymap evil-surround-mode-map) - -(evil-define-key 'visual evil-surround-mode-map "s" 'evil-surround-region) -(evil-define-key 'visual evil-surround-mode-map "S" 'evil-Surround-region) - -(provide 'evil-surround) -;;; evil-surround.el ends here diff --git a/surround.el b/surround.el new file mode 100644 index 0000000..379c442 --- /dev/null +++ b/surround.el @@ -0,0 +1,231 @@ +;;; surround.el --- emulate surround.vim from Vim + +;; Copyright (C) 2010, 2011 Tim Harper +;; +;; Author: Tim Harper <timcharper at gmail dot com> +;; Vegard Øye <vegard_oye at hotmail dot com> +;; Maintainer: Please send bug reports to the mailing list (below). +;; Created: July 23 2011 +;; Version: 0.1 +;; Keywords: emulation, vi, evil +;; Mailing list: <implementations-list at lists.ourproject.org> +;; Subscribe: http://tinyurl.com/implementations-list +;; Newsgroup: nntp://news.gmane.org/gmane.emacs.vim-emulation +;; Archives: http://dir.gmane.org/gmane.emacs.vim-emulation +;; +;; This file is not part of GNU Emacs. + +;;; Commentary: + +;; This package emulates surround.vim by Tim Pope. +;; The functionality is wrapped into a minor mode. To enable +;; it globally, add the following lines to ~/.emacs: +;; +;; (require 'surround) +;; (global-surround-mode 1) +;; +;; Alternatively, you can enable surround-mode along a major mode +;; by adding `turn-on-surround-mode' to the mode hook. +;; +;; This package uses Evil as its vi layer. It is available from: +;; +;; http://gitorious.org/evil + +;;; Code: + +(require 'evil) + +(defgroup surround nil + "surround.vim for Emacs" + :prefix "surround-" + :group 'evil) + +(defcustom surround-pairs-alist + '((?\( . ?\)) + (?\[ . ?\]) + (?{ . ?}) + (?# . ("#{" . "}")) + (?b . ("(" . ")")) + (?B . ("{" . "}")) + (?t . surround-read-tag) + (?< . surround-read-tag)) + "Association list of surround items. +Each item is of the form (TRIGGER . (LEFT . RIGHT)), all strings. +Alternatively, a function can be put in place of (LEFT . RIGHT). +This only affects inserting pairs, not deleting or changing them." + :group 'surround + :type '(repeat (cons (regexp :tag "Key") + (symbol :tag "Surround pair")))) + +(defvar surround-read-tag-map + (let ((map (copy-keymap minibuffer-local-map))) + (define-key map ">" 'exit-minibuffer) + map) + "Keymap used by `surround-read-tag'.") + +(defun surround-read-tag () + "Read a XML tag from the minibuffer." + (let* ((input (read-from-minibuffer "<" "" surround-read-tag-map)) + (match (string-match "\\([0-9a-z-]+\\)\\(.*?\\)[>]*$" input)) + (tag (match-string 1 input)) + (rest (match-string 2 input))) + (cons (format "<%s%s>" (or tag "") (or rest "")) + (format "</%s>" (or tag ""))))) + +(defun surround-pair (char) + "Return the surround pair of CHAR. +This is a cons cell (LEFT . RIGHT), both strings." + (let* ((open (or (car (rassoc char surround-pairs-alist)) char)) + (close (or (cdr (assoc char surround-pairs-alist)) char))) + (cond + ((functionp close) + (funcall close)) + ((consp close) + close) + ((eq (char-syntax char) ?\() + ;; add whitespace + (cons (format "%c " open) (format " %c" close))) + (t + (cons (format "%c" open) (format "%c" close)))))) + +(defun surround-outer-overlay (char) + "Return outer overlay for the delimited range represented by CHAR. +This overlay includes the delimiters. +See also `surround-inner-overlay'." + (let ((outer (lookup-key evil-motion-state-map + (format "a%c" char)))) + (when (functionp outer) + (setq outer (funcall outer)) + (when (evil-range-p outer) + (when (eq (char-syntax char) ?\() + (evil-add-whitespace-before-range outer "[ \t]") + (evil-add-whitespace-after-range outer "[ \t]")) + (setq outer (make-overlay (evil-range-beginning outer) + (evil-range-end outer) + nil nil t)))))) + +(defun surround-inner-overlay (char) + "Return inner overlay for the delimited range represented by CHAR. +This overlay excludes the delimiters. +See also `surround-outer-overlay'." + (let ((inner (lookup-key evil-motion-state-map + (format "i%c" char)))) + (when (functionp inner) + (setq inner (funcall inner)) + (when (evil-range-p inner) + (setq inner (make-overlay (evil-range-beginning inner) + (evil-range-end inner) + nil nil t)))))) + +(defun surround-delete (char &optional outer inner) + "Delete the surrounding delimiters represented by CHAR. +Alternatively, the text to delete can be represented with +the overlays OUTER and INNER, where OUTER includes the delimiters +and INNER excludes them. The intersection (i.e., difference) +between these overlays is what is deleted." + (interactive "c") + (cond + ((and outer inner) + (delete-region (overlay-start outer) (overlay-start inner)) + (delete-region (overlay-end inner) (overlay-end outer)) + (goto-char (overlay-start outer))) + (t + ;; no overlays specified: create them on the basis of CHAR + ;; and delete after use + (let* ((outer (surround-outer-overlay char)) + (inner (surround-inner-overlay char))) + (unwind-protect + (when (and outer inner) + (surround-delete char outer inner)) + (when outer (delete-overlay outer)) + (when inner (delete-overlay inner))))))) + +(defun surround-change (char &optional outer inner) + "Change the surrounding delimiters represented by CHAR. +Alternatively, the text to delete can be represented with the +overlays OUTER and INNER, which are passed to `surround-delete'." + (interactive "c") + (cond + ((and outer inner) + (surround-delete char outer inner) + (surround-region (overlay-start outer) + (overlay-end outer) + nil (read-char))) + (t + (let* ((outer (surround-outer-overlay char)) + (inner (surround-inner-overlay char))) + (unwind-protect + (when (and outer inner) + (surround-change char outer inner)) + (when outer (delete-overlay outer)) + (when inner (delete-overlay inner))))))) + +;; Dispatcher function in Operator-Pending state. +;; "cs" calls `surround-change', "ds" calls `surround-delete', +;; and "ys" calls `surround-region'. +(evil-define-command surround-edit (operation) + "Edit the surrounding delimiters represented by CHAR. +If OPERATION is `change', call `surround-change'. +if OPERATION is `surround', call `surround-region'. +Otherwise call `surround-delete'." + (interactive + (progn + ;; abort the calling operator + (setq evil-inhibit-operator t) + (list (assoc-default evil-this-operator + '((evil-change . change) + (evil-delete . delete)))))) + (cond + ((eq operation 'change) + (call-interactively 'surround-change)) + ((eq operation 'delete) + (call-interactively 'surround-delete)) + (t + (define-key evil-operator-shortcut-map "s" 'evil-line) + (call-interactively 'surround-region)))) + +(evil-define-operator surround-region (beg end type char) + "Surround BEG and END with CHAR." + (interactive (list (read-char))) ; CHAR + (let* ((overlay (make-overlay beg end nil nil t)) + (pair (surround-pair char)) + (open (car pair)) + (close (cdr pair))) + (unwind-protect + (progn + (goto-char (overlay-start overlay)) + (insert open) + (when (eq type 'line) + (indent-according-to-mode) + (newline-and-indent)) + (goto-char (overlay-end overlay)) + (insert close) + (when (eq type 'line) + (indent-according-to-mode) + (newline)) + (goto-char (overlay-start overlay))) + (delete-overlay overlay)))) + +(define-minor-mode surround-mode + "Buffer-local minor mode to emulate surround.vim." + :keymap (make-sparse-keymap) + (evil-normalize-keymaps)) + +(defun turn-on-surround-mode () + "Enable surround-mode in the current buffer." + (surround-mode 1)) + +(defun turn-off-surround-mode () + "Disable surround-mode in the current buffer." + (surround-mode -1)) + +(define-globalized-minor-mode global-surround-mode + surround-mode turn-on-surround-mode + "Global minor mode to emulate surround.vim.") + +(evil-define-key 'operator surround-mode-map "s" 'surround-edit) +(evil-define-key 'visual surround-mode-map "S" 'surround-region) + +(provide 'surround) + +;;; surround.el ends here |