From f5a241211337b894b66df2418db1e07dee87c9ba Mon Sep 17 00:00:00 2001
From: alemi <me@alemi.dev>
Date: Thu, 16 Nov 2023 22:07:09 +0100
Subject: [PATCH] fix: proper text events handling

this works properly but only now that codemp lib sends whole buffer as
text change every time
---
 src/codemp.lua | 37 +++++++++++++------------------------
 src/lib.rs     |  6 +++---
 2 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/src/codemp.lua b/src/codemp.lua
index aa0f7e7..e704537 100644
--- a/src/codemp.lua
+++ b/src/codemp.lua
@@ -191,42 +191,31 @@ vim.api.nvim_create_user_command(
 		buffer_mappings[buffer] = args.args
 		buffer_mappings_reverse[args.args] = buffer
 
-		-- buffer_set_content(buffer, controller.content)
-
 		-- hook serverbound callbacks
 		vim.api.nvim_buf_attach(buffer, false, {
 			on_lines = function (_, buf, tick, firstline, lastline, new_lastline, old_byte_size)
 				if tick <= codemp_changed_tick then return end
-				local content = buffer_get_content(buf)
-				controller:send(0, #content - 1, content)
-				-- print(string.format(">[%s] %s:%s|%s (%s)", tick, firstline, lastline, new_lastline, old_byte_size))
-				-- local start_index = firstline == 0 and 0 or vim.fn.line2byte(firstline + 1) - 1
-				-- local text = table.concat(
-				-- 	vim.api.nvim_buf_get_lines(buf, firstline, new_lastline, true),
-				-- 	"\n"
-				-- )
-				-- -- if lastline ~= new_lastline then
-				-- -- 	text = text .. "\n"
-				-- -- end
-				-- print(string.format(">delta [%d,%s,%d]", start_index, text, start_index + old_byte_size - 1))
-				-- controller:delta(start_index, text, start_index + old_byte_size - 1)
+				local start = vim.api.nvim_buf_get_offset(buf, firstline)
+				local content = table.concat(vim.api.nvim_buf_get_lines(buf, firstline, new_lastline, false), '\n')
+				if new_lastline < lastline then old_byte_size = old_byte_size + 1 end
+				controller:send(start, start + old_byte_size - 1, content)
 			end
 		})
 
 		-- hook clientbound callbacks
 		register_controller_handler(args.args, controller, function(event)
 			codemp_changed_tick = vim.api.nvim_buf_get_changedtick(buffer) + 1
-			-- local start = event.start
-			-- local finish = event.finish
-			-- print(string.format(
-			-- 	"buf_set_text(%s,%s, %s,%s, '%s')",
-			-- 	start.row, start.col, finish.row, finish.col, vim.inspect(split_without_trim(event.content, "\n"))
-			-- ))
+			buffer_set_content(buffer, event.content)
+			-- local start_row = vim.api.nvim_buf_get_offset(buffer, event.first)
+			-- local end_row = vim.api.nvim_buf_get_offset(buffer, event.last - 1)
 			-- vim.api.nvim_buf_set_text(
-			-- 	buffer, start.row, start.col, finish.row, finish.col,
-			-- 	split_without_trim(event.content, "\n")
+			-- 	buffer,
+			-- 	start_row,
+			-- 	event.first - start_row,
+			-- 	end_row,
+			-- 	event.last - end_row,
+			-- 	vim.fn.split(event.content, '\n', true)
 			-- )
-			buffer_set_content(buffer, event)
 		end)
 
 		print(" ++ joined workspace " .. args.args)
diff --git a/src/lib.rs b/src/lib.rs
index 5e03494..7592e3b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -145,7 +145,7 @@ impl LuaUserData for LuaBufferController {
 		});
 		methods.add_method("try_recv", |_, this, ()| {
 			match this.0.try_recv() .map_err(LuaCodempError::from)? {
-				Some(x) => Ok(Some(x.content)),
+				Some(x) => Ok(Some(LuaTextChange(x))),
 				None => Ok(None),
 			}
 		});
@@ -169,8 +169,8 @@ struct LuaTextChange(CodempTextChange);
 impl LuaUserData for LuaTextChange {
 	fn add_fields<'lua, F: LuaUserDataFields<'lua, Self>>(fields: &mut F) {
 		fields.add_field_method_get("content", |_, this| Ok(this.0.content.clone()));
-		fields.add_field_method_get("start",   |_, this| Ok(this.0.span.start));
-		fields.add_field_method_get("finish",  |_, this| Ok(this.0.span.end));
+		fields.add_field_method_get("first",   |_, this| Ok(this.0.span.start));
+		fields.add_field_method_get("last",  |_, this| Ok(this.0.span.end));
 	}
 
 	fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {