jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handling support for functions \w functions using completing-read-multiple

Browse source
This commit is contained in:
Ahmed Shariff 2021-09-16 18:42:32 -05:00
parent cea165192d
commit 576f9d3512
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
org-ql-view.el
View file

@ -658,9 +658,12 @@ When opened, the link searches the buffer it's opened from."
'("file link is in" "files currently searched") '("file link is in" "files currently searched")
nil t nil nil "file link is in") nil t nil nil "file link is in")
("file link is in" nil) ("file link is in" nil)
("files currently searched" buffers-files))) ("files currently searched" (cl-typecase buffers-files
(function (funcall buffers-files))
(otherwise buffers-files)))))
(strings-or-file-buffers-p (strings-or-file-buffers-p
(thing) (cl-etypecase thing (thing) (cl-etypecase thing
(functionp t)
(list (cl-every #'strings-or-file-buffers-p thing)) (list (cl-every #'strings-or-file-buffers-p thing))
(string thing) (string thing)
(buffer (or (buffer-file-name thing) (buffer (or (buffer-file-name thing)
@ -1035,6 +1038,7 @@ current buffer. Otherwise BUFFERS-FILES is returned unchanged."
(let ((contracted-buffers-files (let ((contracted-buffers-files
;; TODO: Test this more exhaustively. ;; TODO: Test this more exhaustively.
(pcase buffers-files (pcase buffers-files
((pred functionp) buffers-files)
((pred listp) ((pred listp)
(pcase (expand-files buffers-files) (pcase (expand-files buffers-files)
((pred (seq-set-equal-p (mapcar #'expand-file-name (org-agenda-files)))) ((pred (seq-set-equal-p (mapcar #'expand-file-name (org-agenda-files))))
@ -1059,6 +1063,7 @@ current buffer. Otherwise BUFFERS-FILES is returned unchanged."
;; Using file-names when it's a file-buffer to avoid duplicates resulting from ;; Using file-names when it's a file-buffer to avoid duplicates resulting from
;; the file-buffer and file name being entered. ;; the file-buffer and file name being entered.
(cl-typecase contracted-buffers-files (cl-typecase contracted-buffers-files
(function contracted-buffers-files)
(string contracted-buffers-files) (string contracted-buffers-files)
(list (--map (list (--map
(pcase-exhaustive it (pcase-exhaustive it
@ -1066,7 +1071,7 @@ current buffer. Otherwise BUFFERS-FILES is returned unchanged."
((pred bufferp) (or (buffer-file-name it) ((pred bufferp) (or (buffer-file-name it)
(buffer-name buffer-file)))) (buffer-name buffer-file))))
contracted-buffers-files)) contracted-buffers-files))
(t (error (format "Value %s is not a string or a list of buffer/strings" contracted-buffers-files))))))) (t (error (format "Value %s is not a string, a valid function or a list of buffer/strings" contracted-buffers-files)))))))
(defun org-ql-view--complete-buffers-files () (defun org-ql-view--complete-buffers-files ()
"Return value for `org-ql-view-buffers-files' using completion. "Return value for `org-ql-view-buffers-files' using completion.
@ -1079,14 +1084,17 @@ representation `org-ql-view-buffers-files' is returned."
(initial-input (pcase contracted-org-ql-view-buffers-files (initial-input (pcase contracted-org-ql-view-buffers-files
('nil nil) ('nil nil)
('string contracted-org-ql-view-buffers-files) ('string contracted-org-ql-view-buffers-files)
((pred functionp) contracted-org-ql-view-buffers-files)
((pred listp) ((pred listp)
(mapconcat 'identity contracted-org-ql-view-buffers-files (mapconcat 'identity contracted-org-ql-view-buffers-files
",")) ","))
(_ (format "%s" contracted-org-ql-view-buffers-files)))) (_ (format "%s" contracted-org-ql-view-buffers-files))))
(completion-read-result (completing-read-multiple (completion-read-result (if (functionp contracted-org-ql-view-buffers-files)
"Buffers/Files: " contracted-org-ql-view-buffers-files
(list 'buffer 'org-agenda-files 'org-directory 'all) (completing-read-multiple
nil nil initial-input))) "Buffers/Files: "
(list 'buffer 'org-agenda-files 'org-directory 'all)
nil nil initial-input))))
(if (equal completion-read-result initial-input) (if (equal completion-read-result initial-input)
org-ql-view-buffers-files org-ql-view-buffers-files
(org-ql-view--expand-buffers-files completion-read-result)))) (org-ql-view--expand-buffers-files completion-read-result))))