X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/2a51d27baad30ea1d951e3ab195f87eee54bc195..8b734977727d8c96e3f716bcda3e0e20ccf70fa1:/packages/swiper/swiper.el diff --git a/packages/swiper/swiper.el b/packages/swiper/swiper.el index 1975ae2d0..1b2d9067a 100644 --- a/packages/swiper/swiper.el +++ b/packages/swiper/swiper.el @@ -61,6 +61,35 @@ '((t (:inherit isearch-fail))) "Face for `swiper' matches modulo 3.") +(defface swiper-minibuffer-match-face-1 + '((((class color) (background light)) + :background "#d3d3d3") + (((class color) (background dark)) + :background "#555555")) + "The background face for `swiper' minibuffer matches." + :group 'function-args-faces) + +(defface swiper-minibuffer-match-face-2 + '((((class color) (background light)) + :background "#e99ce8" :weight bold) + (((class color) (background dark)) + :background "#777777" :weight bold)) + "Face for `swiper' minibuffer matches modulo 1.") + +(defface swiper-minibuffer-match-face-3 + '((((class color) (background light)) + :background "#bbbbff" :weight bold) + (((class color) (background dark)) + :background "#7777ff" :weight bold)) + "Face for `swiper' minibuffer matches modulo 2.") + +(defface swiper-minibuffer-match-face-4 + '((((class color) (background light)) + :background "#ffbbff" :weight bold) + (((class color) (background dark)) + :background "#8a498a" :weight bold)) + "Face for `swiper' minibuffer matches modulo 3.") + (defface swiper-line-face '((t (:inherit highlight))) "Face for current `swiper' line.") @@ -83,9 +112,6 @@ map) "Keymap for swiper.") -(defvar swiper--window nil - "Store the current window.") - (defun swiper-query-replace () "Start `query-replace' with string to replace from last search string." (interactive) @@ -96,7 +122,7 @@ (to (query-replace-read-to from "Query replace" t))) (delete-minibuffer-contents) (ivy-set-action (lambda (_) - (with-selected-window swiper--window + (with-ivy-window (move-beginning-of-line 1) (perform-replace from to t t nil)))) @@ -108,14 +134,14 @@ (declare-function avy--regex-candidates "ext:avy") (declare-function avy--process "ext:avy") (declare-function avy--overlay-post "ext:avy") -(declare-function avy--goto "ext:avy") +(declare-function avy-action-goto "ext:avy") ;;;###autoload (defun swiper-avy () "Jump to one of the current swiper candidates." (interactive) (unless (string= ivy-text "") - (with-selected-window (ivy-state-window ivy-last) + (with-ivy-window (let* ((avy-all-windows nil) (candidates (avy--regex-candidates @@ -124,12 +150,12 @@ (candidate (avy--process candidates #'avy--overlay-post))) (ivy-quit-and-run - (avy--goto candidate)))))) + (avy-action-goto candidate)))))) (defun swiper-recenter-top-bottom (&optional arg) - "Call (`recenter-top-bottom' ARG) in `swiper--window'." + "Call (`recenter-top-bottom' ARG)." (interactive "P") - (with-selected-window swiper--window + (with-ivy-window (recenter-top-bottom arg))) (defun swiper-font-lock-ensure () @@ -145,7 +171,11 @@ dired-mode jabber-chat-mode elfeed-search-mode - fundamental-mode))) + fundamental-mode + Man-mode + woman-mode + mu4e-view-mode + mu4e-headers-mode))) (unless (> (buffer-size) 100000) (if (fboundp 'font-lock-ensure) (font-lock-ensure) @@ -163,19 +193,21 @@ (unless (zerop n-lines) (setq swiper--width (1+ (floor (log n-lines 10)))) (setq swiper--format-spec - (format "%%-%dd %%s" swiper--width)) + (format "%%-%dd " swiper--width)) (let ((line-number 0) candidates) (save-excursion (goto-char (point-min)) (swiper-font-lock-ensure) (while (< (point) (point-max)) - (push (format swiper--format-spec - (cl-incf line-number) - (buffer-substring - (line-beginning-position) - (line-end-position))) - candidates) + (let ((str (concat " " (buffer-substring + (line-beginning-position) + (line-end-position))))) + (put-text-property 0 1 'display + (format swiper--format-spec + (cl-incf line-number)) + str) + (push str candidates)) (forward-line 1)) (nreverse candidates)))))) @@ -199,8 +231,7 @@ When non-nil, INITIAL-INPUT is the initial search pattern." "Perform initialization common to both completion methods." (setq swiper--opoint (point)) (setq swiper--len 0) - (setq swiper--anchor (line-number-at-pos)) - (setq swiper--window (selected-window))) + (setq swiper--anchor (line-number-at-pos))) (defun swiper--re-builder (str) "Transform STR into a swiper regex. @@ -230,22 +261,16 @@ there have line numbers. In the buffer, `ivy--regex' should be used." "`isearch' with an overview using `ivy'. When non-nil, INITIAL-INPUT is the initial search pattern." (interactive) - (unless (eq (length (help-function-arglist 'ivy-read)) 4) - (warn "You seem to be using the outdated stand-alone \"ivy\" package. -Please remove it and update the \"swiper\" package.")) (swiper--init) (let ((candidates (swiper--candidates)) - (preselect (format - swiper--format-spec - (line-number-at-pos) - (buffer-substring-no-properties - (line-beginning-position) - (line-end-position)))) + (preselect (buffer-substring-no-properties + (line-beginning-position) + (line-end-position))) + (minibuffer-allow-text-properties t) res) (unwind-protect (setq res (ivy-read - (replace-regexp-in-string - "%s" "pattern: " swiper--format-spec) + "Swiper: " candidates :initial-input initial-input :keymap swiper-map @@ -281,28 +306,30 @@ Please remove it and update the \"swiper\" package.")) (defun swiper--update-input-ivy () "Called when `ivy' input is updated." - (swiper--cleanup) - (let* ((re (ivy--regex ivy-text)) - (str ivy--current) - (num (if (string-match "^[0-9]+" str) - (string-to-number (match-string 0 str)) - 0))) - (with-selected-window swiper--window - (goto-char (point-min)) - (when (cl-plusp num) + (with-ivy-window + (swiper--cleanup) + (when (> (length ivy--current) 0) + (let* ((re (funcall ivy--regex-function ivy-text)) + (re (if (stringp re) re (caar re))) + (str (get-text-property 0 'display ivy--current)) + (num (if (string-match "^[0-9]+" str) + (string-to-number (match-string 0 str)) + 0))) (goto-char (point-min)) - (forward-line (1- num)) - (if (and (equal ivy-text "") - (>= swiper--opoint (line-beginning-position)) - (<= swiper--opoint (line-end-position))) - (goto-char swiper--opoint) - (re-search-forward re (line-end-position) t)) - (isearch-range-invisible (line-beginning-position) - (line-end-position)) - (unless (and (>= (point) (window-start)) - (<= (point) (window-end swiper--window t))) - (recenter))) - (swiper--add-overlays re)))) + (when (cl-plusp num) + (goto-char (point-min)) + (forward-line (1- num)) + (if (and (equal ivy-text "") + (>= swiper--opoint (line-beginning-position)) + (<= swiper--opoint (line-end-position))) + (goto-char swiper--opoint) + (re-search-forward re (line-end-position) t)) + (isearch-range-invisible (line-beginning-position) + (line-end-position)) + (unless (and (>= (point) (window-start)) + (<= (point) (window-end (ivy-state-window ivy-last) t))) + (recenter))) + (swiper--add-overlays re))))) (defun swiper--add-overlays (re &optional beg end) "Add overlays for RE regexp in visible part of the current buffer. @@ -311,46 +338,46 @@ BEG and END, when specified, are the point bounds." (line-beginning-position) (1+ (line-end-position))))) (overlay-put ov 'face 'swiper-line-face) - (overlay-put ov 'window swiper--window) - (push ov swiper--overlays)) - (let* ((wh (window-height)) - (beg (or beg (save-excursion - (forward-line (- wh)) - (point)))) - (end (or end (save-excursion - (forward-line wh) - (point))))) - (when (>= (length re) swiper-min-highlight) - (save-excursion - (goto-char beg) - ;; RE can become an invalid regexp - (while (and (ignore-errors (re-search-forward re end t)) - (> (- (match-end 0) (match-beginning 0)) 0)) - (let ((i 0)) - (while (<= i ivy--subexps) - (when (match-beginning i) - (let ((overlay (make-overlay (match-beginning i) - (match-end i))) - (face - (cond ((zerop ivy--subexps) - (cadr swiper-faces)) - ((zerop i) - (car swiper-faces)) - (t - (nth (1+ (mod (+ i 2) (1- (length swiper-faces)))) - swiper-faces))))) - (push overlay swiper--overlays) - (overlay-put overlay 'face face) - (overlay-put overlay 'window swiper--window) - (overlay-put overlay 'priority i))) - (cl-incf i)))))))) + (overlay-put ov 'window (ivy-state-window ivy-last)) + (push ov swiper--overlays) + (let* ((wh (window-height)) + (beg (or beg (save-excursion + (forward-line (- wh)) + (point)))) + (end (or end (save-excursion + (forward-line wh) + (point))))) + (when (>= (length re) swiper-min-highlight) + (save-excursion + (goto-char beg) + ;; RE can become an invalid regexp + (while (and (ignore-errors (re-search-forward re end t)) + (> (- (match-end 0) (match-beginning 0)) 0)) + (let ((i 0)) + (while (<= i ivy--subexps) + (when (match-beginning i) + (let ((overlay (make-overlay (match-beginning i) + (match-end i))) + (face + (cond ((zerop ivy--subexps) + (cadr swiper-faces)) + ((zerop i) + (car swiper-faces)) + (t + (nth (1+ (mod (+ i 2) (1- (length swiper-faces)))) + swiper-faces))))) + (push overlay swiper--overlays) + (overlay-put overlay 'face face) + (overlay-put overlay 'window (ivy-state-window ivy-last)) + (overlay-put overlay 'priority i))) + (cl-incf i))))))))) (defun swiper--action (x input) "Goto line X and search for INPUT." (if (null x) (user-error "No candidates") (goto-char (point-min)) - (forward-line (1- (read x))) + (forward-line (1- (read (get-text-property 0 'display x)))) (re-search-forward (ivy--regex input) (line-end-position) t) (swiper--ensure-visible) @@ -359,6 +386,93 @@ BEG and END, when specified, are the point bounds." (push-mark swiper--opoint t) (message "Mark saved where search started"))))) +;; (define-key isearch-mode-map (kbd "C-o") 'swiper-from-isearch) +(defun swiper-from-isearch () + "Invoke `swiper' from isearch." + (interactive) + (let ((query (if isearch-regexp + isearch-string + (regexp-quote isearch-string)))) + (isearch-exit) + (swiper query))) + +(defvar swiper-multi-buffers nil + "Store the current list of buffers.") + +(defvar swiper-multi-candidates nil + "Store the list of candidates for `swiper-multi'.") + +(defun swiper-multi-prompt () + (format "Buffers (%s): " + (mapconcat #'identity swiper-multi-buffers ", "))) + +(defun swiper-multi () + "Select one or more buffers. +Run `swiper' for those buffers." + (interactive) + (setq swiper-multi-buffers nil) + (setq swiper-multi-candidates nil) + (ivy-read (swiper-multi-prompt) + 'internal-complete-buffer + :action 'swiper-multi-action-1) + (ivy-read "Swiper: " swiper-multi-candidates + :action 'swiper-multi-action-2 + :unwind #'swiper--cleanup)) + +(defun swiper-multi-action-1 (x) + (if (member x swiper-multi-buffers) + (progn + (setq swiper-multi-buffers (delete x swiper-multi-buffers))) + (unless (equal x "") + (setq swiper-multi-buffers (append swiper-multi-buffers (list x))))) + (let ((prompt (swiper-multi-prompt))) + (setf (ivy-state-prompt ivy-last) prompt) + (setq ivy--prompt (concat "%-4d " prompt))) + (cond ((memq this-command '(ivy-done + ivy-alt-done + ivy-immediate-done)) + (let ((ww (window-width))) + (dolist (buf swiper-multi-buffers) + (with-current-buffer buf + (setq swiper-multi-candidates + (append + (mapcar + (lambda (s) + (setq s (concat s " ")) + (let ((len (length s))) + (put-text-property + (1- len) len 'display + (concat + (make-string + (max + (- ww + (string-width s) + (length (buffer-name)) + 1) + 0) + ?\ ) + (buffer-name)) + s) + s)) + (swiper--candidates)) + swiper-multi-candidates)))))) + ((eq this-command 'ivy-call) + (delete-minibuffer-contents)))) + +(defun swiper-multi-action-2 (x) + (let ((buf-space (get-text-property (1- (length x)) 'display x))) + (with-ivy-window + (when (string-match "\\` *\\([^ ]+\\)\\'" buf-space) + (switch-to-buffer (match-string 1 buf-space)) + (goto-char (point-min)) + (forward-line (1- (read x))) + (re-search-forward + (ivy--regex ivy-text) + (line-end-position) t) + (unless (eq ivy-exit 'done) + (swiper--cleanup) + (swiper--add-overlays (ivy--regex ivy-text))))))) + (provide 'swiper) ;;; swiper.el ends here