1 files changed, 7 insertions, 17 deletions
diff --git a/lsp/basedpyright.lua b/lsp/basedpyright.lua
index f78bbd21..8872ea14 100644
--- a/lsp/basedpyright.lua
+++ b/lsp/basedpyright.lua
@@ -4,21 +4,6 @@
 ---
 --- `basedpyright`, a static type checker and language server for python
 
-local function organize_imports()
-  local params = {
-    command = 'basedpyright.organizeimports',
-    arguments = { vim.uri_from_bufnr(0) },
-  }
-
-  local clients = vim.lsp.get_clients {
-    bufnr = vim.api.nvim_get_current_buf(),
-    name = 'basedpyright',
-  }
-  for _, client in ipairs(clients) do
-    client.request('workspace/executeCommand', params, nil, 0)
-  end
-end
-
 local function set_python_path(path)
   local clients = vim.lsp.get_clients {
     bufnr = vim.api.nvim_get_current_buf(),
@@ -55,8 +40,13 @@ return {
       },
     },
   },
-  on_attach = function()
-    vim.api.nvim_buf_create_user_command(0, 'LspPyrightOrganizeImports', organize_imports, {
+  on_attach = function(client, bufnr)
+    vim.api.nvim_buf_create_user_command(bufnr, 'LspPyrightOrganizeImports', function()
+      client:exec_cmd({
+        command = 'basedpyright.organizeimports',
+        arguments = { vim.uri_from_bufnr(bufnr) },
+      })
+    end, {
       desc = 'Organize Imports',
     })