summaryrefslogtreecommitdiff
path: root/lua/plugins/lspconfig.lua
diff options
context:
space:
mode:
Diffstat (limited to 'lua/plugins/lspconfig.lua')
-rw-r--r--lua/plugins/lspconfig.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua
index ec41a3f..23ab2b2 100644
--- a/lua/plugins/lspconfig.lua
+++ b/lua/plugins/lspconfig.lua
@@ -36,7 +36,7 @@ local servers = {
allFeatures = true,
},
},
- ruff_lsp = {
+ ruff = {
init_options = {
settings = {
-- Any extra CLI arguments for `ruff` go here.
@@ -79,7 +79,7 @@ return {
'gopls',
'rust-analyzer',
'mypy',
- 'ruff-lsp',
+ 'ruff',
'pyright',
'lua-language-server',
'shfmt',
@@ -112,7 +112,7 @@ return {
{ 'folke/neodev.nvim', opts = {} },
},
config = function()
- local lspconfig = require('lspconfig')
+ local lspconfig = vim.lsp.config
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
local capabilities = vim.lsp.protocol.make_client_capabilities()
@@ -120,7 +120,7 @@ return {
-- TODO: change keybinds to the autocmd suggested by the lspconfig github
local on_attach = function(client, bufnr)
- if client.name == 'ruff_lsp' then
+ if client.name == 'ruff' then
-- Disable hover in favor of Pyright
client.server_capabilities.hoverProvider = false
end
@@ -178,7 +178,7 @@ return {
-- generic server setup
local function setup_server(server_name)
- lspconfig[server_name].setup({
+ lspconfig(server_name, {
capabilities = capabilities,
on_attach = on_attach,
settings = servers[server_name],
@@ -186,7 +186,7 @@ return {
end
-- setup_server('clangd')
- lspconfig['clangd'].setup({
+ lspconfig('clangd', {
capabilities = capabilities,
on_attach = function(client, bufnr)
-- Really only required if NvChad is used:
@@ -208,12 +208,12 @@ return {
setup_server('gopls')
setup_server('rust_analyzer')
setup_server('pyright')
- setup_server('ruff_lsp')
+ setup_server('ruff')
setup_server('lua_ls')
setup_server('bashls')
-- assumes localhost is mirrored (networkingMode=mirrored in .wslconfig)
-- setup_server('gdscript')
- lspconfig['gdscript'].setup({
+ lspconfig('gdscript', {
capabilities = capabilities,
on_attach = on_attach,
settings = servers['gdscript'],