diff options
author | Gregory Anders <8965202+gpanders@users.noreply.github.com> | 2024-02-24 19:21:57 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-02-24 19:21:57 -0600 |
commit | 2e1f5055acdef650c27efc4afdf8606037ec021b (patch) | |
tree | 3c45462de95f9e63a902ca57813cb4440dfdf017 /runtime/lua/vim/lsp/util.lua | |
parent | c2ddef30e743d8c1de6d960bf230b8646cb49c7c (diff) | |
download | rneovim-2e1f5055acdef650c27efc4afdf8606037ec021b.tar.gz rneovim-2e1f5055acdef650c27efc4afdf8606037ec021b.tar.bz2 rneovim-2e1f5055acdef650c27efc4afdf8606037ec021b.zip |
fix(lsp): add assertion for explicit bufnr in apply_text_edits (#27614)
Assert that the buffer number passed to apply_text_edits is fully
resolved (not 0 or null). Pass the known buffer number to
apply_text_edits from lsp.formatexpr().
Diffstat (limited to 'runtime/lua/vim/lsp/util.lua')
-rw-r--r-- | runtime/lua/vim/lsp/util.lua | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/runtime/lua/vim/lsp/util.lua b/runtime/lua/vim/lsp/util.lua index 444354fdc3..b60135f851 100644 --- a/runtime/lua/vim/lsp/util.lua +++ b/runtime/lua/vim/lsp/util.lua @@ -419,6 +419,9 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding) if not next(text_edits) then return end + + assert(bufnr ~= 0, 'Explicit buffer number is required') + if not api.nvim_buf_is_loaded(bufnr) then vim.fn.bufload(bufnr) end @@ -457,7 +460,7 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding) -- save and restore local marks since they get deleted by nvim_buf_set_lines local marks = {} - for _, m in pairs(vim.fn.getmarklist(bufnr or vim.api.nvim_get_current_buf())) do + for _, m in pairs(vim.fn.getmarklist(bufnr)) do if m.mark:match("^'[a-z]$") then marks[m.mark:sub(2, 2)] = { m.pos[2], m.pos[3] - 1 } -- api-indexed end @@ -516,7 +519,7 @@ function M.apply_text_edits(text_edits, bufnr, offset_encoding) local max = api.nvim_buf_line_count(bufnr) -- no need to restore marks that still exist - for _, m in pairs(vim.fn.getmarklist(bufnr or vim.api.nvim_get_current_buf())) do + for _, m in pairs(vim.fn.getmarklist(bufnr)) do marks[m.mark:sub(2, 2)] = nil end -- restore marks |