feature/snippets: refactor, cleanup & stability tweaks

This commit is contained in:
Henrik Lissner 2017-03-22 17:42:51 -04:00
parent f380cff5c4
commit 29e844c92e
3 changed files with 12 additions and 15 deletions

View file

@ -10,8 +10,8 @@ and switches to insert mode if there are editable fields."
(cl-letf (((symbol-function 'region-beginning) (lambda () evil-visual-beginning))
((symbol-function 'region-end) (lambda () evil-visual-end)))
(yas-insert-snippet))
(let* ((snippet (first (yas--snippets-at-point)))
(fields (yas--snippet-fields snippet)))
(evil-insert-state +1)
(unless fields (evil-change-state 'normal))))
(when-let (snippet (car-safe (yas--snippets-at-point)))
(let ((fields (yas--snippet-fields snippet)))
(evil-insert-state +1)
(unless fields (evil-change-state 'normal)))))

View file

@ -57,7 +57,3 @@ buggy behavior when <delete> is pressed in an empty field."
(when (and field (> (point) sof))
(delete-region sof (point)))))
;; TODO move this to ivy
;;;###autoload
(defun +snippets/ivy-prompt (prompt choices &optional display-fn)
(yas-completing-prompt prompt choices display-fn #'ivy-completing-read))