Implement block-wise surround

1 files changed, 20 insertions, 1 deletions

diff --git a/evil-surround.el b/evil-surround.el
index faa7d96..3ded066 100755
--- a/evil-surround.el
+++ b/evil-surround.el
@@ -212,6 +212,22 @@ overlays OUTER and INNER, which are passed to `evil-surround-delete'."
   (define-key evil-operator-shortcut-map "s" 'evil-surround-line)
   (define-key evil-operator-shortcut-map "S" 'evil-surround-line))
 
+(defun evil-surround-block (beg end char)
+  "Split a block into regions per line and surround each of them individually."
+  (save-excursion
+    (goto-char beg)
+    (let ((lines (- (1+ (line-number-at-pos end)) (line-number-at-pos beg)))
+          (start-col (current-column))
+          (end-col (save-excursion (goto-char end) (current-column))))
+      (while (> lines 0)
+        (move-to-column start-col)
+        ;; skip lines that are empty at this column
+        (unless (/= start-col (current-column))
+          (evil-surround-region (point) (save-excursion (move-to-column end-col) (point))
+                                'inclusive char))
+        (setq lines (1- lines))
+        (next-line)))))
+
 ;; Dispatcher function in Operator-Pending state.
 ;; "cs" calls `evil-surround-change', "ds" calls `evil-surround-delete',
 ;; and "ys" calls `evil-surround-region'.
@@ -267,7 +283,10 @@ Becomes this:
         (progn
           (goto-char (overlay-start overlay))
 
-          (cond ((eq type 'line)
+          (cond ((eq type 'block)
+                 (evil-surround-block beg end char))
+
+                ((eq type 'line)
                  (insert open)
                  (indent-according-to-mode)
                  (newline-and-indent)