chore: move to separate fn the on_bytes cb

lua/codemp/buffers.lua

@@ -24,6 +24,51 @@ local function detach(name)
 	require('codemp.window').update()
 end
 
+local function process_change(_, buf, tick, start_row, start_col, start_offset, old_end_row, old_end_col, old_end_byte_len, new_end_row, new_end_col, new_byte_len)
+	if tick == ticks[buf] then return end
+	if id_buffer_map[buf] == nil then return true end -- unregister callback handler
+	if CODEMP.config.debug then print(string.format(
+		"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
+	)) end
+	local end_offset = start_offset + old_end_byte_len
+	local change_content = ""
+	local len = utils.buffer.len(buf)
+	if start_offset + new_byte_len + 1 > len then
+		-- i dont know why but we may go out of bounds when doing 'dd' at the end of buffer??
+		local delta = (start_offset + new_byte_len + 1) - len
+		if CODEMP.config.debug then print("/!\\ bytes out of bounds by " .. delta .. ", adjusting") end
+		end_offset = end_offset - delta
+		start_offset = start_offset - delta
+	end
+	if new_byte_len > 0 then
+		local actual_end_col = new_end_col
+		if new_end_row == 0 then actual_end_col = new_end_col + start_col end
+		local actual_end_row = start_row + new_end_row
+		-- -- when bulk inserting at the end we go out of bounds, so we probably need to clamp?
+		-- --  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
+	if CODEMP.config.debug then
+		print(string.format("sending: %s..%s '%s'", start_offset, start_offset + old_end_byte_len, change_content))
+	end
+	controller:send({
+		start_idx = start_offset, end_idx = end_offset, content = change_content
+	})
+end
+
 ---@class AttachOptions
 ---@field content? string if provided, set this as content after attaching
 ---@field nowait? boolean skip waiting for initial content sync
@@ -82,52 +127,7 @@ local function attach(name, opts)
 
 			-- hook serverbound callbacks
 			-- TODO breaks when deleting whole lines at buffer end
-			vim.api.nvim_buf_attach(buffer, false, {
+			vim.api.nvim_buf_attach(buffer, false, { on_bytes = process_change })
-				on_bytes = function(_, buf, tick, start_row, start_col, start_offset, old_end_row, old_end_col, old_end_byte_len, new_end_row, new_end_col, new_byte_len)
-					if tick == ticks[buf] then return end
-					if id_buffer_map[buf] == nil then return true end -- unregister callback handler
-					if CODEMP.config.debug then print(string.format(
-						"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
-					)) end
-					local end_offset = start_offset + old_end_byte_len
-					local change_content = ""
-					local len = utils.buffer.len(buf)
-					if start_offset + new_byte_len + 1 > len then
-						-- i dont know why but we may go out of bounds when doing 'dd' at the end of buffer??
-						local delta = (start_offset + new_byte_len + 1) - len
-						if CODEMP.config.debug then print("/!\\ bytes out of bounds by " .. delta .. ", adjusting") end
-						end_offset = end_offset - delta
-						start_offset = start_offset - delta
-					end
-					if new_byte_len > 0 then
-						local actual_end_col = new_end_col
-						if new_end_row == 0 then actual_end_col = new_end_col + start_col end
-						local actual_end_row = start_row + new_end_row
-						-- -- when bulk inserting at the end we go out of bounds, so we probably need to clamp?
-						-- --  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
-					if CODEMP.config.debug then
-						print(string.format("sending: %s..%s '%s'", start_offset, start_offset + old_end_byte_len, change_content))
-					end
-					controller:send({
-						start_idx = start_offset, end_idx = end_offset, content = change_content
-					})
-				end,
-			})
 
 			local lock = false
 			local async = vim.loop.new_async(vim.schedule_wrap(function ()