Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Slightly improve performance? #35

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Slightly improve performance? #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 7 additions & 17 deletions company-fuzzy.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,21 +294,14 @@ See function `string-prefix-p' for arguments PREFIX, STRING and IGNORE-CASE."
(setq result-lst (reverse result-lst))
(cl-remove-duplicates result-lst)))

(defun company-fuzzy--get-backend-by-candidate (candidate)
"Return the backend symbol by using CANDIDATE as search index."
(let ((match (ht-find (lambda (_backend cands)
(member candidate cands))
company-fuzzy--candidates)))
(car match)))

(defun company-fuzzy--call-backend (backend command key)
"Safely call BACKEND by COMMAND and KEY."
(ignore-errors (funcall backend command key)))

(defun company-fuzzy--backend-command (candidate command)
"Find the backend from the CANDIDATE then call the COMMAND."
(unless (string-empty-p candidate)
(when-let ((backend (company-fuzzy--get-backend-by-candidate candidate)))
(when-let ((backend (ht-get company-fuzzy--candidates candidate)))
(company-fuzzy--call-backend backend command candidate))))

;;
Expand Down Expand Up @@ -337,7 +330,7 @@ See function `string-prefix-p' for arguments PREFIX, STRING and IGNORE-CASE."

(defun company-fuzzy--extract-annotation (candidate)
"Extract annotation from CANDIDATE."
(let* ((backend (company-fuzzy--get-backend-by-candidate candidate))
(let* ((backend (ht-get company-fuzzy--candidates candidate))
(backend-str (company-fuzzy--backend-string candidate backend))
(orig-anno (company-fuzzy--source-anno-string candidate backend)))
(concat orig-anno backend-str)))
Expand Down Expand Up @@ -469,7 +462,7 @@ If optional argument FLIP is non-nil, reverse query and pattern order."
(when company-fuzzy-mode
;; NOTE: Here we force to change `company-prefix' so the completion
;; will do what we expected.
(let ((backend (company-fuzzy--get-backend-by-candidate candidate)))
(let ((backend (ht-get company-fuzzy--candidates candidate)))
(setq company-prefix (company-fuzzy--backend-prefix backend 'complete)))))

;;
Expand Down Expand Up @@ -572,7 +565,7 @@ P.S. Not all backend work this way."

(defun company-fuzzy--backend-prefix-candidate (cand type)
"Get the backend prefix by CAND and TYPE."
(let ((backend (company-fuzzy--get-backend-by-candidate cand)))
(let ((backend (ht-get company-fuzzy--candidates cand)))
(company-fuzzy--backend-prefix backend type)))

(defun company-fuzzy--backend-prefix (backend type)
Expand Down Expand Up @@ -624,11 +617,7 @@ Insert .* between each char."

(defun company-fuzzy--ht-all-candidates ()
"Return all candidates from the data."
(let (all-candidates)
(ht-map (lambda (_backend cands)
(setq all-candidates (append all-candidates cands)))
company-fuzzy--candidates)
(delete-dups all-candidates)))
(ht-keys company-fuzzy--candidates))

(defun company-fuzzy-all-candidates ()
"Return the list of all candidates."
Expand Down Expand Up @@ -679,7 +668,8 @@ Insert .* between each char."
(defun company-fuzzy--register-candidates (backend candidates)
"Register CANDIDATES with BACKEND id."
(delete-dups candidates)
(ht-set company-fuzzy--candidates backend (copy-sequence candidates)))
(dolist (cand candidates)
(ht-set company-fuzzy--candidates cand backend)))

(defun company-fuzzy--collect-candidates (backend candidates)
"Collect BACKEND's CANDIDATES by it's type."
Expand Down