fix treesitter

Author: fedemengo

fnl/mods/lsp/lsp.fnl

@@ -133,7 +133,8 @@
                                                         :test true}
                                            :staticcheck true
                                            :usePlaceholders true}}}
-                :lua_ls {:settings {:Lua {:diagnostics {:globals [:vim]}}}}
+                :lua_ls {:filetypes [:lua]
+                         :settings {:Lua {:diagnostics {:globals [:vim]}}}}
                 ;:fennel_language_server {:default_config {:cmd [:$HOME/.local/bin/fennel-language-server]
                 ;                                          :filetypes [:fennel]
                 ;                                          :single_file_support true
@@ -142,7 +143,8 @@
                 ;                                                              :diagnostics {:globals [:vim
                 ;                                                                                      :module
                 ;                                                                                      :autoload]}}}}}
-                :pylsp {:settings {:pylsp {:plugins {:pycodestyle {:enable false
+                :pylsp {:filetypes [:python]
+                        :settings {:pylsp {:plugins {:pycodestyle {:enable false
                                                                    :ignore [;; continuation line indentation is not a multiple of four
                                                                             :E121
                                                                             ;; expected 2 blank lines, found 1
@@ -160,12 +162,21 @@
                                                      :pylsp_mypy {:enabled true
                                                                   :live_mode true}}}}
                         :plugins {:rope_autoimport {:enabled true}}}
+                :bashls {:filetypes [:bash :sh :zsh]}
+                :dockerls {:filetypes [:dockerfile]}
+                :jsonls {:filetypes [:json :jsonc]}
+                :sqlls {:filetypes [:sql]}
+                :jdtls {:filetypes [:java]}
+                :rust_analyzer {:filetypes [:rust]}
                 :clangd {:autostart true
                          :capabilities {:offsetEncoding :utf-8}
                          :filetypes [:c :cpp :cuda]}})
 
 (local default_lsp_capabilities (cmp_nvim_lsp.default_capabilities))
 
+(local enabled_servers [])
+(local ft_to_servers {})
+
 (let [installed ((. masonlsp :get_installed_servers))]
   (each [_ server (ipairs installed)]
     (let [opts (or (. lsp_opt server) {})]
@@ -174,4 +185,25 @@
                                                     default_lsp_capabilities
                                                     (or (. opts :capabilities) {})))
       (vim.lsp.config server opts)
-      (vim.lsp.enable server))))
+      (let [filetypes (or (. opts :filetypes)
+                          (. (. vim.lsp.config server) :filetypes)
+                          [])]
+        (each [_ ft (ipairs filetypes)]
+          (when (not (. ft_to_servers ft))
+            (tset ft_to_servers ft []))
+          (table.insert (. ft_to_servers ft) server))))))
+
+(vim.api.nvim_create_autocmd :FileType
+                             {:group (vim.api.nvim_create_augroup :lsp-enable
+                                                                  {:clear true})
+                              :callback (fn [ev]
+                                          (let [servers (or (. ft_to_servers
+                                                               (. ev :match))
+                                                            [])]
+                                            (each [_ server (ipairs servers)]
+                                              (when (not (. enabled_servers
+                                                             server))
+                                                (vim.lsp.enable server)
+                                                (tset enabled_servers
+                                                      server
+                                                      true)))))} )

fnl/mods/tools/treesitter.fnl

@@ -1,5 +1,24 @@
 (module mods.tools.treesitter {autoload {treesitter nvim-treesitter}})
 
+(local parsers [:commonlisp
+                :fennel
+                :go
+                :gomod
+                :gowork
+                :cpp
+                :python
+                :lua
+                :vim
+                :vimdoc
+                :bash
+                :gitcommit
+                :gitignore
+                :make
+                :diff
+                :dockerfile
+                :yaml
+                :json])
+
 (fn is-large-file [_ bufnr]
   (or (> (vim.fn.getfsize (vim.fn.bufname bufnr)) (* 1024 1024))
       ; 1MB is rarely source code
@@ -11,26 +30,31 @@
 (fn disable-indent [ft bufnr]
   (or (is-large-file ft bufnr) (is-filetype ft bufnr)))
 
-(treesitter.setup {:ensure_installed [:commonlisp
-                                      :fennel
-                                      :go
-                                      :gomod
-                                      :gowork
-                                      :cpp
-                                      :python
-                                      :lua
-                                      :vim
-                                      :vimdoc
-                                      :bash
-                                      :gitcommit
-                                      :gitignore
-                                      :make
-                                      :diff
-                                      :dockerfile
-                                      :yaml
-                                      :json]
-                   :sync_install false
-                   :indent {:enable true :disable disable-indent}
-                   :highlight {:enable true
-                               :disable is-large-file
-                               :additional_vim_regex_highlighting false}})
+(fn maybe-start-highlighter [bufnr]
+  (when (not (is-large-file nil bufnr))
+    (vim.api.nvim_buf_call bufnr
+                           (fn []
+                             (pcall vim.treesitter.start)))))
+
+(treesitter.setup)
+(treesitter.install parsers)
+
+(vim.api.nvim_create_autocmd :FileType
+                             {:group (vim.api.nvim_create_augroup :treesitter
+                                                                  {:clear true})
+                              :callback (fn [ev]
+                                          (let [bufnr (. ev :buf)
+                                                ft (vim.api.nvim_get_option_value :filetype
+                                                                                  {:buf bufnr})
+                                                indentexpr "v:lua.require'nvim-treesitter'.indentexpr()"]
+                                            (maybe-start-highlighter bufnr)
+                                            (if (disable-indent ft bufnr)
+                                                (when (= (vim.api.nvim_get_option_value :indentexpr
+                                                                                         {:buf bufnr})
+                                                         indentexpr)
+                                                  (vim.api.nvim_set_option_value :indentexpr
+                                                                                 ""
+                                                                                 {:buf bufnr}))
+                                                (vim.api.nvim_set_option_value :indentexpr
+                                                                               indentexpr
+                                                                               {:buf bufnr}))))})