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

feature/snippets: remove evil hacks (experimental)

Browse source 
They don't seem to be necessary anymore. More testing is required.
This commit is contained in:
Henrik Lissner 2017-12-27 18:20:14 -05:00
parent 16df33a5b1
commit 9fa60965a8
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 2 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/feature/snippets/config.el
View file

@ -38,27 +38,8 @@
;; fix an error caused by smartparens interfering with yasnippet bindings ;; fix an error caused by smartparens interfering with yasnippet bindings
(advice-add #'yas-expand :before #'sp-remove-active-pair-overlay) (advice-add #'yas-expand :before #'sp-remove-active-pair-overlay)
(after! evil ;; Exit snippets on ESC from normal mode
;; Exit snippets on ESC in normal mode (add-hook '+evil-esc-hook #'yas-exit-all-snippets))
(add-hook '+evil-esc-hook #'yas-exit-all-snippets)
;; Once you're in normal mode, you're out
(add-hook 'evil-normal-state-entry-hook #'yas-abort-snippet)
;; Strip out whitespace before a line selection
(defun +snippets|yas-before-expand ()
"Strip out the shitespace before a line selection."
(when (and (evil-visual-state-p)
(eq (evil-visual-type) 'line))
(setq yas-selected-text
(replace-regexp-in-string
"\\(^\\s-*\\|\n? $\\)" ""
(buffer-substring-no-properties evil-visual-beginning
evil-visual-end)))))
(add-hook 'yas-before-expand-snippet-hook #'+snippets|yas-before-expand)
(defun +snippets|yas-after-expand ()
"Fix previous hook persisting yas-selected-text between expansions."
(setq yas-selected-text nil))
(add-hook 'yas-after-exit-snippet-hook #'+snippets|yas-after-expand)))
(def-package! auto-yasnippet (def-package! auto-yasnippet