Merge pull request #27 from AuroBreeze/dev

Dev

Author: AuroBreeze

Release.md

@@ -1,5 +1,24 @@
 # Quick-c Release Notes
 
+## v1.5.10 (2025-11-02)
+
+### 修复
+- Make（`cqM`）在无终端时不聚焦且切入插入模式的问题：
+  - 首次运行时如无打开终端，将自动聚焦到终端。
+  - 当选择不聚焦终端时，返回原窗口会在必要时执行 `stopinsert`，避免把普通缓冲区置于插入模式。
+  - 适配内置终端与 betterTerm 两种路径。
+- 多终端时选择“默认终端策略”后不聚焦、终端窗口“闪一下后关闭”的问题：
+  - 发送完成后会按策略聚焦：若启用 betterTerm 且 `focus_on_run = true`，则延迟 `open(index)`；否则聚焦最近的内置终端窗口。
+  - 避免在无需聚焦时提前 `open()` betterTerm，防止 UI 抖动/闪退。
+### 兼容性
+- 无破坏性变更，默认即可。
+- betterTerm 用户：保留默认 `focus_on_run = true` 可配合新逻辑正常聚焦。
+
+### 迁移指南
+- 无需迁移。建议在升级后验证两种场景：
+  1) 无打开终端时运行 `cqM`：应聚焦终端，原缓冲区不会被置为插入模式。
+  2) 已有终端时运行 `cqM`：不应抢焦点，原缓冲区保持原模式。
+
 ## v1.5.9 (2025-11-01)
 
 ### 改进

lua/quick-c/terminal.lua

@@ -4,6 +4,7 @@ function T.run_in_native_terminal(config, is_windows, cmd, opts)
   opts = opts or {}
   local focus = (opts.focus ~= false)
   local prev = vim.api.nvim_get_current_win()
+  local prev_mode = (vim.api.nvim_get_mode and vim.api.nvim_get_mode().mode) or 'n'
   if config.terminal.open then
     vim.cmd 'botright split | terminal'
     vim.cmd(string.format('resize %d', config.terminal.height or 12))
@@ -16,6 +17,9 @@ function T.run_in_native_terminal(config, is_windows, cmd, opts)
   end
   if not focus then
     pcall(vim.api.nvim_set_current_win, prev)
+    if prev_mode:sub(1, 1) == 'n' then
+      pcall(vim.cmd, 'stopinsert')
+    end
   end
   vim.defer_fn(function()
     vim.fn.chansend(chan, cmd .. (is_windows() and '\r' or '\n'))
@@ -36,11 +40,16 @@ function T.run_in_betterterm(config, is_windows, cmd, notify_warn, notify_err, o
   opts = opts or {}
   local want_focus = (opts.focus ~= false)
   local prev = vim.api.nvim_get_current_win()
-  if open_first or focus then
+  local prev_mode = (vim.api.nvim_get_mode and vim.api.nvim_get_mode().mode) or 'n'
+  -- Only open immediately if we intend to focus now; otherwise avoid toggling UI.
+  if (open_first or focus) and want_focus then
     pcall(betterTerm.open, idx)
   end
   if not want_focus then
     pcall(vim.api.nvim_set_current_win, prev)
+    if prev_mode:sub(1, 1) == 'n' then
+      pcall(vim.cmd, 'stopinsert')
+    end
   end
   vim.defer_fn(function()
     local ok_send, err = pcall(betterTerm.send, cmd .. (is_windows() and '\r' or '\n'), idx)
@@ -56,8 +65,11 @@ function T.run_in_betterterm(config, is_windows, cmd, notify_warn, notify_err, o
 end
 
 function T.run_make_in_terminal(config, is_windows, cmdline, notify_warn, notify_err)
-  if not T.run_in_betterterm(config, is_windows, cmdline, notify_warn, notify_err, { focus = false }) then
-    if not T.run_in_native_terminal(config, is_windows, cmdline, { focus = false }) then
+  -- Auto-focus terminal when none is currently open; otherwise do not steal focus.
+  local open_terms = T.list_open_builtin_terminals()
+  local want_focus = (#open_terms == 0)
+  if not T.run_in_betterterm(config, is_windows, cmdline, notify_warn, notify_err, { focus = want_focus }) then
+    if not T.run_in_native_terminal(config, is_windows, cmdline, { focus = want_focus }) then
       notify_err 'Unable to run make: cannot open terminal'
     end
   end
@@ -156,6 +168,16 @@ function T.select_or_run_in_terminal(config, is_windows, cmdline, notify_warn, n
                       pcall(betterTerm.open, idx)
                     end, 120)
                   end
+                else
+                  -- Focus a builtin terminal window after sending, to honor explicit user choice
+                  vim.defer_fn(function()
+                    local terms = T.list_open_builtin_terminals()
+                    if terms and #terms > 0 then
+                      -- pick the last one (most recently opened)
+                      local last = terms[#terms]
+                      pcall(open_builtin_terminal_window, config, last.bufnr)
+                    end
+                  end, 120)
                 end
               end
             else