[nvim] which-key plugin added, pyright fixed

This commit is contained in:
Dmitry Chumak
2025-03-10 22:09:13 +03:00
parent 4a89901c68
commit 4bf35a7004
3 changed files with 58 additions and 20 deletions

View File

@@ -13,10 +13,10 @@ require("mason-lspconfig").setup({
-- See `:help vim.diagnostic.*` for documentation on any of the below functions
--
local opts = { noremap = true, silent = true }
vim.keymap.set("n", "<space>e", vim.diagnostic.open_float, opts)
vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, opts)
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev, opts)
vim.keymap.set("n", "]d", vim.diagnostic.goto_next, opts)
vim.keymap.set("n", "<space>q", vim.diagnostic.setloclist, opts)
vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, opts)
local on_attach = function(client, bufnr)
-- Enable completion triggered by <c-x><c-o>
@@ -33,17 +33,17 @@ local on_attach = function(client, bufnr)
vim.keymap.set("n", "gd", vim.lsp.buf.definition, bufopts)
vim.keymap.set("n", "K", vim.lsp.buf.hover, bufopts)
vim.keymap.set("n", "gi", vim.lsp.buf.implementation, bufopts)
vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts)
vim.keymap.set("n", "<C-k>", vim.lsp.buf.signature_help, bufopts)
vim.keymap.set("n", "<space>wa", vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set("n", "<space>wr", vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set("n", "<space>wl", function()
vim.keymap.set("n", "<leader>wa", vim.lsp.buf.add_workspace_folder, bufopts)
vim.keymap.set("n", "<leader>wr", vim.lsp.buf.remove_workspace_folder, bufopts)
vim.keymap.set("n", "<leader>wl", function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end, bufopts)
vim.keymap.set("n", "<space>D", vim.lsp.buf.type_definition, bufopts)
vim.keymap.set("n", "<space>rn", vim.lsp.buf.rename, bufopts)
vim.keymap.set("n", "<space>ca", vim.lsp.buf.code_action, bufopts)
vim.keymap.set("n", "gr", vim.lsp.buf.references, bufopts)
vim.keymap.set("n", "<space>lf", function()
vim.keymap.set("n", "<leader>D", vim.lsp.buf.type_definition, bufopts)
vim.keymap.set("n", "<leader>rn", vim.lsp.buf.rename, bufopts)
vim.keymap.set("n", "<leader>ca", vim.lsp.buf.code_action, bufopts)
vim.keymap.set("n", "<leader>lf", function()
vim.lsp.buf.format({
async = true,
})
@@ -102,12 +102,27 @@ require("lspconfig").lua_ls.setup({
capabilities = capabilities,
handlers = handlers
})
require("lspconfig").gopls.setup {capabilities = capabilities, handlers = handlers}
require("lspconfig").bashls.setup {capabilities = capabilities, handlers = handlers,
require("lspconfig").gopls.setup { capabilities = capabilities, handlers = handlers, on_attach = on_attach}
require("lspconfig").bashls.setup { capabilities = capabilities, handlers = handlers,
on_attach = on_attach,
settings = {
bashIde = {
globPattern = "*@(.sh|.inc|.bash|.command)"
}
}
}
require'lspconfig'.pyright.setup{}
require("lspconfig").pyright.setup { capabilities = capabilities, handlers = handlers,
on_attach = on_attach,
settings = {
python = {
analysis = {
include = {
'~/arcadia',
'~/arcadia/yt/python',
'~/arcadia/contrib/libs/protobuf/python',
'~/arcadia/contrib/python',
}
}
}
}
}