From fd7ac6710e98cce3d47c428a76a60fbdb81be981 Mon Sep 17 00:00:00 2001 From: Jeetaditya Chatterjee Date: Sun, 4 Dec 2022 03:10:55 +0000 Subject: [PATCH] feat(tree-sitter): add support for more languages In this case - lua - erlang - ess-r - yaml --- modules/lang/erlang/config.el | 5 ++++- modules/lang/ess/config.el | 3 +++ modules/lang/lua/config.el | 5 ++++- modules/lang/yaml/config.el | 2 ++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules/lang/erlang/config.el b/modules/lang/erlang/config.el index a686c7c35..edd3fd689 100644 --- a/modules/lang/erlang/config.el +++ b/modules/lang/erlang/config.el @@ -6,4 +6,7 @@ :mode ("/\\(?:app\\|sys\\)\\.config\\'" . erlang-mode) :config (when (modulep! +lsp) - (add-hook 'erlang-mode-local-vars-hook #'lsp! 'append))) + (add-hook 'erlang-mode-local-vars-hook #'lsp! 'append)) + + (when (modulep! +tree-sitter) + (add-hook 'erlang-mode-local-vars-hook #'tree-sitter! 'append))) diff --git a/modules/lang/ess/config.el b/modules/lang/ess/config.el index 07060a774..0bb2b84e4 100644 --- a/modules/lang/ess/config.el +++ b/modules/lang/ess/config.el @@ -23,6 +23,9 @@ (when (modulep! +lsp) (add-hook 'ess-r-mode-local-vars-hook #'lsp! 'append)) + (when (modulep! +tree-sitter) + (add-hook 'ess-r-mode-local-vars-hook #'tree-sitter! 'append)) + (set-repl-handler! 'ess-r-mode #'+ess/open-r-repl) (set-repl-handler! 'ess-julia-mode #'+ess/open-julia-repl) (set-lookup-handlers! '(ess-r-mode ess-julia-mode) diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el index ff3c13358..97286aa62 100644 --- a/modules/lang/lua/config.el +++ b/modules/lang/lua/config.el @@ -41,7 +41,10 @@ lua-language-server.") "-E" "-e" "LANG=en" (doom-path +lua-lsp-dir "main.lua"))) - (set-eglot-client! 'lua-mode (+lua-generate-lsp-server-command))))) + (set-eglot-client! 'lua-mode (+lua-generate-lsp-server-command))) + + (when (modulep! +tree-sitter!) + (add-hook 'lua-mode-local-vars-hook #'tree-sitter! 'append)))) (use-package! moonscript diff --git a/modules/lang/yaml/config.el b/modules/lang/yaml/config.el index 9ebb79637..684568c44 100644 --- a/modules/lang/yaml/config.el +++ b/modules/lang/yaml/config.el @@ -5,5 +5,7 @@ :init (when (modulep! +lsp) (add-hook 'yaml-mode-local-vars-hook #'lsp! 'append)) + (when (modulep! +tree-sitter) + (add-hook 'yaml-mode-local-vars-hook #'tree-sitter! 'append)) :config (setq-hook! 'yaml-mode-hook tab-width yaml-indent-offset))