Merge pull request #33 from AuroBreeze/dev

Dev

Author: AuroBreeze

Release.md

@@ -1,5 +1,31 @@
 # Quick-c Release Notes
 
+## v1.5.15 (2025-12-04)
+
+### 新增
+- cqM 目标记忆：每个 cwd 记住“上一次选择的目标”，再次打开列表会在顶部显示快捷项：`[Last target: <name>]`，可一键执行。
+
+### 改进
+- cqM 选择器默认以“正常模式”打开（`initial_mode = 'normal'`），无需先退出插入模式。
+
+### 修复
+- 终端已打开但未聚焦时，编辑页触发 cqM 发送命令会“切换/关闭”终端窗口的问题：
+  - 不再在发送前强制 `open`，避免 betterTerm 的 toggle 行为。
+  - 发送成功后按策略聚焦：优先聚焦已有终端窗口；无窗口时再兜底 `betterTerm.open`。
+  - 聚焦策略优先遵循 `betterterm.focus_on_run`；未启用 betterTerm 时回退到“无内置终端时才聚焦”。
+- `select_or_run_in_terminal` 的默认分支移除多余的 `open` 调用并稳定回退路径，避免潜在的循环加载与焦点抖动。
+
+### 验证建议
+1) 打开一个终端窗口但保持未聚焦，在代码缓冲执行 `<leader>cqM` 选择目标：终端不应被关闭，若 `focus_on_run = true` 则会聚焦；为 `false` 不抢焦点。
+2) 连续两次选择同一目录下的某个目标，第二次列表顶部应出现 `[Last target: <name>]`，选择即可直接执行；当 `make.args.prompt = true` 时仍会弹出参数输入框。
+3) cqM 打开后处于正常模式，可直接使用 j/k、<CR> 操作。
+
+### 兼容性
+- 无破坏性变更；默认行为与配置说明一致。
+
+### 迁移指南
+- 无需迁移；如需跨会话持久化“上次目标”，后续将提供可选方案。
+
 ## v1.5.14 (2025-11-27)
 
 ### 修复

lua/quick-c/telescope.lua

@@ -2,6 +2,7 @@ local M = {}
 local U = require 'quick-c.util'
 local T = require 'quick-c.terminal'
 local LAST_ARGS = {}
+local LAST_TARGET = {}
 
 -- Enhanced quickfix Telescope: show detailed error preview on the right
 function M.telescope_quickfix(config)
