revert linter related changes

Author: sprocketc

src/electron/file.cljs

@@ -44,10 +44,12 @@
   (let [document (edn/read-string data)
         file-path (:path document)
         directory (and file-path (.dirname path file-path))
-        options (-> (cond-> dialog-options
-                      (and directory (.existsSync fs directory))
-                      (assoc :defaultPath directory))
-                    (update :defaultPath #(.join path % (:title document))))]
+        options (cond-> dialog-options
+                  (and directory (.existsSync fs directory))
+                  (assoc :defaultPath directory)
+
+                  :always
+                  (update :defaultPath #(.join path % (:title document))))]
     (-> (save-dialog! options)
         (.then (fn [file-path]
                  (when file-path

src/renderer/document/events.cljs

@@ -188,9 +188,11 @@
      (let [migrated-document (utils.compatibility/migrate-document document)
            migrated (not= document migrated-document)
            document (assoc migrated-document :id guid)]
-       {:db (cond-> (-> db
-                        (document.handlers/load document)
-                        (history.handlers/finalize #(t [::load-doc "Load document"])))
+       {:db (cond-> db
+              :always
+              (-> (document.handlers/load document)
+                  (history.handlers/finalize #(t [::load-doc "Load document"])))
+
               (not migrated)
               (document.handlers/update-saved-info (select-keys
                                                     document

src/renderer/document/handlers.cljs

@@ -181,15 +181,16 @@
                    open-document-id
                    (assoc :id open-document-id))]
     (if (document.db/valid? document)
-      (-> (cond-> db
-            (not open-document-id)
-            (-> (create-tab document)
-                (center))
+      (cond-> db
+        (not open-document-id)
+        (-> (create-tab document)
+            (center))
 
-            (:path document)
-            (add-recent (:path document)))
+        (:path document)
+        (add-recent (:path document))
 
-          (set-active (:id document)))
+        :always
+        (set-active (:id document)))
 
       (let [explanation (-> document document.db/explain m.error/humanize str)]
         (->> (notification.views/spec-failed "Load document" explanation)

src/renderer/element/handlers.cljs

@@ -662,13 +662,15 @@
 (m/=> normalize [:-> map? Element])
 (defn normalize
   [el]
-  (-> (cond-> el
-        (not (string? (:content el)))
-        (dissoc :content))
-      (utils.map/remove-nils)
-      (utils.element/normalize-attrs)
-      (dissoc :locked)
-      (merge db/default)))
+  (cond-> el
+    (not (string? (:content el)))
+    (dissoc :content)
+
+    :always
+    (-> (utils.map/remove-nils)
+        (utils.element/normalize-attrs)
+        (dissoc :locked)
+        (merge db/default))))
 
 (m/=> create [:-> App map? App])
 (defn create
@@ -688,28 +690,33 @@
       (let [error-message (-> new-el db/explain m.error/humanize str)]
         (->> (notification.views/spec-failed "Invalid element" error-message)
              (notification.handlers/add db)))
-      (cond-> (assoc-in db (path db id) new-el)
-        (:parent new-el)
-        (update-prop (:parent new-el) :children #(vec (conj % id)))
+      (let [is-translated (or (utils.element/svg? new-el)
+                              (utils.element/root? new-el)
+                              (:parent el))]
+        (cond-> db
+          :always
+          (assoc-in (path db id) new-el)
+
+          (:parent new-el)
+          (update-prop (:parent new-el) :children #(vec (conj % id)))
 
-        (not (or (utils.element/svg? new-el)
-                 (utils.element/root? new-el)
-                 (:parent el)))
-        (translate [(- min-x) (- min-y)])
+          (not is-translated)
+          (translate [(- min-x) (- min-y)])
 
-        (or (utils.element/svg? new-el)
-            (utils.element/root? new-el)
-            (:parent el))
-        (refresh-bbox id)
+          is-translated
+          (refresh-bbox id)
 
-        child-els
-        (add-children child-els)))))
+          child-els
+          (add-children child-els))))))
 
 (m/=> create-default-canvas [:-> App [:maybe Vec2] App])
 (defn create-default-canvas
   [db size]
-  (cond-> (create db {:tag :canvas
-                      :attrs {:fill "#eeeeee"}})
+  (cond-> db
+    :always
+    (create {:tag :canvas
+             :attrs {:fill "#eeeeee"}})
+
     size
     (-> (create {:tag :svg
                  :attrs {:width (first size)
@@ -771,9 +778,12 @@
          pointer-pos (:adjusted-pointer-pos db)]
      (reduce
       select
-      (cond-> (-> (deselect db)
-                  (add (assoc el :parent (:id parent-el)))
-                  (place (matrix/add pointer-pos offset)))
+      (cond-> db
+        :always
+        (-> (deselect)
+            (add (assoc el :parent (:id parent-el)))
+            (place (matrix/add pointer-pos offset)))
+
         (not= (:id (root db)) (:id parent-el))
         (translate [(- s-x1) (- s-y1)])) (selected-ids db)))))
 

src/renderer/element/impl/container/svg.cljs

@@ -48,7 +48,10 @@
         :style {:filter (str "blur(" (/ 2 zoom) "px)")}})]
 
      [:svg
-      (cond-> (dissoc attrs :style)
+      (cond-> attrs
+        :always
+        (dissoc :style)
+
         active-filter
         (assoc :filter (str "url(#" (name active-filter) ")")))
       [:rect

src/renderer/element/impl/shape/rect.cljs

@@ -34,15 +34,15 @@
         rx (if (> rx (/ width 2)) (/ width 2) rx)
         ry (if (> ry (/ height 2)) (/ height 2) ry)
         curved? (and (> rx 0) (> ry 0))]
-    (-> []
-        (conj "M" (+ x rx) y)
-        (conj "H" (- (+ x width) rx))
-        (cond-> curved? (conj "A" rx ry 0 0 1 (+ x width) (+ y ry)))
-        (conj "V" (- (+ y height) ry))
-        (cond-> curved? (conj "A" rx ry 0 0 1 (- (+ x width) rx) (+ y height)))
-        (conj "H" (+ x rx))
-        (cond-> curved? (conj "A" rx ry 0 0 1 x (- (+ y height) ry)))
-        (conj "V" (+ y ry))
-        (cond-> curved? (conj "A" rx ry 0 0 1 (+ x rx) y))
-        (conj "z")
-        (->> (string/join " ")))))
+    (cond-> []
+      :always (conj "M" (+ x rx) y
+                    "H" (- (+ x width) rx))
+      curved? (conj "A" rx ry 0 0 1 (+ x width) (+ y ry))
+      :always (conj "V" (- (+ y height) ry))
+      curved? (conj "A" rx ry 0 0 1 (- (+ x width) rx) (+ y height))
+      :always (conj "H" (+ x rx))
+      curved? (conj "A" rx ry 0 0 1 x (- (+ y height) ry))
+      :always (conj "V" (+ y ry))
+      curved? (conj "A" rx ry 0 0 1 (+ x rx) y)
+      :always (conj "z")
+      :always (->> (string/join " ")))))

src/renderer/event/handlers.cljs

@@ -32,56 +32,60 @@
       "pointermove"
       (-> (if pointer-offset
             (if (significant-drag? pointer-pos pointer-offset drag-threshold)
-              (-> (cond-> db
-                    (not= tool :pan)
-                    (tool.handlers/pan-out-of-canvas dom-rect pointer-pos pointer-offset)
-
-                    (not drag)
-                    (-> (assoc :drag true)
-                        (tool.hierarchy/on-drag-start e)
-                        (tool.handlers/add-fx [::event.effects/set-pointer-capture
-                                               pointer-id])))
-                  (tool.hierarchy/on-drag e))
+              (cond-> db
+                (not= tool :pan)
+                (tool.handlers/pan-out-of-canvas dom-rect pointer-pos pointer-offset)
+
+                (not drag)
+                (-> (assoc :drag true)
+                    (tool.hierarchy/on-drag-start e)
+                    (tool.handlers/add-fx [::event.effects/set-pointer-capture
+                                           pointer-id]))
+
+                :always
+                (tool.hierarchy/on-drag e))
               db)
             (tool.hierarchy/on-pointer-move db e))
           (assoc :pointer-pos pointer-pos
                  :adjusted-pointer-pos adjusted-pointer-pos))
 
       "pointerdown"
-      (-> (cond-> db
-            (= button :middle)
-            (-> (assoc :cached-tool tool
-                       :cached-state state)
-                (tool.handlers/activate :pan))
+      (cond-> db
+        (= button :middle)
+        (-> (assoc :cached-tool tool
+                   :cached-state state)
+            (tool.handlers/activate :pan))
 
-            (not= button :right)
-            (-> (update :active-pointers conj pointer-id)
-                (assoc :pointer-offset pointer-pos
-                       :adjusted-pointer-offset adjusted-pointer-pos
-                       :nearest-neighbor-offset (:point nearest-neighbor))))
-
-          (tool.hierarchy/on-pointer-down e)
-          (tool.handlers/add-fx [::effects/focus nil]))
+        (not= button :right)
+        (-> (update :active-pointers conj pointer-id)
+            (assoc :pointer-offset pointer-pos
+                   :adjusted-pointer-offset adjusted-pointer-pos
+                   :nearest-neighbor-offset (:point nearest-neighbor)))
+        :always
+        (-> (tool.hierarchy/on-pointer-down e)
+            (tool.handlers/add-fx [::effects/focus nil])))
 
       "pointerup"
       (if (contains? active-pointers pointer-id)
-        (-> (cond-> (if drag
-                      (-> (tool.hierarchy/on-drag-end db e)
-                          (tool.handlers/add-fx [::event.effects/release-pointer-capture
-                                                 pointer-id]))
-                      (if (= button :right)
-                        db
-                        (if (< 0 (- timestamp event-timestamp) double-click-delta)
-                          (-> (dissoc db :event-timestamp)
-                              (tool.hierarchy/on-double-click e))
-                          (-> (assoc db :event-timestamp timestamp)
-                              (tool.hierarchy/on-pointer-up e)))))
-              (and cached-tool (= button :middle))
-              (-> (tool.handlers/activate cached-tool)
-                  (tool.handlers/set-state cached-state)
-                  (dissoc :cached-tool :cached-state)))
-            (update :active-pointers disj pointer-id)
-            (dissoc :pointer-offset :drag :nearest-neighbor))
+        (cond-> (if drag
+                  (-> (tool.hierarchy/on-drag-end db e)
+                      (tool.handlers/add-fx [::event.effects/release-pointer-capture
+                                             pointer-id]))
+                  (if (= button :right)
+                    db
+                    (if (< 0 (- timestamp event-timestamp) double-click-delta)
+                      (-> (dissoc db :event-timestamp)
+                          (tool.hierarchy/on-double-click e))
+                      (-> (assoc db :event-timestamp timestamp)
+                          (tool.hierarchy/on-pointer-up e)))))
+          (and cached-tool (= button :middle))
+          (-> (tool.handlers/activate cached-tool)
+              (tool.handlers/set-state cached-state)
+              (dissoc :cached-tool :cached-state))
+
+          :always
+          (-> (update :active-pointers disj pointer-id)
+              (dissoc :pointer-offset :drag :nearest-neighbor)))
         db)
       db)))
 
@@ -90,33 +94,37 @@
   [db e]
   (case (:type e)
     "keydown"
-    (-> (cond-> db
-          (and (= (:code e) "Space")
-               (not= (:tool db) :pan)
-               (= (:state db) :idle))
-          (-> (assoc :cached-tool (:tool db))
-              (tool.handlers/activate :pan))
-
-          (= (:key e) "Shift")
-          (-> (assoc-in [:snap :transient-active] true)
-              (cond-> (not (-> db :snap :active))
-                (-> (dissoc :nearest-neighbor)
-                    (snap.handlers/rebuild-tree)))))
-        (tool.hierarchy/on-key-down e))
+    (cond-> db
+      (and (= (:code e) "Space")
+           (not= (:tool db) :pan)
+           (= (:state db) :idle))
+      (-> (assoc :cached-tool (:tool db))
+          (tool.handlers/activate :pan))
+
+      (= (:key e) "Shift")
+      (-> (assoc-in [:snap :transient-active] true)
+          (cond-> (not (-> db :snap :active))
+            (-> (dissoc :nearest-neighbor)
+                (snap.handlers/rebuild-tree))))
+
+      :always
+      (tool.hierarchy/on-key-down e))
 
     "keyup"
-    (-> (cond-> db
-          (and (= (:code e) "Space")
-               (:cached-tool db))
-          (-> (tool.handlers/activate (:cached-tool db))
-              (dissoc :cached-tool))
-
-          (= (:key e) "Shift")
-          (-> (assoc-in [:snap :transient-active] false)
-              (cond->
-               (not (-> db :snap :active))
-                (dissoc :nearest-neighbor))))
-        (tool.hierarchy/on-key-up e))
+    (cond-> db
+      (and (= (:code e) "Space")
+           (:cached-tool db))
+      (-> (tool.handlers/activate (:cached-tool db))
+          (dissoc :cached-tool))
+
+      (= (:key e) "Shift")
+      (-> (assoc-in [:snap :transient-active] false)
+          (cond->
+           (not (-> db :snap :active))
+            (dissoc :nearest-neighbor)))
+
+      :always
+      (tool.hierarchy/on-key-up e))
     db))
 
 (m/=> wheel [:-> App WheelEvent App])