Skip to content

Add evil-Surround-change function to surround with newlines #213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add evil-Surround-change function to surround with newlines #213

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions evil-surround.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,10 +327,11 @@ between these overlays is what is deleted."
(when inner (delete-overlay inner)))))))

;;;###autoload
(defun evil-surround-change (char &optional outer inner)
(defun evil-surround-change (char &optional outer inner force-new-line)
"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 `evil-surround-delete'."
overlays OUTER and INNER, which are passed to `evil-surround-delete'.
If FORCE-NEW-LINE is t pad with additional newlines"
(interactive (evil-surround-input-char))
(cond
((and outer inner)
Expand All @@ -339,17 +340,23 @@ overlays OUTER and INNER, which are passed to `evil-surround-delete'."
(let ((key (evil-surround-read-char)))
(evil-surround-region (overlay-start outer)
(overlay-end outer)
nil (if (evil-surround-valid-char-p key) key char))))
nil (if (evil-surround-valid-char-p key) key char) force-new-line)))
(t
(let* ((delims (evil-surround--get-delims char))
(outer (evil-surround-outer-overlay delims char))
(inner (evil-surround-inner-overlay delims char)))
(unwind-protect
(when (and outer inner)
(evil-surround-change char outer inner))
(evil-surround-change char outer inner force-new-line))
(when outer (delete-overlay outer))
(when inner (delete-overlay inner)))))))

;;;###autoload
(defun evil-Surround-change (char &optional outer inner)
"Call `evil-surround-change' with FORCE-NEW-LINE set to t."
(interactive (evil-surround-input-char))
(evil-surround-change char outer inner t))

(defun evil-surround-interactive-setup ()
(setq evil-inhibit-operator t)
(list (assoc-default evil-this-operator
Expand Down Expand Up @@ -412,12 +419,12 @@ Otherwise call `evil-surround-region'."
(let ((p (point))) (list p p 'exclusive)))

(evil-define-command evil-Surround-edit (operation)
"Like evil-surround-edit, but for surrounding with additional new-lines.
"Like `evil-surround-edit', but for surrounding with additional new-lines.

It does nothing for change / delete."
It does nothing for delete."
(interactive (evil-surround-interactive-setup))
(cond
((eq operation 'change) nil)
((eq operation 'change) (call-interactively 'evil-Surround-change))
((eq operation 'delete) nil)
(t
(evil-surround-setup-surround-line-operators)
Expand Down