fix: handle chat or request stopped

Author: franco-ruggeri

lua/codecompanion-spinner/spinner-manager.lua

@@ -1,3 +1,4 @@
+local log = require("codecompanion-spinner.log")
 local Spinner = require("codecompanion-spinner.spinner")
 
 local M = {}
@@ -9,6 +10,7 @@ M.setup = function()
 	vim.api.nvim_create_autocmd("User", {
 		pattern = "CodeCompanionChatCreated",
 		callback = function(args)
+			log.debug("CodeCompanionChatCreated")
 			local chat_id = args.data.id
 			assert(spinners[chat_id] == nil)
 			active_spinner = Spinner:new(chat_id, args.buf)
@@ -19,6 +21,7 @@ M.setup = function()
 	vim.api.nvim_create_autocmd("User", {
 		pattern = "CodeCompanionChatClosed",
 		callback = function(args)
+			log.debug("CodeCompanionChatClosed")
 			local chat_id = args.data.id
 			if spinners[chat_id] then
 				spinners[chat_id]:stop()
@@ -30,6 +33,8 @@ M.setup = function()
 	vim.api.nvim_create_autocmd("User", {
 		pattern = "CodeCompanionChatOpened",
 		callback = function(args)
+			log.debug("CodeCompanionChatOpened")
+
 			local spinner = spinners[args.data.id]
 
 			-- When a new chat is created, this event is triggered but no spinner is
@@ -47,6 +52,7 @@ M.setup = function()
 	vim.api.nvim_create_autocmd("User", {
 		pattern = "CodeCompanionChatHidden",
 		callback = function(args)
+			log.debug("CodeCompanionChatHidden")
 			local spinner = spinners[args.data.id]
 			spinner:disable()
 		end,
@@ -55,6 +61,7 @@ M.setup = function()
 	vim.api.nvim_create_autocmd("User", {
 		pattern = "CodeCompanionRequestStarted",
 		callback = function(args)
+			log.debug("CodeCompanionRequestStarted")
 			assert(active_spinner)
 			active_spinner:start(args.data.id)
 		end,
@@ -63,21 +70,18 @@ M.setup = function()
 	vim.api.nvim_create_autocmd("User", {
 		pattern = "CodeCompanionRequestFinished",
 		callback = function(args)
+			log.debug("CodeCompanionRequestFinished")
+
+			-- Search for the spinner is handling the request.
+			-- Note: If the chat was stopped, the spinner was deleted.
+			-- In that case, no spinner will be found.
 			local request_id = args.data.id
 			for _, spinner in pairs(spinners) do
 				if spinner.request_id == request_id then
 					spinner:stop()
-					return
+					break
 				end
 			end
-			error("No spinner found for request ID: " .. request_id)
-		end,
-	})
-
-	vim.api.nvim_create_autocmd("User", {
-		pattern = "CodeCompanionChatStopped",
-		callback = function(args)
-			spinners[args.data.id]:stop()
 		end,
 	})
 end

lua/codecompanion-spinner/spinner.lua

@@ -44,7 +44,9 @@ function M:_update_text()
 end
 
 function M:_clear_text()
-	vim.api.nvim_buf_clear_namespace(self.buffer, self.namespace_id, 0, -1)
+	if vim.api.nvim_buf_is_valid(self.buffer) then -- if not closed already
+		vim.api.nvim_buf_clear_namespace(self.buffer, self.namespace_id, 0, -1)
+	end
 end
 
 function M:_start_timer()
@@ -73,7 +75,6 @@ function M:start(request_id)
 end
 
 function M:stop()
-	log.debug("in stop of spinner", self.chat_id, "... chat_in_buffer:", self.chat_in_buffer)
 	if self.chat_in_buffer then
 		self:_clear_text()
 		self:_stop_timer()