[elpa] master 033358c 11/38: Merge pull request #965 from taigacute/master

[Dmitry Gutov]

branch: master
commit 033358c7b03a22668a1e6d81e22580396fe161dd
Merge: e585f63 cdd2c00
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>

    Merge pull request #965 from taigacute/master
    
    Add the docbuffer in company-yasnippet
---
 company-yasnippet.el | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/company-yasnippet.el b/company-yasnippet.el
index e5fded4..cc12eb2 100644
--- a/company-yasnippet.el
+++ b/company-yasnippet.el
@@ -97,6 +97,22 @@
        res))
    tables))
 
+(defun company-yasnippet--doc (arg)
+  (let ((template (get-text-property 0 'yas-template arg))
+        (mode major-mode))
+    (with-current-buffer (company-doc-buffer)
+      (yas-minor-mode 1)
+      (yas-expand-snippet (yas--template-content template))
+      (delay-mode-hooks
+        (let ((inhibit-message t))
+          (if (eq mode 'web-mode)
+                (progn
+                  (setq mode 'html-mode)
+                  (funcall mode))
+            (funcall mode)))
+         (ignore-errors (font-lock-ensure)))
+      (current-buffer))))
+
 ;;;###autoload
 (defun company-yasnippet (command &optional arg &rest ignore)
   "`company-mode' backend for `yasnippet'.
@@ -134,6 +150,7 @@ shadow backends that come after it.  Recommended usages:
       (unless company-tooltip-align-annotations " -> ")
       (get-text-property 0 'yas-annotation arg)))
     (candidates (company-yasnippet--candidates arg))
+    (doc-buffer (company-yasnippet--doc arg))
     (no-cache t)
     (post-completion
      (let ((template (get-text-property 0 'yas-template arg))