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

Jump to bottom

Fix for issue #2805 by using company-finish on counsel-company. #2835

Closed
wants to merge 4 commits into from
Closed

Fix for issue #2805 by using company-finish on counsel-company. #2835

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
247b6f5
Fix for issue #2805 by using company-finish on counsel-company.
joefbsjr Mar 28, 2021
ceda444
Fix company-prefix and company-common when using counsel-company.
joefbsjr Mar 28, 2021
3dff606
Refactored counsel-company simplifying and removing uneeded code.
Mar 31, 2021
2b71a98
Merge branch 'abo-abo:master' into master
joefbsjr Aug 11, 2022
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
22 changes: 6 additions & 16 deletions counsel.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,25 +369,15 @@ Update the minibuffer with the amount of lines collected every
(company-mode 1)
(unless company-candidates
(company-complete))
(let ((len (cond ((let (l)
(and company-common
(string= company-common
(buffer-substring
(- (point) (setq l (length company-common)))
(point)))
l)))
(company-prefix
(length company-prefix)))))
(when len
(setq ivy-completion-beg (- (point) len))
(setq ivy-completion-end (point))
(ivy-read "Candidate: " company-candidates
:action #'ivy-completion-in-region-action
:caller 'counsel-company))))
(company--continue)
(when company-candidates
(ivy-read "Candidate: " company-candidates
:action 'company-finish
:caller 'counsel-company)))

(ivy-configure 'counsel-company
:display-transformer-fn #'counsel--company-display-transformer
:unwind-fn #'company-abort)
:unwind-fn (lambda() (unless ivy-exit (company-abort))))

(defun counsel--company-display-transformer (s)
(concat s (let ((annot (company-call-backend 'annotation s)))
Expand Down