fix(diagnostic): open_float on multi-line diagnostics #28301

Problem: when diagnostic have a range of line, open_float not work.

Solution: filter diagnostic by line number range.
This commit is contained in:
Raphael 2024-04-23 19:06:41 +08:00 committed by GitHub
parent aef120d1e9
commit ad76b050eb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 42 additions and 1 deletions

View File

@ -1697,7 +1697,7 @@ function M.open_float(opts, ...)
if scope == 'line' then
--- @param d vim.Diagnostic
diagnostics = vim.tbl_filter(function(d)
return d.lnum == lnum
return lnum >= d.lnum and lnum <= d.end_lnum
end, diagnostics)
elseif scope == 'cursor' then
-- LSP servers can send diagnostics with `end_col` past the length of the line

View File

@ -2506,6 +2506,47 @@ describe('vim.diagnostic', function()
]]
)
end)
it('works for multi-line diagnostics #21949', function()
-- open float failed non diagnostic lnum
eq(
vim.NIL,
exec_lua [[
local diagnostics = {
make_error("Error in two lines lnum is 1 and end_lnum is 2", 1, 1, 2, 3),
}
local winids = {}
vim.api.nvim_win_set_buf(0, diagnostic_bufnr)
vim.diagnostic.set(diagnostic_ns, diagnostic_bufnr, diagnostics)
local _, winnr = vim.diagnostic.open_float(0, { header = false })
return winnr
]]
)
-- can open a float window on lnum 1
eq(
{ '1. Error in two lines lnum is 1 and end_lnum is 2' },
exec_lua [[
vim.api.nvim_win_set_cursor(0, {2, 0})
local float_bufnr, winnr = vim.diagnostic.open_float(0, { header = false })
local lines = vim.api.nvim_buf_get_lines(float_bufnr, 0, -1, false)
vim.api.nvim_win_close(winnr, true)
return lines
]]
)
-- can open a float window on end_lnum 2
eq(
{ '1. Error in two lines lnum is 1 and end_lnum is 2' },
exec_lua [[
vim.api.nvim_win_set_cursor(0, {3, 0})
local float_bufnr, winnr = vim.diagnostic.open_float(0, { header = false })
local lines = vim.api.nvim_buf_get_lines(float_bufnr, 0, -1, false)
vim.api.nvim_win_close(winnr, true)
return lines
]]
)
end)
end)
describe('setloclist()', function()