From d268aa81e52683b2aca47b0ec5df06d4ed54e561 Mon Sep 17 00:00:00 2001 From: furtest Date: Wed, 31 Dec 2025 15:34:16 +0100 Subject: [PATCH] Add pyright to the lsp --- nvim/lsp/pyright.lua | 67 +++++++++++++++++++++++++++++++++++++++++++ nvim/lua/nvim-cmp.lua | 1 + 2 files changed, 68 insertions(+) create mode 100644 nvim/lsp/pyright.lua diff --git a/nvim/lsp/pyright.lua b/nvim/lsp/pyright.lua new file mode 100644 index 0000000..b73407c --- /dev/null +++ b/nvim/lsp/pyright.lua @@ -0,0 +1,67 @@ +---@brief +--- +--- https://github.com/microsoft/pyright +--- +--- `pyright`, a static type checker and language server for python + +local function set_python_path(command) + local path = command.args + local clients = vim.lsp.get_clients { + bufnr = vim.api.nvim_get_current_buf(), + name = 'pyright', + } + for _, client in ipairs(clients) do + if client.settings then + client.settings.python = + vim.tbl_deep_extend('force', client.settings.python --[[@as table]], { pythonPath = path }) + else + client.config.settings = vim.tbl_deep_extend('force', client.config.settings, { python = { pythonPath = path } }) + end + client:notify('workspace/didChangeConfiguration', { settings = nil }) + end +end + +---@type vim.lsp.Config +return { + cmd = { 'pyright-langserver', '--stdio' }, + filetypes = { 'python' }, + root_markers = { + 'pyrightconfig.json', + 'pyproject.toml', + 'setup.py', + 'setup.cfg', + 'requirements.txt', + 'Pipfile', + '.git', + }, + settings = { + python = { + analysis = { + autoSearchPaths = true, + useLibraryCodeForTypes = true, + diagnosticMode = 'openFilesOnly', + }, + }, + }, + on_attach = function(client, bufnr) + vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightOrganizeImports', function() + local params = { + command = 'pyright.organizeimports', + arguments = { vim.uri_from_bufnr(bufnr) }, + } + + -- Using client.request() directly because "pyright.organizeimports" is private + -- (not advertised via capabilities), which client:exec_cmd() refuses to call. + -- https://github.com/neovim/neovim/blob/c333d64663d3b6e0dd9aa440e433d346af4a3d81/runtime/lua/vim/lsp/client.lua#L1024-L1030 + ---@diagnostic disable-next-line: param-type-mismatch + client.request('workspace/executeCommand', params, nil, bufnr) + end, { + desc = 'Organize Imports', + }) + vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightSetPythonPath', set_python_path, { + desc = 'Reconfigure pyright with the provided python path', + nargs = 1, + complete = 'file', + }) + end, +} diff --git a/nvim/lua/nvim-cmp.lua b/nvim/lua/nvim-cmp.lua index 8fe818a..b499906 100644 --- a/nvim/lua/nvim-cmp.lua +++ b/nvim/lua/nvim-cmp.lua @@ -50,3 +50,4 @@ vim.lsp.config.clangd = { vim.lsp.enable({'clangd'}) +vim.lsp.enable('pyright')