mirror of
https://github.com/neovim/neovim.git
synced 2026-05-03 04:25:03 +00:00
refactor(lsp): share completion request logic between omnifunc & trigger
This commit is contained in:
Mathias Fussenegger
committed by
Mathias Fußenegger
Mathias Fußenegger
parent
cc1f2d2ca6
commit
4c938f6d72
@@ -348,78 +348,6 @@ function M._convert_results(
|
||||
return matches, server_start_boundary
|
||||
end
|
||||
|
||||
--- Implements 'omnifunc' compatible LSP completion.
|
||||
---
|
||||
--- @see |complete-functions|
|
||||
--- @see |complete-items|
|
||||
--- @see |CompleteDone|
|
||||
---
|
||||
--- @param findstart integer 0 or 1, decides behavior
|
||||
--- @param base integer findstart=0, text to match against
|
||||
---
|
||||
--- @return integer|table Decided by {findstart}:
|
||||
--- - findstart=0: column where the completion starts, or -2 or -3
|
||||
--- - findstart=1: list of matches (actually just calls |complete()|)
|
||||
function M._omnifunc(findstart, base)
|
||||
vim.lsp.log.debug('omnifunc.findstart', { findstart = findstart, base = base })
|
||||
assert(base) -- silence luals
|
||||
local bufnr = api.nvim_get_current_buf()
|
||||
local clients = lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_completion })
|
||||
local remaining = #clients
|
||||
if remaining == 0 then
|
||||
return findstart == 1 and -1 or {}
|
||||
end
|
||||
|
||||
local win = api.nvim_get_current_win()
|
||||
local cursor = api.nvim_win_get_cursor(win)
|
||||
local lnum = cursor[1] - 1
|
||||
local cursor_col = cursor[2]
|
||||
local line = api.nvim_get_current_line()
|
||||
local line_to_cursor = line:sub(1, cursor_col)
|
||||
local client_start_boundary = vim.fn.match(line_to_cursor, '\\k*$') --[[@as integer]]
|
||||
local server_start_boundary = nil
|
||||
local items = {}
|
||||
|
||||
local function on_done()
|
||||
local mode = api.nvim_get_mode()['mode']
|
||||
if mode == 'i' or mode == 'ic' then
|
||||
vim.fn.complete((server_start_boundary or client_start_boundary) + 1, items)
|
||||
end
|
||||
end
|
||||
|
||||
local util = vim.lsp.util
|
||||
for _, client in ipairs(clients) do
|
||||
local params = util.make_position_params(win, client.offset_encoding)
|
||||
client.request(ms.textDocument_completion, params, function(err, result)
|
||||
if err then
|
||||
lsp.log.warn(err.message)
|
||||
end
|
||||
if result and vim.fn.mode() == 'i' then
|
||||
local matches
|
||||
matches, server_start_boundary = M._convert_results(
|
||||
line,
|
||||
lnum,
|
||||
cursor_col,
|
||||
client.id,
|
||||
client_start_boundary,
|
||||
server_start_boundary,
|
||||
result,
|
||||
client.offset_encoding
|
||||
)
|
||||
vim.list_extend(items, matches)
|
||||
end
|
||||
remaining = remaining - 1
|
||||
if remaining == 0 then
|
||||
vim.schedule(on_done)
|
||||
end
|
||||
end, bufnr)
|
||||
end
|
||||
|
||||
-- Return -2 to signal that we should continue completion so that we can
|
||||
-- async complete.
|
||||
return -2
|
||||
end
|
||||
|
||||
--- @param clients table<integer, vim.lsp.Client>
|
||||
--- @param bufnr integer
|
||||
--- @param win integer
|
||||
@@ -455,6 +383,64 @@ local function request(clients, bufnr, win, callback)
|
||||
end
|
||||
end
|
||||
|
||||
local function trigger(bufnr, clients)
|
||||
reset_timer()
|
||||
Context:cancel_pending()
|
||||
|
||||
local win = api.nvim_get_current_win()
|
||||
local cursor_row, cursor_col = unpack(api.nvim_win_get_cursor(win)) --- @type integer, integer
|
||||
local line = api.nvim_get_current_line()
|
||||
local line_to_cursor = line:sub(1, cursor_col)
|
||||
local word_boundary = vim.fn.match(line_to_cursor, '\\k*$')
|
||||
local start_time = vim.uv.hrtime()
|
||||
Context.last_request_time = start_time
|
||||
|
||||
local cancel_request = request(clients, bufnr, win, function(responses)
|
||||
local end_time = vim.uv.hrtime()
|
||||
rtt_ms = compute_new_average((end_time - start_time) * ns_to_ms)
|
||||
|
||||
Context.pending_requests = {}
|
||||
Context.isIncomplete = false
|
||||
|
||||
local row_changed = api.nvim_win_get_cursor(win)[1] ~= cursor_row
|
||||
local mode = api.nvim_get_mode().mode
|
||||
if row_changed or not (mode == 'i' or mode == 'ic') then
|
||||
return
|
||||
end
|
||||
|
||||
local matches = {}
|
||||
local server_start_boundary --- @type integer?
|
||||
for client_id, response in pairs(responses) do
|
||||
if response.err then
|
||||
vim.notify_once(response.err.message, vim.log.levels.warn)
|
||||
end
|
||||
|
||||
local result = response.result
|
||||
if result then
|
||||
Context.isIncomplete = Context.isIncomplete or result.isIncomplete
|
||||
local client = lsp.get_client_by_id(client_id)
|
||||
local encoding = client and client.offset_encoding or 'utf-16'
|
||||
local client_matches
|
||||
client_matches, server_start_boundary = M._convert_results(
|
||||
line,
|
||||
cursor_row - 1,
|
||||
cursor_col,
|
||||
client_id,
|
||||
word_boundary,
|
||||
nil,
|
||||
result,
|
||||
encoding
|
||||
)
|
||||
vim.list_extend(matches, client_matches)
|
||||
end
|
||||
end
|
||||
local start_col = (server_start_boundary or word_boundary) + 1
|
||||
vim.fn.complete(start_col, matches)
|
||||
end)
|
||||
|
||||
table.insert(Context.pending_requests, cancel_request)
|
||||
end
|
||||
|
||||
--- @param handle vim.lsp.completion.BufHandle
|
||||
local function on_insert_char_pre(handle)
|
||||
if tonumber(vim.fn.pumvisible()) == 1 then
|
||||
@@ -701,63 +687,38 @@ end
|
||||
|
||||
--- Trigger LSP completion in the current buffer.
|
||||
function M.trigger()
|
||||
reset_timer()
|
||||
Context:cancel_pending()
|
||||
|
||||
local win = api.nvim_get_current_win()
|
||||
local bufnr = api.nvim_get_current_buf()
|
||||
local cursor_row, cursor_col = unpack(api.nvim_win_get_cursor(win)) --- @type integer, integer
|
||||
local line = api.nvim_get_current_line()
|
||||
local line_to_cursor = line:sub(1, cursor_col)
|
||||
local clients = (buf_handles[bufnr] or {}).clients or {}
|
||||
local word_boundary = vim.fn.match(line_to_cursor, '\\k*$')
|
||||
local start_time = vim.uv.hrtime()
|
||||
Context.last_request_time = start_time
|
||||
trigger(bufnr, clients)
|
||||
end
|
||||
|
||||
local cancel_request = request(clients, bufnr, win, function(responses)
|
||||
local end_time = vim.uv.hrtime()
|
||||
rtt_ms = compute_new_average((end_time - start_time) * ns_to_ms)
|
||||
--- Implements 'omnifunc' compatible LSP completion.
|
||||
---
|
||||
--- @see |complete-functions|
|
||||
--- @see |complete-items|
|
||||
--- @see |CompleteDone|
|
||||
---
|
||||
--- @param findstart integer 0 or 1, decides behavior
|
||||
--- @param base integer findstart=0, text to match against
|
||||
---
|
||||
--- @return integer|table Decided by {findstart}:
|
||||
--- - findstart=0: column where the completion starts, or -2 or -3
|
||||
--- - findstart=1: list of matches (actually just calls |complete()|)
|
||||
function M._omnifunc(findstart, base)
|
||||
vim.lsp.log.debug('omnifunc.findstart', { findstart = findstart, base = base })
|
||||
assert(base) -- silence luals
|
||||
local bufnr = api.nvim_get_current_buf()
|
||||
local clients = lsp.get_clients({ bufnr = bufnr, method = ms.textDocument_completion })
|
||||
local remaining = #clients
|
||||
if remaining == 0 then
|
||||
return findstart == 1 and -1 or {}
|
||||
end
|
||||
|
||||
Context.pending_requests = {}
|
||||
Context.isIncomplete = false
|
||||
trigger(bufnr, clients)
|
||||
|
||||
local row_changed = api.nvim_win_get_cursor(win)[1] ~= cursor_row
|
||||
local mode = api.nvim_get_mode().mode
|
||||
if row_changed or not (mode == 'i' or mode == 'ic') then
|
||||
return
|
||||
end
|
||||
|
||||
local matches = {}
|
||||
local server_start_boundary --- @type integer?
|
||||
for client_id, response in pairs(responses) do
|
||||
if response.err then
|
||||
vim.notify_once(response.err.message, vim.log.levels.warn)
|
||||
end
|
||||
|
||||
local result = response.result
|
||||
if result then
|
||||
Context.isIncomplete = Context.isIncomplete or result.isIncomplete
|
||||
local client = lsp.get_client_by_id(client_id)
|
||||
local encoding = client and client.offset_encoding or 'utf-16'
|
||||
local client_matches
|
||||
client_matches, server_start_boundary = M._convert_results(
|
||||
line,
|
||||
cursor_row - 1,
|
||||
cursor_col,
|
||||
client_id,
|
||||
word_boundary,
|
||||
nil,
|
||||
result,
|
||||
encoding
|
||||
)
|
||||
vim.list_extend(matches, client_matches)
|
||||
end
|
||||
end
|
||||
local start_col = (server_start_boundary or word_boundary) + 1
|
||||
vim.fn.complete(start_col, matches)
|
||||
end)
|
||||
|
||||
table.insert(Context.pending_requests, cancel_request)
|
||||
-- Return -2 to signal that we should continue completion so that we can
|
||||
-- async complete.
|
||||
return -2
|
||||
end
|
||||
|
||||
return M
|
||||
|
||||
Reference in New Issue
Block a user