Skip to content

Update clojure-ts-mode support #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
borkdude merged 3 commits into from
Feb 18, 2024
Merged

Update clojure-ts-mode support #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
603fbef
Update clojure-ts major mode names
p4v4n Feb 18, 2024
719f8d7
Add tests for clojure-ts-mode
p4v4n Feb 18, 2024
1f394a9
Run clojure-ts-tests only when emacs-version >= 29.1
p4v4n Feb 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Eldev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
(eldev-use-package-archive 'melpa)

(eldev-add-extra-dependencies 'test 'clojure-mode)

(when (version<= "29.1" emacs-version)
(eldev-add-extra-dependencies 'test 'clojure-ts-mode))
8 changes: 4 additions & 4 deletions flycheck-clj-kondo.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ Argument EXTRA-ARGS: passes extra args to the checker."
;; Else use the mode to infer which language to turn on.
(pcase ,lang
("clj" (member major-mode '(clojure-mode clojure-ts-mode)))
("cljs" (member major-mode '(clojurescript-mode clojurescritps-ts-mode)))
("cljc" (member major-mode '(clojurec-mode clojurec-ts-mode))))))))
("cljs" (member major-mode '(clojurescript-mode clojure-ts-clojurescript-mode)))
("cljc" (member major-mode '(clojurec-mode clojure-ts-clojurec-mode))))))))

;; (macroexpand-1 '(flycheck-clj-kondo--define-checker clj-kondo-clj "clj" clojure-mode "--cache"))

Expand All @@ -97,8 +97,8 @@ Argument EXTRA-ARGS: passes extra args to the checker."
Argument EXTRA-ARGS: passes extra arguments to the checkers."
`(progn
(flycheck-clj-kondo--define-checker clj-kondo-clj "clj" (clojure-mode clojure-ts-mode) ,@extra-args)
(flycheck-clj-kondo--define-checker clj-kondo-cljs "cljs" (clojurescript-mode clojurescript-ts-mode) ,@extra-args)
(flycheck-clj-kondo--define-checker clj-kondo-cljc "cljc" (clojurec-mode clojurec-ts-mode) ,@extra-args)
(flycheck-clj-kondo--define-checker clj-kondo-cljs "cljs" (clojurescript-mode clojure-ts-clojurescript-mode) ,@extra-args)
(flycheck-clj-kondo--define-checker clj-kondo-cljc "cljc" (clojurec-mode clojure-ts-clojurec-mode) ,@extra-args)
(flycheck-clj-kondo--define-checker clj-kondo-edn "edn" (clojure-mode clojure-ts-mode) ,@extra-args)
(dolist (element '(clj-kondo-clj clj-kondo-cljs clj-kondo-cljc clj-kondo-edn))
(add-to-list 'flycheck-checkers element))))
Expand Down
55 changes: 55 additions & 0 deletions test/flycheck-clj-kondo-test.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,58 @@
(flycheck-ert-def-checker-test clj-kondo-clj clj utf8
(flycheck-ert-should-syntax-check
"test/corpus/utf8.clj" 'clojure-mode))

;; Tests for clojure-ts-mode

(when (version<= "29.1" emacs-version)
(flycheck-ert-def-checker-test clj-kondo-clj clj basic-ts
(flycheck-ert-should-syntax-check
"test/corpus/basic.clj" 'clojure-ts-mode
'(3 23 warning "unused binding y"
:checker clj-kondo-clj)
'(3 25 warning "unused binding z"
:checker clj-kondo-clj)
'(4 65 warning "unused binding y"
:checker clj-kondo-clj)
'(5 25 warning "unused binding y"
:checker clj-kondo-clj)
'(5 29 warning "unused binding zs"
:checker clj-kondo-clj)
'(7 1 error "corpus.basic/public-fixed is called with 1 arg but expects 3"
:checker clj-kondo-clj)
'(10 1 error "corpus.basic/public-multi-arity is called with 3 args but expects 1 or 2"
:checker clj-kondo-clj)
'(11 1 error "corpus.basic/public-varargs is called with 1 arg but expects 2 or more"
:checker clj-kondo-clj)))

(flycheck-ert-def-checker-test clj-kondo-cljc cljc basic-ts
(flycheck-ert-should-syntax-check
"test/corpus/basic.cljc" 'clojure-ts-clojurec-mode
'(3 26 warning "unused binding y"
:checker clj-kondo-cljc)
'(13 9 error "test.corpus.basic/foo is called with 1 arg but expects 2"
:checker clj-kondo-cljc)
'(14 10 error "test.corpus.basic/foo is called with 2 args but expects 1"
:checker clj-kondo-cljc)
'(21 1 error "test.corpus.basic/bar is called with 3 args but expects 1"
:checker clj-kondo-cljc)))

(flycheck-ert-def-checker-test clj-kondo-cljs cljs basic-ts
(flycheck-ert-should-syntax-check
"test/corpus/basic.cljs" 'clojure-ts-clojurescript-mode
'(3 5 error "Namespace name does not match file name: cond-without-else1"
:checker clj-kondo-cljs)
'(11 3 warning "use :else as the catch-all test expression in cond"
:checker clj-kondo-cljs)
'(18 3 warning "use :else as the catch-all test expression in cond"
:checker clj-kondo-cljs)))

(flycheck-ert-def-checker-test clj-kondo-edn edn basic-ts
(flycheck-ert-should-syntax-check
"test/corpus/basic.edn" 'clojure-ts-mode
'(1 10 error "duplicate key a"
:checker clj-kondo-edn)))

(flycheck-ert-def-checker-test clj-kondo-clj clj utf8-ts
(flycheck-ert-should-syntax-check
"test/corpus/utf8.clj" 'clojure-ts-mode)))