mirror of https://github.com/logseq/logseq
move command to text.cljs
parent
8c05794a52
commit
d5d7c1f007
|
@ -31,7 +31,6 @@
|
|||
[frontend.components.plugins :as plugins]
|
||||
[frontend.handler.plugin :as plugin-handler]
|
||||
[frontend.handler.block :as block-handler]
|
||||
[frontend.handler.extract :as extract]
|
||||
[frontend.handler.dnd :as dnd]
|
||||
[frontend.handler.editor :as editor-handler]
|
||||
[frontend.handler.repeated :as repeated]
|
||||
|
@ -1165,7 +1164,7 @@
|
|||
|
||||
(and (string/starts-with? a "[[")
|
||||
(string/ends-with? a "]]"))
|
||||
(let [page-name (extract/extract-page-name-from-ref a)]
|
||||
(let [page-name (text/extract-page-name-from-ref a)]
|
||||
(when-not (string/blank? page-name)
|
||||
(page-embed config page-name)))
|
||||
|
||||
|
|
|
@ -51,13 +51,6 @@
|
|||
(or first-block-name file-name)
|
||||
(or file-name first-block-name)))))))
|
||||
|
||||
(defn extract-page-name-from-ref
|
||||
[ref]
|
||||
(when-not (string/blank? ref)
|
||||
(if-let [matches (or (re-matches #"\[\[file:.+\]\[(.+)\]\]" ref)
|
||||
(re-matches #"\[\[(.+)\]\]" ref))]
|
||||
(string/trim (last matches))
|
||||
ref)))
|
||||
|
||||
;; TODO: performance improvement
|
||||
(defn- extract-pages-and-blocks
|
||||
|
|
|
@ -19,6 +19,14 @@
|
|||
(string/starts-with? s "((")
|
||||
(string/ends-with? s "))")))
|
||||
|
||||
(defn extract-page-name-from-ref
|
||||
[ref]
|
||||
(when-not (string/blank? ref)
|
||||
(if-let [matches (or (re-matches #"\[\[file:.+\]\[(.+)\]\]" ref)
|
||||
(re-matches #"\[\[(.+)\]\]" ref))]
|
||||
(string/trim (last matches))
|
||||
ref)))
|
||||
|
||||
(defonce page-ref-re #"\[\[(.*?)\]\]")
|
||||
|
||||
(defonce page-ref-re-2 #"(\[\[.*?\]\])")
|
||||
|
|
Loading…
Reference in New Issue