[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/mheerdegen-preview bef717d 06/35: WIP: New :key arg for "
From: |
Michael Heerdegen |
Subject: |
[elpa] scratch/mheerdegen-preview bef717d 06/35: WIP: New :key arg for "filename" and new pattern types "file" and "dir" |
Date: |
Mon, 29 Oct 2018 22:24:04 -0400 (EDT) |
branch: scratch/mheerdegen-preview
commit bef717d4538f3c167149587ae57c5808674dcf98
Author: Michael Heerdegen <address@hidden>
Commit: Michael Heerdegen <address@hidden>
WIP: New :key arg for "filename" and new pattern types "file" and "dir"
---
packages/el-search/el-search.el | 81 +++++++++++++++++++++++++++++++----------
1 file changed, 61 insertions(+), 20 deletions(-)
diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el
index db5117d..28ab546 100644
--- a/packages/el-search/el-search.el
+++ b/packages/el-search/el-search.el
@@ -2089,42 +2089,83 @@ is matched by the `el-search-regexp-like-p' REGEXP."
',regexp)
,this)))))
-(defun el-search--filename-matcher (&rest regexps)
+(defun el-search--filename-matcher (fun &rest regexps)
;; Return a file name matcher for the REGEXPS. This is a predicate
;; accepting two arguments that returns non-nil when the first
;; argument is a file name (i.e. a string) that is matched by all
;; `el-search-regexp-like-p' REGEXPS, or a buffer whose associated file
;; name matches accordingly. It ignores the second argument.
- (let ((get-file-name (lambda (file-name-or-buffer)
- (if (bufferp file-name-or-buffer)
- (buffer-file-name file-name-or-buffer)
- file-name-or-buffer))))
- (if (not regexps)
- (lambda (file-name-or-buffer _) (funcall get-file-name
file-name-or-buffer))
- (let* ((regexp-matchers (mapcar #'el-search--string-matcher regexps))
- (test-file-name-or-buffer
- (el-search-with-short-term-memory
- (lambda (file-name-or-buffer)
- (when-let ((file-name (funcall get-file-name
file-name-or-buffer)))
- (cl-every (lambda (matcher) (funcall matcher file-name))
regexp-matchers))))))
- (lambda (file-name-or-buffer _) (funcall test-file-name-or-buffer
file-name-or-buffer))))))
+ (let (real-fun)
+ (pcase regexps
+ (`(:key ,specified-fun . ,more-regexps)
+ (setq real-fun (lambda (arg) (funcall specified-fun (funcall fun
arg)))
+ regexps more-regexps))
+ (_ (setq real-fun fun)))
+ (let ((get-file-name (lambda (file-name-or-buffer)
+ (funcall real-fun
+ (if (bufferp file-name-or-buffer)
+ (buffer-file-name file-name-or-buffer)
+ file-name-or-buffer)))))
+ (if (not regexps)
+ (lambda (file-name-or-buffer _) (funcall get-file-name
file-name-or-buffer))
+ (let* ((regexp-matchers (mapcar #'el-search--string-matcher regexps))
+ (test-file-name-or-buffer
+ (el-search-with-short-term-memory
+ (lambda (file-name-or-buffer)
+ (when-let ((file-name (funcall get-file-name
file-name-or-buffer)))
+ (cl-every (lambda (matcher) (funcall matcher file-name))
regexp-matchers))))))
+ (lambda (file-name-or-buffer _) (funcall test-file-name-or-buffer
file-name-or-buffer)))))))
(el-search-defpattern filename (&rest regexps)
"Matches anything when the searched buffer has an associated file.
With any `el-search-regexp-like-p' REGEXPS given, the file's
-absolute name must be matched by all of them."
- ;;FIXME: should we also allow to match the f-n-nondirectory and
- ;;f-n-sans-extension? Maybe it could become a new pattern type named
`feature'?
- (declare (heuristic-matcher #'el-search--filename-matcher)
+absolute name must be matched by all of them.
+
+The list of REGEXPS can optionally be prefixed with two elements :key
+KEYFUN. Then the filename will be passed to KEYFUN before matching.
+
+Example: This will match any pattern in any file whose name without
+extension matches \"el\":
+
+ (filename :key file-name-sans-extension \"el\").
+
+See also the pattern types \"file\" and \"dir\" that use a key
+function implicitly (but support to specify a :key nonetheless)."
+ (declare (heuristic-matcher (apply-partially #'el-search--filename-matcher
#'identity))
(inverse-heuristic-matcher t))
- (el-search-defpattern--check-args "filename" regexps
#'el-search-regexp-like-p)
- (let ((file-name-matcher (apply #'el-search--filename-matcher regexps)))
+ (el-search-defpattern--check-args "filename"
+ (if (eq (car-safe regexps) :key) (cddr
regexps) regexps)
+ #'el-search-regexp-like-p)
+ (let ((file-name-matcher (apply #'el-search--filename-matcher #'identity
regexps)))
;; We can't expand to just t because this would not work with `not'.
;; `el-search--filename-matcher' caches the result, so this is still a
;; pseudo constant
`(guard (funcall ',file-name-matcher (current-buffer) nil))))
+(defun el-search--file-directory (name)
+ (directory-file-name (file-name-directory name)))
+
+(el-search-defpattern file (&rest regexps)
+ "Like \"filename\" but matches REGEXPS against file names without directory."
+ (declare (heuristic-matcher (apply-partially #'el-search--filename-matcher
#'file-name-nondirectory))
+ (inverse-heuristic-matcher t))
+ (el-search-defpattern--check-args "file"
+ (if (eq (car-safe regexps) :key) (cddr
regexps) regexps)
+ #'el-search-regexp-like-p)
+ (let ((file-name-matcher (apply #'el-search--filename-matcher
#'file-name-nondirectory regexps)))
+ `(guard (funcall ',file-name-matcher (current-buffer) nil))))
+
+(el-search-defpattern dir (&rest regexps)
+ "Like \"filename\" but matches REGEXPS against directory names."
+ (declare (heuristic-matcher (apply-partially #'el-search--filename-matcher
#'el-search--file-directory))
+ (inverse-heuristic-matcher t))
+ (el-search-defpattern--check-args "dir"
+ (if (eq (car-safe regexps) :key) (cddr
regexps) regexps)
+ #'el-search-regexp-like-p)
+ (let ((file-name-matcher (apply #'el-search--filename-matcher
#'el-search--file-directory regexps)))
+ `(guard (funcall ',file-name-matcher (current-buffer) nil))))
+
;;;; Highlighting
- [elpa] branch scratch/mheerdegen-preview created (now cdfaec4), Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview 76163ac 01/35: WIP: [el-search] Fix an infloop, Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview ee441a0 03/35: WIP: Add diverse "sloppy" pattern types, Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview 9805060 02/35: WIP: [el-search] Fix nested match issues in *El Occur*, Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview 220f349 04/35: WIP: Add package "sscell", Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview bef717d 06/35: WIP: New :key arg for "filename" and new pattern types "file" and "dir",
Michael Heerdegen <=
- [elpa] scratch/mheerdegen-preview d2faca2 09/35: WIP: New command 'el-search-repository', Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview 2f72331 08/35: WIP: New file el-search/el-search-pp.el, Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview f2ec15d 13/35: WIP [el-search] Fix more "redundant _ pattern" cases, Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview f025458 12/35: WIP [el-search] Add quick help command, Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview f23fe5e 17/35: WIP: Optimize caching, Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview b4b94b0 11/35: WIP [el-search] Implement 'el-search-keyboard-quit', Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview 44715aa 05/35: WIP: New package "gnus-article-notes", Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview 5057b57 14/35: WIP [el-search] Discourage using symbols as LPATS in `append' and `l', Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview 5e2aea1 20/35: WIP [el-search] Adjust prev/next match commands for search and occur, Michael Heerdegen, 2018/10/29
- [elpa] scratch/mheerdegen-preview 38def8b 25/35: WIP: Test: Make mouse clicks not abort the search, Michael Heerdegen, 2018/10/29