Skip to content

Commit

Permalink
fix: check existing_client support workspaceFolder (#3452)
Browse files Browse the repository at this point in the history
if existing_client does not support workpaceFolder
should spawn a new server instance
  • Loading branch information
glepnir authored Nov 26, 2024
1 parent 2700851 commit fe88ead
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions lua/lspconfig/manager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ end
--- @param root_dir string
--- @param client vim.lsp.Client
function M:_notify_workspace_folder_added(root_dir, client)
if is_dir_in_workspace_folders(client, root_dir) then
return
end

local supported = vim.tbl_get(client, 'server_capabilities', 'workspace', 'workspaceFolders', 'supported')
if not supported then
if
is_dir_in_workspace_folders(client, root_dir)
or not vim.tbl_get(client, 'server_capabilities', 'workspace', 'workspaceFolders', 'supported')
then
return
end

Expand Down Expand Up @@ -132,6 +130,10 @@ function M:_start_client(bufnr, new_config, root_dir, single_file, silent)
bufnr = bufnr,
silent = silent,
reuse_client = function(existing_client)
if not vim.tbl_get(existing_client, 'server_capabilities', 'workspace', 'workspaceFolders', 'supported') then
return false
end

if (self._clients[root_dir] or {})[existing_client.name] then
self:_notify_workspace_folder_added(root_dir, existing_client)
return true
Expand Down

0 comments on commit fe88ead

Please sign in to comment.