Skip to content

Commit e2f837f

Browse files
ilmottailmotta
authored
Raise clj-kondo linter levels (#17289)
Recently, we changed clj-kondo default fail-level from "warning" to "error", but we missed the fact that we needed to raise the default level for all linters set to "warning".
1 parent 07d1b13 commit e2f837f

File tree

3 files changed

+90
-62
lines changed

3 files changed

+90
-62
lines changed

‎.clj-kondo/config.edn

Lines changed: 43 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,49 @@
99
status-im.utils.styles/defn clojure.core/defn
1010
test-helpers.unit/deftest-sub clojure.core/defn
1111
taoensso.tufte/defnp clojure.core/defn}
12-
:linters {:consistent-alias {:level :error
13-
:aliases {clojure.string string
14-
clojure.set set
15-
clojure.walk walk
16-
taoensso.timbre log}}
17-
:shadowed-var {:level :error
18-
;; We temporarily use :include to define an
19-
;; allowlist of core Clojure vars. In the
20-
;; future, as we progressively fix shadowed
21-
;; vars, we should be able to delete this
22-
;; option and lint all vars.
23-
:exclude [type name]}
24-
:invalid-arity {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
12+
:linters {:clj-kondo-config {:level :error}
13+
:cond-else {:level :error}
14+
:consistent-alias {:level :error
15+
:aliases {clojure.string string
16+
clojure.set set
17+
clojure.walk walk
18+
taoensso.timbre log}}
19+
:docstring-blank {:level :error}
20+
:inline-def {:level :error}
21+
:invalid-arity {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
22+
:loop-without-recur {:level :error}
23+
:misplaced-docstring {:level :error}
24+
:missing-body-in-when {:level :error}
25+
:missing-clause-in-try {:level :error}
26+
:missing-else-branch {:level :error}
27+
:not-empty? {:level :error}
28+
:quoted-case-test-constant {:level :error}
29+
:redundant-do {:level :error}
30+
:redundant-let {:level :error}
31+
:refer-all {:level :error}
32+
:shadowed-var {:level :error
33+
;; We temporarily use :include to define an
34+
;; allowlist of core Clojure vars. In the
35+
;; future, as we progressively fix shadowed
36+
;; vars, we should be able to delete this
37+
;; option and lint all vars.
38+
:exclude [type name]}
39+
:single-operand-comparison {:level :error}
40+
:syntax {:level :error}
41+
:unbound-destructuring-default {:level :error}
42+
:unknown-require-option {:level :error}
43+
:unreachable-code {:level :error}
44+
:unresolved-namespace {:level :error}
2545
;; TODO remove number when this is fixed
2646
;; https://github.com/borkdude/clj-kondo/issues/867
27-
:unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY
28-
number
29-
status-im.test-helpers/restore-app-db]}}
47+
:unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY
48+
number
49+
status-im.test-helpers/restore-app-db]}
50+
:unresolved-var {:level :error}
51+
:unused-binding {:level :error}
52+
:unused-import {:level :error}
53+
:unused-namespace {:level :error}
54+
:unused-private-var {:level :error}
55+
:unused-referred-var {:level :error}
56+
:use {:level :error}}
3057
:config-in-ns {mocks.js-dependencies {:linters {:clojure-lsp/unused-public-var {:level :off}}}}}

