From b05e831bd26a221361856ae8a11ad2f2a80eb9c5 Mon Sep 17 00:00:00 2001 From: pro100ton Date: Fri, 22 Nov 2024 20:56:36 +0300 Subject: [PATCH] Updgraded python linters and formatters. Changed zoo of them to one ruff --- lua/t0xa/plugins/lsp/lspconfig.lua | 201 ++++++++++++++++------------- lua/t0xa/plugins/lsp/mason.lua | 11 +- lua/t0xa/plugins/none-ls.lua | 3 - 3 files changed, 116 insertions(+), 99 deletions(-) diff --git a/lua/t0xa/plugins/lsp/lspconfig.lua b/lua/t0xa/plugins/lsp/lspconfig.lua index b5ad600..6153c84 100644 --- a/lua/t0xa/plugins/lsp/lspconfig.lua +++ b/lua/t0xa/plugins/lsp/lspconfig.lua @@ -1,109 +1,136 @@ return { - "neovim/nvim-lspconfig", - event = { "BufReadPre", "BufNewFile" }, - dependencies = { - "hrsh7th/cmp-nvim-lsp", - -- Some additional QOL impovements like rename imports when file is renamed - { "antosha417/nvim-lsp-file-operations", config = true }, - -- Improved functionality when working with neovim config - { "folke/neodev.nvim", opts = {} }, - }, - config = function() - -- import lspconfig plugin - local lspconfig = require("lspconfig") + "neovim/nvim-lspconfig", + event = { "BufReadPre", "BufNewFile" }, + dependencies = { + "hrsh7th/cmp-nvim-lsp", + -- Some additional QOL impovements like rename imports when file is renamed + { "antosha417/nvim-lsp-file-operations", config = true }, + -- Improved functionality when working with neovim config + { "folke/neodev.nvim", opts = {} }, + }, + config = function() + -- import lspconfig plugin + local lspconfig = require("lspconfig") - -- import mason_lspconfig plugin - local mason_lspconfig = require("mason-lspconfig") + -- import mason_lspconfig plugin + local mason_lspconfig = require("mason-lspconfig") - -- import cmp-nvim-lsp plugin - local cmp_nvim_lsp = require("cmp_nvim_lsp") + -- import cmp-nvim-lsp plugin + 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 - -- 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 } + -- Pyright setup + lspconfig.pyright.setup({ + settings = { + pyright = { + -- Using Ruff's import organizer + disableOrganizeImports = true, + }, + python = { + analysis = { + -- Ignore all files for analysis to exclusively use Ruff for linting + ignore = { "*" }, + }, + }, + }, + }) - -- set keybinds - opts.desc = "Show LSP references" - keymap.set("n", "gR", "Telescope lsp_references", opts) -- show definition, references + local keymap = vim.keymap -- for conciseness - opts.desc = "Go to declaration" - keymap.set("n", "gD", vim.lsp.buf.declaration, opts) -- go to declaration + -- nvim_create_autocmd - used to execute some logic automaticaly on a specific event + -- 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" - keymap.set("n", "gd", "Telescope lsp_definitions", opts) -- show lsp definitions + -- set keybinds + opts.desc = "Show LSP references" + keymap.set("n", "gR", "Telescope lsp_references", opts) -- show definition, references - opts.desc = "Show LSP implementations" - keymap.set("n", "gi", "Telescope lsp_implementations", opts) -- show lsp implementations + opts.desc = "Go to declaration" + keymap.set("n", "gD", vim.lsp.buf.declaration, opts) -- go to declaration - opts.desc = "Show LSP type definitions" - keymap.set("n", "gt", "Telescope lsp_type_definitions", opts) -- show lsp type definitions + opts.desc = "Show LSP definitions" + keymap.set("n", "gd", "Telescope lsp_definitions", opts) -- show lsp definitions - opts.desc = "See available code actions" - keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection + opts.desc = "Show LSP implementations" + keymap.set("n", "gi", "Telescope lsp_implementations", opts) -- show lsp implementations - opts.desc = "Smart rename" - keymap.set("n", "rn", vim.lsp.buf.rename, opts) -- smart rename + opts.desc = "Show LSP type definitions" + keymap.set("n", "gt", "Telescope lsp_type_definitions", opts) -- show lsp type definitions - opts.desc = "Show buffer diagnostics" - keymap.set("n", "D", "Telescope diagnostics bufnr=0", opts) -- show diagnostics for file + opts.desc = "See available code actions" + keymap.set({ "n", "v" }, "ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection - opts.desc = "Show line diagnostics" - keymap.set("n", "d", vim.diagnostic.open_float, opts) -- show diagnostics for line + opts.desc = "Smart rename" + keymap.set("n", "rn", vim.lsp.buf.rename, opts) -- smart rename - opts.desc = "Go to previous diagnostic" - keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer + opts.desc = "Show buffer diagnostics" + keymap.set("n", "D", "Telescope diagnostics bufnr=0", opts) -- show diagnostics for file - opts.desc = "Go to next diagnostic" - keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer + opts.desc = "Show line diagnostics" + keymap.set("n", "d", vim.diagnostic.open_float, opts) -- show diagnostics for line - opts.desc = "Show documentation for what is under cursor" - keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor + opts.desc = "Go to previous diagnostic" + keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer - opts.desc = "Restart LSP" - keymap.set("n", "rs", ":LspRestart", opts) -- mapping to restart lsp if necessary + opts.desc = "Go to next diagnostic" + keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer - opts.desc = "Run formatting on current buffer" - keymap.set('n', 'f', function() vim.lsp.buf.format { async = true } end, opts) - end, - }) + opts.desc = "Show documentation for what is under cursor" + keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor - -- used to enable autocompletion (assign to every lsp server config) - local capabilities = cmp_nvim_lsp.default_capabilities() + opts.desc = "Restart LSP" + keymap.set("n", "rs", ":LspRestart", opts) -- mapping to restart lsp if necessary - mason_lspconfig.setup_handlers({ - -- default handler for installed servers - function(server_name) - lspconfig[server_name].setup({ - capabilities = capabilities, - }) - end, - ["lua_ls"] = function() - -- configure lua server (with special settings) - lspconfig["lua_ls"].setup({ - capabilities = capabilities, - settings = { - Lua = { - -- make the language server recognize "vim" global - diagnostics = { - globals = { "vim" }, - }, - completion = { - callSnippet = "Replace", - }, - }, - }, - }) - end, - }) - end, + opts.desc = "Run formatting on current buffer" + keymap.set("n", "f", function() + vim.lsp.buf.format({ async = true }) + end, opts) + end, + }) + + -- used to enable autocompletion (assign to every lsp server config) + local capabilities = cmp_nvim_lsp.default_capabilities() + + mason_lspconfig.setup_handlers({ + -- default handler for installed servers + function(server_name) + lspconfig[server_name].setup({ + capabilities = capabilities, + }) + end, + ["lua_ls"] = function() + -- configure lua server (with special settings) + lspconfig["lua_ls"].setup({ + capabilities = capabilities, + settings = { + Lua = { + -- make the language server recognize "vim" global + diagnostics = { + globals = { "vim" }, + }, + completion = { + callSnippet = "Replace", + }, + }, + }, + }) + end, + }) + end, } - diff --git a/lua/t0xa/plugins/lsp/mason.lua b/lua/t0xa/plugins/lsp/mason.lua index 4545c44..fc723e8 100644 --- a/lua/t0xa/plugins/lsp/mason.lua +++ b/lua/t0xa/plugins/lsp/mason.lua @@ -40,17 +40,10 @@ return { "goimports-reviser", "prettier", -- prettier formatter "stylua", -- lua formatter - "isort", -- python formatter - "black", -- python formatter + "ruff", -- Python formatter and linter "gofumpt", - "pylint", - "flake8", -- Astra settings for 3.7 Python - -- { "isort", version = "5.11.5" }, -- python formatter - -- { "black", version = "23.3.0" }, -- python formatter - -- { "pylint", version = "2.9.0" }, - -- { "pylint", version = "2.9.0" }, - -- { "flake8", version = "4.0.1" }, + -- NOTE: On Astra you need to install Ruff as standalone package "eslint_d", }, }) diff --git a/lua/t0xa/plugins/none-ls.lua b/lua/t0xa/plugins/none-ls.lua index 2d6b9e8..0b57679 100644 --- a/lua/t0xa/plugins/none-ls.lua +++ b/lua/t0xa/plugins/none-ls.lua @@ -8,13 +8,10 @@ return { null_ls.setup({ sources = { - null_ls.builtins.formatting.black, - null_ls.builtins.formatting.isort, null_ls.builtins.formatting.gofumpt, null_ls.builtins.formatting.goimports_reviser, null_ls.builtins.formatting.stylua, null_ls.builtins.formatting.golines, - require("none-ls.diagnostics.flake8"), }, }) end,