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

fix(snippets): fix +snippets/new and +snippets/new-alias file creation

Browse source 
When adding a snippet/alias to a mode for the first time, setting
`default-directory` before calling `+snippet--ensure-dir` would cause an
error due to the directory not existing. As a fix, return the dir from
`+snippet--ensure-dir` and bind `default-directory` to that.

Additionally, not having a file associated with the buffer caused issues
with loading the snippet after using snippet-mode's C-c C-c binding,
especially when other directories were added to yasnippet's load paths.
As a solution for this, prompt the user for a snippet key and set the
buffer's file name to it within the snippet dir. If an existing file
would be overwritten, ask user for confirmation. As an additional
convenience, set the snippet's key field to the entered value.

Finally, replace %alias with doom-snippets-expand in the generated alias
snippets. Not aware of any history here, but %alias did not work for me.
This commit is contained in:
theschmocker 2023-08-19 21:12:05 -05:00
parent 41f31ba9ce
commit 4643376268
1 changed files with 46 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

78
modules/editor/snippets/autoload/snippets.el
View file

@ -33,7 +33,13 @@ ignored. This makes it easy to override built-in snippets with private ones."
(unless (file-directory-p dir)
(if (y-or-n-p (format "%S doesn't exist. Create it?" (abbreviate-file-name dir)))
(make-directory dir t)
(error "%S doesn't exist" (abbreviate-file-name dir)))))
(error "%S doesn't exist" (abbreviate-file-name dir))))
dir)
(defun +snippets--use-snippet-file-name-p (snippet-file-name)
(or (not (file-exists-p snippet-file-name))
(y-or-n-p (format "%s exists. Overwrite it?"
(abbreviate-file-name snippet-file-name)))))
(defun +snippet--get-template-by-uuid (uuid &optional mode)
"Look up the template by uuid in child-most to parent-most mode order.
@ -191,22 +197,25 @@ buggy behavior when <delete> is pressed in an empty field."
(defun +snippets/new ()
"Create a new snippet in `+snippets-dir'."
(interactive)
(let ((default-directory
(expand-file-name (symbol-name major-mode)
+snippets-dir)))
(+snippet--ensure-dir default-directory)
(with-current-buffer (switch-to-buffer "untitled-snippet")
(snippet-mode)
(erase-buffer)
(yas-expand-snippet (concat "# -*- mode: snippet -*-\n"
"# name: $1\n"
"# uuid: $2\n"
"# key: ${3:trigger-key}${4:\n"
"# condition: t}\n"
"# --\n"
"$0"))
(when (bound-and-true-p evil-local-mode)
(evil-insert-state)))))
(let* ((default-directory (+snippet--ensure-dir (expand-file-name
(symbol-name major-mode)
+snippets-dir)))
(snippet-key (read-string "Enter a key for the snippet: "))
(snippet-file-name (expand-file-name snippet-key)))
(when (+snippets--use-snippet-file-name-p snippet-file-name)
(with-current-buffer (switch-to-buffer snippet-key)
(snippet-mode)
(erase-buffer)
(set-visited-file-name snippet-file-name)
(yas-expand-snippet (concat "# -*- mode: snippet -*-\n"
"# name: $1\n"
"# uuid: $2\n"
"# key: ${3:" snippet-key "}${4:\n"
"# condition: t}\n"
"# --\n"
"$0"))
(when (bound-and-true-p evil-local-mode)
(evil-insert-state))))))
;;;###autoload
(defun +snippets/new-alias (template-uuid)
@ -219,21 +228,26 @@ You will be prompted for a snippet to alias."
current-prefix-arg)))
(unless (require 'doom-snippets nil t)
(user-error "This command requires the `doom-snippets' library bundled with Doom Emacs"))
(let ((default-directory (expand-file-name (symbol-name major-mode) +snippets-dir)))
(+snippet--ensure-dir default-directory)
(with-current-buffer (switch-to-buffer "untitled-snippet")
(snippet-mode)
(erase-buffer)
(yas-expand-snippet
(concat "# -*- mode: snippet -*-\n"
"# name: $1\n"
"# key: ${2:trigger-key}${3:\n"
"# condition: t}\n"
"# type: command\n"
"# --\n"
"(%alias \"${4:" (or template-uuid "uuid") "}\")"))
(when (bound-and-true-p evil-local-mode)
(evil-insert-state)))))
(let* ((default-directory (+snippet--ensure-dir (expand-file-name
(symbol-name major-mode)
+snippets-dir)))
(alias-key (read-string "Enter a key for the alias: "))
(alias-file-name (expand-file-name alias-key)))
(when (+snippets--use-snippet-file-name-p alias-file-name)
(with-current-buffer (switch-to-buffer alias-key)
(snippet-mode)
(erase-buffer)
(set-visited-file-name alias-file-name)
(yas-expand-snippet
(concat "# -*- mode: snippet -*-\n"
"# name: $1\n"
"# key: ${2:" alias-key "}${3:\n"
"# condition: t}\n"
"# type: command\n"
"# --\n"
"(doom-snippets-expand :uuid \"${4:" (or template-uuid "uuid") "}\")"))
(when (bound-and-true-p evil-local-mode)
(evil-insert-state))))))
;;;###autoload
(defun +snippets/edit (template-uuid)