X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/b0039dd1f382edcd722f6c1c7194867538831d32..f5dac473c5461c4834431feac50ea18b6948d4df:/packages/swiper/swiper.el diff --git a/packages/swiper/swiper.el b/packages/swiper/swiper.el index 1975ae2d0..1032f0486 100644 --- a/packages/swiper/swiper.el +++ b/packages/swiper/swiper.el @@ -83,9 +83,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 +93,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 +105,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 +121,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 +142,9 @@ dired-mode jabber-chat-mode elfeed-search-mode - fundamental-mode))) + fundamental-mode + Man-mode + woman-mode))) (unless (> (buffer-size) 100000) (if (fboundp 'font-lock-ensure) (font-lock-ensure) @@ -199,8 +198,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. @@ -244,8 +242,7 @@ Please remove it and update the \"swiper\" package.")) 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,13 +278,13 @@ 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 + (with-ivy-window + (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))) (goto-char (point-min)) (when (cl-plusp num) (goto-char (point-min)) @@ -300,7 +297,7 @@ Please remove it and update the \"swiper\" package.")) (isearch-range-invisible (line-beginning-position) (line-end-position)) (unless (and (>= (point) (window-start)) - (<= (point) (window-end swiper--window t))) + (<= (point) (window-end (ivy-state-window ivy-last) t))) (recenter))) (swiper--add-overlays re)))) @@ -311,39 +308,39 @@ 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." @@ -359,6 +356,16 @@ 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))) + (provide 'swiper) ;;; swiper.el ends here