Skip to content

refactor: accept edits using nvim_buf_set_lines #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bjarosze wants to merge 2 commits into from
Closed

refactor: accept edits using nvim_buf_set_lines #627

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fc2ca0
refactor: accept edits using nvim_buf_set_lines
bjarosze Dec 19, 2025
efa2fea
use position_encoding
bjarosze Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 30 additions & 9 deletions lua/copilot/suggestion/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,34 @@ function M.prev()
end, ctx)
end

local function apply_edit(range, new_lines, bufnr, position_encoding)
local start_line = range.start.line
local start_char = vim.lsp.util._get_line_byte_from_position(bufnr, range.start, position_encoding)
local end_line = range["end"].line
local end_char = vim.lsp.util._get_line_byte_from_position(bufnr, range["end"], position_encoding)

local current_lines = vim.api.nvim_buf_get_lines(bufnr, start_line, end_line + 1, false)
if #current_lines == 0 then
return
end

local before = current_lines[1]:sub(1, start_char)
local after = current_lines[#current_lines]:sub(end_char + 1)

local result_lines = {}
if #new_lines == 1 then
table.insert(result_lines, before .. new_lines[1] .. after)
else
table.insert(result_lines, before .. new_lines[1])
for i = 2, #new_lines - 1 do
table.insert(result_lines, new_lines[i])
end
table.insert(result_lines, new_lines[#new_lines] .. after)
end

vim.api.nvim_buf_set_lines(bufnr, start_line, end_line + 1, false, result_lines)
end

---@param modifier? (fun(suggestion: copilot_get_completions_data_completion): copilot_get_completions_data_completion)
function M.accept(modifier)
local ctx = get_ctx()
Expand Down Expand Up @@ -639,8 +667,7 @@ function M.accept(modifier)
vim.schedule_wrap(function()
-- Create an undo breakpoint
vim.cmd("let &undolevels=&undolevels")
-- Hack for 'autoindent', makes the indent persist. Check `:help 'autoindent'`.
vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("<Space><Left><Del>", true, false, true), "n", false)

local bufnr = vim.api.nvim_get_current_buf()

-- only utf encodings are supported
Expand All @@ -657,13 +684,7 @@ function M.accept(modifier)
local lines_count = #lines
local last_col = #lines[lines_count]

-- apply_text_edits will remove the last \n if the last line is empty,
-- so we trick it by adding an extra one
if last_col == 0 then
newText = newText .. "\n"
end

vim.lsp.util.apply_text_edits({ { range = range, newText = newText } }, bufnr, encoding)
apply_edit(range, lines, bufnr, encoding)

-- Position cursor at the end of the last inserted line
local new_cursor_line = range["start"].line + #lines
Expand Down