X-Git-Url: https://code.delx.au/gnu-emacs-elpa/blobdiff_plain/48a3fe4c899ef430752e1f4b643c8186c6e6db12..a6b750299b8e9c2f9342aa192004d16ea7333881:/packages/el-search/el-search.el diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el index 6e9fa5e08..f6c8c48e0 100644 --- a/packages/el-search/el-search.el +++ b/packages/el-search/el-search.el @@ -7,7 +7,7 @@ ;; Created: 29 Jul 2015 ;; Keywords: lisp ;; Compatibility: GNU Emacs 25 -;; Version: 0.0.3 +;; Version: 0.1.3 ;; Package-Requires: ((emacs "25")) @@ -33,14 +33,22 @@ ;; ============ ;; ;; -;; The main user entry point is the command `el-search-pattern'. It +;; The main user entry point is `el-search-pattern'. This command ;; prompts for a `pcase' pattern and searches the current buffer for -;; expressions that are matched by it when read. Point is put at the -;; beginning of the expression found (unlike isearch). +;; matching expressions by iteratively `read'ing buffer contents. For +;; any match, point is put at the beginning of the expression found +;; (unlike isearch which puts point at the end of matches). +;; +;; Why is it based on `pcase'? Because pattern matching (and the +;; ability to combine destructuring and condition testing) is well +;; suited for this task. In addition, pcase allows to add specialized +;; pattern types and to combine them with other patterns in a natural +;; and transparent way out of the box. ;; ;; It doesn't matter how the code is actually formatted. Comments are -;; ignored by the search, and strings are treated as objects, their -;; contents are not being searched. +;; ignored, and strings are treated as atomic objects, their contents +;; are not being searched. +;; ;; ;; Example 1: if you enter ;; @@ -65,22 +73,46 @@ ;; ,(and s (guard (< 70 (length (car (split-string s "\n"))))))) ;; ;; +;; When a search pattern is processed, the searched buffer is current +;; with point at the beginning of the currently tested expression. +;; +;; ;; Convenience ;; =========== ;; -;; For expression input, the minibuffer prompts here uses -;; `emacs-lisp-mode'. +;; For pattern input, the minibuffer is put into `emacs-lisp-mode'. +;; +;; Any input PATTERN is silently transformed into (and exp PATTERN) +;; so that you can always refer to the whole currently tested +;; expression via the variable `exp'. ;; -;; When reading a search pattern in the minibuffer, the input is -;; automatically wrapped into `(and expr ,(read input)). So, if you -;; want to search a buffer for symbols that are defined in "cl-lib", -;; you can use this pattern ;; -;; (guard (and (symbolp expr) -;; (when-let ((file (symbol-file expr))) +;; Example 3: +;; +;; If you want to search a buffer for symbols that are defined in +;; "cl-lib", you can use this pattern +;; +;; (guard (and (symbolp exp) +;; (when-let ((file (symbol-file exp))) ;; (string-match-p "cl-lib\\.elc?$" file)))) ;; -;; without binding the variable `expr'. +;; +;; ,---------------------------------------------------------------------- +;; | Q: "But I hate `pcase'! Can't we just do without?" | +;; | | +;; | A: Respect that you kept up until here! Just use (guard CODE), where| +;; | CODE is any normal Elisp expression that returns non-nil when and | +;; | only when you have a match. Use the variable `exp' to refer to | +;; | the currently tested expression. Just like in the last example! | +;; `---------------------------------------------------------------------- +;; +;; +;; It's cumbersome to write out the same complicated pattern +;; constructs in the minibuffer again and again. You can define your +;; own pcase pattern types for the purpose of el-search with +;; `el-search-defpattern'. It is just like `pcase-defmacro', but the +;; effect is limited to this package. See C-h f `el-search-pattern' +;; for a list of predefined additional pattern forms. ;; ;; ;; Replacing @@ -114,6 +146,12 @@ ;; y and n work like in isearch (meaning "yes" and "no") if you are ;; used to that. ;; +;; It is possible to replace a match with multiple expressions using +;; "splicing mode". When it is active, the replacement expression +;; must evaluate to a list, and is spliced instead of inserted into +;; the buffer for any replaced match. Use s to toggle splicing mode +;; in a `el-search-query-replace' session. +;; ;; ;; Suggested key bindings ;; ====================== @@ -156,19 +194,25 @@ ;; ;; TODO: ;; -;; - implement backward searching and wrapped searching +;; - When replacing like (progn A B C) -> A B C, the layout of the +;; whole "group" A B C as a unit is lost. Instead of restoring layout +;; as we do now (via "read mappings"), we could just make a backup of +;; the original expression as a string, and use our search machinery +;; to find occurrences in the replacement recursively. ;; -;; - improve docstrings +;; - detect infloops when replacing automatically (e.g. for 1 -> '(1)) ;; -;; - add more examples +;; - implement backward searching +;; +;; - improve docstrings ;; ;; - handle more reader syntaxes, e.g. #n, #n# ;; ;; - Implement sessions; add multi-file support based on iterators. A -;; file list is read in (or the user can specify an iterator as a -;; variable). The state in the current buffer is just (buffer -;; . marker). Or should this be abstracted into an own lib? Could be -;; named "files-session" or so. +;; file list is read in (or the user can specify an iterator as a +;; variable). The state in the current buffer is just (buffer +;; . marker). Or should this be abstracted into an own lib? Could +;; be named "files-session" or so. @@ -182,6 +226,7 @@ (require 'cl-lib) (require 'elisp-mode) (require 'thingatpt) +(require 'help-fns) ;el-search--make-docstring ;;;; Configuration stuff @@ -191,16 +236,19 @@ :group 'lisp) (defcustom el-search-this-expression-identifier 'exp - "Name of the identifier referring to the whole expression. -The default value is `expr'. You can use this variable in the -search prompt to refer to value of the currently searched -expression." + "Name of the identifier referring to the current expression. +The default value is `exp'. You can use this name in the search +prompt to refer to the value of the currently tested expression." :type 'symbol) (defface el-search-match '((((background dark)) (:background "#0000A0")) - (t (:background "DarkSlateGray1"))) + (t (:background "DarkSlateGray3"))) "Face for highlighting the current match.") +(defface el-search-other-match '((((background dark)) (:background "#202060")) + (t (:background "DarkSlateGray1"))) + "Face for highlighting the other matches.") + ;;;; Helpers @@ -236,12 +284,20 @@ expression." (read-from-minibuffer prompt initial-contents el-search-read-expression-map read (or hist 'read-expression-history) default))) -(defun el-search--read-pattern (prompt &optional default initial-contents read) - (el-search-read-expression - prompt initial-contents 'el-search-history - (or default (when-let ((this-sexp (sexp-at-point))) - (concat "'" (el-search--print this-sexp)))) - read)) +(defvar el-search--initial-mb-contents nil) + +(defun el-search--read-pattern (prompt &optional default read) + (let ((this-sexp (sexp-at-point))) + (minibuffer-with-setup-hook + (lambda () + (when this-sexp + (let ((more-defaults (list (concat "'" (el-search--print this-sexp))))) + (setq-local minibuffer-default-add-function + (lambda () (if (listp minibuffer-default) + (append minibuffer-default more-defaults) + (cons minibuffer-default more-defaults))))))) + (el-search-read-expression + prompt el-search--initial-mb-contents 'el-search-history default read)))) (defun el-search--end-of-sexp () ;;Point must be at sexp beginning @@ -253,7 +309,7 @@ Don't move if already at beginning of a sexp. Point must not be inside a string or comment." (let ((not-done t) res) (while not-done - (let ((stop-here nil) syntax-here + (let ((stop-here nil) (looking-at-from-back (lambda (regexp n) (save-excursion (backward-char n) @@ -263,10 +319,7 @@ Point must not be inside a string or comment." ((eobp) (signal 'end-of-buffer nil)) ((looking-at (rx (and (* space) ";"))) (forward-line)) ((looking-at (rx (+ (or space "\n")))) (goto-char (match-end 0))) - ((progn (setq syntax-here (syntax-ppss)) - (or (nth 4 syntax-here) (nth 8 syntax-here))) - (if (nth 4 syntax-here) (forward-line) (search-forward "\""))) - + ;; FIXME: can the rest be done more generically? ((and (looking-at (rx (or (syntax symbol) (syntax word)))) (not (looking-at "\\_<")) @@ -283,13 +336,52 @@ Point must not be inside a string or comment." (error (forward-char)))) res)) +(defvar el-search--pcase-macros '() + "List of additional \"el-search\" pcase macros.") + +(defun el-search--make-docstring () + ;; code mainly from `pcase--make-docstring' + (let* ((main (documentation (symbol-function 'el-search-pattern) 'raw)) + (ud (help-split-fundoc main 'pcase))) + (with-temp-buffer + (insert (or (cdr ud) main)) + (mapc + (pcase-lambda (`(,symbol . ,fun)) + (when-let ((doc (documentation fun))) + (insert "\n\n\n-- ") + (setq doc (help-fns--signature symbol doc fun fun nil)) + (insert "\n" (or doc "Not documented.")))) + (reverse el-search--pcase-macros)) + (let ((combined-doc (buffer-string))) + (if ud (help-add-fundoc-usage combined-doc (car ud)) combined-doc))))) + +(put 'el-search-pattern 'function-documentation '(el-search--make-docstring)) + +(defmacro el-search-defpattern (name args &rest body) + "Like `pcase-defmacro', but limited to el-search patterns. +The semantics is exactly that of `pcase-defmacro', but the scope +of the definitions is limited to \"el-search\"." + (declare (indent 2) (debug defun)) + `(setf (alist-get ',name el-search--pcase-macros) + (lambda ,args ,@body))) + + +(defmacro el-search--with-additional-pcase-macros (&rest body) + `(cl-letf ,(mapcar (pcase-lambda (`(,symbol . ,fun)) + `((get ',symbol 'pcase-macroexpander) #',fun)) + el-search--pcase-macros) + ,@body)) + (defun el-search--matcher (pattern &rest body) - (let ((warning-suppress-log-types '((bytecomp)))) - (byte-compile - `(lambda (expression) - (pcase expression - (,pattern ,@(or body (list t))) - (_ nil)))))) + (eval ;use `eval' to allow for user defined pattern types at run time + `(el-search--with-additional-pcase-macros + (let ((byte-compile-debug t) ;make undefined pattern types raise an error + (warning-suppress-log-types '((bytecomp))) + (pcase--dontwarn-upats (cons '_ pcase--dontwarn-upats))) + (byte-compile (lambda (expression) + (pcase expression + (,pattern ,@(or body (list t))) + (_ nil)))))))) (defun el-search--match-p (matcher expression) (funcall matcher expression)) @@ -297,15 +389,41 @@ Point must not be inside a string or comment." (defun el-search--wrap-pattern (pattern) `(and ,el-search-this-expression-identifier ,pattern)) -(defun el-search--search-pattern (pattern &optional noerror) - "Search elisp buffer with `pcase' PATTERN. -Set point to the beginning of the occurrence found and return -point. Optional second argument, if non-nil, means if fail just -return nil (no error)." - ;; For better performance we read complete top-level sexps and test - ;; for matches. We enter top-level expressions in the buffer text - ;; only when the test was successful. - (let ((matcher (el-search--matcher pattern)) (match-beg nil) (opoint (point)) current-expr) +(defun el-search--skip-expression (expression &optional read) + ;; Move forward at least one character. Don't move into a string or + ;; comment. Don't move further than the beginning of the next sexp. + ;; Try to move as far as possible. Point must be at the beginning + ;; of an expression. + ;; If there are positions where `read' would succeed, but that do + ;; not represent a valid sexp start, move past them (e.g. when + ;; before "#'" move past both characters). + ;; + ;; EXPRESSION must be the (read) expression at point, but when READ + ;; is non-nil, ignore the first argument and read the expression at + ;; point instead. + (when read (setq expression (save-excursion (read (current-buffer))))) + (cond + ((or (null expression) + (equal [] expression) + (not (or (listp expression) (vectorp expression)))) + (goto-char (el-search--end-of-sexp))) + ((looking-at (rx (or ",@" "," "#'" "'"))) + (goto-char (match-end 0))) + (t (forward-char)))) + +(defun el-search--search-pattern-1 (matcher &optional noerror) + (let ((match-beg nil) (opoint (point)) current-expr) + + ;; when inside a string or comment, move past it + (let ((syntax-here (syntax-ppss))) + (when (nth 3 syntax-here) ;inside a string + (goto-char (nth 8 syntax-here)) + (forward-sexp)) + (when (nth 4 syntax-here) ;inside a comment + (forward-line 1) + (while (and (not (eobp)) (looking-at (rx (and (* space) ";")))) + (forward-line 1)))) + (if (catch 'no-match (while (not match-beg) (condition-case nil @@ -316,21 +434,32 @@ return nil (no error)." (if (el-search--match-p matcher current-expr) (setq match-beg (point) opoint (point)) - (forward-char)))) + (el-search--skip-expression current-expr)))) (if noerror nil (signal 'end-of-buffer nil))) match-beg)) +(defun el-search--search-pattern (pattern &optional noerror) + "Search elisp buffer with `pcase' PATTERN. +Set point to the beginning of the occurrence found and return +point. Optional second argument, if non-nil, means if fail just +return nil (no error)." + (el-search--search-pattern-1 (el-search--matcher pattern) noerror)) + (defun el-search--do-subsexps (pos do-fun &optional ret-fun bound) - ;; bound -> nil means till end of buffer + ;; In current buffer, for any expression start between POS and BOUND + ;; or (point-max), in order, call two argument function DO-FUN with + ;; the current sexp string and the ending position of the current + ;; sexp. When done, with RET-FUN given, call it with no args and + ;; return the result; else, return nil. (save-excursion (goto-char pos) (condition-case nil (while (< (point) (or bound (point-max))) (let* ((this-sexp-end (save-excursion (thing-at-point--end-of-sexp) (point))) - (this-sexp-bounds (buffer-substring-no-properties (point) this-sexp-end))) - (funcall do-fun this-sexp-bounds this-sexp-end)) - (forward-char) - (el-search--ensure-sexp-start)) + (this-sexp-string (buffer-substring-no-properties (point) this-sexp-end))) + (funcall do-fun this-sexp-string this-sexp-end) + (el-search--skip-expression (read this-sexp-string)) + (el-search--ensure-sexp-start))) (end-of-buffer)) (when ret-fun (funcall ret-fun)))) @@ -356,37 +485,306 @@ return nil (no error)." (unless (looking-at "[[:space:]\)]*$") (insert "\n") (backward-char))) - (insert old))) + (save-excursion (insert old)))) (lambda () (buffer-substring (point-min) (point-max)))))) +(defun el-search--check-pattern-args (type args predicate &optional message) + "Check whether all ARGS fulfill PREDICATE. +Raise an error if not. TYPE and optional argument MESSAGE are +used to construct the error message." + (mapc (lambda (arg) + (unless (funcall predicate arg) + (error (concat "Pattern `%S': " + (or message (format "argument doesn't fulfill %S" predicate)) + ": %S") + type arg))) + args)) + + +;;;; Additional pattern type definitions + +(defun el-search--split (matcher1 matcher2 list) + "Helper for the append pattern type. + +When a splitting of LIST into two lists L1, L2 exist so that Li +is matched by MATCHERi, return (L1 L2) for such Li, else return +nil." + (let ((try-match (lambda (list1 list2) + (when (and (el-search--match-p matcher1 list1) + (el-search--match-p matcher2 list2)) + (list list1 list2)))) + (list1 list) (list2 '()) (match nil)) + ;; don't use recursion, this could hit `max-lisp-eval-depth' + (while (and (not (setq match (funcall try-match list1 list2))) + (consp list1)) + (let ((last-list1 (last list1))) + (if-let ((cdr-last-list1 (cdr last-list1))) + ;; list1 is a dotted list. Then list2 must be empty. + (progn (setcdr last-list1 nil) + (setq list2 cdr-last-list1)) + (setq list1 (butlast list1 1) + list2 (cons (car last-list1) list2))))) + match)) + +(el-search-defpattern append (&rest patterns) + "Matches any list factorable into lists matched by PATTERNS in order. + +PATTERNS is a list of patterns P1..Pn. Match any list L for that +lists L1..Ln exist that are matched by P1..Pn in order and L is +equal to the concatenation of L1..Ln. Ln is allowed to be no +list. + +When different ways of matching are possible, it is unspecified +which one is chosen. + +Example: the pattern + + (append '(1 2 3) x (app car-safe 7)) + +matches the list (1 2 3 4 5 6 7 8 9) and binds `x' to (4 5 6)." + (if (null patterns) + '(pred null) + (pcase-let ((`(,pattern . ,more-patterns) patterns)) + (cond + ((null more-patterns) pattern) + ((null (cdr more-patterns)) + `(and (pred listp) + (app ,(apply-partially #'el-search--split + (el-search--matcher pattern) + (el-search--matcher (car more-patterns))) + (,'\` ((,'\, ,pattern) + (,'\, ,(car more-patterns))))))) + (t `(append ,pattern (append ,@more-patterns))))))) + +(el-search-defpattern string (&rest regexps) + "Matches any string that is matched by all REGEXPS." + (el-search--check-pattern-args 'string regexps #'stringp) + (let ((string (make-symbol "string")) + (regexp (make-symbol "regexp"))) + `(and (pred stringp) + (pred (lambda (,string) + (cl-every + (lambda (,regexp) (string-match-p ,regexp ,string)) + (list ,@regexps))))))) + +(el-search-defpattern symbol (&rest regexps) + "Matches any symbol whose name is matched by all REGEXPS." + (el-search--check-pattern-args 'symbol regexps #'stringp) + `(and (pred symbolp) + (app symbol-name (string ,@regexps)))) + +(defun el-search--contains-p (matcher exp) + "Return non-nil when tree EXP contains a match for MATCHER. +Recurse on all types of sequences. In the positive case the +return value is (t elt), where ELT is a matching element found in +EXP." + (if (el-search--match-p matcher exp) + (list t exp) + (and (sequencep exp) + (let ((try-match (apply-partially #'el-search--contains-p matcher))) + (if (consp exp) + (or (funcall try-match (car exp)) + (funcall try-match (cdr exp))) + (cl-some try-match exp)))))) + +(el-search-defpattern contains (&rest patterns) + "Matches trees that contain a match for all PATTERNs. +Searches any tree of sequences recursively for matches. Objects +of any kind matched by all PATTERNs are also matched. + + Example: (contains (string \"H\") 17) matches ((\"Hallo\") x (5 [1 17]))" + (cond + ((null patterns) '_) + ((null (cdr patterns)) + (let ((pattern (car patterns))) + `(app ,(apply-partially #'el-search--contains-p (el-search--matcher pattern)) + (,'\` (t (,'\, ,pattern)))))) + (t `(and ,@(mapcar (lambda (pattern) `(contains ,pattern)) patterns))))) + +(el-search-defpattern not (pattern) + "Matches any object that is not matched by PATTERN." + `(app ,(apply-partially #'el-search--match-p (el-search--matcher pattern)) + (pred not))) + +(defun el-search--match-symbol-file (regexp symbol) + (when-let ((symbol-file (and (symbolp symbol) + (symbol-file symbol)))) + (string-match-p + (if (symbolp regexp) (concat "\\`" (symbol-name regexp) "\\'") regexp) + (file-name-sans-extension (file-name-nondirectory symbol-file))))) + +(el-search-defpattern source (regexp) + "Matches any symbol whose `symbol-file' is matched by REGEXP. + +This pattern matches when the object is a symbol for that +`symbol-file' returns a (non-nil) FILE-NAME that fulfills + (string-match-p REGEXP (file-name-sans-extension + (file-name-nondirectory FILENAME))) + +REGEXP can also be a symbol, in which case + + (concat \"^\" (symbol-name regexp) \"$\") + +is used as regular expression." + (el-search--check-pattern-args 'source (list regexp) #'stringp) + `(pred (el-search--match-symbol-file ,regexp))) + +(defun el-search--match-key-sequence (keys expr) + (when-let ((expr-keys (pcase expr + ((or (pred stringp) (pred vectorp)) expr) + (`(kbd ,(and (pred stringp) string)) (ignore-errors (kbd string)))))) + (apply #'equal + (mapcar (lambda (keys) (ignore-errors (key-description keys))) + (list keys expr-keys))))) + +(el-search-defpattern keys (key-sequence) + "Matches descriptions of the KEY-SEQUENCE. +KEY-SEQUENCE is a string or vector representing a key sequence, +or an expression of the form (kbd STRING). + +Match any description of the same key sequence in any of these +formats. + +Example: the pattern + + (keys (kbd \"C-s\")) + +matches any of these expressions: + + \"\\C-s\" + \"\C-s\" + (kbd \"C-s\") + [(control ?s)]" + (when (eq (car-safe key-sequence) 'kbd) + (setq key-sequence (kbd (cadr key-sequence)))) + (el-search--check-pattern-args 'keys (list key-sequence) (lambda (x) (or (stringp x) (vectorp x))) + "argument not a string or vector") + `(pred (el-search--match-key-sequence ,key-sequence))) + +(defun el-search--s (expr) + (cond + ((symbolp expr) `(symbol ,(symbol-name expr))) + ((stringp expr) `(string ,expr)) + (t expr))) + +(el-search-defpattern l (&rest lpats) + "Alternative pattern type for matching lists. +Match any list with subsequent elements matched by all LPATS in +order. + +The idea is to be able to search for pieces of code (i.e. lists) +with very brief input by using a specialized syntax. + +An LPAT can take the following forms: + +SYMBOL Matches any symbol matched by SYMBOL's name interpreted as + a regexp +STRING Matches any string matched by STRING interpreted as a + regexp +_ Matches any list element +__ Matches any number of list elements (including zero) +^ Matches zero elements, but only at the beginning of a list +$ Matches zero elements, but only at the end of a list +PAT Anything else is interpreted as a normal pcase pattern, and + matches one list element matched by it + +^ is only valid as the first, $ as the last of the LPATS. + +Example: To match defuns that contain \"hl\" in their name and +have at least one mandatory, but also optional arguments, you +could use this pattern: + + (l ^ 'defun hl (l _ &optional))" + (let ((match-start nil) (match-end nil)) + (when (eq (car-safe lpats) '^) + (setq match-start t) + (cl-callf cdr lpats)) + (when (eq (car-safe (last lpats)) '$) + (setq match-end t) + (cl-callf butlast lpats 1)) + `(append ,@(if match-start '() '(_)) + ,@(mapcar + (lambda (elt) + (pcase elt + ('__ '_) + ('_ '`(,_)) + ('_? '(or '() `(,_))) ;FIXME: useful - document? or should we provide a (? PAT) + ;thing? + (_ `(,'\` ((,'\, ,(el-search--s elt))))))) + lpats) + ,@(if match-end '() '(_))))) + ;;;; Highlighting (defvar-local el-search-hl-overlay nil) +(defvar-local el-search-hl-other-overlays '()) + (defvar el-search-keep-hl nil) -(defun el-search-hl-sexp-at-point () - (let ((bounds (list (point) (el-search--end-of-sexp)))) +(defun el-search-hl-sexp (&optional bounds) + (let ((bounds (or bounds + (list (point) (el-search--end-of-sexp))))) (if (overlayp el-search-hl-overlay) (apply #'move-overlay el-search-hl-overlay bounds) (overlay-put (setq el-search-hl-overlay (apply #'make-overlay bounds)) - 'face 'el-search-match))) - (add-hook 'post-command-hook (el-search-hl-post-command-fun (current-buffer)) t)) + 'face 'el-search-match)) + (overlay-put el-search-hl-overlay 'priority 1002)) + (add-hook 'post-command-hook #'el-search-hl-post-command-fun t t)) + +(defun el-search--hl-other-matches-1 (pattern from to) + (mapc #'delete-overlay el-search-hl-other-overlays) + (setq el-search-hl-other-overlays '()) + (let ((matcher (el-search--matcher pattern)) + this-match-beg this-match-end + (done nil)) + (save-excursion + (goto-char from) + (while (not done) + (setq this-match-beg (el-search--search-pattern-1 matcher t)) + (if (not this-match-beg) + (setq done t) + (goto-char this-match-beg) + (setq this-match-end (el-search--end-of-sexp)) + (let ((ov (make-overlay this-match-beg this-match-end))) + (overlay-put ov 'face 'el-search-other-match) + (overlay-put ov 'priority 1001) + (push ov el-search-hl-other-overlays) + (goto-char this-match-end) + (when (>= (point) to) (setq done t)))))))) + +(defun el-search-hl-other-matches (pattern) + "Highlight all matches visible in the selected window." + (el-search--hl-other-matches-1 pattern + (save-excursion + (goto-char (window-start)) + (beginning-of-defun-raw) + (point)) + (window-end)) + (add-hook 'window-scroll-functions #'el-search--after-scroll t t)) + +(defun el-search--after-scroll (_win start) + (el-search--hl-other-matches-1 el-search-current-pattern + (save-excursion + (goto-char start) + (beginning-of-defun-raw) + (point)) + (window-end nil t))) (defun el-search-hl-remove () (when (overlayp el-search-hl-overlay) - (delete-overlay el-search-hl-overlay))) - -(defun el-search-hl-post-command-fun (buf) - (lambda () - (when (buffer-live-p buf) - (unless (or el-search-keep-hl - (eq this-command 'el-search-query-replace) - (eq this-command 'el-search-pattern)) - (with-current-buffer buf - (el-search-hl-remove) - (remove-hook 'post-command-hook #'el-search-hl-post-command-fun t)))))) + (delete-overlay el-search-hl-overlay)) + (remove-hook 'window-scroll-functions #'el-search--after-scroll t) + (mapc #'delete-overlay el-search-hl-other-overlays) + (setq el-search-hl-other-overlays '())) + +(defun el-search-hl-post-command-fun () + (unless (or el-search-keep-hl + (eq this-command 'el-search-query-replace) + (eq this-command 'el-search-pattern)) + (el-search-hl-remove) + (remove-hook 'post-command-hook 'el-search-hl-post-command-fun t))) ;;;; Core functions @@ -399,14 +797,24 @@ return nil (no error)." ;;;###autoload (defun el-search-pattern (pattern) - "Do incremental elisp search forward." + "Start new or resume last elisp search. + +Search current buffer for expressions that are matched by `pcase' +PATTERN. Use `read' to transform buffer contents into +expressions. + + +Additional `pcase' pattern types to be used with this command can +be defined with `el-search-defpattern'. + +The following additional pattern types are currently defined:" (interactive (list (if (and (eq this-command last-command) el-search-success) el-search-current-pattern (let ((pattern (el-search--read-pattern "Find pcase pattern: " (car el-search-history) - nil t))) + t))) ;; A very common mistake: input "foo" instead of "'foo" (when (and (symbolp pattern) (not (eq pattern '_)) @@ -414,11 +822,12 @@ return nil (no error)." (not (eq (symbol-value pattern) pattern)))) (error "Please don't forget the quote when searching for a symbol")) (el-search--wrap-pattern pattern))))) + (setq this-command 'el-search-pattern) ;in case we come from isearch (setq el-search-current-pattern pattern) - (setq el-search-success nil) (let ((opoint (point))) - (when (eq this-command last-command) - (forward-char)) + (when (and (eq this-command last-command) el-search-success) + (el-search--skip-expression nil t)) + (setq el-search-success nil) (when (condition-case nil (el-search--search-pattern pattern) (end-of-buffer (message "No match") @@ -427,25 +836,52 @@ return nil (no error)." (ding) nil)) (setq el-search-success t) - (el-search-hl-sexp-at-point) - (message "%s" (substitute-command-keys "Type \\[el-search-pattern] to repeat"))))) - -(defun el-search-search-and-replace-pattern (pattern replacement &optional mapping) + (el-search-hl-sexp) + (unless (eq this-command last-command) + (el-search-hl-other-matches pattern))))) + +(defvar el-search-search-and-replace-help-string + "\ +y Replace this match and move to the next. +SPC or n Skip this match and move to the next. +r Replace this match but don't move. +! Replace all remaining matches automatically. +q Quit. To resume, use e.g. `repeat-complex-command'. +? Show this help. +s Toggle splicing mode. When splicing mode is + on (default off), the replacement expression must + evaluate to a list, and the result is spliced into the + buffer, instead of just inserted. + +Hit any key to proceed." + "Help string for ? in `el-search-query-replace'.") + +(defun el-search-search-and-replace-pattern (pattern replacement &optional mapping splice) (let ((replace-all nil) (nbr-replaced 0) (nbr-skipped 0) (done nil) (el-search-keep-hl t) (opoint (point)) (get-replacement (el-search--matcher pattern replacement))) (unwind-protect (while (and (not done) (el-search--search-pattern pattern t)) (setq opoint (point)) - (unless replace-all (el-search-hl-sexp-at-point)) + (unless replace-all + (el-search-hl-sexp) + (unless (eq this-command last-command) + (el-search-hl-other-matches pattern))) (let* ((read-mapping (el-search--create-read-map)) (region (list (point) (el-search--end-of-sexp))) (substring (apply #'buffer-substring-no-properties region)) (expr (read substring)) (replaced-this nil) (new-expr (funcall get-replacement expr)) - (to-insert (el-search--repair-replacement-layout - (el-search--print new-expr) (append mapping read-mapping))) + (get-replacement-string + (lambda () (if (and splice (not (listp new-expr))) + (error "Expression to splice in is an atom") + (el-search--repair-replacement-layout + (if splice + (mapconcat #'el-search--print new-expr " ") + (el-search--print new-expr)) + (append mapping read-mapping))))) + (to-insert (funcall get-replacement-string)) (do-replace (lambda () (atomic-change-group (apply #'delete-region region) @@ -453,21 +889,24 @@ return nil (no error)." (opoint (point))) (insert to-insert) (indent-region opoint (point)) - (goto-char opoint) - (el-search-hl-sexp-at-point))) + (el-search-hl-sexp (list opoint (point))) + (goto-char opoint))) (cl-incf nbr-replaced) (setq replaced-this t)))) (if replace-all (funcall do-replace) (while (not (pcase (if replaced-this - (read-char-choice "[SPC ! q]" '(?\ ?! ?q ?n)) + (read-char-choice "[SPC ! q] (? for help)" + '(?\ ?! ?q ?n ??)) (read-char-choice - (concat "Replace this occurence" + (concat "Replace this occurrence" (if (or (string-match-p "\n" to-insert) (< 40 (length to-insert))) "" (format " with `%s'" to-insert)) - "? [y SPC r ! q]" ) - '(?y ?n ?r ?\ ?! ?q))) + "? " + (if splice "{splice} " "") + "[y SPC r ! s q] (? for help)" ) + '(?y ?n ?r ?\ ?! ?q ?s ??))) (?r (funcall do-replace) nil) (?y (funcall do-replace) @@ -479,9 +918,14 @@ return nil (no error)." (funcall do-replace)) (setq replace-all t) t) + (?s (cl-callf not splice) + (setq to-insert (funcall get-replacement-string)) + nil) (?q (setq done t) - t))))) - (unless (or done (eobp)) (forward-char 1))))) + t) + (?? (ignore (read-char el-search-search-and-replace-help-string)) + nil))))) + (unless (or done (eobp)) (el-search--skip-expression nil t))))) (el-search-hl-remove) (goto-char opoint) (message "Replaced %d matches%s" @@ -489,10 +933,11 @@ return nil (no error)." (if (zerop nbr-skipped) "" (format " (%d skipped)" nbr-skipped))))) -(defun el-search-query-replace-read-args (&optional initial-contents) +(defun el-search-query-replace-read-args () (barf-if-buffer-read-only) - (let* ((from (el-search--read-pattern "Replace from: " nil initial-contents)) - (to (el-search--read-pattern "Replace with result of evaluation of: " from))) + (let* ((from (el-search--read-pattern "Replace from: ")) + (to (let ((el-search--initial-mb-contents nil)) + (el-search--read-pattern "Replace with result of evaluation of: " from)))) (list (el-search--wrap-pattern (read from)) (read to) (with-temp-buffer (insert to) @@ -502,17 +947,13 @@ return nil (no error)." (defun el-search-query-replace (from to &optional mapping) "Replace some occurrences of FROM pattern with evaluated TO." (interactive (el-search-query-replace-read-args)) + (setq this-command 'el-search-query-replace) ;in case we come from isearch (setq el-search-current-pattern from) (barf-if-buffer-read-only) (el-search-search-and-replace-pattern from to mapping)) (defun el-search--take-over-from-isearch () - (let ((other-end isearch-other-end) - (input isearch-string)) - (isearch-exit) - (when (and other-end (< other-end (point))) - (goto-char other-end)) - input)) + (prog1 isearch-string (isearch-exit))) ;;;###autoload (defun el-search-search-from-isearch () @@ -520,17 +961,15 @@ return nil (no error)." ;; with Isearch, using `isearch-search-fun-function'. ;; Alas, this is not trivial if we want to transfer our optimizations. (interactive) - (el-search-pattern - (el-search--read-pattern - "Find pcase pattern: " nil (concat "'" (el-search--take-over-from-isearch)) t)) - (setq this-command 'el-search-pattern)) + (let ((el-search--initial-mb-contents (concat "'" (el-search--take-over-from-isearch)))) + ;; use `call-interactively' so we get recorded in `extended-command-history' + (call-interactively #'el-search-pattern))) ;;;###autoload (defun el-search-replace-from-isearch () (interactive) - (let ((this-command 'el-search-query-replace)) - (apply #'el-search-query-replace - (el-search-query-replace-read-args (concat "'" (el-search--take-over-from-isearch)))))) + (let ((el-search--initial-mb-contents (concat "'" (el-search--take-over-from-isearch)))) + (call-interactively #'el-search-query-replace)))