emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master fdbdff3 15/38: catch yas-expand-snippet error


From: Dmitry Gutov
Subject: [elpa] master fdbdff3 15/38: catch yas-expand-snippet error
Date: Sat, 25 Jul 2020 19:51:13 -0400 (EDT)

branch: master
commit fdbdff323a9510ef1c9b5f84d56216ba8ce9c866
Author: stephen <sawakitaeiji233@gmail.com>
Commit: stephen <sawakitaeiji233@gmail.com>

    catch yas-expand-snippet error
---
 company-yasnippet.el | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/company-yasnippet.el b/company-yasnippet.el
index a8c4d36..f7753bc 100644
--- a/company-yasnippet.el
+++ b/company-yasnippet.el
@@ -107,11 +107,15 @@ It has to accept one argument: the snippet's name.")
 
 (defun company-yasnippet--doc (arg)
   (let ((template (get-text-property 0 'yas-template arg))
-        (mode major-mode))
+        (mode major-mode)
+        (file-name (buffer-file-name)))
     (with-current-buffer (company-doc-buffer)
-      (setq-local buffer-file-name "company-yasnippet-doc")
+      (setq-local buffer-file-name file-name)
       (yas-minor-mode 1)
-      (yas-expand-snippet (yas--template-content template))
+      (condition-case error
+        (yas-expand-snippet (yas--template-content template))
+       (error
+          (message "%s"  (error-message-string error))))
       (delay-mode-hooks
         (let ((inhibit-message t))
           (if (eq mode 'web-mode)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]