[elpa] master 265eb38 16/38: Merge pull request #967 from taigacute/master

[Dmitry Gutov]

branch: master
commit 265eb38e7b635fae4880fafeb7e53d50535988f5
Merge: d091704 fdbdff3
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>

    Merge pull request #967 from taigacute/master
    
    Improve the behavior
---
 company-yasnippet.el | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/company-yasnippet.el b/company-yasnippet.el
index 14ed8e3..f7753bc 100644
--- a/company-yasnippet.el
+++ b/company-yasnippet.el
@@ -107,10 +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 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)