emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

feature/snippets: fix +snippets/expand-on-region off-by-1 bug in evil-mode

Browse source
This commit is contained in:
Henrik Lissner 2017-03-22 04:57:29 -04:00
parent 585c425258
commit 78758f67e6
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/feature/snippets/autoload/evil.el
View file

@ -6,13 +6,12 @@
and switches to insert mode if there are editable fields." and switches to insert mode if there are editable fields."
(interactive) (interactive)
(when (evil-visual-state-p) (when (evil-visual-state-p)
(let ((end (region-end))) (evil-visual-select evil-visual-beginning evil-visual-end 'inclusive))
(evil-visual-select (cl-letf (((symbol-function 'region-beginning) (lambda () evil-visual-beginning))
(region-beginning) ((symbol-function 'region-end) (lambda () evil-visual-end)))
(if (eq evil-this-type 'line) end (1+ end)) (yas-insert-snippet))
'inclusive)))
(yas-insert-snippet)
(let* ((snippet (first (yas--snippets-at-point))) (let* ((snippet (first (yas--snippets-at-point)))
(fields (yas--snippet-fields snippet))) (fields (yas--snippet-fields snippet)))
(evil-insert-state +1) (evil-insert-state +1)
(unless fields (evil-change-state 'normal)))) (unless fields (evil-change-state 'normal))))