phyer/avante.nvim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sidebar): apply current cursor (#440)

Browse Source
This commit is contained in:
yetone 2024-09-01 17:26:27 +08:00 committed by GitHub
parent 6b41c64735
commit 3ccb71d7ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lua/avante/sidebar.lua
View File

@ -516,25 +516,28 @@ end
function Sidebar:apply(current_cursor) function Sidebar:apply(current_cursor)
local content = table.concat(Utils.get_buf_lines(0, -1, self.code.bufnr), "\n") 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 response, response_start_line = self:get_content_between_separators()
local snippets = extract_code_snippets(content, response) local all_snippets = extract_code_snippets(content, response)
snippets = ensure_snippets_no_overlap(content, snippets) all_snippets = ensure_snippets_no_overlap(content, all_snippets)
local selected_snippets = {}
if current_cursor then if current_cursor then
if self.result and self.result.winid then if self.result and self.result.winid then
local cursor_line = Utils.get_cursor_pos(self.result.winid) local cursor_line = Utils.get_cursor_pos(self.result.winid)
for _, snippet in ipairs(snippets) do for _, snippet in ipairs(all_snippets) do
if if
cursor_line >= snippet.start_line_in_response_buf + response_start_line cursor_line >= snippet.start_line_in_response_buf + response_start_line - 1
and cursor_line <= snippet.end_line_in_response_buf + response_start_line and cursor_line <= snippet.end_line_in_response_buf + response_start_line - 1
then then
snippets = { snippet } selected_snippets = { snippet }
break break
end end
end end
end end
else
selected_snippets = all_snippets
end end
vim.defer_fn(function() vim.defer_fn(function()
insert_conflict_contents(self.code.bufnr, snippets) insert_conflict_contents(self.code.bufnr, selected_snippets)
api.nvim_set_current_win(self.code.winid) api.nvim_set_current_win(self.code.winid)
api.nvim_feedkeys(api.nvim_replace_termcodes("<Esc>", true, false, true), "n", true) api.nvim_feedkeys(api.nvim_replace_termcodes("<Esc>", true, false, true), "n", true)