feat: minimal diff

README.md

@@ -205,6 +205,7 @@ _See [config.lua#L9](./lua/avante/config.lua) for the full config_
     auto_set_keymaps = true,
     auto_apply_diff_after_generation = false,
     support_paste_from_clipboard = false,
+    minimize_diff = false,
   },
   mappings = {
     --- @class AvanteConflictMappings

lua/avante/config.lua

@@ -92,12 +92,14 @@ You are an excellent programming expert.
   ---                                     Note that avante will safely set these keymap. See https://github.com/yetone/avante.nvim/wiki#keymaps-and-api-i-guess for more details.
   ---3. auto_set_highlight_group        : Whether to automatically set the highlight group for the current line. Default to true.
   ---4. support_paste_from_clipboard    : Whether to support pasting image from clipboard. This will be determined automatically based whether img-clip is available or not.
+  ---5. minimize_diff    : Whether to remove unchanged lines when applying a code block
   behaviour = {
     auto_suggestions = false, -- Experimental stage
     auto_set_highlight_group = true,
     auto_set_keymaps = true,
     auto_apply_diff_after_generation = false,
     support_paste_from_clipboard = false,
+    minimize_diff = false,
   },
   history = {
     storage_path = vim.fn.stdpath("state") .. "/avante",

lua/avante/sidebar.lua

@@ -496,12 +496,70 @@ local function parse_codeblocks(buf)
   return codeblocks
 end
 
+---@param lines string[]
+---@param snippet AvanteCodeSnippet
+---@return AvanteCodeSnippet?
+local function minimize_snippet(lines, snippet)
+  local start_line = snippet.range[1]
+  local end_line = snippet.range[2]
+  local snippet_lines = vim.split(snippet.content, "\n")
+
+  local start_offset = 0
+  while
+    start_offset < #snippet_lines
+    and start_line + start_offset <= end_line
+    and snippet_lines[start_offset + 1] == lines[start_line + start_offset]
+  do
+    start_offset = start_offset + 1
+  end
+
+  local end_offset = 0
+  while
+    end_offset < (#snippet_lines - start_offset)
+    and (end_line - end_offset) >= start_line
+    and snippet_lines[#snippet_lines - end_offset] == lines[end_line - end_offset]
+  do
+    end_offset = end_offset + 1
+  end
+
+  local minimized_content = table.concat(snippet_lines, "\n", start_offset + 1, #snippet_lines - end_offset)
+  local minimized_start = start_line + start_offset
+  local minimized_end = end_line - end_offset
+  if minimized_end < minimized_start then return nil end
+  local minimized_range = { minimized_start, minimized_end }
+
+  return {
+    range = minimized_range,
+    content = minimized_content,
+    lang = snippet.lang,
+    explanation = snippet.explanation,
+    start_line_in_response_buf = snippet.start_line_in_response_buf,
+    end_line_in_response_buf = snippet.end_line_in_response_buf,
+  }
+end
+
+---@param content string
+---@param snippets AvanteCodeSnippet[]
+---@return AvanteCodeSnippet[]
+local function minimize_snippets(content, snippets)
+  local original_lines = vim.split(content, "\n")
+  local results = {}
+
+  for _, snippet in ipairs(snippets) do
+    local result = minimize_snippet(original_lines, snippet)
+    if result ~= nil then table.insert(results, result) end
+  end
+
+  return results
+end
+
 ---@param current_cursor boolean
 function Sidebar:apply(current_cursor)
   local content = table.concat(Utils.get_buf_lines(0, -1, self.code.bufnr), "\n")
   local response, response_start_line = self:get_content_between_separators()
   local all_snippets = extract_code_snippets(content, response)
   all_snippets = ensure_snippets_no_overlap(content, all_snippets)
+  if Config.options.behaviour.minimize_diff then all_snippets = minimize_snippets(content, all_snippets) end
   local selected_snippets = {}
   if current_cursor then
     if self.result and self.result.winid then