greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: marker switch

pull/2169/head
Tienson Qin 2021-06-11 11:01:42 +08:00
parent 0bde30bc58
commit 5926e6c1bf
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/frontend/handler/editor.cljs
View File

@ -728,20 +728,25 @@
content (state/get-edit-content)
format (or (db/get-page-format (state/get-current-page))
(state/get-preferred-format))
cond-fn (fn [marker] (or (and (= :markdown format)
(util/safe-re-find (re-pattern (str "#*\\s*" marker)) content))
(util/starts-with? content "TODO")))
markdown? (= :markdown format)
cond-fn (fn [marker] (or (and markdown? (util/safe-re-find (re-pattern (str "#*\\s*" marker)) content))
(util/starts-with? content "TODO")))
marker-pattern (fn [marker] (re-pattern (str "^" (if markdown? "[# ]*") marker)))
replace-marker (fn [old-marker new-marker]
(string/replace-first content (marker-pattern old-marker)
(fn [match]
(string/replace match old-marker new-marker))))
[new-content marker] (cond
(cond-fn "TODO")
[(string/replace-first content #"^TODO" "DOING") "DOING"]
[(replace-marker "TODO" "DOING") "DOING"]
(cond-fn "DOING")
[(string/replace-first content #"^DOING" "DONE") "DONE"]
[(replace-marker "DOING" "DONE") "DONE"]
(cond-fn "LATER")
[(string/replace-first content #"^LATER" "NOW") "NOW"]
[(replace-marker "LATER" "NOW") "NOW"]
(cond-fn "NOW")
[(string/replace-first content #"^NOW" "DONE") "DONE"]
[(replace-marker "NOW" "DONE") "DONE"]
(cond-fn "DONE")
[(string/replace-first content #"^DONE" "") nil]
[(replace-marker "DONE" "") nil]
:else
(let [marker (if (= :now (state/get-preferred-workflow))
"LATER"