clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance: unify advanced commands with slash commands

Browse Source 
fixes LOG-3206
This commit is contained in:
Gabriel Horner
2024-08-27 12:36:46 -04:00
parent f442c9e954
commit 1401bb1dd9
5 changed files with 41 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1725,25 +1725,6 @@
(js/console.error e)
nil)))
(defn get-matched-block-commands
[input]
(try
(let [edit-content (gobj/get input "value")
pos (cursor/pos input)
last-command (subs edit-content
(:pos (:pos (state/get-editor-action-data)))
pos)]
(when (> pos 0)
(or
(and (= \< (util/nth-safe edit-content (dec pos)))
(commands/block-commands-map))
(and last-command
(commands/get-matched-commands
last-command
(commands/block-commands-map))))))
(catch :default _error
nil)))
(defn auto-complete?
[]
(or @*asset-uploading?
@@ -1936,12 +1917,6 @@
(commands/reinit-matched-commands!)
(state/set-editor-show-commands!))
(and (not db-based?) (= last-input-char commands/angle-bracket))
(do
(state/set-editor-action-data! {:pos (cursor/get-caret-pos input)})
(commands/reinit-matched-block-commands!)
(state/set-editor-show-block-commands!))
(and (= last-input-char last-prev-input-char commands/colon)
(or (nil? prev-prev-input-char)
(= prev-prev-input-char "\n"))
@@ -2792,7 +2767,7 @@
(delete-block! repo))))
(and (> current-pos 0)
(contains? #{commands/command-trigger commands/angle-bracket commands/command-ask}
(contains? #{commands/command-trigger commands/command-ask}
(util/nth-safe value (dec current-pos))))
(do
(util/stop e)
@@ -2989,7 +2964,7 @@
(> current-pos 0)))
(defn- default-case-for-keyup-handler
[input current-pos k code is-processed? c]
[input current-pos k code is-processed?]
(let [last-key-code (state/get-last-key-code)
blank-selected? (string/blank? (util/get-selected-text))
non-enter-processed? (and is-processed? ;; #3251
@@ -3040,21 +3015,11 @@
(commands/handle-step [:editor/search-block :reference])
(state/set-editor-action-data! {:pos (cursor/get-caret-pos input)}))
;; Handle non-ascii angle brackets
(and (= "〈" c)
(= "《" (util/nth-safe (gobj/get input "value") (dec (dec current-pos))))
(> current-pos 0))
(do
(commands/handle-step [:editor/input commands/angle-bracket {:last-pattern "《〈"
:backward-pos 0}])
(state/set-editor-action-data! {:pos (cursor/get-caret-pos input)})
(state/set-editor-show-block-commands!))
:else
nil)))))
(defn keyup-handler
[_state input input-id]
[_state input]
(fn [e key-code]
(when-not (util/goog-event-is-composing? e)
(let [current-pos (cursor/pos input)
@@ -3094,32 +3059,8 @@
(reset! commands/*matched-commands matched-commands)
(state/clear-editor-action!))))
;; When you type search text after < (and when you release shift after typing <)
(and (not (config/db-based-graph? (state/get-current-repo))) (= :block-commands (state/get-editor-action)) (not= key-code 188)) ; not <
(let [matched-block-commands (get-matched-block-commands input)
format (:format (get-state))]
(if (seq matched-block-commands)
(cond
(= key-code 9) ;tab
(do
(util/stop e)
(insert-command! input-id
(last (first matched-block-commands))
format
{:last-pattern commands/angle-bracket
:command :block-commands}))
:else
(reset! commands/*matched-block-commands matched-block-commands))
(state/clear-editor-action!)))
;; When you type two spaces after a command character (may always just be handled by the above instead?)
(and (contains? #{:block-commands} (state/get-editor-action))
(= c (util/nth-safe value (dec (dec current-pos))) " "))
(state/clear-editor-action!)
:else
(default-case-for-keyup-handler input current-pos k code is-processed? c))
(default-case-for-keyup-handler input current-pos k code is-processed?))
(close-autocomplete-if-outside input)