Skip to content

fix(ui): preserve extra fields in chat messages #1399

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

Merged
deathbeam merged 1 commit into from
Sep 12, 2025
Merged

fix(ui): preserve extra fields in chat messages #1399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions lua/CopilotChat/ui/chat.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ end
function Chat:parse()
self:validate()

-- Skip parsing if buffer hasn't changed
local changedtick = vim.api.nvim_buf_get_changedtick(self.bufnr)
if self._last_changedtick == changedtick then
return false
Expand Down Expand Up @@ -707,13 +708,31 @@ function Chat:parse()
-- Finish last message
current_message.section.end_line = vim.api.nvim_buf_line_count(self.bufnr)

-- Build lookup table for previous messages by id
local old_messages_by_id = {}
for _, msg in ipairs(self.messages or {}) do
if msg.id then
old_messages_by_id[msg.id] = msg
end
end

-- Format new messages and preserve extra fields from old messages
for _, message in ipairs(new_messages) do
message.content = vim.trim(table.concat(message.content, '\n'))
if message.section then
for _, block in ipairs(message.section.blocks) do
block.content = vim.trim(table.concat(block.content, '\n'))
end
end

local old = old_messages_by_id[message.id]
if old then
for k, v in pairs(old) do
if message[k] == nil then
message[k] = v
end
end
end
end

self.messages = new_messages
Expand Down Expand Up @@ -825,10 +844,10 @@ function Chat:render()
for i, line in ipairs(utils.split_lines(message.content)) do
for _, tool_call in ipairs(assistant_msg.tool_calls) do
if line:match(string.format('#%s:%s', tool_call.name, vim.pesc(tool_call.id))) then
local l = message.section.start_line - 1 + i
local l = message.section.start_line + i
vim.api.nvim_buf_add_highlight(self.bufnr, highlight_ns, 'CopilotChatAnnotationHeader', l, 0, #line)
if not utils.empty(tool_call.arguments) then
vim.api.nvim_buf_set_extmark(self.bufnr, highlight_ns, l - 1, 0, {
vim.api.nvim_buf_set_extmark(self.bufnr, highlight_ns, l, 0, {
virt_lines = vim.tbl_map(function(json_line)
return { { json_line, 'CopilotChatAnnotation' } }
end, vim.split(vim.inspect(utils.json_decode(tool_call.arguments)), '\n')),
Expand Down
Loading