hexedtech/codemp-nvim
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp-nvim.git synced 2024-11-22 07:24:52 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: deal with some sending edge cases

Browse source
This commit is contained in:
əlemi 2024-09-09 05:14:52 +02:00
parent b824b87505
commit 14f5e52e99
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
lua/codemp/buffers.lua
View file

@ -41,26 +41,40 @@ local function attach(name, buffer, content, nowait)
"start(row:%s, col:%s) offset:%s end(row:%s, col:%s new(row:%s, col:%s)) len(old:%s, new:%s)", "start(row:%s, col:%s) offset:%s end(row:%s, col:%s new(row:%s, col:%s)) len(old:%s, new:%s)",
start_row, start_col, start_offset, old_end_row, old_end_col, new_end_row, new_end_col, old_end_byte_len, new_byte_len start_row, start_col, start_offset, old_end_row, old_end_col, new_end_row, new_end_col, old_end_byte_len, new_byte_len
)) end )) end
local change_content local end_offset = start_offset + old_end_byte_len
if new_byte_len == 0 then local change_content = ""
change_content = "" local len = utils.buffer.len(buf)
else if start_offset + new_byte_len + 1 > len then
local actual_end_row = start_row + new_end_row -- i dont know why but we may go out of bounds when doing 'dd' at the end of buffer??
if new_byte_len == old_end_byte_len - 1 and new_end_row == old_end_row - 1 then local delta = (start_offset + new_byte_len + 1) - len
-- if just 1 byte changes and the line count changes, we deleted a line but getting text would mean going out of bounds if CODEMP.config.debug then print("/!\\ bytes out of bounds by " .. delta .. ", adjusting") end
actual_end_row = actual_end_row - 1 end_offset = end_offset - delta
end start_offset = start_offset - delta
end
if new_byte_len > 0 then
local actual_end_col = new_end_col local actual_end_col = new_end_col
if new_end_row == 0 then actual_end_col = new_end_col + start_col end if new_end_row == 0 then actual_end_col = new_end_col + start_col end
change_content = table.concat( local actual_end_row = start_row + new_end_row
vim.api.nvim_buf_get_text(buf, start_row, start_col, actual_end_row, actual_end_col, {}), -- -- when bulk inserting at the end we go out of bounds, so we probably need to clamp?
'\n' -- -- issue: row=x+1 col=0 and row=x col=0 may be very far apart! we need to get last col of row x, ughh..
) -- -- also, this doesn't work so it will stay commented out for a while longer
-- if new_end_row ~= old_end_row and new_end_col == 0 then
-- -- we may be dealing with the last line of the buffer, get_text could error because out-of-bounds
-- local row_count = vim.api.nvim_buf_line_count(buf)
-- if actual_end_row + 1 > row_count then
-- local delta = (actual_end_row + 1) - row_count
-- if CODEMP.config.debug then print("/!\\ row out of bounds by " .. delta .. ", adjusting") end
-- actual_end_row = actual_end_row - delta
-- actual_end_col = len - vim.api.nvim_buf_get_offset(buf, row_count)
-- end
-- end
local lines = vim.api.nvim_buf_get_text(buf, start_row, start_col, actual_end_row, actual_end_col, {})
change_content = table.concat(lines, '\n')
end end
if CODEMP.config.debug then if CODEMP.config.debug then
print(string.format("sending: %s %s %s %s -- '%s'", start_row, start_col, start_row + new_end_row, start_col + new_end_col, change_content)) print(string.format("sending: %s..%s '%s'", start_offset, start_offset + old_end_byte_len, change_content))
end end
controller:send(start_offset, start_offset + old_end_byte_len, change_content):await() controller:send(start_offset, end_offset, change_content):await()
end, end,
}) })