Skip to content
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

Jump to bottom

Make find-file-occur work with multi-pass regex builders #1984

Closed
wants to merge 4 commits into from
Closed

Make find-file-occur work with multi-pass regex builders #1984

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
858e267
Make find-file-occur work with multi-pass regex builders
CeleritasCelery Mar 20, 2019
deac1e0
Prevent pcre conversion from creating look-around for a single form
CeleritasCelery Mar 27, 2019
fda3fb2
Update style based on feedback
CeleritasCelery Mar 27, 2019
585fb27
Add double space to match style
CeleritasCelery Mar 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 9 additions & 10 deletions counsel.el
View file
Open in desktop
Expand Up @@ -1866,7 +1866,7 @@ When INITIAL-INPUT is non-nil, use it in the minibuffer during completion."
("grep -i -E '%s'"))
"Alist of file name filtering commands.
The car is a shell command and the cdr is t when the shell
command supports look-arounds. The executable for the commands
command supports look-arounds. The executable for the commands
will be checked for existence via `executable-find'. The first
CeleritasCelery marked this conversation as resolved.
Show resolved Hide resolved
one that exists will be used.")
CeleritasCelery marked this conversation as resolved.
Show resolved Hide resolved

Expand All @@ -1892,14 +1892,14 @@ If USE-IGNORE is non-nil, try to generate a command that respects
(list ignore-re (cons regex t))
(cons ignore-re regex))))
(setq cmd (format (car cmd) (counsel--elisp-to-pcre regex (cdr cmd))))
(if (string-match-p "csh$" shell-file-name)
(if (string-match-p "csh\\'" shell-file-name)
(replace-regexp-in-string "\\?!" "?\\\\!" cmd)
cmd)))

(defun counsel--occur-cmd-find ()
(let* ((cmd (format
"find . -maxdepth 1 | %s | xargs -I {} find {} -maxdepth 0 -ls"
(counsel--file-name-filter t))))
(let ((cmd (format
"find . -maxdepth 1 | %s | xargs -I {} find {} -maxdepth 0 -ls"
(counsel--file-name-filter t))))
(concat
(counsel--cmd-to-dired-by-type "d" cmd)
" && "
Expand All @@ -1923,11 +1923,10 @@ If USE-IGNORE is non-nil, try to generate a command that respects
'find-dired-filter)
(counsel-cmd-to-dired
(counsel--expand-ls
(if (string-match-p "grep" counsel-find-file-occur-cmd)
;; for backwards compatibility
(format counsel-find-file-occur-cmd
(counsel--elisp-to-pcre ivy--old-re))
(format counsel-find-file-occur-cmd
(format counsel-find-file-occur-cmd
(if (string-match-p "grep" counsel-find-file-occur-cmd)
;; for backwards compatibility
(counsel--elisp-to-pcre ivy--old-re)
(counsel--file-name-filter t)))))))
CeleritasCelery marked this conversation as resolved.
Show resolved Hide resolved

(defun counsel-up-directory ()
Expand Down