From c2f6208139dc6fb8f76fff806e6808ff4cceb0a9 Mon Sep 17 00:00:00 2001 From: Gustaf Rydholm Date: Mon, 11 Apr 2022 19:56:36 +0200 Subject: refactor(lsp installer): rename lsp settings --- fnl/config/lsp/lsp-installer.fnl | 8 ++++---- fnl/config/lsp/settings/pyright.fnl | 2 +- fnl/config/lsp/settings/sumneko-lua.fnl | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'fnl/config/lsp') diff --git a/fnl/config/lsp/lsp-installer.fnl b/fnl/config/lsp/lsp-installer.fnl index 9522ef1..72bef8e 100644 --- a/fnl/config/lsp/lsp-installer.fnl +++ b/fnl/config/lsp/lsp-installer.fnl @@ -10,11 +10,11 @@ (let [jsonls-opts (require :config.lsp.settings.jsonls)] (vim.tbl_deep_extend :force jsonls-opts opts))) (when (= server.name :sumneko_lua) - (let [sumneko-lua-opts (require :config.lsp.settings.sumneko-lua)] - (vim.tbl_deep_extend :force sumneko-lua-opts.settings opts))) + (let [sumneko-lua (require :config.lsp.settings.sumneko-lua)] + (vim.tbl_deep_extend :force sumneko-lua.opts opts))) (when (= server.name :pyright) - (let [pyright-opts (require :config.lsp.settings.pyright)] - (vim.tbl_deep_extend :force pyright-opts.settings opts))) opts) + (let [pyright (require :config.lsp.settings.pyright)] + (vim.tbl_deep_extend :force pyright.opts opts))) opts) (let [lsp-installer (util.load-plugin :nvim-lsp-installer)] (lsp-installer.on_server_ready (fn [server] diff --git a/fnl/config/lsp/settings/pyright.fnl b/fnl/config/lsp/settings/pyright.fnl index 7269469..639ecff 100644 --- a/fnl/config/lsp/settings/pyright.fnl +++ b/fnl/config/lsp/settings/pyright.fnl @@ -1,4 +1,4 @@ ;; Config for pyright language server. (module config.lsp.settings.pyright) -(def settings {:settings {:python {:analysis {:typeCheckingMode :off}}}}) +(def opts {:settings {:python {:analysis {:typeCheckingMode :off}}}}) diff --git a/fnl/config/lsp/settings/sumneko-lua.fnl b/fnl/config/lsp/settings/sumneko-lua.fnl index cc8e9ab..90c8807 100644 --- a/fnl/config/lsp/settings/sumneko-lua.fnl +++ b/fnl/config/lsp/settings/sumneko-lua.fnl @@ -20,4 +20,4 @@ (def- runtime {:version :LuaJIT :path (vim.split package.path ";")}) -(def settings {:settings {:Lua {: diagnostics : workspace}}}) +(def opts {:settings {:Lua {: diagnostics : workspace}}}) -- cgit v1.2.3-70-g09d2