From 403480f16a5d753b7fc1383b49779178c9dac3d0 Mon Sep 17 00:00:00 2001
From: Tomas Slusny <slusnucky@gmail.com>
Date: Tue, 12 Aug 2025 16:16:21 +0200
Subject: [PATCH] fix(utils): always exit insert mode in return_to_normal_mode

Previously, return_to_normal_mode only exited insert mode if not already
in normal mode. This change ensures that 'stopinsert' is always called,
making the function more reliable when switching modes, especially after
visual selections. This improves consistency in mode transitions.

Fixes #1307
---
 lua/CopilotChat/utils.lua | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lua/CopilotChat/utils.lua b/lua/CopilotChat/utils.lua
index fe2f4773..a221b749 100644
--- a/lua/CopilotChat/utils.lua
+++ b/lua/CopilotChat/utils.lua
@@ -174,9 +174,8 @@ function M.return_to_normal_mode()
   local mode = vim.fn.mode():lower()
   if mode:find('v') then
     vim.cmd([[execute "normal! \<Esc>"]])
-  elseif mode ~= 'n' then
-    vim.cmd('stopinsert')
   end
+  vim.cmd('stopinsert')
 end
 
 --- Debounce a function