From a23c5817466606256166a7511ba350cb829b2891 Mon Sep 17 00:00:00 2001 From: Proctor Date: Tue, 31 Jan 2023 13:13:30 -0600 Subject: [PATCH] Neovim: move from lsp-installer to mason --- .../nvim/fnl/dotfiles/plugin/lspconfig.fnl | 75 +++++++++---------- .../nvim/fnl/dotfiles/plugin/mason.fnl | 6 ++ nvim/.config/nvim/fnl/dotfiles/plugins.fnl | 4 +- 3 files changed, 44 insertions(+), 41 deletions(-) create mode 100644 nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl index 21bf051..ad3e403 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/lspconfig.fnl @@ -3,6 +3,7 @@ u dotfiles.util nvim aniseed.nvim lsp vim.lsp + lspconfig lspconfig nu aniseed.nvim.util cmp_nvim_lsp cmp_nvim_lsp}}) @@ -17,14 +18,14 @@ (nvim.fn.sign_define sign-level {:texthl sign-level :text sign :numhl sign-level}))) -; (define-sign :Error "â˜ĸī¸") -; (define-sign :Warn "⚠ī¸") -; (define-sign :SignHint "🔎") -; (define-sign :Info "ℹī¸") -(define-sign :Error :X) -(define-sign :Warn "!") -(define-sign :SignHint "?") -(define-sign :Info :i) +(define-sign :Error "â˜ĸī¸") +(define-sign :Warn "⚠ī¸") +(define-sign :SignHint "🔎") +(define-sign :Info "ℹī¸") +; (define-sign :Error :X) +; (define-sign :Warn "!") +; (define-sign :SignHint "?") +; (define-sign :Info :i) (def core-nmappings {:gd "lua vim.lsp.buf.definition()" @@ -86,6 +87,8 @@ :ua [:unwind-all []] :uw [:unwind-thread []]}}) +(def server-specific-opts {}) + (defn bind-client-mappings [client] (let [client-name (a.get client :name) mappings (a.get client-nmappings client-name) @@ -124,36 +127,28 @@ ; -- vim.api.nvim_command[[autocmd BufWritePre lua vim.lsp.buf_request_sync(vim.api.nvim_get_current_buf(), 'workspace/executeCommand', {command = 'clean-ns', arguments = {vim.uri_from_bufnr(1), vim.api.nvim_win_get_cursor(0)[1], vim.api.nvim_win_get_cursor(0)[2]}, title = 'Clean Namespace'})]] (print "LSP Client Attached.")) -(when-let [lspi (require :nvim-lsp-installer)] - (let [capabilities (cmp_nvim_lsp.default_capabilities (lsp.protocol.make_client_capabilities))] - (defn lsp-execute-command [cmd ...] - (let [buf-uri (vim.uri_from_bufnr 0) - cursor (vim.api.nvim_win_get_cursor 0) - r (- (a.first cursor) 1) - c (a.second cursor) - opts [buf-uri r c] - args (a.concat opts [...])] - (vim.lsp.buf.execute_command {:command cmd :arguments args}))) - (defn setup-servers [] - (lspi.on_server_ready (fn [server] - (let [opts {: on_attach - : capabilities - :flags {:debounce_text_changes 150}}] - (server:setup opts)))) - ;; (let [lspconfig (require :lspconfig) - ;; servers (lspi.get_installed_servers)] - ;; (each [_ server (pairs servers)] - ;; (server.setup {:on_attach on_attach :flags {:debounce_text_changes 150} }))) - ) - (defn on-post-install [] (setup-servers) (nvim.ex.bufdo :e)) - (setup-servers) - (set lspi.post_install_hook on-post-install) - (nu.fn-bridge :LspExecuteCommand :dotfiles.plugin.lspconfig - :lsp-execute-command {:return false}) - (u.nnoremap :li :LspInfo))) +(def base-server-opts + (let [capabilities (cmp_nvim_lsp.default_capabilities (lsp.protocol.make_client_capabilities))] + {: on_attach : capabilities :flags {:debounce_text_changes 150}})) -(comment (let [lspi (require :nvim-lsp-installer) - ;lspconfig (require :lspconfig) - servers (lspi.get_installed_servers)] - (each [_ server (pairs servers)] - (a.pr server)))) +(defn default-server-handler [server-name] + (let [specific-opts (a.get server-specific-opts server-name {}) + server (a.get lspconfig server-name) + server-opts (a.merge base-server-opts server-opts)] + (server.setup server-opts))) + +(defn lsp-execute-command [cmd ...] + (let [buf-uri (vim.uri_from_bufnr 0) + cursor (vim.api.nvim_win_get_cursor 0) + r (- (a.first cursor) 1) + c (a.second cursor) + opts [buf-uri r c] + args (a.concat opts [...])] + (vim.lsp.buf.execute_command {:command cmd :arguments args}))) + +(when-let [mason-lspconfig (require :mason-lspconfig)] (mason-lspconfig.setup) + (mason-lspconfig.setup_handlers {1 default-server-handler})) + +(u.nnoremap :li :LspInfo) +(nu.fn-bridge :LspExecuteCommand :dotfiles.plugin.lspconfig + :lsp-execute-command {:return false}) diff --git a/nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl b/nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl new file mode 100644 index 0000000..3fe2b6a --- /dev/null +++ b/nvim/.config/nvim/fnl/dotfiles/plugin/mason.fnl @@ -0,0 +1,6 @@ +(module dotfiles.plugin.mason + {autoload {nvim aniseed.nvim mason mason mason-lspconf mason-lspconfig}}) + +(mason.setup {:ui {:icons {:package_installed "✓"}}}) + +(mason-lspconf.setup {:ensure_installed [:sumneko_lua]}) diff --git a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl index 8f374b9..f7e111c 100644 --- a/nvim/.config/nvim/fnl/dotfiles/plugins.fnl +++ b/nvim/.config/nvim/fnl/dotfiles/plugins.fnl @@ -77,7 +77,9 @@ :tpope/vim-unimpaired {} :tpope/vim-vinegar {} :wbthomason/packer.nvim {:mod :packer} - :williamboman/nvim-lsp-installer {} + ;; :williamboman/nvim-lsp-installbuilder {} + :williamboman/mason.nvim {:mod :mason + :requires [:williamboman/mason-lspconfig.nvim]} ; NeoVim lsp server installs ; :luochen1990/rainbow {} ; :thecontinium/asyncomplete-conjure.vim {}