diff --git a/modules/lang/janet/README.org b/modules/lang/janet/README.org index 44cfe98f5..65e09c2ea 100644 --- a/modules/lang/janet/README.org +++ b/modules/lang/janet/README.org @@ -12,7 +12,9 @@ This module adds rudimentary support for the [[https://janet-lang.org/][Janet pr [[doom-contrib-maintainer:][Become a maintainer?]] ** Module flags -/This module has no flags./ +- +tree-sitter :: + Leverages tree-sitter for better syntax highlighting and structural text + editing. Requires [[doom-module::tools tree-sitter]]. ** Packages - [[doom-package:janet-mode]] diff --git a/modules/lang/janet/config.el b/modules/lang/janet/config.el index cf26fbd66..00c4f0a42 100644 --- a/modules/lang/janet/config.el +++ b/modules/lang/janet/config.el @@ -24,16 +24,15 @@ (put sym 'janet-indent-function 'defun))) -;; (use-package! janet-ts-mode -;; :when (modulep! +tree-sitter) -;; :defer t -;; :init -;; (set-tree-sitter! 'janet-mode 'janet-ts-mode -;; `(janet-simple :url "https://github.com/sogaiu/tree-sitter-janet-simple" -;; :cc ,(if (featurep :system 'windows) "gcc.exe"))) -;; :config -;; ;; HACK: These autoloads are inserted twice by this package, so remove them so -;; ;; this module can be the single source of truth. -;; (cl-callf2 delete '("\\.janet\\'" . janet-ts-mode) auto-mode-alist) -;; (cl-callf2 delete '("\\.jdn\\'" . janet-ts-mode) auto-mode-alist) -;; (cl-callf2 delete '("janet" . janet-ts-mode) interpreter-mode-alist)) +(use-package! janet-ts-mode + :when (modulep! +tree-sitter) + :defer t + :init + (set-tree-sitter! 'janet-mode 'janet-ts-mode + `(janet-simple :url "https://github.com/sogaiu/tree-sitter-janet-simple" + :cc ,(if (featurep :system 'windows) "gcc.exe"))) + :config + ;; HACK: These entries are inserted twice by this package, so remove them so + ;; this module can be the single source of truth. + (cl-callf2 rassq-delete-all 'janet-ts-mode auto-mode-alist) + (cl-callf2 rassq-delete-all 'janet-ts-mode interpreter-mode-alist)) diff --git a/modules/lang/janet/packages.el b/modules/lang/janet/packages.el index ba107e355..88409a9d9 100644 --- a/modules/lang/janet/packages.el +++ b/modules/lang/janet/packages.el @@ -5,7 +5,7 @@ :recipe (:files ("*.el")) :pin "9e3254a0249d720d5fa5603f1f8c3ed0612695af") -;; (when (modulep! +tree-sitter) -;; (package! janet-ts-mode -;; :recipe (:host github :repo "sogaiu/janet-ts-mode") -;; :pin "ac684edf57e4d4e085cf99d5ad2ee084b46b8123")) +(when (modulep! +tree-sitter) + (package! janet-ts-mode + :recipe (:host github :repo "sogaiu/janet-ts-mode") + :pin "ac684edf57e4d4e085cf99d5ad2ee084b46b8123"))