ld/avy
1
0
Fork 0
mirror of https://github.com/abo-abo/avy.git synced 2025-10-14 05:43:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add `avy-lead-face-1' for dimmed matched chars

Browse Source 
* avy.el (avy-lead-face-0): Update doc.
(avy-lead-face-1): New face.
(avy-current-path): New defvar.
(avy-read): Store the current matched chars in `avy-current-path'.
(avy--overlay-pre):
(avy--overlay-post): Extend the string with the matched part. This
prevents shifting during selection, and looks nice too.

Fixes #38
This commit is contained in:
Oleh Krehel 2015-05-12 12:36:18 +02:00
parent e35f1ed51f
commit 8efed4072a
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
avy.el
View File

@ -127,7 +127,11 @@ When nil, punctuation chars will not be matched.
(defface avy-lead-face-0 (defface avy-lead-face-0
'((t (:foreground "white" :background "#4f57f9"))) '((t (:foreground "white" :background "#4f57f9")))
"Face used for the leading chars.") "Face used for first non-terminating leading chars.")
(defface avy-lead-face-1
'((t (:foreground "white" :background "gray")))
"Face used for matched leading chars.")
(defface avy-lead-face (defface avy-lead-face
'((t (:foreground "white" :background "#e52b50"))) '((t (:foreground "white" :background "#e52b50")))
@ -208,6 +212,9 @@ KEYS is the path from the root of `avy-tree' to LEAF."
(defvar avy-handler-function 'avy-handler-default (defvar avy-handler-function 'avy-handler-default
"A function to call for a bad `read-char' in `avy-read'.") "A function to call for a bad `read-char' in `avy-read'.")
(defvar avy-current-path ""
"Store the current incomplete path during `avy-read'.")
(defun avy-read (tree display-fn cleanup-fn) (defun avy-read (tree display-fn cleanup-fn)
"Select a leaf from TREE using consecutive `read-char'. "Select a leaf from TREE using consecutive `read-char'.
@ -218,6 +225,7 @@ commonly done by adding a CHAR overlay at LEAF position.
CLEANUP-FN should take no arguments and remove the effects of CLEANUP-FN should take no arguments and remove the effects of
multiple DISPLAY-FN invokations." multiple DISPLAY-FN invokations."
(catch 'done (catch 'done
(setq avy-current-path "")
(while tree (while tree
(let ((avy--leafs nil)) (let ((avy--leafs nil))
(avy-traverse tree (avy-traverse tree
@ -230,7 +238,9 @@ multiple DISPLAY-FN invokations."
(funcall cleanup-fn) (funcall cleanup-fn)
(if (setq branch (assoc char tree)) (if (setq branch (assoc char tree))
(if (eq (car (setq tree (cdr branch))) 'leaf) (if (eq (car (setq tree (cdr branch))) 'leaf)
(throw 'done (cdr tree))) (throw 'done (cdr tree))
(setq avy-current-path
(concat avy-current-path (string char))))
(funcall avy-handler-function char)))))) (funcall avy-handler-function char))))))
;;** Rest ;;** Rest
@ -372,6 +382,10 @@ LEAF is normally ((BEG . END) . WND)."
'face 'avy-lead-face))) 'face 'avy-lead-face)))
(when (> (length str) 1) (when (> (length str) 1)
(set-text-properties 0 1 '(face avy-lead-face-0) str)) (set-text-properties 0 1 '(face avy-lead-face-0) str))
(setq str (concat
(propertize avy-current-path
'face 'avy-lead-face-1)
str))
(avy--overlay (avy--overlay
str str
(cond ((numberp leaf) (cond ((numberp leaf)
@ -456,6 +470,10 @@ LEAF is normally ((BEG . END) . WND)."
'face 'avy-lead-face))) 'face 'avy-lead-face)))
(when (> (length str) 1) (when (> (length str) 1)
(set-text-properties 0 1 '(face avy-lead-face-0) str)) (set-text-properties 0 1 '(face avy-lead-face-0) str))
(setq str (concat
(propertize avy-current-path
'face 'avy-lead-face-1)
str))
(avy--overlay (avy--overlay
str str
(cond ((numberp leaf) (cond ((numberp leaf)