disable fennel lsp once again

fedemengo · Oct 3, 2023 · f7337c6 · f7337c6
1 parent b29f8fe
commit f7337c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/fnl/mods/lsp/lsp.fnl b/fnl/mods/lsp/lsp.fnl
@@ -46,7 +46,7 @@
 
 (mason.setup)
 (masonlsp.setup {:ensure_installed [:gopls
-                                    :fennel_language_server
+                                    ;:fennel_language_server
                                     :clangd
                                     :bashls
                                     :dockerls
@@ -111,14 +111,14 @@
                                            :staticcheck true
                                            :usePlaceholders true}}}
                 :lua_ls {:settings {:Lua {:diagnostics {:globals [:vim]}}}}
-                :fennel_language_server {:default_config {:cmd [:$HOME/.local/bin/fennel-language-server]
-                                                          :filetypes [:fennel]
-                                                          :single_file_support true
-                                                          :root_dir (lsputil.root_pattern :fnl)
-                                                          :settings {:fennel {:workspace {:library (vim.api.nvim_list_runtime_paths)}
-                                                                              :diagnostics {:globals [:vim
-                                                                                                      :module
-                                                                                                      :autoload]}}}}}
+                ;:fennel_language_server {:default_config {:cmd [:$HOME/.local/bin/fennel-language-server]
+                ;                                          :filetypes [:fennel]
+                ;                                          :single_file_support true
+                ;                                          :root_dir (lsputil.root_pattern :fnl)
+                ;                                          :settings {:fennel {:workspace {:library (vim.api.nvim_list_runtime_paths)}
+                ;                                                              :diagnostics {:globals [:vim
+                ;                                                                                      :module
+                ;                                                                                      :autoload]}}}}}
                 :pylsp {:settings {:pylsp {:plugins {:pycodestyle {:enable true
                                                                    :ignore [;; expected 2 blank lines, found 1
                                                                             :E302

diff --git a/fnl/mods/tools/telescope.fnl b/fnl/mods/tools/telescope.fnl
@@ -155,8 +155,7 @@
 (map [:n] :gr themed_bufnr_lsp_refs {:desc "References [LSP]"})
 (map [:n] :gd themed_bufnr_lsp_defs {:desc "Definitions [LSP]"})
 (map [:n] :fd (bindf builtin.diagnostics ivy_config) {:desc :Diagnostics})
-(map [:n] :fe (bindf (bindf builtin.diagnostics {:severity_bound :ERROR :prompt_title "Workspace Errors"}) ivy_config)
-     {:desc "Diagnostics [ERR]"})
+(map [:n] :fe (bindf builtin.diagnostics (merge-table {:severity_bound :ERROR :prompt_title "Workspace Errors"} (deep-copy ivy_config))) {:desc "Diagnostics [ERR]"})
 
 (var pickers (require :telescope.pickers))
 (var finders (require :telescope.finders))