refactor(tree-sitter): centralize grammar config & hacks

Easier to track and maintain.

modules/lang/cc/config.el

@@ -30,10 +30,8 @@ This is ignored by ccls.")
   :hook (c-mode-common . rainbow-delimiters-mode)
   :init
   (when (modulep! +tree-sitter)
-    (set-tree-sitter! 'c-mode 'c-ts-mode
-      '((c :url "https://github.com/tree-sitter/tree-sitter-c")))
-    (set-tree-sitter! 'c++-mode 'c++-ts-mode
-      '((cpp :url "https://github.com/tree-sitter/tree-sitter-cpp"))))
+    (set-tree-sitter! 'c-mode 'c-ts-mode 'c)
+    (set-tree-sitter! 'c++-mode 'c++-ts-mode 'cpp))
 
   :config
   (set-docsets! '(c-mode c-ts-mode) "C")
@@ -116,8 +114,7 @@ This is ignored by ccls.")
   :init
   (when (and (modulep! +tree-sitter)
              (boundp 'cmake-ts-mode)) ; 29+ only
-    (set-tree-sitter! 'cmake-mode 'cmake-ts-mode
-      '((cmake :url "https://github.com/uyha/tree-sitter-cmake"))))
+    (set-tree-sitter! 'cmake-mode 'cmake-ts-mode 'cmake))
   :config
   (set-docsets! '(cmake-mode cmake-ts-mode) "CMake")
   (set-popup-rule! "^\\*CMake Help\\*" :size 0.4 :ttl t)
@@ -160,12 +157,7 @@ This is ignored by ccls.")
     '((cuda :url "https://github.com/tree-sitter-grammars/tree-sitter-cuda")))
   :config
   (when (modulep! +lsp)
-    (add-hook 'cuda-ts-mode-local-vars-hook #'lsp! 'append))
-  ;; HACK: Remove redundant entries so we can rely solely on
-  ;;   `major-mode-remap-defaults' et co.
-  (rassq-delete-all 'cuda-ts-mode auto-mode-alist)
-  (cl-callf2 delete '(cuda "https://github.com/tree-sitter-grammars/tree-sitter-cuda" nil nil nil nil)
-             treesit-language-source-alist))
+    (add-hook 'cuda-ts-mode-local-vars-hook #'lsp! 'append)))
 
 
 (use-package! demangle-mode

modules/lang/clojure/config.el

@@ -62,7 +62,6 @@
   ;; HACK: Rely on `major-mode-remap-defaults' instead (upstream also doesn't
   ;;   check if the grammars are ready before adding these entries, which will
   ;;   bork clojure buffers.
-  (cl-callf2 rassq-delete-all 'clojure-ts-mode auto-mode-alist)
   (cl-callf2 rassq-delete-all 'clojure-ts-clojurescript-mode auto-mode-alist)
   (cl-callf2 rassq-delete-all 'clojure-ts-clojurec-mode auto-mode-alist)
   (cl-callf2 rassq-delete-all 'clojure-ts-clojuredart-mode auto-mode-alist)

modules/lang/csharp/config.el

@@ -2,6 +2,9 @@
 
 (use-package! csharp-mode
   :hook (csharp-mode . rainbow-delimiters-mode)
+  :init
+  (when (modulep! +tree-sitter)
+    (set-tree-sitter! 'csharp-mode 'csharp-ts-mode 'c-sharp))
   :config
   (set-formatter! 'csharpier '("csharpier" "format" "--write-stdout")
     :modes '(csharp-mode csharp-ts-mode))
@@ -38,26 +41,12 @@
     (add-hook 'csharp-mode-local-vars-hook #'lsp! 'append)
     (add-hook 'csharp-ts-mode-local-vars-hook #'lsp! 'append))
 
-  (when (and (modulep! +tree-sitter)
-             (fboundp 'csharp-ts-mode)) ; 29.1+ only
-    (set-tree-sitter! 'csharp-mode 'csharp-ts-mode
-      '((c-sharp :url "https://github.com/tree-sitter/tree-sitter-c-sharp"
-                 :rev "v0.23.1"))))
-
   (defadvice! +csharp-disable-clear-string-fences-a (fn &rest args)
     "This turns off `c-clear-string-fences' for `csharp-mode'. When
 on for `csharp-mode' font lock breaks after an interpolated string
 or terminating simple string."
     :around #'csharp-disable-clear-string-fences
     (unless (eq major-mode 'csharp-mode)
-      (apply fn args)))
-
-  ;; HACK: `csharp-ts-mode' changes `auto-mode-alist' every time the mode is
-  ;;   activated, which runs the risk of overwriting user (or Doom) entries.
-  ;; REVIEW: Should be addressed upstream.
-  (defadvice! +csharp--undo-ts-side-effects-a (fn &rest args)
-    :around #'csharp-ts-mode
-    (let (auto-mode-alist)
       (apply fn args))))
 
 

modules/lang/elixir/config.el

@@ -59,16 +59,8 @@
   :when (fboundp 'elixir-ts-mode) ; 30.1+ only
   :defer t
   :init
-  (set-tree-sitter! 'elixir-mode 'elixir-ts-mode
-    '((elixir :url "https://github.com/elixir-lang/tree-sitter-elixir"
-              :rev "v0.3.3")
-      (heex :url "https://github.com/phoenixframework/tree-sitter-heex"
-            :rev "v0.7.0")))
+  (set-tree-sitter! 'elixir-mode 'elixir-ts-mode '(elixir heex))
   :config
-  ;; HACK: Rely on `major-mode-remap-defaults' (and elixir-mode's autoloaded
-  ;;   auto-mode-alist entries).
-  (cl-callf2 rassq-delete-all 'elixir-ts-mode auto-mode-alist)
-
   (+elixir-common-config 'elixir-ts-mode))
 
 

modules/lang/go/config.el

@@ -53,10 +53,7 @@
   :when (fboundp 'go-ts-mode) ; 31.1+ only
   :defer t
   :init
-  (set-tree-sitter! 'go-mode 'go-ts-mode
-    '((go :url "https://github.com/tree-sitter/tree-sitter-go" :ref "v0.23.4")
-      (gomod :url "https://github.com/camdencheek/tree-sitter-go-mod" :ref "v1.1.0")
-      (gowork :url "https://github.com/omertuc/tree-sitter-go-work")))
+  (set-tree-sitter! 'go-mode 'go-ts-mode '(go gomod gowork))
   :config
   (+go-common-config 'go-ts-mode))
 

modules/lang/janet/config.el

@@ -30,9 +30,4 @@
   :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))
+                   :cc ,(if (featurep :system 'windows) "gcc.exe"))))

modules/lang/json/config.el

@@ -25,9 +25,7 @@
   :when (fboundp 'json-ts-mode) ; 29.1+ only
   :defer t
   :init
-  (set-tree-sitter! 'json-mode 'json-ts-mode
-    '((json :url "https://github.com/tree-sitter/tree-sitter-json"
-            :rev "v0.24.8")))
+  (set-tree-sitter! 'json-mode 'json-ts-mode 'json)
   :config
   ;; HACK: Rely on `major-mode-remap-defaults'.
   (cl-callf2 assq-delete-all 'json-ts-mode auto-mode-alist)

modules/lang/julia/config.el

@@ -48,9 +48,7 @@
   :when (modulep! +tree-sitter)
   :defer t
   :init
-  (set-tree-sitter! 'julia-mode 'julia-ts-mode
-    '((julia :url "https://github.com/tree-sitter/tree-sitter-julia"
-             :rev "v0.23.1")))
+  (set-tree-sitter! 'julia-mode 'julia-ts-mode 'julia)
   :config
   (when (modulep! +lsp)
     (add-hook 'julia-ts-mode-local-vars-hook #'lsp! 'append)))

modules/lang/lua/config.el

@@ -30,9 +30,7 @@
   :when (fboundp 'lua-ts-mode) ; 30.1+ only
   :defer t
   :init
-  (set-tree-sitter! 'lua-mode 'lua-ts-mode
-    '((lua :url "https://github.com/tree-sitter-grammars/tree-sitter-lua"
-           :rev "v0.3.0")))
+  (set-tree-sitter! 'lua-mode 'lua-ts-mode 'lua)
   :config
   (set-lookup-handlers! 'lua-ts-mode :documentation 'lua-search-documentation)
   (set-electric! 'lua-ts-mode :words '("else" "end"))

modules/lang/markdown/config.el

@@ -131,14 +131,7 @@ capture, the end position, and the output buffer.")
   :when (fboundp 'markdown-ts-mode)
   :defer t
   :init
-  (set-tree-sitter! 'markdown-mode 'markdown-ts-mode
-    '((markdown :url "https://github.com/tree-sitter-grammars/tree-sitter-markdown"
-                :rev "v0.4.1"
-                :source-dir "tree-sitter-markdown-inline/src")
-      (markdown-inline :url "https://github.com/tree-sitter-grammars/tree-sitter-markdown"
-                       :rev "v0.4.1"
-                       :source-dir "tree-sitter-markdown-inline/src")))
-
+  (set-tree-sitter! 'markdown-mode 'markdown-ts-mode '(markdown markdown-inline))
   :config
   (cl-callf2 delete '("\\.md\\'" . markdown-ts-mode) auto-mode-alist))
 

modules/lang/php/config.el

@@ -83,16 +83,8 @@
   :when (fboundp 'php-ts-mode) ; 30.1+ only
   :defer t
   :init
-  (set-tree-sitter! 'php-mode 'php-ts-mode
-    '((php :url "https://github.com/tree-sitter/tree-sitter-php"
-       :rev "v0.23.11"
-       :source-dir "php/src")
-      (phpdoc :url "https://github.com/claytonrcarter/tree-sitter-phpdoc")))
+  (set-tree-sitter! 'php-mode 'php-ts-mode '(php phpdoc))
   :config
-  ;; HACK: Rely on `major-mode-remap-defaults'.
-  (cl-callf2 rassq-delete-all 'php-ts-mode auto-mode-alist)
-  (cl-callf2 rassq-delete-all 'php-ts-mode interpreter-mode-alist)
-
   (+php-common-config 'php-ts-mode))
 
 

modules/lang/python/config.el

@@ -20,8 +20,7 @@
         python-indent-guess-indent-offset-verbose nil)
 
   (when (modulep! +tree-sitter)
-    (set-tree-sitter! 'python-mode 'python-ts-mode
-      '((python :url "https://github.com/tree-sitter/tree-sitter-python"))))
+    (set-tree-sitter! 'python-mode 'python-ts-mode 'python))
 
   :config
   ;; HACK: `python-base-mode' (and `python-ts-mode') don't exist on pre-29
@@ -98,16 +97,7 @@
 
   ;; HACK: `python-mode' doesn't update `tab-width' to reflect
   ;;   `python-indent-offset', causing issues anywhere `tab-width' is respected.
-  (setq-hook! '(python-mode-hook python-ts-mode-hook) tab-width python-indent-offset)
-
-  ;; HACK: `python-ts-mode' changes `auto-mode-alist' and
-  ;;   `interpreter-mode-alist' every time the mode is activated, which runs the
-  ;;   risk of overwriting user (or Doom) entries.
-  ;; REVIEW: Should be addressed upstream.
-  (defadvice! +python--undo-ts-side-effects-a (fn &rest args)
-    :around #'python-ts-mode
-    (let (auto-mode-alist interpreter-mode-alist)
-      (apply fn args))))
+  (setq-hook! '(python-mode-hook python-ts-mode-hook) tab-width python-indent-offset))
 
 
 (use-package! pyimport

modules/lang/ruby/config.el

@@ -41,8 +41,7 @@
   :when (fboundp 'ruby-ts-mode) ; 29.1+ only
   :defer t
   :init
-  (set-tree-sitter! 'ruby-mode 'ruby-ts-mode
-    '((ruby :url "https://github.com/tree-sitter/tree-sitter-ruby")))
+  (set-tree-sitter! 'ruby-mode 'ruby-ts-mode 'ruby)
   :config
   (set-electric! 'ruby-ts-mode :words '("else" "end" "elsif"))
   (set-repl-handler! 'ruby-ts-mode #'inf-ruby)

modules/lang/yaml/config.el

@@ -12,12 +12,7 @@
   :when (modulep! +tree-sitter)
   :when (fboundp 'yaml-ts-mode) ; 29.1+ only
   :init
-  (set-tree-sitter! 'yaml-mode 'yaml-ts-mode
-    '((yaml :url "https://github.com/tree-sitter-grammars/tree-sitter-yaml"
-            :rev "v0.7.0")))
+  (set-tree-sitter! 'yaml-mode 'yaml-ts-mode 'yaml)
   :config
-  ;; HACK: Rely on `major-mode-remap-defaults'.
-  (cl-callf2 rassq-delete-all 'yaml-ts-mode auto-mode-alist)
-
   (when (modulep! +lsp)
     (add-hook 'yaml-ts-mode-local-vars-hook #'lsp! 'append)))

modules/lang/zig/config.el

@@ -47,7 +47,4 @@
     '((zig :url "https://github.com/tree-sitter/zig-tree-sitter"
            :rev "v0.25.0")))
   :config
-  ;; HACK: Rely on `major-mode-remap-defaults'
-  (cl-callf2 rassq-delete-all 'zig-ts-mode auto-mode-alist)
-
   (+zig-common-config 'zig-ts-mode))