sascha/vlfi
1
0
Fork 0
mirror of https://github.com/m00natic/vlfi.git synced 2025-01-18 12:05:31 +00:00
Code Issues Releases Wiki Activity

Fix positive goto-line search and make highlighting of match optional.

Browse Source
This commit is contained in:
Andrey Kotlarski 2014-09-25 19:15:12 +03:00
parent a9c14e2d4c
commit 2c660b064f
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
vlf-search.el
View File

@ -30,10 +30,11 @@
(require 'vlf) (require 'vlf)
(defun vlf-re-search (regexp count backward batch-step (defun vlf-re-search (regexp count backward batch-step
&optional reporter time) &optional reporter time highlight)
"Search for REGEXP COUNT number of times forward or BACKWARD. "Search for REGEXP COUNT number of times forward or BACKWARD.
BATCH-STEP is amount of overlap between successive chunks. BATCH-STEP is amount of overlap between successive chunks.
Use existing REPORTER and start TIME if given. Use existing REPORTER and start TIME if given.
Highlight match if HIGHLIGHT is non nil.
Return t if search has been at least partially successful." Return t if search has been at least partially successful."
(if (<= count 0) (if (<= count 0)
(error "Count must be positive")) (error "Count must be positive"))
@ -135,20 +136,22 @@ Return t if search has been at least partially successful."
(if backward (if backward
(vlf-goto-match match-chunk-start match-chunk-end (vlf-goto-match match-chunk-start match-chunk-end
match-end-pos match-start-pos match-end-pos match-start-pos
count to-find time) count to-find time highlight)
(vlf-goto-match match-chunk-start match-chunk-end (vlf-goto-match match-chunk-start match-chunk-end
match-start-pos match-end-pos match-start-pos match-end-pos
count to-find time)))) count to-find time highlight))))
(run-hook-with-args 'vlf-after-batch-functions 'search) (run-hook-with-args 'vlf-after-batch-functions 'search)
result))))) result)))))
(defun vlf-goto-match (match-chunk-start match-chunk-end (defun vlf-goto-match (match-chunk-start match-chunk-end
match-pos-start match-pos-end match-pos-start match-pos-end
count to-find time) count to-find time
highlight)
"Move to MATCH-CHUNK-START MATCH-CHUNK-END surrounding\ "Move to MATCH-CHUNK-START MATCH-CHUNK-END surrounding\
MATCH-POS-START and MATCH-POS-END. MATCH-POS-START and MATCH-POS-END.
According to COUNT and left TO-FIND, show if search has been According to COUNT and left TO-FIND, show if search has been
successful. Use start TIME to report how much it took. successful. Use start TIME to report how much it took.
Highlight match if HIGHLIGHT is non nil.
Return nil if nothing found." Return nil if nothing found."
(if (= count to-find) (if (= count to-find)
(progn (vlf-move-to-chunk match-chunk-start match-chunk-end) (progn (vlf-move-to-chunk match-chunk-start match-chunk-end)
@ -180,7 +183,9 @@ Return nil if nothing found."
(goto-char (or (byte-to-position (- match-pos-start (goto-char (or (byte-to-position (- match-pos-start
vlf-start-pos)) vlf-start-pos))
(point-max))) (point-max)))
(unwind-protect (sit-for 1) (if highlight
(unwind-protect (sit-for 1)
(delete-overlay overlay))
(delete-overlay overlay)) (delete-overlay overlay))
t)))) t))))
@ -193,7 +198,8 @@ Search is performed chunk by chunk in `vlf-batch-size' memory."
(car regexp-history))) (car regexp-history)))
(or current-prefix-arg 1)))) (or current-prefix-arg 1))))
(let ((batch-size vlf-batch-size)) (let ((batch-size vlf-batch-size))
(or (vlf-re-search regexp count nil (min 1024 (/ vlf-batch-size 8))) (or (vlf-re-search regexp count nil (min 1024 (/ vlf-batch-size 8))
nil nil t)
(setq vlf-batch-size batch-size)))) (setq vlf-batch-size batch-size))))
(defun vlf-re-search-backward (regexp count) (defun vlf-re-search-backward (regexp count)
@ -205,7 +211,8 @@ Search is performed chunk by chunk in `vlf-batch-size' memory."
(car regexp-history))) (car regexp-history)))
(or current-prefix-arg 1)))) (or current-prefix-arg 1))))
(let ((batch-size vlf-batch-size)) (let ((batch-size vlf-batch-size))
(or (vlf-re-search regexp count t (min 1024 (/ vlf-batch-size 8))) (or (vlf-re-search regexp count t (min 1024 (/ vlf-batch-size 8))
nil nil t)
(setq vlf-batch-size batch-size)))) (setq vlf-batch-size batch-size))))
(defun vlf-goto-line (n) (defun vlf-goto-line (n)
@ -255,8 +262,11 @@ Search is performed chunk by chunk in `vlf-batch-size' memory."
(vlf-tune-batch '(:insert :encode)) (vlf-tune-batch '(:insert :encode))
(vlf-move-to-chunk-2 start (+ start vlf-batch-size)) (vlf-move-to-chunk-2 start (+ start vlf-batch-size))
(goto-char (point-min)) (goto-char (point-min))
(setq success (vlf-re-search "[\n\C-m]" n nil 0 (setq success
reporter time))))) (or (zerop n)
(when (vlf-re-search "[\n\C-m]" n nil 0
reporter time)
(forward-char) t))))))
(let ((start (max 0 (- vlf-file-size vlf-batch-size))) (let ((start (max 0 (- vlf-file-size vlf-batch-size)))
(end vlf-file-size) (end vlf-file-size)
(reporter (make-progress-reporter (reporter (make-progress-reporter
@ -342,9 +352,8 @@ replace BACKWARD."
(while (and match-found (if backward (while (and match-found (if backward
(not (zerop vlf-start-pos)) (not (zerop vlf-start-pos))
(< vlf-end-pos vlf-file-size))) (< vlf-end-pos vlf-file-size)))
(setq match-found (if backward (setq match-found (vlf-re-search regexp 1 backward
(vlf-re-search-backward regexp 1) (min 1024 (/ vlf-batch-size 8))))
(vlf-re-search-forward regexp 1)))
(when match-found (when match-found
(cond ((not automatic) (cond ((not automatic)
(query-replace-regexp regexp to-string delimited (query-replace-regexp regexp to-string delimited

2
vlf.el
View File

@ -60,7 +60,7 @@ values are: `write', `ediff', `occur', `search', `goto-line'."
"Search backward for REGEXP prefix COUNT number of times." t) "Search backward for REGEXP prefix COUNT number of times." t)
(autoload 'vlf-goto-line "vlf-search" "Go to line." t) (autoload 'vlf-goto-line "vlf-search" "Go to line." t)
(autoload 'vlf-query-replace "vlf-search" (autoload 'vlf-query-replace "vlf-search"
"Replace some things after point matching REGEXP." t) "Query replace regexp over whole file." t)
(autoload 'vlf-occur "vlf-occur" (autoload 'vlf-occur "vlf-occur"
"Make whole file occur style index for REGEXP." t) "Make whole file occur style index for REGEXP." t)
(autoload 'vlf-toggle-follow "vlf-follow" (autoload 'vlf-toggle-follow "vlf-follow"