buf_updates: fix updates for empty buffers (#12926)

On empty buffers, when editing the first line, the line is buffered, causing offset to be < 0. While the buffer is not actually empty, the buffered line has not been flushed (and should not be) yet, so the call is valid but an edge case.

2 files changed, 21 insertions, 2 deletions

diff --git a/src/nvim/extmark.c b/src/nvim/extmark.c
index ba94f55a50..17141f12fd 100644
--- a/src/nvim/extmark.c
+++ b/src/nvim/extmark.c
@@ -568,8 +568,18 @@ void extmark_splice(buf_T *buf,
                     int new_row, colnr_T new_col, bcount_t new_byte,
                     ExtmarkOp undo)
 {
-  long offset = ml_find_line_or_offset(buf, start_row+1, NULL, true);
-  extmark_splice_impl(buf, start_row, start_col, offset+start_col,
+  long offset = ml_find_line_or_offset(buf, start_row + 1, NULL, true);
+
+  // On empty buffers, when editing the first line, the line is buffered,
+  // causing offset to be < 0. While the buffer is not actually empty, the
+  // buffered line has not been flushed (and should not be) yet, so the call is
+  // valid but an edge case.
+  //
+  // TODO(vigoux): maybe the is a better way of testing that ?
+  if (offset < 0 && buf->b_ml.ml_chunksize == NULL) {
+    offset = 0;
+  }
+  extmark_splice_impl(buf, start_row, start_col, offset + start_col,
                       old_row, old_col, old_byte, new_row, new_col, new_byte,
                       undo);
 }
diff --git a/test/functional/lua/buffer_updates_spec.lua b/test/functional/lua/buffer_updates_spec.lua
index faf63e7374..ac5d25bdab 100644
--- a/test/functional/lua/buffer_updates_spec.lua
+++ b/test/functional/lua/buffer_updates_spec.lua
@@ -402,6 +402,15 @@ describe('lua: nvim_buf_attach on_bytes', function()
         { "test1", "bytes", 1, 7, 1, 3, 14, 0, 0, 0, 1, 3, 4 };
       }
     end)
+
+    it('editing empty buffers', function()
+      local check_events = setup_eventcheck(verify, {})
+
+      feed 'ia'
+      check_events {
+        { "test1", "bytes", 1, 3, 0, 0, 0, 0, 0, 0, 0, 1, 1 };
+      }
+    end)
   end
 
   describe('(with verify) handles', function()