[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 10/14: company-capf: cache the capf data
From: |
Dmitry Gutov |
Subject: |
[elpa] 10/14: company-capf: cache the capf data |
Date: |
Tue, 18 Feb 2014 05:51:02 +0000 |
dgutov pushed a commit to branch master
in repository elpa.
commit 255b36eca0e5c6d13540bf34e31bcb4a0c7fe7e3
Author: Dmitry Gutov <address@hidden>
Date: Mon Feb 17 07:43:40 2014 +0200
company-capf: cache the capf data
The annotation command can be called a lot of times. At least in theory.
---
company-capf.el | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/company-capf.el b/company-capf.el
index d31f32d..eeb543b 100644
--- a/company-capf.el
+++ b/company-capf.el
@@ -27,6 +27,14 @@
(eval-when-compile (require 'cl))
+(defvar company--capf-data nil)
+(make-variable-buffer-local 'company--capf-data)
+
+(defun company--capf-clear-data (&optional _ignore)
+ (setq company--capf-data nil)
+ (remove-hook 'company-completion-cancelled-hook 'company--capf-clear-data t)
+ (remove-hook 'company-completion-finished-hook 'company--capf-clear-data t))
+
(defun company--capf-data ()
;; Ignore tags-completion-at-point-function because it subverts company-etags
;; in the default value of company-backends, where the latter comes later.
@@ -47,9 +55,12 @@ Requires Emacs 24.1 or newer."
(when res
(if (> (nth 2 res) (point))
'stop
+ (setq company--capf-data res)
+ (add-hook 'company-completion-cancelled-hook
'company--capf-clear-data nil t)
+ (add-hook 'company-completion-finished-hook
'company--capf-clear-data nil t)
(buffer-substring-no-properties (nth 1 res) (point))))))
(`candidates
- (let ((res (company--capf-data)))
+ (let ((res company--capf-data))
(when res
(let* ((table (nth 3 res))
(pred (plist-get (nthcdr 4 res) :predicate))
@@ -71,7 +82,7 @@ Requires Emacs 24.1 or newer."
candidates))
candidates)))))
(`sorted
- (let ((res (company--capf-data)))
+ (let ((res company--capf-data))
(when res
(let ((meta (completion-metadata
(buffer-substring (nth 1 res) (nth 2 res))
@@ -94,13 +105,13 @@ Requires Emacs 24.1 or newer."
(`no-cache t) ;Not much can be done here, as long as we handle
;non-prefix matches.
(`meta
- (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-docsig)))
+ (let ((f (plist-get (nthcdr 4 company--capf-data) :company-docsig)))
(when f (funcall f arg))))
(`doc-buffer
- (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-doc-buffer)))
+ (let ((f (plist-get (nthcdr 4 company--capf-data) :company-doc-buffer)))
(when f (funcall f arg))))
(`location
- (let ((f (plist-get (nthcdr 4 (company--capf-data)) :company-location)))
+ (let ((f (plist-get (nthcdr 4 company--capf-data) :company-location)))
(when f (funcall f arg))))
(`annotation
(save-excursion
@@ -109,13 +120,13 @@ Requires Emacs 24.1 or newer."
;; better to cache the capf-data value instead.
(when company-point
(goto-char company-point))
- (let ((f (plist-get (nthcdr 4 (company--capf-data))
:annotation-function)))
+ (let ((f (plist-get (nthcdr 4 company--capf-data)
:annotation-function)))
(when f (funcall f arg)))))
(`require-match
- (plist-get (nthcdr 4 (company--capf-data)) :company-require-match))
+ (plist-get (nthcdr 4 company--capf-data) :company-require-match))
(`init nil) ;Don't bother: plenty of other ways to initialize the
code.
(`post-completion
- (let* ((res (company--capf-data))
+ (let* ((res company--capf-data)
(exit-function (plist-get (nthcdr 4 res) :exit-function)))
(if exit-function
(funcall exit-function arg 'finished))))
- [elpa] branch master updated (2e6b4f6 -> cae1efc), Dmitry Gutov, 2014/02/18
- [elpa] 04/14: Fix scrolling up from the last item, Dmitry Gutov, 2014/02/18
- [elpa] 06/14: Introduce company-dabbrev-downcase, Dmitry Gutov, 2014/02/18
- [elpa] 01/14: Set company-added-newline to t if the buffer was modified, Dmitry Gutov, 2014/02/18
- [elpa] 02/14: Don't `company-cancel' twice, Dmitry Gutov, 2014/02/18
- [elpa] 05/14: Fix out-of-bounds error on truncated anno fontification, Dmitry Gutov, 2014/02/18
- [elpa] 07/14: company-capf: fix when company-point is nil, Dmitry Gutov, 2014/02/18
- [elpa] 03/14: New user option, company-continue-commands, Dmitry Gutov, 2014/02/18
- [elpa] 08/14: company--capf-data: Check that the cdr is cons, not data itself, Dmitry Gutov, 2014/02/18
- [elpa] 09/14: company-capf common-part: look up font-lock-face, Dmitry Gutov, 2014/02/18
- [elpa] 10/14: company-capf: cache the capf data,
Dmitry Gutov <=
- [elpa] 14/14: Merge commit '119822078ee3024c2d27017d45ef4578fa36040f' from company, Dmitry Gutov, 2014/02/18
- [elpa] 12/14: company-continue-commands: change the default value, Dmitry Gutov, 2014/02/18
- [elpa] 13/14: Bump the version, Dmitry Gutov, 2014/02/18
- [elpa] 11/14: common-part: rename to `match' and document, Dmitry Gutov, 2014/02/18