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

Fix snippet expansion on TAB in visual mode

Browse source 
Overzealous dispatcher was overriding yas-insert-snippet.
This commit is contained in:
Henrik Lissner 2019-02-19 18:05:56 -05:00
parent c82faf7f10
commit f1c13337cc
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
modules/config/default/+evil-bindings.el
View file

@ -33,16 +33,27 @@
(and (featurep! :completion company +tng) (and (featurep! :completion company +tng)
(+company-has-completion-p)) (+company-has-completion-p))
'+company/complete) '+company/complete)
:nv [tab] (general-predicate-dispatch nil :n [tab] (general-predicate-dispatch nil
(derived-mode-p 'magit-mode) (derived-mode-p 'magit-mode)
'magit-section-toggle 'magit-section-toggle
(derived-mode-p 'deadgrep-mode) (derived-mode-p 'deadgrep-mode)
'deadgrep-toggle-file-results 'deadgrep-toggle-file-results
(and (featurep! :editor fold) (and (featurep! :editor fold)
(save-excursion (end-of-line) (invisible-p (point)))) (save-excursion (end-of-line) (invisible-p (point))))
'+fold/toggle '+fold/toggle
(fboundp 'evilmi-jump-items) (fboundp 'evilmi-jump-items)
'evilmi-jump-items) 'evilmi-jump-items)
:v [tab] (general-predicate-dispatch nil
(and (bound-and-true-p yas-minor-mode)
(or (eq evil-visual-selection 'line)
(and (fboundp 'evilmi-jump-items)
(save-excursion
(/= (point)
(progn (evilmi-jump-items nil)
(point)))))))
'yas-insert-snippet
(fboundp 'evilmi-jump-items)
'evilmi-jump-items)
;; Smarter newlines ;; Smarter newlines
:i [remap newline] #'newline-and-indent ; auto-indent on newline :i [remap newline] #'newline-and-indent ; auto-indent on newline
@ -203,9 +214,7 @@
[M-left] #'+snippets/goto-start-of-field [M-left] #'+snippets/goto-start-of-field
[M-backspace] #'+snippets/delete-to-start-of-field [M-backspace] #'+snippets/delete-to-start-of-field
[backspace] #'+snippets/delete-backward-char [backspace] #'+snippets/delete-backward-char
[delete] #'+snippets/delete-forward-char-or-field) [delete] #'+snippets/delete-forward-char-or-field)))
(:map yas-minor-mode-map
:v [tab] #'yas-insert-snippet)))
(:when (featurep! :feature spellcheck) (:when (featurep! :feature spellcheck)
:m "]S" #'flyspell-correct-word-generic :m "]S" #'flyspell-correct-word-generic