fix: root_dir support string value directly

root_dir in `vim.lsp.ClientConfig` can be a string type and in our annoation also mentioned `string|function` type. but actually root_dir does not support string type. add a type check of root_dir and then we can use `vim.fs.root` directly.
neovim · Sep 22, 2024 · ed2208a · ed2208a
1 parent e30efa0
commit ed2208a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/lua/lspconfig/configs.lua b/lua/lspconfig/configs.lua
@@ -73,7 +73,7 @@ function configs.__newindex(t, config_name, config_def)
         { 'f', 't' },
         true,
       },
-      root_dir = { user_config.root_dir, 'f', true },
+      root_dir = { user_config.root_dir, { 's', 'f' }, true },
       filetypes = { user_config.filetype, 't', true },
       on_new_config = { user_config.on_new_config, 'f', true },
       on_attach = { user_config.on_attach, 'f', true },

diff --git a/lua/lspconfig/manager.lua b/lua/lspconfig/manager.lua
@@ -269,9 +269,8 @@ function M:try_add(bufnr, project_root)
   local pwd = assert(uv.cwd())
 
   async.run(function()
-    local root_dir
-    if get_root_dir then
-      root_dir = get_root_dir(buf_path, bufnr)
+    local root_dir = (type(get_root_dir) == 'function') and get_root_dir(buf_path, bufnr) or get_root_dir
+    if type(get_root_dir) == 'function' then
       async.reenter()
       if not api.nvim_buf_is_valid(bufnr) then
         return