'((t (:inherit highlight)))
"Face used by Ivy for highlighting first match.")
+(defface ivy-confirm-face
+ '((t :foreground "ForestGreen" :inherit minibuffer-prompt))
+ "Face used by Ivy to issue a confirmation prompt.")
+
+(defface ivy-match-required-face
+ '((t :foreground "red" :inherit minibuffer-prompt))
+ "Face used by Ivy to issue a match required prompt.")
+
(defface ivy-subdir
'((t (:weight bold)))
"Face used by Ivy for highlighting subdirs in the alternatives.")
+(defface ivy-remote
+ '((t (:foreground "#110099")))
+ "Face used by Ivy for highlighting remotes in the alternatives.")
+
(defcustom ivy-height 10
"Number of lines for the minibuffer window."
:type 'integer)
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-m") 'ivy-done)
(define-key map (kbd "C-j") 'ivy-alt-done)
+ (define-key map (kbd "TAB") 'ivy-partial-or-done)
(define-key map (kbd "C-n") 'ivy-next-line)
(define-key map (kbd "C-p") 'ivy-previous-line)
(define-key map (kbd "<down>") 'ivy-next-line)
(define-key map (kbd "C-g") 'minibuffer-keyboard-quit)
(define-key map (kbd "C-v") 'ivy-scroll-up-command)
(define-key map (kbd "M-v") 'ivy-scroll-down-command)
+ (define-key map (kbd "C-M-n") 'ivy-next-line-and-call)
+ (define-key map (kbd "C-M-p") 'ivy-previous-line-and-call)
+ (define-key map (kbd "M-q") 'ivy-toggle-regexp-quote)
map)
"Keymap used in the minibuffer.")
of `history-length', which see.")
(defvar ivy-require-match t
- "Store require-match. See `completing-read'.")
+ "Store require-match. See `completing-read'.")
+
+(defvar ivy-def nil
+ "Store the default completion value. See `completing-read'.")
(defvar ivy--directory nil
"Current directory when completing file names.")
(defvar ivy-text ""
"Store the user's string as it is typed in.")
+(defvar ivy-window nil
+ "Store the window in which `ivy-read' was called.")
+
(defvar ivy--current ""
"Current candidate.")
(defvar ivy--action nil
"Store a function to call at the end of `ivy--read'.")
+(defvar ivy--persistent-action nil
+ "Store a function to call for current candidate without exiting.")
+
(defvar ivy--all-candidates nil
"Store the candidates passed to `ivy-read'.")
"Store the format-style prompt.
When non-nil, it should contain one %d.")
+(defvar ivy--prompt-extra ""
+ "Temporary modifications to the prompt.")
+
(defvar ivy--old-re nil
"Store the old regexp.")
(defvar ivy--old-cands nil
"Store the candidates matched by `ivy--old-re'.")
+(defvar ivy--regex-function 'ivy--regex
+ "Current function for building a regex.")
+
+(defvar ivy--collection nil
+ "Store the current collection function.")
+
+(defvar Info-current-file)
+
;;** Commands
(defun ivy-done ()
"Exit the minibuffer with the selected candidate."
(interactive)
(delete-minibuffer-contents)
- (cond (ivy--directory
- (insert
- (cond ((string= ivy-text "")
- (if (equal ivy--current "./")
- ivy--directory
- (expand-file-name ivy--current ivy--directory)))
- ((zerop ivy--length)
- (expand-file-name ivy-text ivy--directory))
- (t
- (expand-file-name ivy--current ivy--directory))))
- (setq ivy-exit 'done))
- ((zerop ivy--length)
- (when (memq ivy-require-match
- '(nil confirm confirm-after-completion))
- (insert ivy-text)
- (setq ivy-exit 'done)))
- (t
- (insert ivy--current)
- (setq ivy-exit 'done)))
- (exit-minibuffer))
-
-(defun ivy-alt-done ()
- "Exit the minibuffer with the selected candidate."
+ (when (cond (ivy--directory
+ (if (zerop ivy--length)
+ (if (or (not (eq confirm-nonexistent-file-or-buffer t))
+ (equal " (confirm)" ivy--prompt-extra))
+ (progn
+ (insert
+ (expand-file-name ivy-text ivy--directory))
+ (setq ivy-exit 'done))
+ (setq ivy--prompt-extra " (confirm)")
+ (insert ivy-text)
+ (ivy--exhibit)
+ nil)
+ (insert
+ (expand-file-name
+ ivy--current ivy--directory))
+ (setq ivy-exit 'done)))
+ ((zerop ivy--length)
+ (if (memq ivy-require-match
+ '(nil confirm confirm-after-completion))
+ (progn
+ (insert ivy-text)
+ (setq ivy-exit 'done))
+ (setq ivy--prompt-extra " (match required)")
+ (insert ivy-text)
+ (ivy--exhibit)
+ nil))
+ (t
+ (insert ivy--current)
+ (setq ivy-exit 'done)))
+ (exit-minibuffer)))
+
+(defun ivy-alt-done (&optional arg)
+ "Exit the minibuffer with the selected candidate.
+When ARG is t, exit with current text, ignoring the candidates."
+ (interactive "P")
+ (if arg
+ (ivy-immediate-done)
+ (let (dir)
+ (if (and ivy--directory
+ (or
+ (and
+ (not (string= ivy--current "./"))
+ (cl-plusp ivy--length)
+ (file-directory-p
+ (setq dir (expand-file-name
+ ivy--current ivy--directory))))
+ (prog1 (string-match ":" ivy-text)
+ (setq dir ivy-text))))
+ (progn
+ (ivy--cd dir)
+ (ivy--exhibit))
+ (ivy-done)))))
+
+(defun ivy-partial-or-done ()
+ "Complete the minibuffer text as much as possible.
+When called twice in a row, exit the minibuffer with the current
+candidate."
(interactive)
- (let (dir)
- (cond ((and ivy--directory
- (= 0 ivy--index)
- (= 0 (length ivy-text)))
- (ivy-done))
-
- ((and ivy--directory
- (cl-plusp ivy--length)
- (file-directory-p
- (setq dir (expand-file-name
- ivy--current ivy--directory))))
- (ivy--cd dir)
- (ivy--exhibit))
-
- (t
- (ivy-done)))))
+ (if (eq this-command last-command)
+ (progn
+ (delete-minibuffer-contents)
+ (insert ivy--current)
+ (setq ivy-exit 'done)
+ (exit-minibuffer))
+ (let* ((parts (split-string ivy-text " " t))
+ (postfix (car (last parts)))
+ (new (try-completion postfix
+ (mapcar (lambda (str) (substring str (string-match postfix str)))
+ ivy--old-cands))))
+ (delete-region (minibuffer-prompt-end) (point-max))
+ (setcar (last parts) new)
+ (insert (mapconcat #'identity parts " ") " "))))
+
+(defun ivy-immediate-done ()
+ "Exit the minibuffer with the current input."
+ (interactive)
+ (delete-minibuffer-contents)
+ (insert ivy-text)
+ (setq ivy-exit 'done)
+ (exit-minibuffer))
(defun ivy-beginning-of-buffer ()
"Select the first completion candidate."
(ivy-previous-history-element 1))
(ivy-previous-line arg))
+(defun ivy-next-line-and-call (&optional arg)
+ "Move cursor vertically down ARG candidates."
+ (interactive "p")
+ (ivy-next-line arg)
+ (ivy--exhibit)
+ (when ivy--persistent-action
+ (with-selected-window ivy-window
+ (funcall ivy--persistent-action ivy--current))))
+
+(defun ivy-previous-line-and-call (&optional arg)
+ "Move cursor vertically down ARG candidates."
+ (interactive "p")
+ (ivy-previous-line arg)
+ (ivy--exhibit)
+ (when ivy--persistent-action
+ (with-selected-window ivy-window
+ (funcall ivy--persistent-action ivy--current))))
+
(defun ivy-previous-history-element (arg)
"Forward to `previous-history-element' with ARG."
(interactive "p")
(previous-history-element arg)
- (move-end-of-line 1))
+ (move-end-of-line 1)
+ (ivy--maybe-scroll-history))
(defun ivy-next-history-element (arg)
"Forward to `next-history-element' with ARG."
(interactive "p")
(next-history-element arg)
- (move-end-of-line 1))
+ (move-end-of-line 1)
+ (ivy--maybe-scroll-history))
+
+(defun ivy--maybe-scroll-history ()
+ "If the selected history element has an index, scroll there."
+ (let ((idx (ignore-errors
+ (get-text-property
+ (minibuffer-prompt-end)
+ 'ivy-index))))
+ (when idx
+ (ivy--exhibit)
+ (setq ivy--index idx))))
(defun ivy--cd (dir)
"When completing file names, move to directory DIR."
(if (null ivy--directory)
(error "Unexpected")
(setq ivy--old-cands nil)
+ (setq ivy--old-re nil)
+ (setq ivy--index 0)
(setq ivy--all-candidates
(ivy--sorted-files (setq ivy--directory dir)))
(setq ivy-text "")
(if (and ivy--directory (= (minibuffer-prompt-end) (point)))
(progn
(ivy--cd (file-name-directory
- (directory-file-name ivy--directory)))
+ (directory-file-name
+ (expand-file-name
+ ivy--directory))))
(ivy--exhibit))
(condition-case nil
(backward-delete-char 1)
(when ivy-on-del-error-function
(funcall ivy-on-del-error-function))))))
+(defvar ivy--regexp-quote 'regexp-quote
+ "Store the regexp quoting state.")
+
+(defun ivy-toggle-regexp-quote ()
+ "Toggle the regexp quoting."
+ (interactive)
+ (setq ivy--old-re nil)
+ (cl-rotatef ivy--regex-function ivy--regexp-quote))
+
(defun ivy-sort-file-function-default (x y)
"Compare two files X and Y.
Prioritize directories."
(internal-complete-buffer . nil)
(counsel-git-grep-function . nil)
(t . string-lessp))
- "And alist of sorting functions for each collection function.
+ "An alist of sorting functions for each collection function.
For each entry, nil means no sorting.
The entry associated to t is used for all fall-through cases.")
+(defvar ivy-re-builders-alist
+ '((t . ivy--regex-plus))
+ "An alist of regex building functions for each collection function.
+Each function should take a string and return a valid regex or a
+regex sequence (see below).
+
+The entry associated to t is used for all fall-through cases.
+Possible choices: `ivy--regex', `regexp-quote', `ivy--regex-plus'.
+
+In case a function returns a list, it should look like this:
+'((\"matching-regexp\" . t) (\"non-matching-regexp\") ...).
+
+The matches will be filtered in a sequence, you can mix the
+regexps that should match and that should not match as you
+like.")
+
(defcustom ivy-sort-max-size 30000
"Sorting won't be done for collections larger than this."
:type 'integer)
'ivy-sort-file-function-default)
(setq seq (mapcar (lambda (x)
(propertize x 'dirp (string-match-p "/$" x)))
- (delete "./" (delete "../" seq)))))
+ seq)))
(when sort-fn
(setq seq (cl-sort seq sort-fn)))
(dolist (dir ivy-extra-directories)
seq)))
;;** Entry Point
-(defun ivy-read (prompt collection
- &optional predicate initial-input keymap preselect update-fn sort)
+(cl-defun ivy-read (prompt collection
+ &key predicate require-match initial-input
+ history preselect keymap update-fn sort)
"Read a string in the minibuffer, with completion.
PROMPT is a string to prompt with; normally it ends in a colon
When SORT is t, refer to `ivy-sort-functions-alist' for sorting."
(setq ivy--directory nil)
+ (setq ivy-require-match require-match)
+ (setq ivy-def preselect)
+ (setq ivy-window (selected-window))
+ (setq ivy--regex-function
+ (or (and (functionp collection)
+ (cdr (assoc collection ivy-re-builders-alist)))
+ (cdr (assoc t ivy-re-builders-alist))
+ 'ivy--regex))
+ (setq ivy--subexps 0)
+ (setq ivy--regexp-quote 'regexp-quote)
+ (setq ivy--collection (and (functionp collection)
+ collection))
+ (setq ivy--old-text nil)
(let (coll sort-fn)
(cond ((eq collection 'Info-read-node-name-1)
(if (equal Info-current-file "dir")
(setq coll (all-completions "" collection predicate))))
((eq collection 'read-file-name-internal)
(setq ivy--directory default-directory)
- (setq initial-input nil)
(setq coll
- (ivy--sorted-files default-directory)))
+ (ivy--sorted-files default-directory))
+ (when initial-input
+ (unless (or require-match
+ (equal initial-input default-directory))
+ (setq coll (cons initial-input coll)))
+ (setq initial-input nil)))
+ ((eq collection 'internal-complete-buffer)
+ (setq coll
+ (mapcar (lambda (x)
+ (if (with-current-buffer x
+ (file-remote-p
+ (abbreviate-file-name default-directory)))
+ (propertize x 'face 'ivy-remote)
+ x))
+ (all-completions "" collection predicate))))
((or (functionp collection)
(vectorp collection)
(listp (car collection)))
(setq coll collection)))
(when sort
(if (and (functionp collection)
- (not (eq collection 'read-file-name-internal))
(setq sort-fn (assoc collection ivy-sort-functions-alist)))
- (when (setq sort-fn (cdr sort-fn))
+ (when (and (setq sort-fn (cdr sort-fn))
+ (not (eq collection 'read-file-name-internal)))
(setq coll (cl-sort coll sort-fn)))
- (if (and (setq sort-fn (cdr (assoc t ivy-sort-functions-alist)))
- (<= (length coll) ivy-sort-max-size))
- (setq coll (cl-sort (copy-sequence coll) sort-fn)))))
+ (unless (eq history 'org-refile-history)
+ (if (and (setq sort-fn (cdr (assoc t ivy-sort-functions-alist)))
+ (<= (length coll) ivy-sort-max-size))
+ (setq coll (cl-sort (copy-sequence coll) sort-fn))))))
(when preselect
- (unless (or ivy-require-match
- (all-completions preselect collection))
+ (unless (or require-match
+ (cl-find-if `(lambda (x)
+ (string-match ,(format "^%s" preselect) x))
+ coll))
(setq coll (cons preselect coll))))
- (cl-case (length coll)
- (0 nil)
- (1 (car coll))
- (t
- (setq ivy--index (or
- (and preselect
- (ivy--preselect-index
- coll initial-input preselect))
- 0))
- (setq ivy--old-re nil)
- (setq ivy--old-cands nil)
- (setq ivy-text "")
- (setq ivy--all-candidates coll)
- (setq ivy--update-fn update-fn)
- (setq ivy-exit nil)
- (setq ivy--default (or (thing-at-point 'symbol) ""))
- (setq ivy--prompt
- (cond ((string-match "%.*d" prompt)
- prompt)
- ((string-match "%.*d" ivy-count-format)
- (concat ivy-count-format prompt))
- (ivy--directory
- prompt)
- (t
- nil)))
- (setq ivy--action nil)
- (prog1
- (unwind-protect
- (minibuffer-with-setup-hook
- #'ivy--minibuffer-setup
- (let ((res (read-from-minibuffer
- prompt
- initial-input
- (make-composed-keymap keymap ivy-minibuffer-map)
- nil
- 'ivy-history)))
- (when (eq ivy-exit 'done)
- (pop ivy-history)
- (setq ivy-history
- (cons ivy-text (delete ivy-text ivy-history)))
- res)))
- (remove-hook 'post-command-hook #'ivy--exhibit))
- (when ivy--action
- (funcall ivy--action)))))))
+ (setq ivy--index (or
+ (and preselect
+ (ivy--preselect-index
+ coll initial-input preselect))
+ 0))
+ (setq ivy--old-re nil)
+ (setq ivy--old-cands nil)
+ (setq ivy-text "")
+ (setq ivy--all-candidates coll)
+ (setq ivy--update-fn update-fn)
+ (setq ivy-exit nil)
+ (setq ivy--default (or (thing-at-point 'symbol) ""))
+ (setq ivy--prompt
+ (cond ((string-match "%.*d" prompt)
+ prompt)
+ ((string-match "%.*d" ivy-count-format)
+ (concat ivy-count-format prompt))
+ (ivy--directory
+ prompt)
+ (t
+ nil)))
+ (setq ivy--action nil)
+ (prog1
+ (unwind-protect
+ (minibuffer-with-setup-hook
+ #'ivy--minibuffer-setup
+ (let* ((hist (or history 'ivy-history))
+ (res (read-from-minibuffer
+ prompt
+ initial-input
+ (make-composed-keymap keymap ivy-minibuffer-map)
+ nil
+ hist)))
+ (when (eq ivy-exit 'done)
+ (set hist (cons (propertize ivy-text 'ivy-index ivy--index)
+ (delete ivy-text
+ (cdr (symbol-value hist)))))
+ res)))
+ (remove-hook 'post-command-hook #'ivy--exhibit))
+ (when ivy--action
+ (funcall ivy--action)))))
(defun ivy-completing-read (prompt collection
&optional predicate require-match initial-input
- _history def _inherit-input-method)
+ history def _inherit-input-method)
"Read a string in the minibuffer, with completion.
This is an interface that conforms to `completing-read', so that
COLLECTION can be a list of strings, an alist, an obarray or a hash table.
PREDICATE limits completion to a subset of COLLECTION.
-REQUIRE-MATCH is stored into `ivy-require-match'. See `completing-read'.
+REQUIRE-MATCH is stored into `ivy-require-match'. See `completing-read'.
INITIAL-INPUT is a string that can be inserted into the minibuffer initially.
_HISTORY is ignored for now.
DEF is the default value.
_INHERIT-INPUT-METHOD is ignored for now.
The history, defaults and input-method arguments are ignored for now."
- (when (listp def)
- (setq def (car def)))
- (setq ivy-require-match require-match)
- (ivy-read prompt collection predicate initial-input nil def nil t))
+ (ivy-read prompt collection
+ :predicate predicate
+ :require-match require-match
+ :initial-input initial-input
+ :preselect (if (listp def) (car def) def)
+ :history history
+ :keymap nil
+ :sort t))
;;;###autoload
(define-minor-mode ivy-mode
(make-hash-table :test 'equal)
"Store pre-computed regex.")
-(defun ivy--regex (str)
- "Re-build regex from STR in case it has a space."
- (let ((hashed (gethash str ivy--regex-hash)))
+(defun ivy--regex (str &optional greedy)
+ "Re-build regex from STR in case it has a space.
+When GREEDY is non-nil, join words in a greedy way."
+ (let ((hashed (unless greedy
+ (gethash str ivy--regex-hash))))
(if hashed
(prog1 (cdr hashed)
(setq ivy--subexps (car hashed)))
(cons
(setq ivy--subexps (length subs))
(mapconcat
- (lambda (x) (format "\\(%s\\)" x))
+ (lambda (x)
+ (if (string-match "^\\\\(.*\\\\)$" x)
+ x
+ (format "\\(%s\\)" x)))
subs
- ".*?"))))
+ (if greedy
+ ".*"
+ ".*?")))))
ivy--regex-hash)))))
+(defun ivy--regex-plus (str)
+ "Build a regex sequence from STR.
+Spaces are wild, everything before \"!\" should match.
+Everything after \"!\" should not match."
+ (let ((parts (split-string str "!" t)))
+ (cl-case (length parts)
+ (0
+ "")
+ (1
+ (ivy--regex (car parts)))
+ (2
+ (let ((r2 (ivy--regex (cadr parts)))
+ (r1 (ivy--regex (car parts))))
+ (list (cons r1 t)
+ (cons r2 nil))))
+ (t (error "Unexpected: use only one !")))))
+
;;** Rest
(defun ivy--minibuffer-setup ()
"Setup ivy completion in the minibuffer."
(set (make-local-variable 'minibuffer-default-add-function)
(lambda ()
(list ivy--default)))
- (use-local-map (make-composed-keymap ivy-minibuffer-map
- (current-local-map)))
(setq-local max-mini-window-height ivy-height)
(add-hook 'post-command-hook #'ivy--exhibit nil t)
;; show completions with empty input
(defun ivy--insert-prompt ()
"Update the prompt according to `ivy--prompt'."
(when ivy--prompt
- (let ((inhibit-read-only t)
- (n-str
- (format
- (if ivy--directory
- (concat ivy--prompt (abbreviate-file-name ivy--directory))
- ivy--prompt)
- (or (and ivy--dynamic-function
- ivy--full-length)
- ivy--length))))
- (save-excursion
- (goto-char (point-min))
- (delete-region (point-min) (minibuffer-prompt-end))
- (set-text-properties
- 0 (length n-str)
- '(front-sticky t rear-nonsticky t field t read-only t face minibuffer-prompt)
- n-str)
- (insert n-str))
- ;; get out of the prompt area
- (constrain-to-field nil (point-max)))))
+ (unless (memq this-command '(ivy-done ivy-alt-done ivy-partial-or-done))
+ (setq ivy--prompt-extra ""))
+ (let (head tail)
+ (if (string-match "\\(.*\\): $" ivy--prompt)
+ (progn
+ (setq head (match-string 1 ivy--prompt))
+ (setq tail ": "))
+ (setq head (substring ivy--prompt 0 -1))
+ (setq tail " "))
+ (let ((inhibit-read-only t)
+ (std-props '(front-sticky t rear-nonsticky t field t read-only t))
+ (n-str
+ (format
+ (concat head
+ ivy--prompt-extra
+ tail
+ (if ivy--directory
+ (abbreviate-file-name ivy--directory)
+ ""))
+ (or (and ivy--dynamic-function
+ ivy--full-length)
+ ivy--length))))
+ (save-excursion
+ (goto-char (point-min))
+ (delete-region (point-min) (minibuffer-prompt-end))
+ (set-text-properties 0 (length n-str)
+ `(face minibuffer-prompt ,@std-props)
+ n-str)
+ (ivy--set-match-props n-str "confirm"
+ `(face ivy-confirm-face ,@std-props))
+ (ivy--set-match-props n-str "match required"
+ `(face ivy-match-required-face ,@std-props))
+ (insert n-str))
+ ;; get out of the prompt area
+ (constrain-to-field nil (point-max))))))
+
+(defun ivy--set-match-props (str match props)
+ "Set STR text proprties that match MATCH to PROPS."
+ (when (string-match match str)
+ (set-text-properties
+ (match-beginning 0)
+ (match-end 0)
+ props
+ str)))
+
+(defvar inhibit-message)
(defun ivy--exhibit ()
"Insert Ivy completions display.
(if ivy--dynamic-function
;; while-no-input would cause annoying
;; "Waiting for process to die...done" message interruptions
- (progn
- (unless (equal ivy--old-text ivy-text)
- (let ((store ivy--dynamic-function)
- (ivy--dynamic-function nil))
- (setq ivy--all-candidates (funcall store ivy-text)))
- (setq ivy--old-text ivy-text))
- (ivy--insert-minibuffer (ivy--format ivy--all-candidates)))
- (when ivy--directory
- (if (string-match "/$" ivy-text)
- (if (member ivy-text ivy--all-candidates)
- (ivy--cd (expand-file-name ivy-text ivy--directory))
- (ivy--cd "/"))
- (if (string-match "~$" ivy-text)
- (ivy--cd (expand-file-name "~/")))))
+ (let ((inhibit-message t))
+ (while-no-input
+ (unless (equal ivy--old-text ivy-text)
+ (let ((store ivy--dynamic-function)
+ (ivy--dynamic-function nil))
+ (setq ivy--all-candidates (funcall store ivy-text))))
+ (ivy--insert-minibuffer (ivy--format ivy--all-candidates))))
+ (cond (ivy--directory
+ (if (string-match "/$" ivy-text)
+ (if (member ivy-text ivy--all-candidates)
+ (ivy--cd (expand-file-name ivy-text ivy--directory))
+ (when (string-match "//$" ivy-text)
+ (ivy--cd "/")))
+ (if (string-match "~$" ivy-text)
+ (ivy--cd (expand-file-name "~/")))))
+ ((and (eq ivy--collection 'internal-complete-buffer)
+ (> (length ivy-text) 0)
+ (or (= (length ivy--old-text) 0)
+ (/= (aref ivy-text 0)
+ (aref ivy--old-text 0))))
+ (setq ivy--all-candidates
+ (all-completions
+ (if (eq (aref ivy-text 0) ?\ ) " " "")
+ 'internal-complete-buffer))))
(ivy--insert-minibuffer
(ivy--format
- (ivy--filter ivy-text ivy--all-candidates)))))
+ (ivy--filter ivy-text ivy--all-candidates))))
+ (setq ivy--old-text ivy-text))
(defun ivy--insert-minibuffer (text)
+ "Insert TEXT into minibuffer with appropriate cleanup."
(ivy--cleanup)
(let ((buffer-undo-list t)
deactivate-mark)
"Propertize STR with FACE.
`font-lock-append-text-property' is used, since it's better than
`propertize' or `add-face-text-property' in this case."
- (font-lock-append-text-property 0 (length str) 'face face str)
+ (require 'colir)
+ (condition-case nil
+ (colir-blend-face-background 0 (length str) face str)
+ (error
+ (ignore-errors
+ (font-lock-append-text-property 0 (length str) 'face face str))))
str)
(defun ivy--filter (name candidates)
- "Return the matches for NAME for CANDIDATES.
+ "Return all items that match NAME in CANDIDATES.
CANDIDATES are assumed to be static."
- (let* ((re (ivy--regex name))
+ (let* ((re (funcall ivy--regex-function name))
(cands (cond ((and (equal re ivy--old-re)
ivy--old-cands)
ivy--old-cands)
((and ivy--old-re
+ (stringp re)
+ (stringp ivy--old-re)
+ (not (string-match "\\\\" ivy--old-re))
(not (equal ivy--old-re ""))
(memq (cl-search
(if (string-match "\\\\)$" ivy--old-re)
(lambda (x) (string-match re x))
ivy--old-cands)))
(t
- (ignore-errors
- (cl-remove-if-not
- (lambda (x) (string-match re x))
- candidates)))))
+ (let ((re-list (if (stringp re) (list (cons re t)) re))
+ (res candidates))
+ (dolist (re re-list)
+ (setq res
+ (funcall
+ (if (cdr re)
+ #'cl-remove-if-not
+ #'cl-remove-if)
+ `(lambda (x) (string-match ,(car re) x))
+ res)))
+ res))))
(tail (nthcdr ivy--index ivy--old-cands))
idx)
(when (and tail ivy--old-cands)
(unless (and (not (equal re ivy--old-re))
- (setq ivy--index (cl-position re cands :test 'equal)))
+ (or (setq ivy--index
+ (or
+ (cl-position re cands
+ :test 'equal)
+ (and ivy--directory
+ (cl-position
+ (concat re "/") cands
+ :test 'equal))))))
(while (and tail (null idx))
;; Compare with eq to handle equal duplicates in cands
(setq idx (cl-position (pop tail) cands)))
(setq ivy--index (or idx 0))))
+ (when (and (string= name "") (not (equal ivy--old-re "")))
+ (setq ivy--index
+ (or (cl-position ivy-def cands :test 'equal)
+ ivy--index)))
(setq ivy--old-re re)
(setq ivy--old-cands cands)))