Nvim: switch from nvim-lsp-installer to masonry.nvim

This commit is contained in:
Marko Korhonen 2022-08-22 14:34:12 +03:00
parent d2821f9ba8
commit 9ef1115fa2
No known key found for this signature in database
GPG Key ID: 911B85FBC6003FE5
2 changed files with 32 additions and 36 deletions

View File

@ -1,6 +1,5 @@
local lsp_installer = require('nvim-lsp-installer')
local M = {}
local lspconfig = require('lspconfig');
M.lsp_map_keys = function(server, bufnr)
local function map_key(...)
@ -50,23 +49,23 @@ capabilities = require('cmp_nvim_lsp').update_capabilities(capabilities)
-- Setup LSP signature plugin
require('lsp_signature').setup()
-- Register a handler that will be called for all installed servers.
lsp_installer.on_server_ready(function(server)
-- Don't setup jdtls here since it is done by nvim-jdtls
if server.name == 'jdtls' then return end
-- Setup mason
require("mason").setup()
require("mason-lspconfig").setup({automatic_installation = true})
local opts = {}
-- LSP servers setup
lspconfig.tsserver.setup {{}, on_attach = M.lsp_map_keys}
lspconfig.yamlls.setup {{}, on_attach = M.lsp_map_keys}
lspconfig.jsonls.setup {{}, on_attach = M.lsp_map_keys}
-- Lua specific settings
if server.name == 'sumneko_lua' then
local runtime_path = vim.split(package.path, ';')
opts.settings = {
lspconfig.sumneko_lua.setup {
settings = {
Lua = {
runtime = {
-- Tell the language server which version of Lua you're using (most likely LuaJIT in the case of Neovim)
version = 'LuaJIT',
-- Setup your lua path
path = runtime_path
path = vim.split(package.path, ';')
},
diagnostics = {
-- Get the language server to recognize the `vim` global
@ -79,12 +78,9 @@ lsp_installer.on_server_ready(function(server)
-- Do not send telemetry data containing a randomized but unique identifier
telemetry = {enable = false}
}
}
end
opts.on_attach = M.lsp_map_keys
opts.capabilities = capabilities
server:setup(opts)
end)
},
on_attach = M.lsp_map_keys,
capabilities = capabilities
}
return M

View File

@ -65,7 +65,7 @@ require('packer').startup(function()
use 'neovim/nvim-lspconfig'
-- Install LSP server executables
use 'williamboman/nvim-lsp-installer'
use {"williamboman/mason.nvim", "williamboman/mason-lspconfig.nvim"}
-- Additional LSP features for Java
use 'mfussenegger/nvim-jdtls'