GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-17 01:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lsp): gracefully handle nil workspaceFolders (#16284)

Browse Source 
* handle when workspaceFolder is nil in buf.list_workspace_folders and buf.add_workspace_folder
This commit is contained in:
Michael Lingelbach
2021-11-11 01:15:59 -08:00
committed by GitHub
parent 14def4d227
commit 0ecc58c277
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/lua/vim/lsp/buf.lua
View File

@ -369,7 +369,7 @@ end
function M.list_workspace_folders() function M.list_workspace_folders()
local workspace_folders = {} local workspace_folders = {}
for _, client in pairs(vim.lsp.buf_get_clients()) do for _, client in pairs(vim.lsp.buf_get_clients()) do
for _, folder in pairs(client.workspaceFolders) do for _, folder in pairs(client.workspaceFolders or {}) do
table.insert(workspace_folders, folder.name) table.insert(workspace_folders, folder.name)
end end
end end
@ -389,7 +389,7 @@ function M.add_workspace_folder(workspace_folder)
local params = util.make_workspace_params({{uri = vim.uri_from_fname(workspace_folder); name = workspace_folder}}, {{}}) local params = util.make_workspace_params({{uri = vim.uri_from_fname(workspace_folder); name = workspace_folder}}, {{}})
for _, client in pairs(vim.lsp.buf_get_clients()) do for _, client in pairs(vim.lsp.buf_get_clients()) do
local found = false local found = false
for _, folder in pairs(client.workspaceFolders) do for _, folder in pairs(client.workspaceFolders or {}) do
if folder.name == workspace_folder then if folder.name == workspace_folder then
found = true found = true
print(workspace_folder, "is already part of this workspace") print(workspace_folder, "is already part of this workspace")
@ -398,6 +398,9 @@ function M.add_workspace_folder(workspace_folder)
end end
if not found then if not found then
vim.lsp.buf_notify(0, 'workspace/didChangeWorkspaceFolders', params) vim.lsp.buf_notify(0, 'workspace/didChangeWorkspaceFolders', params)
if not client.workspaceFolders then
client.workspaceFolders = {}
end
table.insert(client.workspaceFolders, params.event.added[1]) table.insert(client.workspaceFolders, params.event.added[1])
end end
end end