Step 5

lua/fittencode/engines/actions/content.lua

@@ -117,7 +117,7 @@ function M:commit(opts)
   end
 
   table.insert(self.buffer_content, lines)
-  return self.chat:commit(lines), lines
+  return self.chat:commit(lines)
 end
 
 function M:on_start(opts)

lua/fittencode/suggestions_preprocessing.lua

@@ -44,13 +44,6 @@ local function condense_nl(opts)
     table.remove(suggestions, non_empty + 3)
   end
 
-  local row, col = Base.get_cursor(window)
-  local prev_line = nil
-  local cur_line = api.nvim_buf_get_lines(buffer, row, row + 1, false)[1]
-  if row > 1 then
-    prev_line = api.nvim_buf_get_lines(buffer, row - 1, row, false)[1]
-  end
-
   local nls = {}
   local remove_all = false
   local keep_first = true
@@ -60,9 +53,18 @@ local function condense_nl(opts)
     remove_all = true
   end
 
-  if #cur_line == 0 then
-    if not prev_line or #prev_line == 0 then
-      remove_all = true
+  if window and buffer and api.nvim_buf_is_valid(buffer) and api.nvim_win_is_valid(window) then
+    local row, col = Base.get_cursor(window)
+    local prev_line = nil
+    local cur_line = api.nvim_buf_get_lines(buffer, row, row + 1, false)[1]
+    if row > 1 then
+      prev_line = api.nvim_buf_get_lines(buffer, row - 1, row, false)[1]
+    end
+
+    if #cur_line == 0 then
+      if not prev_line or #prev_line == 0 then
+        remove_all = true
+      end
     end
   end
 

lua/fittencode/views/chat.lua

@@ -24,7 +24,7 @@ end
 
 local function _commit(window, buffer, lines)
   local cursor = {}
-  if api.nvim_buf_is_valid(buffer) and api.nvim_win_is_valid(window) then
+  if window and buffer and api.nvim_buf_is_valid(buffer) and api.nvim_win_is_valid(window) then
     api.nvim_set_option_value('modifiable', true, { buf = buffer })
     api.nvim_set_option_value('readonly', false, { buf = buffer })
     cursor = Lines.set_text({