diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua index c1d7813..3e2715d 100644 --- a/after/plugin/lsp.lua +++ b/after/plugin/lsp.lua @@ -2,46 +2,47 @@ local lsp = require('lsp-zero') lsp.preset('recommended') lsp.setup_servers({ - 'bashls', + 'basedpyright', + 'bashls', 'jsonls', - 'ccls', + 'ccls', 'csharp_ls', - 'gopls', - 'html', - 'htmx', - 'lua_ls', - 'ruby_lsp', - 'rust_analyzer', - 'yamlls' + 'gopls', + 'html', + 'htmx', + 'lua_ls', + 'ruby_lsp', + 'rust_analyzer', + 'yamlls' }) local cmp = require('cmp') -local cmp_select = {behavior = cmp.SelectBehavior.Select} +local cmp_select = { behavior = cmp.SelectBehavior.Select } local cmp_mappings = lsp.defaults.cmp_mappings({ - [''] = cmp.mapping.select_prev_item(cmp_select), - [''] = cmp.mapping.select_next_item(cmp_select), - [''] = cmp.mapping.confirm({ select = true}), - [""] = cmp.mapping.complete(), + [''] = cmp.mapping.select_prev_item(cmp_select), + [''] = cmp.mapping.select_next_item(cmp_select), + [''] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.complete(), }) lsp.set_preferences({ - sign_icons = { } + sign_icons = {} }) lsp.setup({ - mapping = cmp_mappings + mapping = cmp_mappings }) lsp.on_attach(function(client, bufnr) - local opts = {buffer = bufnr, remap = false} - vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) - vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) - vim.keymap.set("n", "vws", function() vim.diagnostic.workspace_symbol() end, opts) - vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) - vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) - vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) - vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) - vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) - vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) - vim.keymap.set("i", "", function() end, opts) + local opts = { buffer = bufnr, remap = false } + vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) + vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) + vim.keymap.set("n", "vws", function() vim.diagnostic.workspace_symbol() end, opts) + vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) + vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) + vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) + vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) + vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) + vim.keymap.set("i", "", function() end, opts) end)