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)