diff options
author | Gregory Anders <greg@gpanders.com> | 2025-01-14 08:19:54 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-01-14 08:19:54 -0600 |
commit | e8a6c1b02122852da83dc52184e78369598d8240 (patch) | |
tree | 4e3b5c9f33957d81885c7888eb168aa8979a1b29 | |
parent | f1c45fc7a4a595e460cd245172a5767bddeb09e9 (diff) | |
download | rneovim-e8a6c1b02122852da83dc52184e78369598d8240.tar.gz rneovim-e8a6c1b02122852da83dc52184e78369598d8240.tar.bz2 rneovim-e8a6c1b02122852da83dc52184e78369598d8240.zip |
fix(lsp): schedule call to vim.lsp.start for async root_dir (#31998)
When `root_dir` is a function it can (and often will) call the provided
callback function in a fast API context (e.g. in the `on_exit` handler
of `vim.system`). When the callback function is executed we should
ensure that it runs vim.lsp.start on the main event loop.
-rw-r--r-- | runtime/lua/vim/lsp.lua | 4 | ||||
-rw-r--r-- | test/functional/plugin/lsp_spec.lua | 53 |
2 files changed, 32 insertions, 25 deletions
diff --git a/runtime/lua/vim/lsp.lua b/runtime/lua/vim/lsp.lua index 23f4e104d0..7812f31db1 100644 --- a/runtime/lua/vim/lsp.lua +++ b/runtime/lua/vim/lsp.lua @@ -513,7 +513,9 @@ local function lsp_enable_callback(bufnr) ---@param root_dir string config.root_dir(function(root_dir) config.root_dir = root_dir - start(config) + vim.schedule(function() + start(config) + end) end) else start(config) diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua index 5e9766c784..db3ab8ed98 100644 --- a/test/functional/plugin/lsp_spec.lua +++ b/test/functional/plugin/lsp_spec.lua @@ -6259,37 +6259,42 @@ describe('LSP', function() ) end) - it('supports a function for root_dir', function() + it('supports async function for root_dir', function() exec_lua(create_server_definition) local tmp1 = t.tmpname(true) + exec_lua(function() + local server = _G._create_server({ + handlers = { + initialize = function(_, _, callback) + callback(nil, { capabilities = {} }) + end, + }, + }) - eq( - 'some_dir', - exec_lua(function() - local server = _G._create_server({ - handlers = { - initialize = function(_, _, callback) - callback(nil, { capabilities = {} }) - end, - }, - }) - - vim.lsp.config('foo', { - cmd = server.cmd, - filetypes = { 'foo' }, - root_dir = function(cb) + vim.lsp.config('foo', { + cmd = server.cmd, + filetypes = { 'foo' }, + root_dir = function(cb) + vim.system({ 'sleep', '0' }, {}, function() cb('some_dir') - end, - }) - vim.lsp.enable('foo') + end) + end, + }) + vim.lsp.enable('foo') - vim.cmd.edit(assert(tmp1)) - vim.bo.filetype = 'foo' + vim.cmd.edit(assert(tmp1)) + vim.bo.filetype = 'foo' + end) - return vim.lsp.get_clients({ bufnr = vim.api.nvim_get_current_buf() })[1].root_dir - end) - ) + retry(nil, 1000, function() + eq( + 'some_dir', + exec_lua(function() + return vim.lsp.get_clients({ bufnr = vim.api.nvim_get_current_buf() })[1].root_dir + end) + ) + end) end) end) end) |