Clean up names and make spellcheck default for text bufs

This commit is contained in:
2022-12-02 19:22:59 -08:00
parent 77e6a35fa1
commit ea3ef70214
4 changed files with 34 additions and 29 deletions

View File

@ -4,17 +4,17 @@
(fn configure []
(hook! :FileType :java
#(let [root_dir (module-call! :jdtls.setup :find_root
#(let [root-dir (module-call! :jdtls.setup :find_root
[ ".git" "mvnw" "gradlew" "build.gradle" ])
lsp_cap (module-call! :cmp_nvim_lsp :default_capabilities)]
lsp-cap (module-call! :cmp_nvim_lsp :default_capabilities)]
(module-call! :jdtls :start_or_attach
{ :capabilities lsp_cap
{ :capabilities lsp-cap
:on_attach (module-fn! :plugin.lsp :on-attach)
:root_dir root_dir
:root_dir root-dir
:cmd [ "jdtls"
"-data"
(module-call! :plugin.lsp
:get-data-dir
:jdtls root_dir) ]}))))
:jdtls root-dir) ]}))))
{: configure}

View File

@ -39,24 +39,24 @@
(fn configure []
(let [lsp (require :lspconfig)
configs (require :lspconfig.configs)
lsp_cap ((. (require :cmp_nvim_lsp) :default_capabilities))
lsp_utils (require :plugin.lsp)]
(macro setup_server! [name ...]
(let [opts { :on-attach `lsp_utils.on_attach
:capabilities `lsp_cap }]
(var last_key nil)
lsp-cap ((. (require :cmp_nvim_lsp) :default_capabilities))
lsp-utils (require :plugin.lsp)]
(macro setup-server! [name ...]
(let [opts { :on-attach `lsp-utils.on-attach
:capabilities `lsp-cap }]
(var last-key nil)
(each [_ val (ipairs [...])]
(if last_key
(do (tset opts last_key val)
(set last_key nil))
(set last_key val)))
(if last-key
(do (tset opts last-key val)
(set last-key nil))
(set last-key val)))
`((. (. lsp ,name) :setup) ,opts)))
(setup_server! :ccls)
(setup_server! :cmake)
(setup_server! :gopls)
(setup_server! :rust_analyzer)
(setup_server! :texlab)
(setup_server! :sumneko_lua
(setup-server! :ccls)
(setup-server! :cmake)
(setup-server! :gopls)
(setup-server! :rust_analyzer)
(setup-server! :texlab)
(setup-server! :sumneko_lua
:settings {
:Lua {
:runtime {
@ -82,6 +82,6 @@
:globals [ "vim" ] }}}}})
; needed to make it not complain about a nil setup function
(if configs.fennel_language_server.setup
(setup_server! :fennel_language_server))))
(setup-server! :fennel_language_server))))
{ : configure : on-attach : get-data-dir }