enable optional linters and refactor

Author: sprocketc

.clj-kondo/config.edn

@@ -0,0 +1,5 @@
+{:linters {:unsorted-required-namespaces {:level :warning}
+           :single-key-in {:level :warning}
+           ;; :shadowed-var {:level :warning}
+           :used-underscored-binding {:level :warning}
+           :redundant-str-call {:level :warning}}}

src/electron/file.cljs

@@ -3,8 +3,8 @@
    ["electron" :refer [app dialog]]
    ["fs" :as fs]
    ["path" :as path]
-   [config :as config]
    [clojure.edn :as edn]
+   [config :as config]
    [promesa.core :as p]))
 
 (def dialog-options
@@ -41,10 +41,10 @@
   (let [document (edn/read-string data)
         file-path (:path document)
         directory (and file-path (.dirname path file-path))
-        dialog-options (cond-> dialog-options
-                         (and directory (.existsSync fs directory))
-                         (assoc :defaultPath directory))]
-    (p/let [file (save-dialog! window dialog-options)]
+        options (cond-> dialog-options
+                  (and directory (.existsSync fs directory))
+                  (assoc :defaultPath directory))]
+    (p/let [file (save-dialog! window options)]
       (write-file! file document))))
 
 (defn save!

src/electron/main.cljs

@@ -2,12 +2,12 @@
   (:require
    #_["@sentry/electron/main" :as sentry-electron-main]
    ["@webref/css" :as css]
+   ["electron" :refer [app shell ipcMain BrowserWindow]]
    ["electron-extension-installer" :refer [REACT_DEVELOPER_TOOLS installExtension]]
    ["electron-log/main" :as log]
    ["electron-reloader"]
    #_["electron-updater" :as updater]
    ["electron-window-state" :as window-state-keeper]
-   ["electron" :refer [app shell ipcMain BrowserWindow]]
    ["font-scanner" :as fontManager]
    ["os" :as os]
    ["path" :as path]
@@ -22,7 +22,7 @@
   (-> (installExtension
        extension
        #js {:loadExtensionOptions {:allowFileAccess true}})
-      (.then (fn [name] (js/console.log "Added Extension: " name)))
+      (.then (fn [extension] (js/console.log "Added Extension: " extension)))
       (.catch (fn [err] (js/console.log "An error occurred: " err)))))
 
 (defn send-to-renderer!

src/renderer/attribute/clock.cljs

@@ -1,8 +1,9 @@
 (ns renderer.attribute.clock
   "https://developer.mozilla.org/en-US/docs/Web/SVG/Content_type#clock-value")
 
-#_(def units
-    {:ms 0.001
-     :s 1
-     :min 60
-     :h 3600})
+#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
+(def units
+  {:ms 0.001
+   :s 1
+   :min 60
+   :h 3600})

src/renderer/attribute/d.cljs

@@ -37,8 +37,8 @@
        :url "https://svgwg.org/svg2-draft/paths.html#PathDataClosePathCommand"}})
 
 (defn ->command
-  [char]
-  (get path-commands (keyword (str/lower-case char))))
+  [c]
+  (get path-commands (keyword (str/lower-case c))))
 
 (defn remove-segment-by-index
   [path i]

src/renderer/color/views.cljs

@@ -7,8 +7,8 @@
    [renderer.color.db :as color.db]
    [renderer.document.events :as-alias document.e]
    [renderer.document.subs :as-alias document.s]
-   [renderer.ui :as ui]
-   [renderer.element.events :as-alias element.e]))
+   [renderer.element.events :as-alias element.e]
+   [renderer.ui :as ui]))
 
 (defn drip [color]
     [:button.button.color-drip
@@ -24,6 +24,7 @@
 (defn swatch [colors]
     [:div.flex (map drip colors)])
 
+#_{:clj-kondo/ignore [:clojure-lsp/unused-public-var]}
 (defn palette []
   (into [:div.flex.flex-col.palette] (map swatch color.db/default-palette)))
 

src/renderer/document/events.cljs

@@ -5,8 +5,8 @@
    [re-frame.core :as rf]
    [re-frame.interceptor :refer [->interceptor get-effect get-coeffect assoc-coeffect assoc-effect]]
    [renderer.dialog.events :as-alias dialog.e]
-   [renderer.document.handlers :as h]
    [renderer.document.effects :as fx]
+   [renderer.document.handlers :as h]
    [renderer.frame.events :as-alias frame.e]
    [renderer.utils.local-storage :as local-storage]
    [renderer.utils.vec :as vec]))

src/renderer/document/handlers.cljs

