Updgraded python linters and formatters. Changed zoo of them to one ruff
This commit is contained in:
parent
22e0121ba7
commit
b05e831bd2
3 changed files with 116 additions and 99 deletions
|
|
@ -1,109 +1,136 @@
|
||||||
return {
|
return {
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
event = { "BufReadPre", "BufNewFile" },
|
event = { "BufReadPre", "BufNewFile" },
|
||||||
dependencies = {
|
dependencies = {
|
||||||
"hrsh7th/cmp-nvim-lsp",
|
"hrsh7th/cmp-nvim-lsp",
|
||||||
-- Some additional QOL impovements like rename imports when file is renamed
|
-- Some additional QOL impovements like rename imports when file is renamed
|
||||||
{ "antosha417/nvim-lsp-file-operations", config = true },
|
{ "antosha417/nvim-lsp-file-operations", config = true },
|
||||||
-- Improved functionality when working with neovim config
|
-- Improved functionality when working with neovim config
|
||||||
{ "folke/neodev.nvim", opts = {} },
|
{ "folke/neodev.nvim", opts = {} },
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
-- import lspconfig plugin
|
-- import lspconfig plugin
|
||||||
local lspconfig = require("lspconfig")
|
local lspconfig = require("lspconfig")
|
||||||
|
|
||||||
-- import mason_lspconfig plugin
|
-- import mason_lspconfig plugin
|
||||||
local mason_lspconfig = require("mason-lspconfig")
|
local mason_lspconfig = require("mason-lspconfig")
|
||||||
|
|
||||||
-- import cmp-nvim-lsp plugin
|
-- import cmp-nvim-lsp plugin
|
||||||
local cmp_nvim_lsp = require("cmp_nvim_lsp")
|
local cmp_nvim_lsp = require("cmp_nvim_lsp")
|
||||||
|
|
||||||
local keymap = vim.keymap -- for conciseness
|
-- Ruff setup
|
||||||
|
lspconfig.ruff.setup({
|
||||||
|
init_options = {
|
||||||
|
settings = {
|
||||||
|
-- Ruff language server settings go here
|
||||||
|
logLevel = "debug",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
-- nvim_create_autocmd - used to execute some logic automaticaly on a specific event
|
-- Pyright setup
|
||||||
-- Here it is used the LSP server attaches to file
|
lspconfig.pyright.setup({
|
||||||
vim.api.nvim_create_autocmd("LspAttach", {
|
settings = {
|
||||||
-- Grouping together autocommands. Here we creating new group and calling it "UserLspConfig"
|
pyright = {
|
||||||
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
|
-- Using Ruff's import organizer
|
||||||
-- callback defining logic to execute on the event
|
disableOrganizeImports = true,
|
||||||
callback = function(ev)
|
},
|
||||||
-- Buffer local mappings.
|
python = {
|
||||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
analysis = {
|
||||||
local opts = { buffer = ev.buf, silent = true }
|
-- Ignore all files for analysis to exclusively use Ruff for linting
|
||||||
|
ignore = { "*" },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
-- set keybinds
|
local keymap = vim.keymap -- for conciseness
|
||||||
opts.desc = "Show LSP references"
|
|
||||||
keymap.set("n", "gR", "<cmd>Telescope lsp_references<CR>", opts) -- show definition, references
|
|
||||||
|
|
||||||
opts.desc = "Go to declaration"
|
-- nvim_create_autocmd - used to execute some logic automaticaly on a specific event
|
||||||
keymap.set("n", "gD", vim.lsp.buf.declaration, opts) -- go to declaration
|
-- Here it is used the LSP server attaches to file
|
||||||
|
vim.api.nvim_create_autocmd("LspAttach", {
|
||||||
|
-- Grouping together autocommands. Here we creating new group and calling it "UserLspConfig"
|
||||||
|
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
|
||||||
|
-- callback defining logic to execute on the event
|
||||||
|
callback = function(ev)
|
||||||
|
-- Buffer local mappings.
|
||||||
|
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||||
|
local opts = { buffer = ev.buf, silent = true }
|
||||||
|
|
||||||
opts.desc = "Show LSP definitions"
|
-- set keybinds
|
||||||
keymap.set("n", "gd", "<cmd>Telescope lsp_definitions<CR>", opts) -- show lsp definitions
|
opts.desc = "Show LSP references"
|
||||||
|
keymap.set("n", "gR", "<cmd>Telescope lsp_references<CR>", opts) -- show definition, references
|
||||||
|
|
||||||
opts.desc = "Show LSP implementations"
|
opts.desc = "Go to declaration"
|
||||||
keymap.set("n", "gi", "<cmd>Telescope lsp_implementations<CR>", opts) -- show lsp implementations
|
keymap.set("n", "gD", vim.lsp.buf.declaration, opts) -- go to declaration
|
||||||
|
|
||||||
opts.desc = "Show LSP type definitions"
|
opts.desc = "Show LSP definitions"
|
||||||
keymap.set("n", "gt", "<cmd>Telescope lsp_type_definitions<CR>", opts) -- show lsp type definitions
|
keymap.set("n", "gd", "<cmd>Telescope lsp_definitions<CR>", opts) -- show lsp definitions
|
||||||
|
|
||||||
opts.desc = "See available code actions"
|
opts.desc = "Show LSP implementations"
|
||||||
keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection
|
keymap.set("n", "gi", "<cmd>Telescope lsp_implementations<CR>", opts) -- show lsp implementations
|
||||||
|
|
||||||
opts.desc = "Smart rename"
|
opts.desc = "Show LSP type definitions"
|
||||||
keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts) -- smart rename
|
keymap.set("n", "gt", "<cmd>Telescope lsp_type_definitions<CR>", opts) -- show lsp type definitions
|
||||||
|
|
||||||
opts.desc = "Show buffer diagnostics"
|
opts.desc = "See available code actions"
|
||||||
keymap.set("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>", opts) -- show diagnostics for file
|
keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection
|
||||||
|
|
||||||
opts.desc = "Show line diagnostics"
|
opts.desc = "Smart rename"
|
||||||
keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts) -- show diagnostics for line
|
keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts) -- smart rename
|
||||||
|
|
||||||
opts.desc = "Go to previous diagnostic"
|
opts.desc = "Show buffer diagnostics"
|
||||||
keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer
|
keymap.set("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>", opts) -- show diagnostics for file
|
||||||
|
|
||||||
opts.desc = "Go to next diagnostic"
|
opts.desc = "Show line diagnostics"
|
||||||
keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer
|
keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts) -- show diagnostics for line
|
||||||
|
|
||||||
opts.desc = "Show documentation for what is under cursor"
|
opts.desc = "Go to previous diagnostic"
|
||||||
keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor
|
keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer
|
||||||
|
|
||||||
opts.desc = "Restart LSP"
|
opts.desc = "Go to next diagnostic"
|
||||||
keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts) -- mapping to restart lsp if necessary
|
keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer
|
||||||
|
|
||||||
opts.desc = "Run formatting on current buffer"
|
opts.desc = "Show documentation for what is under cursor"
|
||||||
keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, opts)
|
keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- used to enable autocompletion (assign to every lsp server config)
|
opts.desc = "Restart LSP"
|
||||||
local capabilities = cmp_nvim_lsp.default_capabilities()
|
keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts) -- mapping to restart lsp if necessary
|
||||||
|
|
||||||
mason_lspconfig.setup_handlers({
|
opts.desc = "Run formatting on current buffer"
|
||||||
-- default handler for installed servers
|
keymap.set("n", "<space>f", function()
|
||||||
function(server_name)
|
vim.lsp.buf.format({ async = true })
|
||||||
lspconfig[server_name].setup({
|
end, opts)
|
||||||
capabilities = capabilities,
|
end,
|
||||||
})
|
})
|
||||||
end,
|
|
||||||
["lua_ls"] = function()
|
-- used to enable autocompletion (assign to every lsp server config)
|
||||||
-- configure lua server (with special settings)
|
local capabilities = cmp_nvim_lsp.default_capabilities()
|
||||||
lspconfig["lua_ls"].setup({
|
|
||||||
capabilities = capabilities,
|
mason_lspconfig.setup_handlers({
|
||||||
settings = {
|
-- default handler for installed servers
|
||||||
Lua = {
|
function(server_name)
|
||||||
-- make the language server recognize "vim" global
|
lspconfig[server_name].setup({
|
||||||
diagnostics = {
|
capabilities = capabilities,
|
||||||
globals = { "vim" },
|
})
|
||||||
},
|
end,
|
||||||
completion = {
|
["lua_ls"] = function()
|
||||||
callSnippet = "Replace",
|
-- configure lua server (with special settings)
|
||||||
},
|
lspconfig["lua_ls"].setup({
|
||||||
},
|
capabilities = capabilities,
|
||||||
},
|
settings = {
|
||||||
})
|
Lua = {
|
||||||
end,
|
-- make the language server recognize "vim" global
|
||||||
})
|
diagnostics = {
|
||||||
end,
|
globals = { "vim" },
|
||||||
|
},
|
||||||
|
completion = {
|
||||||
|
callSnippet = "Replace",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,17 +40,10 @@ return {
|
||||||
"goimports-reviser",
|
"goimports-reviser",
|
||||||
"prettier", -- prettier formatter
|
"prettier", -- prettier formatter
|
||||||
"stylua", -- lua formatter
|
"stylua", -- lua formatter
|
||||||
"isort", -- python formatter
|
"ruff", -- Python formatter and linter
|
||||||
"black", -- python formatter
|
|
||||||
"gofumpt",
|
"gofumpt",
|
||||||
"pylint",
|
|
||||||
"flake8",
|
|
||||||
-- Astra settings for 3.7 Python
|
-- Astra settings for 3.7 Python
|
||||||
-- { "isort", version = "5.11.5" }, -- python formatter
|
-- NOTE: On Astra you need to install Ruff as standalone package
|
||||||
-- { "black", version = "23.3.0" }, -- python formatter
|
|
||||||
-- { "pylint", version = "2.9.0" },
|
|
||||||
-- { "pylint", version = "2.9.0" },
|
|
||||||
-- { "flake8", version = "4.0.1" },
|
|
||||||
"eslint_d",
|
"eslint_d",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -8,13 +8,10 @@ return {
|
||||||
|
|
||||||
null_ls.setup({
|
null_ls.setup({
|
||||||
sources = {
|
sources = {
|
||||||
null_ls.builtins.formatting.black,
|
|
||||||
null_ls.builtins.formatting.isort,
|
|
||||||
null_ls.builtins.formatting.gofumpt,
|
null_ls.builtins.formatting.gofumpt,
|
||||||
null_ls.builtins.formatting.goimports_reviser,
|
null_ls.builtins.formatting.goimports_reviser,
|
||||||
null_ls.builtins.formatting.stylua,
|
null_ls.builtins.formatting.stylua,
|
||||||
null_ls.builtins.formatting.golines,
|
null_ls.builtins.formatting.golines,
|
||||||
require("none-ls.diagnostics.flake8"),
|
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue