Make region selection functions behave more vi like in vi-mode

Author: tomaneo

extensions/vi-mode/states.lisp

@@ -127,13 +127,15 @@
     (setf (current-state) state)))
 
 (defun vi-enable-hook ()
+  (setf *region-end-offset* -1)
   (setf (current-state) (or (buffer-state (current-buffer)) (ensure-state 'normal)))
   (add-hook *switch-to-buffer-hook* 'vi-switch-to-buffer)
   (add-hook *switch-to-window-hook* 'vi-switch-to-window)
   (add-hook *prompt-after-activate-hook* 'enter-prompt)
   (add-hook *prompt-deactivate-hook* 'exit-prompt))
 
 (defun vi-disable-hook ()
+  (setf *region-end-offset* 0)
   (remove-hook *switch-to-buffer-hook* 'vi-switch-to-buffer)
   (remove-hook *switch-to-window-hook* 'vi-switch-to-window)
   (remove-hook *prompt-after-activate-hook* 'enter-prompt)

src/commands/s-expression.lisp

@@ -66,7 +66,7 @@
      (form-offset (mark-point (cursor-mark (current-point))) 1))
     (t
      (save-excursion
-       (form-offset (current-point) 1)
+       (character-offset (form-offset (current-point) 1) *region-end-offset*)
        (set-cursor-mark (current-point) (current-point))))))
 
 (define-command (kill-sexp (:advice-classes editable-advice)) (&optional (n 1)) (:universal)

src/internal-packages.lisp

@@ -644,6 +644,7 @@
    :background-color)
   ;; region.lisp
   (:export
+   :*region-end-offset*
    :check-marked-using-global-mode
    :region-beginning-using-global-mode
    :region-end-using-global-mode

src/mouse.lisp

@@ -331,7 +331,7 @@
       (get-select-expression-points (current-point))
     (when start
       (set-current-mark start)
-      (move-point (current-point) end))))
+      (move-point (current-point) (character-offset end *region-end-offset*)))))
 
 (defun select-form-at-current-point ()
   (with-point ((start (current-point))
@@ -341,7 +341,7 @@
       (move-point end start)
       (form-offset end 1)
       (set-current-mark start)
-      (move-point (current-point) end))))
+      (move-point (current-point) (character-offset end *region-end-offset*)))))
 
 
 (define-command <mouse-event> () ()

src/region.lisp

@@ -1,5 +1,7 @@
 (in-package :lem-core)
 
+(defvar *region-end-offset* 0)
+
 (defgeneric check-marked-using-global-mode (global-mode buffer))
 (defgeneric region-beginning-using-global-mode (global-mode &optional buffer))
 (defgeneric region-end-using-global-mode (global-mode &optional buffer))