diff options
| author | Michael Lingelbach <m.j.lbach@gmail.com> | 2021-08-24 09:33:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-24 09:33:47 -0400 |
| commit | f4e0bf174eab077a3a424878cc9b37ad428b84b9 (patch) | |
| tree | c32931ef8d3bcefb7d501e68f17ac5f5a9a97fff | |
| parent | chore: refactor ui components (#1172) (diff) | |
| download | nvim-lspconfig-f4e0bf174eab077a3a424878cc9b37ad428b84b9.tar nvim-lspconfig-f4e0bf174eab077a3a424878cc9b37ad428b84b9.tar.gz nvim-lspconfig-f4e0bf174eab077a3a424878cc9b37ad428b84b9.tar.bz2 nvim-lspconfig-f4e0bf174eab077a3a424878cc9b37ad428b84b9.tar.lz nvim-lspconfig-f4e0bf174eab077a3a424878cc9b37ad428b84b9.tar.xz nvim-lspconfig-f4e0bf174eab077a3a424878cc9b37ad428b84b9.tar.zst nvim-lspconfig-f4e0bf174eab077a3a424878cc9b37ad428b84b9.zip | |
chore(pyright): align root with pylsp (#1175)
| -rw-r--r-- | lua/lspconfig/pyright.lua | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lua/lspconfig/pyright.lua b/lua/lspconfig/pyright.lua index c0ea13e3..a41284fb 100644 --- a/lua/lspconfig/pyright.lua +++ b/lua/lspconfig/pyright.lua @@ -7,15 +7,6 @@ if vim.fn.has 'win32' == 1 then bin_name = bin_name .. '.cmd' end -local root_files = { - 'setup.py', - 'pyproject.toml', - 'setup.cfg', - 'requirements.txt', - 'pyrightconfig.json', - '.git', -} - local function organize_imports() local params = { command = 'pyright.organizeimports', @@ -28,8 +19,16 @@ configs[server_name] = { default_config = { cmd = { bin_name, '--stdio' }, filetypes = { 'python' }, - root_dir = function(filename) - return util.root_pattern(unpack(root_files))(filename) or util.path.dirname(filename) + root_dir = function(fname) + local root_files = { + 'pyproject.toml', + 'setup.py', + 'setup.cfg', + 'requirements.txt', + 'Pipfile', + 'pyrightconfig.json', + } + return util.root_pattern(unpack(root_files))(fname) or util.find_git_ancestory(fname) or util.path.dirname(fname) end, settings = { python = { |