Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions lua/CopilotChat/chat.lua
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,10 @@ local function create_buf()
return bufnr
end

local Chat = class(function(self, name, on_buf_create)
local Chat = class(function(self, on_buf_create)
self.on_buf_create = on_buf_create
self.bufnr = create_buf()
self.on_buf_create(self.bufnr)
self.spinner = Spinner(self.bufnr, name)
self.bufnr = nil
self.spinner = nil
self.winnr = nil
end)

Expand All @@ -55,9 +54,14 @@ function Chat:validate()
return
end
self.bufnr = create_buf()
self.on_buf_create(self.bufnr)
self.spinner.bufnr = self.bufnr
if not self.spinner then
self.spinner = Spinner(self.bufnr, 'copilot-chat')
else
self.spinner.bufnr = self.bufnr
end

self:close()
self.on_buf_create(self.bufnr)
end

function Chat:last()
Expand Down
4 changes: 1 addition & 3 deletions lua/CopilotChat/diff.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,7 @@ local Diff = class(function(self, on_buf_create, help)
self.current = nil
self.ns = vim.api.nvim_create_namespace('copilot-diff')
self.mark_ns = vim.api.nvim_create_namespace('copilot-diff-mark')
self.bufnr = create_buf()
self.on_buf_create(self.bufnr)

self.bufnr = nil
vim.api.nvim_set_hl(self.ns, '@diff.plus', { bg = blend_color_with_neovim_bg('DiffAdd', 20) })
vim.api.nvim_set_hl(self.ns, '@diff.minus', { bg = blend_color_with_neovim_bg('DiffDelete', 20) })
vim.api.nvim_set_hl(self.ns, '@diff.delta', { bg = blend_color_with_neovim_bg('DiffChange', 20) })
Expand Down
5 changes: 3 additions & 2 deletions lua/CopilotChat/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ function M.setup(config)
.. "' to accept diff."
)

state.chat = Chat(plugin_name, function(bufnr)
state.chat = Chat(function(bufnr)
if M.config.mappings.complete then
vim.keymap.set('i', M.config.mappings.complete, complete, { buffer = bufnr })
end
Expand Down Expand Up @@ -495,12 +495,13 @@ function M.setup(config)
end
end, { buffer = bufnr })
end

M.reset()
end)

tiktoken.setup()
debuginfo.setup()
M.debug(M.config.debug)
M.reset()

for name, prompt in pairs(M.prompts(true)) do
vim.api.nvim_create_user_command('CopilotChat' .. name, function(args)
Expand Down