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

yasnippet: clean up config (move var alias to snippets .yas-setup)

Browse source
This commit is contained in:
Henrik Lissner 2016-03-29 18:12:15 -04:00
parent 124452adbb
commit 7721e2f7d8
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core-yasnippet.el
View file

@ -33,8 +33,6 @@
(yas-reload-all) (yas-reload-all)
;; Simpler `yas-selected-text' alias for templates
(defvaralias '% 'yas-selected-text)
;; Undo global maps ;; Undo global maps
(map! :i [(tab)] nil (map! :i [(tab)] nil
:v "<backtab>" nil) :v "<backtab>" nil)
@ -57,13 +55,13 @@
;; Strip out the shitespace before a line selection ;; Strip out the shitespace before a line selection
(add-hook! yas-before-expand-snippet 'narf|yas-before-expand) (add-hook! yas-before-expand-snippet 'narf|yas-before-expand)
;; Previous hook causes yas-selected-text to persist between expansions. ;; Previous hook causes yas-selected-text to persist between expansions.
;; This little hack gets around it. ;; This little hack fixes that.
(add-hook! yas-after-exit-snippet 'narf|yas-after-expand) (add-hook! yas-after-exit-snippet '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)
;; Prevents evil's visual-line from mode gobbling up the newline on the ;; Prevents evil's visual-line from gobbling up the newline on the right due to an
;; right due to an off-by-one issue. ;; 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)