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

Clean up yasnippet config

Browse source
This commit is contained in:
Henrik Lissner 2016-05-18 02:14:44 -04:00
parent a1dce80783
commit 4b13812eda
1 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/core-yasnippet.el
View file

@ -34,12 +34,10 @@
(associate! snippet-mode :match "emacs\\.d/private/\\(snippets\\|templates\\)/.+$") (associate! snippet-mode :match "emacs\\.d/private/\\(snippets\\|templates\\)/.+$")
;; Undo global maps
(map! :i [(tab)] nil (map! :i [(tab)] nil
:v "<backtab>" nil) :v "<backtab>" nil
;; keybinds (:map yas-keymap
(map! :map yas-keymap
"C-e" 'narf/yas-goto-end-of-field "C-e" 'narf/yas-goto-end-of-field
"C-a" 'narf/yas-goto-start-of-field "C-a" 'narf/yas-goto-start-of-field
"<M-right>" 'narf/yas-goto-end-of-field "<M-right>" 'narf/yas-goto-end-of-field
@ -49,26 +47,25 @@
"<escape>" 'evil-normal-state "<escape>" 'evil-normal-state
[backspace] 'narf/yas-backspace [backspace] 'narf/yas-backspace
"<delete>" 'narf/yas-delete) "<delete>" 'narf/yas-delete))
;; Prevents evil's visual-line from gobbling up the newline on the right due to an ;; Prevents evil's visual-line from gobbling up the newline on the right due
;; off-by-one issue. ;; to an off-by-one issue.
(defadvice yas-expand-snippet (around yas-expand-snippet-visual-line activate) (defadvice yas-expand-snippet (around yas-expand-snippet-visual-line activate)
(when (narf/evil-visual-line-state-p) (when (narf/evil-visual-line-state-p)
(ad-set-arg 2 (1- (ad-get-arg 2)))) ad-do-it) (ad-set-arg 2 (1- (ad-get-arg 2)))) ad-do-it)
;; Once you're in normal mode, you're out ;; Once you're in normal mode, you're out
(add-hook 'evil-normal-state-entry-hook 'yas-abort-snippet) (add-hook 'evil-normal-state-entry-hook 'yas-abort-snippet)
;; Strip out the shitespace before a line selection ;; Strip out whitespace before a line selection
(add-hook 'yas-before-expand-snippet-hook 'narf|yas-before-expand) (add-hook 'yas-before-expand-snippet-hook 'narf|yas-before-expand)
;; Previous hook causes yas-selected-text to persist between expansions. ;; Fix previous hook persisting yas-selected-text between expansions
;; This little hack fixes that.
(add-hook 'yas-after-exit-snippet-hook 'narf|yas-after-expand) (add-hook 'yas-after-exit-snippet-hook 'narf|yas-after-expand)
;; Exit snippets on ESC in normal mode ;; Exit snippets on ESC in normal mode
(advice-add 'evil-force-normal-state :before 'yas-exit-all-snippets) (advice-add 'evil-force-normal-state :before 'yas-exit-all-snippets)
;; Fix an issue with smartparens' keybindings interfering with yasnippet keybindings. ;; Fix an issue with smartparens interfering with yasnippet keybindings
(advice-add 'yas-expand :before 'sp-remove-active-pair-overlay)) (advice-add 'yas-expand :before 'sp-remove-active-pair-overlay))
(use-package auto-yasnippet (use-package auto-yasnippet