@@ -289,6 +290,7 @@ function M.telescope_make(
         pickers
           .new({}, {
             prompt_title = 'Make Targets (' .. cwd .. ')',
+            initial_mode = 'normal',
             finder = finders.new_table {
               results = { { display = '[No Make targets found]', kind = 'empty' } },
               entry_maker = function(e)
@@ -320,6 +322,11 @@ function M.telescope_make(
       local function build_entries()
         local entries = {}
         table.insert(entries, { display = '[Custom args...]', kind = 'args' })
+        -- prepend last target quick entry if available for this cwd
+        local last = LAST_TARGET[cwd]
+        if type(last) == 'string' and last ~= '' then
+          table.insert(entries, { display = string.format('[Last target: %s]', last), kind = 'last', value = last })
+        end
         local list = {}
         if mktargets.prioritize_phony ~= false then
           local a, b = {}, {}
@@ -356,6 +363,7 @@ function M.telescope_make(
       pickers
         .new({}, {
           prompt_title = title .. ' (' .. cwd .. ')',
+          initial_mode = 'normal',
           finder = finders.new_table {
             results = entries,
             entry_maker = function(e)
@@ -531,6 +539,10 @@ function M.telescope_make(
               end
               local ui = vim.ui or {}
               if not ui.input then
+                -- remember last selected explicit target
+                if type(target) == 'string' and target ~= '' then
+                  LAST_TARGET[cwd] = target
+                end
                 make_run_in_cwd(target, cwd)
                 return
               end
@@ -551,8 +563,14 @@ function M.telescope_make(
                   else
                     cmd = string.format('%s -C %s %s %s', prog, shell_quote_path(cwd), target or '', arg)
                   end
+                  if type(target) == 'string' and target ~= '' then
+                    LAST_TARGET[cwd] = target
+                  end
                   run_make_in_terminal(cmd)
                 else
+                  if type(target) == 'string' and target ~= '' then
+                    LAST_TARGET[cwd] = target
+                  end
                   make_run_in_cwd(target, cwd)
                 end
               end)
@@ -596,10 +614,22 @@ function M.telescope_make(
                   run_make_in_terminal(cmd)
                 end)
                 return
+              elseif entry.kind == 'last' then
+                local target = entry.value
+                if mkargs.prompt ~= false then
+                  run_with_args(target)
+                else
+                  LAST_TARGET[cwd] = target
+                  make_run_in_cwd(target, cwd)
+                end
+                return
               end
               if mkargs.prompt ~= false then
                 run_with_args(entry.value)
               else
+                if type(entry.value) == 'string' and entry.value ~= '' then
+                  LAST_TARGET[cwd] = entry.value
+                end
                 make_run_in_cwd(entry.value, cwd)
               end
             end

lua/quick-c/terminal.lua

@@ -42,19 +42,8 @@ function T.run_in_betterterm(config, is_windows, cmd, notify_warn, notify_err, o
   local want_focus = (focus == true) and (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'
-  -- Open terminal if requested by config (open_if_closed) or when focusing is desired.
-  -- Even when we don't want to steal focus, we still open the terminal to ensure the session exists,
-  -- then immediately restore previous window to avoid key leakage and focus steal.
-  if (open_first or focus) then
-    pcall(betterTerm.open, idx)
-  end
-  if not want_focus then
-    -- Restore immediately to avoid stealing focus
-    pcall(vim.api.nvim_set_current_win, prev)
-    if prev_mode:sub(1, 1) == 'n' then
-      pcall(vim.cmd, 'stopinsert')
-    end
-  end
+  -- Do not pre-open to avoid toggle-closing an already visible terminal window.
+  -- We will try to send first; if it fails, we may open; if focusing is desired, we'll try to focus an existing window.
   vim.defer_fn(function()
     local ok_send, err = pcall(betterTerm.send, cmd .. (is_windows() and '\r' or '\n'), idx)
     if not ok_send then
@@ -64,8 +53,34 @@ function T.run_in_betterterm(config, is_windows, cmd, notify_warn, notify_err, o
       end
       return
     end
-    -- Some versions of betterTerm may re-focus after open/send; if we don't want focus, restore again after send
-    if not want_focus then
+    -- Focus behavior after successful send
+    if want_focus then
+      -- Prefer focusing an existing terminal window to avoid toggle-close behavior
+      local terms = T.list_open_builtin_terminals()
+      if terms and #terms > 0 then
+        local last = terms[#terms]
+        pcall(vim.api.nvim_set_current_win, prev) -- ensure we have valid window context
+        vim.defer_fn(function()
+          pcall(function()
+            -- try to focus existing terminal window displaying this buffer
+            for _, win in ipairs(vim.api.nvim_list_wins()) do
+              if vim.api.nvim_win_is_valid(win) and vim.api.nvim_win_get_buf(win) == last.bufnr then
+                pcall(vim.api.nvim_set_current_win, win)
+                return
+              end
+            end
+            -- not found: as a fallback, open via betterTerm (may create or bring to front)
+            pcall(betterTerm.open, idx)
+          end)
+        end, 60)
+      else
+        -- No terminal windows: open one now to show output
+        vim.defer_fn(function()
+          pcall(betterTerm.open, idx)
+        end, 60)
+      end
+    else
+      -- If not focusing, restore previous window to avoid stealing focus
       vim.defer_fn(function()
         pcall(vim.api.nvim_set_current_win, prev)
         if prev_mode:sub(1, 1) == 'n' then
@@ -78,9 +93,14 @@ 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)
-  -- Auto-focus terminal when none is currently open; otherwise do not steal focus.
+  -- Decide focus policy:
+  -- - If betterTerm is enabled and focus_on_run ~= false, prefer focusing (honor user config).
+  -- - Otherwise fallback to legacy behavior: focus only when no builtin terminal is open.
   local open_terms = T.list_open_builtin_terminals()
-  local want_focus = (#open_terms == 0)
+  local bt_cfg = config.betterterm or {}
+  local prefer_bt = (bt_cfg.enabled ~= false)
+  local cfg_focus = (bt_cfg.focus_on_run ~= false)
+  local want_focus = (prefer_bt and cfg_focus) or (#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'
@@ -170,52 +190,18 @@ function T.select_or_run_in_terminal(config, is_windows, cmdline, notify_warn, n
             actions.close(bufnr)
             local v = entry.value
             if v.kind == 'default' then
+              -- Use unified focusing/selection policy inside run_make_in_terminal
               T.run_make_in_terminal(config, is_windows, cmdline, notify_warn, notify_err)
-              do
-                local ok_bt, betterTerm = pcall(require, 'betterTerm')
-                if ok_bt and (config.betterterm and config.betterterm.enabled ~= false) then
-                  local idx = (config.betterterm and config.betterterm.index) or 0
-                  local focus_on_run = (config.betterterm and config.betterterm.focus_on_run) ~= false
-                  if focus_on_run then
-                    vim.defer_fn(function()
-                      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
               local ok = T.send_to_builtin_terminal(is_windows, v.job, cmdline, { bufnr = v.bufnr, config = config })
               if not ok then
                 notify_warn 'Failed to send to selected terminal, using default strategy'
                 T.run_make_in_terminal(config, is_windows, cmdline, notify_warn, notify_err)
-                do
-                  local ok_bt, betterTerm = pcall(require, 'betterTerm')
-                  if ok_bt and (config.betterterm and config.betterterm.enabled ~= false) then
-                    local idx = (config.betterterm and config.betterterm.index) or 0
-                    local focus_on_run = (config.betterterm and config.betterterm.focus_on_run) ~= false
-                    if focus_on_run then
-                      vim.defer_fn(function()
-                        pcall(betterTerm.open, idx)
-                      end, 120)
-                    end
-                  end
-                end
-              end
-              if ok then
-                vim.defer_fn(function()
-                  pcall(open_builtin_terminal_window, config, v.bufnr)
-                end, 120)
+                return
               end
+              vim.defer_fn(function()
+                pcall(open_builtin_terminal_window, config, v.bufnr)
+              end, 120)
             end
           end
           map('i', '<CR>', choose)