ndwarshuis
/
emacs-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ENH small optimization for task testing

This commit is contained in:
Nathan Dwarshuis 2021-04-20 00:38:51 -04:00
parent 4ecd2b4972
commit e1e27a470f
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
local/lib/org-x/org-x.el
View File

@ -387,25 +387,40 @@ no timestamp is found."
;; task-level testing ;; task-level testing
(defun org-x-is-todoitem-p () (defalias 'org-x-is-todoitem-p 'org-get-todo-state
"Return todo keyword if heading has one." "Return todo keyword if heading has one.")
(-some-> (org-get-todo-state) (substring-no-properties)))
(defun org-x-headline-has-task-children ()
"Return todo keyword of first task child under headline if it exists."
(org-x-headline-has-children #'org-x-is-todoitem-p))
(defun org-x-headline-has-task-parent ()
"Return todo keyword of current headline's if it exists."
(org-x-headline-has-parent #'org-x-is-todoitem-p))
(defun org-x-is-project-p () (defun org-x-is-project-p ()
"Return todo keyword if heading has todoitem children." "Return todo keyword if heading has todoitem children."
(and (org-x-headline-has-children 'org-x-is-todoitem-p) (org-x-is-todoitem-p))) (-when-let (kw (org-x-is-todoitem-p))
(when (org-x-headline-has-task-children)
kw)))
(defun org-x-is-task-p () (defun org-x-is-task-p ()
"Return todo keyword if heading has no todoitem children." "Return todo keyword if heading has no todoitem children."
(and (not (org-x-headline-has-children 'org-x-is-todoitem-p)) (org-x-is-todoitem-p))) (-when-let (kw (org-x-is-todoitem-p))
(unless (org-x-headline-has-task-children)
kw)))
(defun org-x-is-project-task-p () (defun org-x-is-project-task-p ()
"Return todo keyword if heading has todoitem parents." "Return todo keyword if heading has todoitem parents."
(and (org-x-headline-has-parent 'org-x-is-todoitem-p) (org-x-is-task-p))) (-when-let (kw (org-x-is-task-p))
(when (org-x-headline-has-task-parent)
kw)))
(defun org-x-is-atomic-task-p () (defun org-x-is-atomic-task-p ()
"Return todo keyword if heading has no todoitem parents or children." "Return todo keyword if heading has no todoitem parents or children."
(and (not (org-x-headline-has-parent 'org-x-is-todoitem-p)) (org-x-is-task-p))) (-when-let (kw (org-x-is-task-p))
(unless (org-x-headline-has-task-parent)
kw)))
(defun org-x-task-status () (defun org-x-task-status ()
"Return the status of the headline under point." "Return the status of the headline under point."
@ -522,8 +537,7 @@ Assume that point is at the beginning of a headline."
(let ((has-todoitem-parent) (let ((has-todoitem-parent)
(has-non-todoitem-parent)) (has-non-todoitem-parent))
(save-excursion (save-excursion
(while (and (org-up-heading-safe) (while (and (not has-todoitem-parent) (org-up-heading-safe))
(not has-todoitem-parent))
(if (org-x-is-todoitem-p) (if (org-x-is-todoitem-p)
(setq has-todoitem-parent t) (setq has-todoitem-parent t)
(setq has-non-todoitem-parent t)))) (setq has-non-todoitem-parent t))))
@ -533,7 +547,7 @@ Assume that point is at the beginning of a headline."
"Return t if current headline has a parent (at any level) with todo KEYWORD." "Return t if current headline has a parent (at any level) with todo KEYWORD."
(let ((has-keyword-parent)) (let ((has-keyword-parent))
(save-excursion (save-excursion
(while (and (org-up-heading-safe) (not has-keyword-parent)) (while (and (not has-keyword-parent) (org-up-heading-safe))
(when (equal keyword (org-x-is-todoitem-p)) (when (equal keyword (org-x-is-todoitem-p))
(setq has-keyword-parent t)))) (setq has-keyword-parent t))))
has-keyword-parent)) has-keyword-parent))