8000 Add options to constrain and broaden files searched by maw · Pull Request #137 · Wilfred/deadgrep · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add options to constrain and broaden files searched #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add options to constrain and broaden files searched #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
706b7aa
Add functions to get lists of files
maw Aug 11, 2023
d9a9ac5
Add button to set search scope
maw Aug 11, 2023
ad4e5d1
Add function and key to cycle search scope
maw Aug 11, 2023
7ceea1d
Construct list of files to search
maw Aug 11, 2023
4f4cb43
Document `K' key
maw Aug 11, 2023
28594e4
Fix button declarations
maw Aug 11, 2023
c3f80b0
Merge remote-tracking branch 'upstream/master' into add-options-to-co…
maw Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ Starting/stopping a search:
| <kbd>F</kbd> | Cycle through file modes: all, type, glob |
| <kbd>I</kbd> | Switch to incremental search, re-running on every keystroke |
| <kbd>D</kbd> | Change the search directory |
| <kbd>K</kbd> | Cycle through scopes: directory, directory-and-open, open |
| <kbd>^</kbd> | Re-run the search in the parent directory |
| <kbd>g</kbd> | Re-run the search |
| <kbd>TAB</kbd> | Expand/collapse results for a file |
Expand Down
78 changes: 77 additions & 1 deletion deadgrep.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ display."
(put 'deadgrep--search-case 'permanent-local t)
(defvar-local deadgrep--file-type 'all)
(put 'deadgrep--file-type 'permanent-local t)
(defvar-local deadgrep--search-scope 'project)
(put 'deadgrep--search-scope 'permanent-local t)

(defvar-local deadgrep--skip-if-hidden nil
"Whether deadgrep should ignore hidden files (e.g. files called .foo).")
Expand Down Expand Up @@ -454,10 +456,19 @@ with a text face property `deadgrep-match-face'."
'case nil
'help-echo "Change case sensitivity")

(define-button-type 'deadgrep-search-scope
'action #'deadgrep--search-scope
'case nil
'help-echo "Change search scope")

(defun deadgrep--case (button)
(setq deadgrep--search-case (button-get button 'case))
(deadgrep-restart))

(defun deadgrep--scope (button)
(setq deadgrep--search-scope (button-get button 'scope))
(deadgrep-restart))

(define-button-type 'deadgrep-context
'action #'deadgrep--context
'context nil
Expand Down Expand Up @@ -774,10 +785,28 @@ to obtain ripgrep results."

(push "--" args)
(push search-term args)
(push "." args)
(setq args (append
(deadgrep--shell-quote-filenames (deadgrep--files-to-search))
args))

(message (format "searching this: %s" (deadgrep--files-to-search)))


(nreverse args)))

(defun deadgrep--files-to-search ()
(cond
((eq deadgrep--search-scope 'project) '("."))
((eq deadgrep--search-scope 'project-open-buffers)
(deadgrep--filenames-of-open-files-in-project))
((eq deadgrep--search-scope 'open-buffers)
(deadgrep--filenames-of-open-files))
(t
(error "search scope wasn't set correctly!" 'deadgrep--search-scope))))

(defun deadgrep--shell-quote-filenames (filenames)
(-map (lambda (filename) (shell-quote-argument filename)) filenames))

(defun deadgrep--write-heading ()
"Write the deadgrep heading with buttons reflecting the current
search settings."
Expand Down Expand Up @@ -828,6 +857,25 @@ search settings."
(deadgrep--button "ignore" 'deadgrep-case
'case 'ignore))
"\n"

(propertize "Scope: "
'face 'deadgrep-meta-face)
(if (eq deadgrep--search-scope 'project)
"project"
(deadgrep--button "project" 'deadgrep-search-scope
'scope 'project))
" "
(if (eq deadgrep--search-scope 'project-open-buffers)
"project open buffers"
(deadgrep--button "project open buffers" 'deadgrep-search-scope
'scope 'project-open-buffers))
" "
(if (eq deadgrep--search-scope 'open-buffers)
"open buffers"
(deadgrep--button "open buffers" 'deadgrep-search-scope
'scope 'open-buffers))

"\n"
(propertize "Context: "
'face 'deadgrep-meta-face)
(if deadgrep--context
Expand Down Expand Up @@ -1032,6 +1080,16 @@ Returns a list ordered by the most recently accessed."
((eq deadgrep--search-case 'ignore) (setq deadgrep--search-case 'smart)))
(deadgrep-restart))

(defun deadgrep-cycle-search-scope ()
(interactive)
(message "cycling")
(cond
((eq deadgrep--search-scope 'project) (setq deadgrep--search-scope 'project-open-buffers))
((eq deadgrep--search-scope 'project-open-buffers) (setq deadgrep--search-scope 'open-buffers))
((eq deadgrep--search-scope 'open-buffers) (setq deadgrep--search-scope 'project)))
(deadgrep-restart))


(defvar deadgrep-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "RET") #'deadgrep-visit-result)
Expand All @@ -1042,6 +1100,7 @@ Returns a list ordered by the most recently accessed."
(define-key map (kbd "T") #'deadgrep-cycle-search-type)
(define-key map (kbd "C") #'deadgrep-cycle-search-case)
(define-key map (kbd "F") #'deadgrep-cycle-files)
(define-key map (kbd "K") #'deadgrep-cycle-search-scope)
(define-key map (kbd "D") #'deadgrep-directory)
(define-key map (kbd "^") #'deadgrep-parent-directory)
(define-key map (kbd "g") #'deadgrep-restart)
Expand Down Expand Up @@ -1806,6 +1865,23 @@ This is intended for use with `next-error-function', which see."
(dolist (buffer (deadgrep--buffers))
(kill-buffer buffer)))

(defun deadgrep--filenames-of-open-files ()
"Get all open buffers that have a backing file"
(-map (lambda (buf)
(buffer-file-name buf))
(-filter (lambda (buffer) (buffer-file-name buffer))
(buffer-list))))

(defun deadgrep--filenames-of-open-files-in-project ()
"Get all buffers that have a backing file in the current project"
(let* ((candidates (deadgrep--filenames-of-open-files))
(prefix (cdr (project-current))))
(-filter (lambda (path)
(if (s-starts-with? prefix path)
path
nil))
candidates)))

(provide 'deadgrep)
;;; deadgrep.el ends here

Expand Down
Loading
0