clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-30 08:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev/var-sizes-linter

Browse Source
This commit is contained in:
Gabriel Horner
2022-02-08 12:02:39 -05:00
parent a3ff4442e8 165a563f96
commit c6d03b67ab
72 changed files with 4617 additions and 4814 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/main/frontend/format/block.cljs
View File

@@ -418,26 +418,6 @@
content
(property/->new-properties content))))
(defn- remove-indentations
[format level element]
(if (= format :org)
element
(case (first element)
"Paragraph"
["Paragraph"
(let [level (if (= (ffirst (second element)) "Plain")
(count (re-find #"^[\s\t]+" (second (first (second element)))))
level)]
(->> (partition-by #(contains? #{["Break_Line"] ["Hard_Break_Line"]} %) (second element))
(map (fn [c]
(if (and (= (ffirst c) "Plain")
(>= (count (re-find #"^[\s\t]+" (second (first c)))) level))
(cons ["Plain" (subs (second (first c)) level)] (rest c))
c)))
(apply concat)))]
element)))
(defn get-custom-id-or-new-id
[properties]
(or (when-let [custom-id (or (get-in properties [:properties :custom-id])
@@ -471,11 +451,11 @@
(update :refs (fn [col] (remove nil? col)))))
(defn extract-blocks*
[blocks pre-block-body pre-block-properties encoded-content]
[blocks pre-block-properties encoded-content]
(let [first-block (first blocks)
first-block-start-pos (get-in first-block [:block/meta :start-pos])
blocks (if (or (seq @pre-block-body)
(seq @pre-block-properties))
blocks (if (or (> first-block-start-pos 0)
(empty? blocks))
(cons
(merge
(let [content (utf8/substring encoded-content 0 first-block-start-pos)
@@ -486,7 +466,6 @@
:meta {:start-pos 0
:end-pos (or first-block-start-pos
(utf8/length encoded-content))}
:body @pre-block-body
:properties @pre-block-properties
:properties-order (keys @pre-block-properties)
:refs (->> (get-page-refs-from-properties @pre-block-properties)
@@ -506,11 +485,9 @@
(try
(let [encoded-content (utf8/encode content)
last-pos (utf8/length encoded-content)
pre-block-body (atom nil)
pre-block-properties (atom nil)
blocks
(loop [headings []
block-body []
blocks (reverse blocks)
timestamps {}
properties {}
@@ -526,18 +503,12 @@
(cond
(paragraph-timestamp-block? block)
(let [timestamps (extract-timestamps block)
timestamps' (merge timestamps timestamps)
[timestamps others] (split-with #(= "Timestamp" (first %)) (second block))
other-body (->>
(concat
timestamps
(drop-while #(contains? #{"Hard_Break_Line" "Break_Line"} (first %)) others))
(remove nil?))]
(recur headings (conj block-body ["Paragraph" other-body]) (rest blocks) timestamps' properties last-pos last-level children (conj block-all-content block-content)))
timestamps' (merge timestamps timestamps)]
(recur headings (rest blocks) timestamps' properties last-pos last-level children (conj block-all-content block-content)))
(property/properties-ast? block)
(let [properties (extract-properties (second block))]
(recur headings block-body (rest blocks) timestamps properties last-pos last-level children (conj block-all-content block-content)))
(recur headings (rest blocks) timestamps properties last-pos last-level children (conj block-all-content block-content)))
(heading-block? block)
(let [id (get-custom-id-or-new-id properties)
@@ -568,9 +539,6 @@
block (cond->
(assoc block
:uuid id
:body (vec
(->> (reverse block-body)
(map #(remove-indentations format (:level block) %))))
:refs ref-pages-in-properties
:children (or current-block-children [])
:format format)
@@ -600,20 +568,17 @@
(and updated-at (integer? updated-at))
(assoc :block/updated-at updated-at))]
(recur (conj headings block) [] (rest blocks) {} {} last-pos' (:level block) children []))
(recur (conj headings block) (rest blocks) {} {} last-pos' (:level block) children []))
:else
(let [block-body' (conj block-body block)]
(recur headings block-body' (rest blocks) timestamps properties last-pos last-level children (conj block-all-content block-content)))))
(recur headings (rest blocks) timestamps properties last-pos last-level children (conj block-all-content block-content))))
(do
(when (seq block-body)
(reset! pre-block-body (reverse block-body)))
(when (seq properties)
(let [properties (:properties properties)]
(reset! pre-block-properties properties)))
(-> (reverse headings)
safe-blocks))))]
(extract-blocks* blocks pre-block-body pre-block-properties encoded-content))
(extract-blocks* blocks pre-block-properties encoded-content))
(catch js/Error e
(js/console.error "extract-blocks-failed")
(log/error :exception e))))