sonny/development
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace deprecated nvim_lsp usage

Browse source
This commit is contained in:
Sonny Bakker 2025-10-08 20:54:10 +02:00
parent 224b9d08f0
commit 95c5cddab2
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

36
templates/nvim/lua/lsp.lua.j2
View file

@ -29,7 +29,7 @@ end
--enable some language servers with the additional completion capabilities --enable some language servers with the additional completion capabilities
--offered by nvim-cmp --offered by nvim-cmp
local servers = { local auto_setup_servers = {
{% for item in language_servers %} {% for item in language_servers %}
{% if item.auto_setup and not loop.last %} {% if item.auto_setup and not loop.last %}
'{{ item.server_name }}', '{{ item.server_name }}',
@ -43,10 +43,8 @@ local servers = {
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
local nvim_lsp = require('lspconfig') for _, lsp in ipairs(auto_setup_servers) do
vim.lsp.config[lsp] = {
for _, lsp in ipairs(servers) do
nvim_lsp[lsp].setup {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
} }
@ -60,26 +58,26 @@ local python_root_dir = function(fname)
util.path.dirname(fname) util.path.dirname(fname)
end end
nvim_lsp.ruff.setup { vim.lsp.config['ruff'] = {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
root_dir = python_root_dir root_dir = python_root_dir
} }
nvim_lsp.pyright.setup { vim.lsp.config['pyright'] = {
settings = { settings = {
pyright = { pyright = {
-- Using Ruff's import organizer -- Using Ruff's import organizer
disableOrganizeImports = true, disableOrganizeImports = true,
}, },
}, }
} }
local snippet_capabilities = vim.deepcopy(capabilities); local snippet_capabilities = vim.deepcopy(capabilities);
snippet_capabilities.textDocument.completion.completionItem.snippetSupport = true snippet_capabilities.textDocument.completion.completionItem.snippetSupport = true
nvim_lsp.html.setup { vim.lsp.config['html'] = {
on_attach = on_attach, on_attach = on_attach,
capabilities = snippet_capabilities, capabilities = snippet_capabilities,
filetypes = { 'html', 'htmldjango' }, filetypes = { 'html', 'htmldjango' },
@ -92,17 +90,17 @@ nvim_lsp.html.setup {
} }
} }
nvim_lsp.cssls.setup { vim.lsp.config['cssls'] = {
on_attach = on_attach, on_attach = on_attach,
capabilities = snippet_capabilities, capabilities = snippet_capabilities,
} }
nvim_lsp.jsonls.setup { vim.lsp.config['jsonls'] = {
on_attach = on_attach, on_attach = on_attach,
capabilities = snippet_capabilities, capabilities = snippet_capabilities,
} }
nvim_lsp.lua_ls.setup { vim.lsp.config['lua_ls'] = {
on_attach = on_attach, on_attach = on_attach,
capabilities = snippet_capabilities, capabilities = snippet_capabilities,
settings = { settings = {
@ -115,12 +113,24 @@ nvim_lsp.lua_ls.setup {
} }
{% endif %} {% endif %}
nvim_lsp.yamlls.setup { vim.lsp.config['yamlls'] = {
on_attach = on_attach, on_attach = on_attach,
capabilities = capabilities, capabilities = capabilities,
filetypes = { 'yaml', 'yaml.ansible', 'yaml.docker-compose', 'yaml.gitlab' } filetypes = { 'yaml', 'yaml.ansible', 'yaml.docker-compose', 'yaml.gitlab' }
} }
local servers = {
{% for item in language_servers %}
{% if not loop.last %}
'{{ item.server_name }}',
{% else %}
'{{ item.server_name }}'
{% endif %}
{% endfor %}
}
vim.lsp.enable { unpack(servers) }
local cmp = require('cmp') local cmp = require('cmp')
local luasnip = require('luasnip') local luasnip = require('luasnip')