From a24a3ef2923b821e83b506cd29bec7494cdfa761 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 23 Oct 2017 20:07:54 +0200 Subject: [PATCH] Fix unindexed file-templates on first load of yasnippet --- modules/feature/file-templates/config.el | 5 ++--- modules/feature/snippets/config.el | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/feature/file-templates/config.el b/modules/feature/file-templates/config.el index 8c55c349c..b4750f1d0 100644 --- a/modules/feature/file-templates/config.el +++ b/modules/feature/file-templates/config.el @@ -11,13 +11,12 @@ :init (setq auto-insert-query nil ; Don't prompt before insertion auto-insert-alist nil) ; Tabula rasa + (after! yasnippet + (push '+file-templates-dir yas-snippet-dirs)) :config (auto-insert-mode 1) - (after! yasnippet - (push '+file-templates-dir yas-snippet-dirs)) - (defun +file-templates--expand (key &optional mode project-only) "Auto insert a snippet of yasnippet into new file." (when (if project-only (doom-project-p) t) diff --git a/modules/feature/snippets/config.el b/modules/feature/snippets/config.el index 322ab221e..a00450d79 100644 --- a/modules/feature/snippets/config.el +++ b/modules/feature/snippets/config.el @@ -11,6 +11,8 @@ (defvar yas-minor-mode-map (make-sparse-keymap)) :init + (setq yas-snippet-dirs '(yas-installed-snippets-dir)) + ;; Ensure `yas-reload-all' is called as late as possible. Other modules could ;; have additional configuration for yasnippet. For example, file-templates. (add-transient-hook! 'yas-minor-mode-hook (yas-reload-all)) @@ -23,7 +25,6 @@ yas-indent-line 'auto yas-also-auto-indent-first-line t yas-prompt-functions '(yas-completing-prompt yas-ido-prompt yas-no-prompt) - yas-snippet-dirs '(yas-installed-snippets-dir) yas-use-menu nil ;; Allow nested snippets yas-triggers-in-field t)