diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-10-12 15:39:39 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-12 15:39:39 +0800 |
| commit | 840e1864c2de2b4b192a4df1865b69093904b139 (patch) | |
| tree | f5c746500e0b7880e1fcc1288c38c662d130fbcb | |
| parent | d2d38858d1f33a2cd92e9a6182ece2459b0d6f75 (diff) | |
| download | rneovim-840e1864c2de2b4b192a4df1865b69093904b139.tar.gz rneovim-840e1864c2de2b4b192a4df1865b69093904b139.tar.bz2 rneovim-840e1864c2de2b4b192a4df1865b69093904b139.zip | |
fix(lsp): handle NUL bytes in popup text (#25612)
Fix #25610
| -rw-r--r-- | runtime/lua/vim/lsp/util.lua | 4 | ||||
| -rw-r--r-- | test/functional/plugin/lsp_spec.lua | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index ec0a1b0ab0..7e6855528a 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -1647,7 +1647,7 @@ function M._make_floating_popup_size(contents, opts) width = 0 for i, line in ipairs(contents) do -- TODO(ashkan) use nvim_strdisplaywidth if/when that is introduced. - line_widths[i] = vim.fn.strdisplaywidth(line) + line_widths[i] = vim.fn.strdisplaywidth(line:gsub('%z', '\n')) width = math.max(line_widths[i], width) end end @@ -1676,7 +1676,7 @@ function M._make_floating_popup_size(contents, opts) height = 0 if vim.tbl_isempty(line_widths) then for _, line in ipairs(contents) do - local line_width = vim.fn.strdisplaywidth(line) + local line_width = vim.fn.strdisplaywidth(line:gsub('%z', '\n')) height = height + math.ceil(line_width / wrap_at) end else diff --git a/test/functional/plugin/lsp_spec.lua b/test/functional/plugin/lsp_spec.lua index 73e05d8d11..8a4a82fa38 100644 --- a/test/functional/plugin/lsp_spec.lua +++ b/test/functional/plugin/lsp_spec.lua @@ -3069,6 +3069,18 @@ describe('LSP', function() it('calculates size correctly with wrapping', function() eq({15,5}, exec_lua[[ return {vim.lsp.util._make_floating_popup_size(contents,{width = 15, wrap_at = 14})} ]]) end) + + it('handles NUL bytes in text', function() + exec_lua([[ contents = { + '\000\001\002\003\004\005\006\007\008\009', + '\010\011\012\013\014\015\016\017\018\019', + '\020\021\022\023\024\025\026\027\028\029', + } ]]) + command('set list listchars=') + eq({20,3}, exec_lua[[ return {vim.lsp.util._make_floating_popup_size(contents)} ]]) + command('set display+=uhex') + eq({40,3}, exec_lua[[ return {vim.lsp.util._make_floating_popup_size(contents)} ]]) + end) end) describe('lsp.util.trim.trim_empty_lines', function() |