[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 033358c 11/38: Merge pull request #965 from taigacute/mast
From: |
Dmitry Gutov |
Subject: |
[elpa] master 033358c 11/38: Merge pull request #965 from taigacute/master |
Date: |
Sat, 25 Jul 2020 19:51:12 -0400 (EDT) |
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))
- [elpa] master d091704 13/38: Update copyright years, (continued)
- [elpa] master d091704 13/38: Update copyright years, Dmitry Gutov, 2020/07/25
- [elpa] master fdbdff3 15/38: catch yas-expand-snippet error, Dmitry Gutov, 2020/07/25
- [elpa] master 265eb38 16/38: Merge pull request #967 from taigacute/master, Dmitry Gutov, 2020/07/25
- [elpa] master e3d7d60 02/38: company-bbdb: Support more headers like From:, Dmitry Gutov, 2020/07/25
- [elpa] master 94e22c4 03/38: Merge pull request #958 from OGAWAHirofumi/company-bbdb-add-more-header, Dmitry Gutov, 2020/07/25
- [elpa] master f275ee6 04/38: Fix Travis CI Build config, Dmitry Gutov, 2020/07/25
- [elpa] master 872b14c 05/38: add the docbuffer on company-yasnippet, Dmitry Gutov, 2020/07/25
- [elpa] master 32e535d 07/38: add syntax highlight, Dmitry Gutov, 2020/07/25
- [elpa] master e585f63 08/38: Merge pull request #963 from tsuu32/fix/travis-ci, Dmitry Gutov, 2020/07/25
- [elpa] master 3262c18 09/38: use symbol-value to get major-mode value, Dmitry Gutov, 2020/07/25
- [elpa] master 033358c 11/38: Merge pull request #965 from taigacute/master,
Dmitry Gutov <=
- [elpa] master 04d3766 14/38: config the company-yasnippet-doc buffer-file-name, Dmitry Gutov, 2020/07/25
- [elpa] master e25c459 18/38: let-bind buffer-file-name instead of setting it, Dmitry Gutov, 2020/07/25
- [elpa] master d38d64b 20/38: Keyworks complete for c++-mode and c-mode, Dmitry Gutov, 2020/07/25
- [elpa] master b9b0577 22/38: Make company-auto-complete condition more reliable, Dmitry Gutov, 2020/07/25
- [elpa] master 56a846c 25/38: Add a NEWS entry, Dmitry Gutov, 2020/07/25
- [elpa] master 6cf5169 23/38: Update copyright years, Dmitry Gutov, 2020/07/25
- [elpa] master c59c85b 24/38: Merge branch 'master' into company-tng-with-post-completion, Dmitry Gutov, 2020/07/25
- [elpa] master e93b3dc 30/38: [company-files] Make post-completion command a dedicated function, Dmitry Gutov, 2020/07/25
- [elpa] master 1c7a872 31/38: Merge pull request #983 from qhuyduong/make-post-completion-command-dedicated-function, Dmitry Gutov, 2020/07/25
- [elpa] master 6a39f31 38/38: Merge commit '656ad10670512e135a0a5881f127bb7a789ef8ca' from company, Dmitry Gutov, 2020/07/25