;; Copyright (C) 2009 Nikolaj Schumacher
;;
;; Author: Nikolaj Schumacher <bugs * nschum de>
-;; Version: 0.1
+;; Version: 0.1.5
;; Keywords: abbrev, convenience, matchis
;; URL: http://nschum.de/src/emacs/company/
;; Compatibility: GNU Emacs 22.x, GNU Emacs 23.x
;;
;;; Change Log:
;;
+;; Added `company-filter-candidates'.
+;; More local Lisp variables are now included in the candidates.
+;;
+;; 2009-03-21 (0.1.5)
;; Fixed elisp documentation buffer always showing the same doc.
;; Added `company-echo-strip-common-frontend'.
;; Added `company-show-numbers' option and M-0 ... M-9 default bindings.
"*Face used for the common part of the completion preview."
:group 'company)
+(defface company-preview-search
+ '((t :inherit company-preview
+ :background "blue1"))
+ "*Face used for the search string in the completion preview."
+ :group 'company)
+
(defface company-echo nil
"*Face used for completions in the echo area."
:group 'company)
(set variable value))
(defcustom company-frontends '(company-pseudo-tooltip-unless-just-one-frontend
- company-preview-if-just-one-frontend
+ company-preview-frontend
company-echo-metadata-frontend)
"*The list of active front-ends (visualizations).
Each front-end is a function that takes one argument. It is called with
(define-key keymap "\t" 'company-complete-common)
(define-key keymap (kbd "<f1>") 'company-show-doc-buffer)
(define-key keymap "\C-s" 'company-search-candidates)
+ (define-key keymap "\C-\M-s" 'company-filter-candidates)
(dotimes (i 10)
(define-key keymap (vector (+ (aref (kbd "M-0") 0) i))
`(lambda () (interactive) (company-complete-number ,i))))
`company-select-next', `company-select-previous'. If these commands are
called before `company-idle-delay', completion will also start.
-Completions can be searched with `company-search-candidates'.
+Completions can be searched with `company-search-candidates' or
+`company-filter-candidates'.
The completion data is retrieved using `company-backends' and displayed using
`company-frontends'.
-regular keymap:
+regular keymap (`company-mode-map'):
\\{company-mode-map}
-keymap during active completions:
+keymap during active completions (`company-active-map'):
\\{company-active-map}"
nil " comp" company-mode-map
(ding)
(company-set-selection (- company-selection pos 1) t))))
-(defsubst company-create-match-predicate (search-string)
- `(lambda (candidate)
- ,(if company-candidates-predicate
- `(and (string-match ,search-string candidate)
- (funcall ,company-candidates-predicate candidate))
- `(string-match ,company-search-string candidate))))
+(defun company-create-match-predicate ()
+ (setq company-candidates-predicate
+ `(lambda (candidate)
+ ,(if company-candidates-predicate
+ `(and (string-match ,company-search-string candidate)
+ (funcall ,company-candidates-predicate
+ candidate))
+ `(string-match ,company-search-string candidate))))
+ (company-update-candidates
+ (company-apply-predicate company-candidates company-candidates-predicate)))
+
+(defun company-filter-printing-char ()
+ (interactive)
+ (unless company-mode (error "Company not enabled"))
+ (unless company-search-mode (error "Company not in search mode"))
+ (company-search-printing-char)
+ (company-create-match-predicate)
+ (company-call-frontends 'update))
(defun company-search-kill-others ()
"Limit the completion candidates to the ones matching the search string."
(interactive)
(unless company-mode (error "Company not enabled"))
(unless company-search-mode (error "Company not in search mode"))
- (let ((predicate (company-create-match-predicate company-search-string)))
- (setq company-candidates-predicate predicate)
- (company-update-candidates (company-apply-predicate company-candidates
- predicate))
- (company-search-mode 0)
- (company-call-frontends 'update)))
+ (company-create-match-predicate)
+ (company-search-mode 0)
+ (company-call-frontends 'update))
(defun company-search-abort ()
"Abort searching the completion candidates."
(let ((l (generic-character-list))
(table (nth 1 keymap)))
(while l
- (set-char-table-default table (car l) 'isearch-printing-char)
+ (set-char-table-default table (car l) 'company-search-printing-char)
(setq l (cdr l))))))
(define-key keymap [t] 'company-search-other-char)
(while (< i ?\s)
"Keymap used for incrementally searching the completion candidates.")
(define-minor-mode company-search-mode
- "Start searching the completion candidates incrementally.
-
-\\<company-search-map>Search can be controlled with the commands:
-- `company-search-repeat-forward' (\\[company-search-repeat-forward])
-- `company-search-repeat-backward' (\\[company-search-repeat-backward])
-- `company-search-abort' (\\[company-search-abort])
-
-Regular characters are appended to the search string.
-
-The command `company-search-kill-others' (\\[company-search-kill-others]) uses
- the search string to limit the completion candidates."
+ "Search mode for completion candidates.
+Don't start this directly, use `company-search-candidates' or
+`company-filter-candidates'."
nil company-search-lighter nil
(if company-search-mode
(if (company-manual-begin)
(progn
(setq company-search-old-selection company-selection)
- (company-enable-overriding-keymap company-search-map)
(company-call-frontends 'update))
(setq company-search-mode nil))
(kill-local-variable 'company-search-string)
The command `company-search-kill-others' (\\[company-search-kill-others]) uses
the search string to limit the completion candidates."
(interactive)
- (company-search-mode 1))
+ (company-search-mode 1)
+ (company-enable-overriding-keymap company-search-map))
+
+(defvar company-filter-map
+ (let ((keymap (make-keymap)))
+ (define-key keymap [remap company-search-printing-char]
+ 'company-filter-printing-char)
+ (set-keymap-parent keymap company-search-map)
+ keymap)
+ "Keymap used for incrementally searching the completion candidates.")
+
+(defun company-filter-candidates ()
+ "Start filtering the completion candidates incrementally.
+This works the same way as `company-search-candidates' immediately
+followed by `company-search-kill-others' after each input."
+ (interactive)
+ (company-search-mode 1)
+ (company-enable-overriding-keymap company-filter-map))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(setq company-preview-overlay (make-overlay pos pos))
- (let ((completion (company-strip-prefix (nth company-selection
- company-candidates))))
+ (let ((completion(nth company-selection company-candidates)))
+ (setq completion (propertize completion 'face 'company-preview))
+ (add-text-properties 0 (length company-common)
+ '(face company-preview-common) completion)
+
+ ;; Add search string
+ (and company-search-string
+ (string-match (regexp-quote company-search-string) completion)
+ (add-text-properties (match-beginning 0)
+ (match-end 0)
+ '(face company-preview-search)
+ completion))
+
+ (setq completion (company-strip-prefix completion))
+
(and (equal pos (point))
(not (equal completion ""))
(add-text-properties 0 1 '(cursor t) completion))
- (setq completion (propertize completion 'face 'company-preview))
- (add-text-properties 0 (- (length company-common) (length company-prefix))
- '(face company-preview-common) completion)
-
(overlay-put company-preview-overlay 'after-string completion)
(overlay-put company-preview-overlay 'window (selected-window))))