diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn index 5675b9d5d..08c3cd7e8 100644 --- a/.clj-kondo/config.edn +++ b/.clj-kondo/config.edn @@ -58,6 +58,12 @@ :redundant-do {:level :off} + :redundant-ignore + {:level :off} + + :redundant-nested-call + {:level :off} + :earmuffed-var-not-dynamic {:level :off} diff --git a/common/src/app/common/data/macros.cljc b/common/src/app/common/data/macros.cljc index 31a89e61c..f339a7344 100644 --- a/common/src/app/common/data/macros.cljc +++ b/common/src/app/common/data/macros.cljc @@ -4,7 +4,6 @@ ;; ;; Copyright (c) KALEIDOS INC -#_:clj-kondo/ignore (ns app.common.data.macros "Data retrieval & manipulation specific macros." (:refer-clojure :exclude [get-in select-keys str with-open min max]) diff --git a/common/src/app/common/files/repair.cljc b/common/src/app/common/files/repair.cljc index c5ed30e7b..66fd58c71 100644 --- a/common/src/app/common/files/repair.cljc +++ b/common/src/app/common/files/repair.cljc @@ -496,7 +496,7 @@ (let [repair-shape (fn [shape] ;; Remove the swap slot - (log/debug :hint (str " -> remove swap-slot")) + (log/debug :hint " -> remove swap-slot") (ctk/remove-swap-slot shape))] (log/dbg :hint "repairing shape :misplaced-slot" :id (:id shape) :name (:name shape) :page-id page-id) diff --git a/common/src/app/common/geom/shapes/bounds.cljc b/common/src/app/common/geom/shapes/bounds.cljc index 8754c6f12..91a2053ad 100644 --- a/common/src/app/common/geom/shapes/bounds.cljc +++ b/common/src/app/common/geom/shapes/bounds.cljc @@ -174,8 +174,10 @@ bounds (cond (or (empty? (:shapes shape)) - (or (:masked-group shape) (= :bool (:type shape))) - (and (cfh/frame-shape? shape) (not (:show-content shape)))) + (:masked-group shape) + (cfh/bool-shape? shape) + (and (cfh/frame-shape? shape) + (not (:show-content shape)))) [base-bounds] :else diff --git a/frontend/src/app/worker/import.cljs b/frontend/src/app/worker/import.cljs index ebeb67daa..950c98ffb 100644 --- a/frontend/src/app/worker/import.cljs +++ b/frontend/src/app/worker/import.cljs @@ -72,7 +72,7 @@ ([context type id media] (let [file-id (:file-id context) path (case type - :manifest (str "manifest.json") + :manifest "manifest.json" :page (str file-id "/" id ".svg") :colors-list (str file-id "/colors.json") :colors (let [ext (cm/mtype->extension (:mtype media))]