Skip to content
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

Jump to bottom

refactor(lsp): use autocmd api #19407

Merged
merged 2 commits into from
Jul 17, 2022
Merged

refactor(lsp): use autocmd api #19407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed25bac
refactor(lsp): use autocmd api
ii14 Jul 17, 2022
99aec6e
refactor(lsp): inline BufWritePost and VimLeavePre callbacks
ii14 Jul 17, 2022
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
27 changes: 16 additions & 11 deletions runtime/lua/vim/lsp.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,12 +1234,12 @@ function lsp.start_client(config)
)
end, function(request_id)
client.requests[request_id] = nil
nvim_command('doautocmd <nomodeline> User LspRequest')
nvim_exec_autocmds('User', { pattern = 'LspRequest', modeline = false })
end)

if success then
client.requests[request_id] = { type = 'pending', bufnr = bufnr, method = method }
nvim_command('doautocmd <nomodeline> User LspRequest')
nvim_exec_autocmds('User', { pattern = 'LspRequest', modeline = false })
end

return success, request_id
Expand Down Expand Up @@ -1308,7 +1308,7 @@ function lsp.start_client(config)
local request = client.requests[id]
if request and request.type == 'pending' then
request.type = 'cancel'
nvim_command('doautocmd <nomodeline> User LspRequest')
nvim_exec_autocmds('User', { pattern = 'LspRequest', modeline = false })
end
return rpc.notify('$/cancelRequest', { id = id })
end
Expand Down Expand Up @@ -1445,13 +1445,15 @@ function lsp.buf_attach_client(bufnr, client_id)
all_buffer_active_clients[bufnr] = buffer_client_ids

local uri = vim.uri_from_bufnr(bufnr)
local buf_did_save_autocommand = [=[
augroup lsp_c_%d_b_%d_did_save
au!
au BufWritePost <buffer=%d> lua vim.lsp._text_document_did_save_handler(0)
augroup END
]=]
api.nvim_exec(string.format(buf_did_save_autocommand, client_id, bufnr, bufnr), false)
local augroup = ('lsp_c_%d_b_%d_did_save'):format(client_id, bufnr)
api.nvim_create_autocmd('BufWritePost', {
group = api.nvim_create_augroup(augroup, { clear = true }),
buffer = bufnr,
callback = function()
lsp._text_document_did_save_handler(0)
end,
desc = 'vim.lsp: textDocument/didSave handler',
})
-- First time, so attach and set up stuff.
api.nvim_buf_attach(bufnr, false, {
on_lines = text_document_did_change_handler,
Expand Down Expand Up @@ -1687,7 +1689,10 @@ function lsp._vim_exit_handler()
end
end

nvim_command('autocmd VimLeavePre * lua vim.lsp._vim_exit_handler()')
api.nvim_create_autocmd('VimLeavePre', {
callback = lsp._vim_exit_handler,
ii14 marked this conversation as resolved.
Show resolved Hide resolved
desc = 'vim.lsp: exit handler',
})

--- Sends an async request for all active clients attached to the
--- buffer.
Expand Down
2 changes: 1 addition & 1 deletion runtime/lua/vim/lsp/handlers.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ local function progress_handler(_, result, ctx, _)
client.messages.progress[token].done = true
end

api.nvim_command('doautocmd <nomodeline> User LspProgressUpdate')
api.nvim_exec_autocmds('User', { pattern = 'LspProgressUpdate', modeline = false })
end

--see: https://microsoft.github.io/language-server-protocol/specifications/specification-current/#progress
Expand Down