mirror of
https://github.com/m00natic/vlfi.git
synced 2024-10-05 18:30:51 +01:00
Add regexp query replace over whole file command.
This commit is contained in:
Andrey Kotlarski
parent
023ee704e7
commit
a9c14e2d4c
@ -64,15 +64,17 @@ Return t if search has been at least partially successful."
|
||||
(if backward
|
||||
(while (not (zerop to-find))
|
||||
(cond ((re-search-backward regexp nil t)
|
||||
(setq to-find (1- to-find)
|
||||
match-chunk-start vlf-start-pos
|
||||
match-chunk-end vlf-end-pos
|
||||
match-start-pos (+ vlf-start-pos
|
||||
(position-bytes
|
||||
(match-beginning 0)))
|
||||
match-end-pos (+ vlf-start-pos
|
||||
(setq match-end-pos (+ vlf-start-pos
|
||||
(position-bytes
|
||||
(match-end 0)))))
|
||||
(match-end 0))))
|
||||
(if (/= match-start-pos match-end-pos)
|
||||
(setq to-find (1- to-find)
|
||||
match-chunk-start vlf-start-pos
|
||||
match-chunk-end vlf-end-pos
|
||||
match-start-pos
|
||||
(+ vlf-start-pos
|
||||
(position-bytes
|
||||
(match-beginning 0))))))
|
||||
((zerop vlf-start-pos)
|
||||
(throw 'end-of-file nil))
|
||||
(t (vlf-tune-batch tune-types)
|
||||
@ -97,15 +99,16 @@ Return t if search has been at least partially successful."
|
||||
vlf-start-pos)))))
|
||||
(while (not (zerop to-find))
|
||||
(cond ((re-search-forward regexp nil t)
|
||||
(setq to-find (1- to-find)
|
||||
match-chunk-start vlf-start-pos
|
||||
match-chunk-end vlf-end-pos
|
||||
match-start-pos (+ vlf-start-pos
|
||||
(setq match-start-pos (+ vlf-start-pos
|
||||
(position-bytes
|
||||
(match-beginning 0)))
|
||||
match-end-pos (+ vlf-start-pos
|
||||
(position-bytes
|
||||
(match-end 0)))))
|
||||
(match-beginning 0))))
|
||||
(if (/= match-start-pos match-end-pos)
|
||||
(setq to-find (1- to-find)
|
||||
match-chunk-start vlf-start-pos
|
||||
match-chunk-end vlf-end-pos
|
||||
match-end-pos (+ vlf-start-pos
|
||||
(position-bytes
|
||||
(match-end 0))))))
|
||||
((= vlf-end-pos vlf-file-size)
|
||||
(throw 'end-of-file nil))
|
||||
(t (vlf-tune-batch tune-types)
|
||||
@ -172,10 +175,12 @@ Return nil if nothing found."
|
||||
(overlay-put overlay 'face 'match)
|
||||
(if success
|
||||
(message "Match found (%f secs)" (- (float-time) time))
|
||||
(goto-char match-end)
|
||||
(message "Moved to the %d match which is last (%f secs)"
|
||||
(- count to-find) (- (float-time) time)))
|
||||
(unwind-protect (sit-for 3)
|
||||
(goto-char (or (byte-to-position (- match-pos-start
|
||||
vlf-start-pos))
|
||||
(point-max)))
|
||||
(unwind-protect (sit-for 1)
|
||||
(delete-overlay overlay))
|
||||
t))))
|
||||
|
||||
@ -311,6 +316,49 @@ Assume `hexl-mode' is active."
|
||||
(goto-char (point-min))
|
||||
(forward-line (- n 1 (/ hidden-bytes hexl-bits))))))
|
||||
|
||||
(defun vlf-query-replace (regexp to-string &optional delimited backward)
|
||||
"Query replace over whole file matching REGEXP with TO-STRING.
|
||||
Third arg DELIMITED (prefix arg if interactive), if non-nil, means replace
|
||||
only matches surrounded by word boundaries. A negative prefix arg means
|
||||
replace BACKWARD."
|
||||
(interactive
|
||||
(let ((common (query-replace-read-args
|
||||
(concat "Query replace over whole file"
|
||||
(if current-prefix-arg
|
||||
(if (eq current-prefix-arg '-)
|
||||
" backward"
|
||||
" word")
|
||||
"")
|
||||
" regexp")
|
||||
t)))
|
||||
(list (nth 0 common) (nth 1 common) (nth 2 common) (nth 3 common))))
|
||||
(query-replace-regexp regexp to-string delimited nil nil backward)
|
||||
(if (buffer-modified-p)
|
||||
(save-buffer))
|
||||
(let ((match-found t)
|
||||
(automatic (eq (lookup-key query-replace-map
|
||||
(vector last-input-event))
|
||||
'automatic)))
|
||||
(while (and match-found (if backward
|
||||
(not (zerop vlf-start-pos))
|
||||
(< vlf-end-pos vlf-file-size)))
|
||||
(setq match-found (if backward
|
||||
(vlf-re-search-backward regexp 1)
|
||||
(vlf-re-search-forward regexp 1)))
|
||||
(when match-found
|
||||
(cond ((not automatic)
|
||||
(query-replace-regexp regexp to-string delimited
|
||||
nil nil backward)
|
||||
(setq automatic (eq (lookup-key query-replace-map
|
||||
(vector last-input-event))
|
||||
'automatic)))
|
||||
(backward (while (re-search-backward regexp nil t)
|
||||
(replace-match to-string)))
|
||||
(t (while (re-search-forward regexp nil t)
|
||||
(replace-match to-string))))
|
||||
(if (buffer-modified-p)
|
||||
(save-buffer))))))
|
||||
|
||||
(provide 'vlf-search)
|
||||
|
||||
;;; vlf-search.el ends here
|
||||
|
||||
3
vlf.el
3
vlf.el
@ -59,6 +59,8 @@ values are: `write', `ediff', `occur', `search', `goto-line'."
|
||||
(autoload 'vlf-re-search-backward "vlf-search"
|
||||
"Search backward for REGEXP prefix COUNT number of times." t)
|
||||
(autoload 'vlf-goto-line "vlf-search" "Go to line." t)
|
||||
(autoload 'vlf-query-replace "vlf-search"
|
||||
"Replace some things after point matching REGEXP." t)
|
||||
(autoload 'vlf-occur "vlf-occur"
|
||||
"Make whole file occur style index for REGEXP." t)
|
||||
(autoload 'vlf-toggle-follow "vlf-follow"
|
||||
@ -79,6 +81,7 @@ values are: `write', `ediff', `occur', `search', `goto-line'."
|
||||
(vlf-change-batch-size t)))
|
||||
(define-key map "s" 'vlf-re-search-forward)
|
||||
(define-key map "r" 'vlf-re-search-backward)
|
||||
(define-key map "%" 'vlf-query-replace)
|
||||
(define-key map "o" 'vlf-occur)
|
||||
(define-key map "[" 'vlf-beginning-of-file)
|
||||
(define-key map "]" 'vlf-end-of-file)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user