‎src/status_im/signals/core.cljs

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -96,52 +96,52 @@
9696
^js event-js (.-event data)
9797
type (.-type data)]
9898
(case type
99-
"node.login" (profile.login/login-node-signal cofx (transforms/js->clj event-js))
100-
"backup.performed" {:db (assoc-in db
101-
[:profile/profile :last-backup]
102-
(.-lastBackup event-js))}
103-
"envelope.sent" (transport.message/update-envelopes-status cofx
104-
(:ids
105-
(js->clj event-js
106-
:keywordize-keys
107-
true))
108-
:sent)
109-
"envelope.expired" (transport.message/update-envelopes-status cofx
110-
(:ids
111-
(js->clj event-js
112-
:keywordize-keys
113-
true))
114-
:not-sent)
115-
"message.delivered" (let [{:keys [chatID messageID]} (js->clj event-js
116-
:keywordize-keys
117-
true)]
118-
(models.message/update-db-message-status cofx
119-
chatID
120-
messageID
121-
:delivered))
122-
"mailserver.changed" (mailserver/handle-mailserver-changed cofx (.-id event-js))
123-
"mailserver.available" (mailserver/handle-mailserver-available cofx (.-id event-js))
124-
"mailserver.not.working" (mailserver/handle-mailserver-not-working cofx)
125-
"discovery.summary" (summary cofx (js->clj event-js :keywordize-keys true))
126-
"mediaserver.started" {:db (assoc db :mediaserver/port (.-port event-js))}
127-
"wakuv2.peerstats" (wakuv2-peer-stats cofx (js->clj event-js :keywordize-keys true))
128-
"messages.new" (transport.message/sanitize-messages-and-process-response cofx
129-
event-js
130-
true)
131-
"wallet" (ethereum.subscriptions/new-wallet-event cofx
99+
"node.login" (profile.login/login-node-signal cofx (transforms/js->clj event-js))
100+
"backup.performed" {:db (assoc-in db
101+
[:profile/profile :last-backup]
102+
(.-lastBackup event-js))}
103+
"envelope.sent" (transport.message/update-envelopes-status cofx
104+
(:ids
132105
(js->clj event-js
133106
:keywordize-keys
134107
true))
135-
"local-notifications" (local-notifications/process cofx
136-
(js->clj event-js :keywordize-keys true))
137-
"community.found" (link-preview/cache-community-preview-data (js->clj event-js
138-
:keywordize-keys
139-
true))
140-
"status.updates.timedout" (visibility-status-updates/handle-visibility-status-updates
141-
cofx
142-
(js->clj event-js :keywordize-keys true))
143-
"localPairing" (handle-local-pairing-signals
144-
cofx
145-
(js->clj event-js :keywordize-keys true))
108+
:sent)
109+
"envelope.expired" (transport.message/update-envelopes-status cofx
110+
(:ids
111+
(js->clj event-js
112+
:keywordize-keys
113+
true))
114+
:not-sent)
115+
"message.delivered" (let [{:keys [chatID messageID]} (js->clj event-js
116+
:keywordize-keys
117+
true)]
118+
(models.message/update-db-message-status cofx
119+
chatID
120+
messageID
121+
:delivered))
122+
"mailserver.changed" (mailserver/handle-mailserver-changed cofx (.-id event-js))
123+
"mailserver.available" (mailserver/handle-mailserver-available cofx (.-id event-js))
124+
"mailserver.not.working" (mailserver/handle-mailserver-not-working cofx)
125+
"discovery.summary" (summary cofx (js->clj event-js :keywordize-keys true))
126+
"mediaserver.started" {:db (assoc db :mediaserver/port (.-port event-js))}
127+
"wakuv2.peerstats" (wakuv2-peer-stats cofx (js->clj event-js :keywordize-keys true))
128+
"messages.new" (transport.message/sanitize-messages-and-process-response cofx
129+
event-js
130+
true)
131+
"wallet" (ethereum.subscriptions/new-wallet-event cofx
132+
(js->clj event-js
133+
:keywordize-keys
134+
true))
135+
"local-notifications" (local-notifications/process cofx
136+
(js->clj event-js :keywordize-keys true))
137+
"community.found" (link-preview/cache-community-preview-data (js->clj event-js
138+
:keywordize-keys
139+
true))
140+
"status.updates.timedout" (visibility-status-updates/handle-visibility-status-updates
141+
cofx
142+
(js->clj event-js :keywordize-keys true))
143+
"localPairing" (handle-local-pairing-signals
144+
cofx
145+
(js->clj event-js :keywordize-keys true))
146146

147147
(log/debug "Event " type " not handled"))))

‎src/status_im2/contexts/chat/messages/content/text/view.cljs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
[status-im2.contexts.chat.messages.content.link-preview.view :as link-preview]
77
[status-im2.contexts.chat.messages.content.text.style :as style]
88
[utils.i18n :as i18n]
9+
[react-native.platform :as platform]
910
[utils.re-frame :as rf]))
1011

1112
(defn render-inline
@@ -104,8 +105,8 @@
104105
(render-inline acc e chat-id style-override mention-first))
105106
[quo/text
106107
{:style {:size :paragraph-1
107-
:margin-bottom (if mention-first (if quo.platform/ios? 4 0) 2)
108-
:margin-top (if mention-first (if quo.platform/ios? -4 0) 2)
108+
:margin-bottom (if mention-first (if platform/ios? 4 0) 2)
109+
:margin-top (if mention-first (if platform/ios? -4 0) 2)
109110
:color (when (seq style-override) colors/white)}}]
110111
children)])
111112

0 commit comments

Comments
 (0)