@@ -55,14 +55,14 @@
 
 (defn create-tab
   [db document]
-  (let [key (or (:key document) (uuid/generate))
+  (let [k (or (:key document) (uuid/generate))
         title (or (:title document) (new-title db))
         active-index (.indexOf (:document-tabs db) (:active-document db))
-        document (merge document {:key key :title title})]
+        document (merge document {:key k :title title})]
     (-> db
-        (assoc-in [:documents key] document)
-        (assoc :active-document key)
-        (update :document-tabs #(vec/add % (inc active-index) key)))))
+        (assoc-in [:documents k] document)
+        (assoc :active-document k)
+        (update :document-tabs #(vec/add % (inc active-index) k)))))
 
 (defn new
   [db]

src/renderer/document/subs.cljs

@@ -96,8 +96,8 @@
 (rf/reg-sub
  ::filter-active?
  :<- [::filter]
- (fn [filter [_ k]]
-   (= filter k)))
+ (fn [active-filter [_ k]]
+   (= active-filter k)))
 
 (rf/reg-sub
  ::hovered-keys
@@ -122,8 +122,8 @@
 (rf/reg-sub
  ::read-only?
  :<- [::timeline.s/time]
- (fn [time _]
-   (pos? time)))
+ (fn [t _]
+   (pos? t)))
 
 (rf/reg-sub
  ::saved?

src/renderer/document/views.cljs

@@ -62,27 +62,27 @@
        (not redos?)]]]))
 
 (defn close-button
-  [key saved?]
+  [k saved?]
   [:button.close-document-button.small.hover:bg-transparent
-   {:key key
+   {:key k
     :title "Close document"
     :on-pointer-down #(.stopPropagation %)
     :on-pointer-up (fn [e]
                      (.stopPropagation e)
-                     (rf/dispatch [::document.e/close key true]))}
+                     (rf/dispatch [::document.e/close k true]))}
    [ui/icon "times"]
    (when-not saved?
      [ui/icon "dot" {:class "icon dot"}])])
 
 (defn context-menu
-  [key]
-  (let [document @(rf/subscribe [::document.s/document key])
+  [k]
+  (let [document @(rf/subscribe [::document.s/document k])
         path (:path document)
         document-tabs @(rf/subscribe [:document-tabs])]
     [{:label "Close"
-      :action [::document.e/close key true]}
+      :action [::document.e/close k true]}
      {:label "Close others"
-      :action [::document.e/close-others key]
+      :action [::document.e/close-others k]
       :disabled? (empty? (rest document-tabs))}
      {:label "Close all"
       :action [::document.e/close-all]}
@@ -94,21 +94,21 @@
       :disabled? (not (and path platform/electron?))}]))
 
 (defn tab
-  [key document active?]
+  [k document active?]
   (ra/with-let [dragged-over? (ra/atom false)]
-    (let [saved? @(rf/subscribe [::document.s/saved? key])]
+    (let [saved? @(rf/subscribe [::document.s/saved? k])]
       [:> ContextMenu/Root
        [:> ContextMenu/Trigger
         [:div.document-tab
          {:class [(when active? "active")
                   (when saved? "saved")]
           :on-wheel #(rf/dispatch [::document.e/scroll (.-deltaY %)])
           :on-pointer-down #(case (.-buttons %)
-                              4 (rf/dispatch [::document.e/close key true])
-                              1 (rf/dispatch [::document.e/set-active key])
+                              4 (rf/dispatch [::document.e/close k true])
+                              1 (rf/dispatch [::document.e/set-active k])
                               nil)
           :draggable true
-          :on-drag-start #(.setData (.-dataTransfer %) "key" (name key))
+          :on-drag-start #(.setData (.-dataTransfer %) "key" (name k))
           :on-drag-over #(.preventDefault %)
           :on-drag-enter #(reset! dragged-over? true)
           :on-drag-leave #(reset! dragged-over? false)
@@ -118,17 +118,17 @@
                      (rf/dispatch [::document.e/swap-position
                                    (-> (.getData (.-dataTransfer evt) "key")
                                        keyword)
-                                   key]))}
+                                   k]))}
          [:span.truncate.pointer-events-none
           (:title document)]
-         [close-button key saved?]]]
+         [close-button k saved?]]]
        [:> ContextMenu/Portal
         (into
          [:> ContextMenu/Content
           {:class "menu-content context-menu-content"}]
          (map (fn [item]
                 [ui/context-menu-item item])
-              (context-menu key)))]])))
+              (context-menu k)))]])))
 
 (defn tab-bar []
   (let [documents @(rf/subscribe [:documents])