Skip to content

Fixes #137 (failure to start LSP client on neovim 0.10+) #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RCX777 wants to merge 2 commits into
base: v0.3
Choose a base branch
from
Open

Fixes #137 (failure to start LSP client on neovim 0.10+) #138

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfd56ab
Add a check to use the new error message returned and also handle nil…
chipsenkbeil Jul 7, 2024
cb4b27a
Fixes #137 (failure to start LSP client on neovim 0.10+)
RCX777 Jul 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions lua/distant-core/client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@ function M:connect_lsp_clients(opts)
log.fmt_trace('File %s of type %s applies to %s', path, buf_ft, label)

-- Start the client if it doesn't exist
--
-- Details: Start LSP server using the provided configuration,
-- replacing the command with the distant-wrapped verison and
-- shadowing the on_exit command if provided
if self.__state.lsp.clients[label] == nil then
-- Wrap the exit so we can clear our id tracker
local on_exit = function(code, signal, client_id)
Expand All @@ -201,18 +205,24 @@ function M:connect_lsp_clients(opts)
end

local cmd = self:wrap({ lsp = config.cmd, scheme = opts.scheme })
local cmd_args = {}
for arg in cmd:gmatch("%S+") do
table.insert(cmd_args, arg)
end

config = vim.tbl_deep_extend('force', config, {
cmd = cmd,
cmd = cmd_args,
on_exit = on_exit,
root_dir = root_dir,
})

-- Start LSP server using the provided configuration, replacing the
-- command with the distant-wrapped verison and shadowing the
-- on_exit command if provided
-- Attempt to start the client, failing immediately if
-- we are unable to start the client or get an explicit
-- error message to report
log.fmt_debug('Starting LSP %s: %s', label, config)
local id = vim.lsp.start_client(config)
local id, err = vim.lsp.start_client(config)
assert(id, 'Unable to start LSP client' .. (err and (': ' .. err) or ''))

self.__state.lsp.clients[label] = id
end

Expand Down