Merge pull request #35 from AuroBreeze/dev

AuroBreeze · web-flow · commit 3353153ba693 · 2025-12-11T11:49:12.000+08:00
Dev
diff --git a/Release.md b/Release.md
@@ -1,5 +1,50 @@
 # Quick-c Release Notes
 
+## v1.6.1 (2025-12-11)
+
+### 新增
+- 目录/项目扫描异步化（非阻塞）：`QuickCCompileDBGenDir`、`QuickCCompileDBGenProject` 均改为异步分步遍历，避免卡主线程。
+- 进度提示（可配置节流）：扫描过程中周期性输出进度（文件/目录计数），默认每约 1200ms 一次。
+- 配置项：
+  - `compile_commands.ignore_dirs`（默认 `{ '.git','node_modules','.cache' }`）
+  - `compile_commands.include_hidden`（默认 `true`，遍历以“.”开头的目录）
+  - `compile_commands.progress_throttle_ms`（默认 `1200`）
+  - `compile_commands.max_depth`（默认 `4`；`nil` 表示不限制）
+
+### 改进
+- 统一体验：项目与目录两条路径使用相同异步扫描器与过滤策略，行为一致。
+- 可控深度：`max_depth` 限制递归层数（根为 0），大项目扫描更可控。
+- 按上下文写入：当 `outdir='source'` 时，生成位置按上下文决定：
+  - 单文件：写到“当前文件目录/compile_commands.json”
+  - 目录扫描：写到“所选目录/compile_commands.json”
+  - 全项目扫描：写到“项目根/compile_commands.json”
+
+### 使用建议
+1) 扫描全项目（异步）：`:QuickCCompileDBGenProject`
+2) 扫描目录（异步）：`:QuickCCompileDBGenDir [dir]`（支持含空格路径与目录补全）
+3) 配置示例：
+```lua
+require('quick-c').setup({
+  compile_commands = {
+    ignore_dirs = { '.git', '.cache', 'build', '.venv' },
+    include_hidden = false,
+    progress_throttle_ms = 1200,
+    max_depth = 4,
+  },
+})
+```
+
+### 验证建议
+1) 设置 `include_hidden=false`，确认 `.hidden/.deps` 等目录被跳过；开启后应被纳入。
+2) 设置 `max_depth=2`，确认仅扫描到二级子目录；提高后包含更深层文件。
+3) 调整 `progress_throttle_ms`（如 300/1200）观察进度提示频率变化。
+
+### 兼容性
+- 非破坏性变更；仅目录/项目扫描路径行为改进与增强。
+
+### 迁移指南
+- 无需迁移；如需更细过滤，请在 `ignore_dirs` 中补充目录名。
+
 ## v1.6.0 (2025-12-04)
 
 ### 新增
diff --git a/lua/quick-c/cc.lua b/lua/quick-c/cc.lua
@@ -83,6 +83,88 @@ local function copy_file(src, dst)
   return vim.fn.writefile(data, dst) == 0
 end
 
+local function collect_sources_recursive(root, ignore_set)
+  local uv = vim.loop
+  local results = {}
+  local function scan(dir)
+    local fs = uv.fs_scandir(dir)
+    if not fs then return end
+    while true do
+      local name, t = uv.fs_scandir_next(fs)
+      if not name then break end
+      local path = dir .. '/' .. name
+      if t == 'directory' then
+        if not ignore_set[name] then
+          scan(path)
+        end
+      else
+        local ext = (name:match('%.([%w]+)$') or ''):lower()
+        if ext == 'c' or ext == 'cpp' or ext == 'cc' or ext == 'cxx' then
+          table.insert(results, path)
+        end
+      end
+    end
+  end
+  scan(root)
+  return results
+end
+
+local function collect_sources_async(root, ignore_set, include_hidden, max_depth, on_progress, on_done)
+  local uv = vim.loop
+  local queue = { { root, 0 } }
+  local results = {}
+  local scanners = {}
+  local dir_count, file_count = 0, 0
+  local function step()
+    local budget = 600
+    while budget > 0 do
+      local item = queue[#queue]
+      local current, depth = nil, 0
+      if item then current, depth = item[1], item[2] or 0 end
+      if not current then
+        on_done(results)
+        return
+      end
+      local fs = scanners[current]
+      if not fs then
+        fs = uv.fs_scandir(current)
+        scanners[current] = fs or false
+        if not fs then
+          queue[#queue] = nil
+        end
+      else
+        local name, t = uv.fs_scandir_next(fs)
+        if not name then
+          queue[#queue] = nil
+        else
+          local path = current .. '/' .. name
+          if t == 'directory' then
+            if not ignore_set[name] then
+              if include_hidden or not name:match('^%.') then
+                if (not max_depth) or (depth + 1 <= max_depth) then
+                  queue[#queue + 1] = { path, depth + 1 }
+                  dir_count = dir_count + 1
+                end
+              end
+            end
+          else
+            local ext = (name:match('%.([%w]+)$') or ''):lower()
+            if ext == 'c' or ext == 'cpp' or ext == 'cc' or ext == 'cxx' then
+              results[#results + 1] = path
+              file_count = file_count + 1
+            end
+          end
+          budget = budget - 1
+        end
+      end
+      if budget <= 0 then break end
+    end
+    if on_progress then on_progress(file_count, dir_count) end
+    vim.defer_fn(step, 1)
+  end
+  step()
+end
+
 function CC.generate(config, notify)
   local ft = vim.bo.filetype
   if ft ~= 'c' and ft ~= 'cpp' then
@@ -239,23 +321,37 @@ end
 -- Non-CMake: scan project for sources and generate
 function CC.generate_for_project(config, notify)
   local cwd = vim.fn.getcwd()
-  local patterns = { '**/*.c', '**/*.cpp', '**/*.cc', '**/*.cxx' }
-  local seen, sources = {}, {}
-  for _, pat in ipairs(patterns) do
-    local list = vim.fn.glob(pat, true, true)
-    for _, f in ipairs(list) do
-      local p = vim.fn.fnamemodify(f, ':p')
-      if vim.fn.filereadable(p) == 1 and not seen[p] then
-        seen[p] = true
-        table.insert(sources, p)
+  local ccfg = config.compile_commands or {}
+  local ignores = {}
+  for _, v in ipairs(ccfg.ignore_dirs or { '.git', 'node_modules', '.cache' }) do ignores[v] = true end
+  local include_hidden = ccfg.include_hidden ~= false
+  local max_depth = ccfg.max_depth
+  local throttle = tonumber(ccfg.progress_throttle_ms) or 600
+  local last = 0
+  collect_sources_async(cwd, ignores, include_hidden, max_depth, function(files, dirs)
+    local uv = vim.loop
+    if uv and uv.now then
+      local now = uv.now()
+      if now - (last or 0) >= throttle then
+        notify.info(string.format('Scanning project: %d files, %d dirs', files or 0, dirs or 0))
+        last = now
       end
     end
-  end
-  if #sources == 0 then
-    notify.warn 'No C/C++ sources found under project root'
-    return
-  end
-  CC.generate_for_sources(config, notify, sources)
+  end, function(list)
+    local seen, sources = {}, {}
+    for _, p in ipairs(list) do
+      local abs = vim.fn.fnamemodify(p, ':p')
+      if vim.fn.filereadable(abs) == 1 and not seen[abs] then
+        seen[abs] = true
+        sources[#sources + 1] = abs
+      end
+    end
+    if #sources == 0 then
+      notify.warn 'No C/C++ sources found under project root'
+      return
+    end
+    CC.generate_for_sources(config, notify, sources)
+  end)
 end
 
 -- Non-CMake: generate for all sources under a specified directory
@@ -270,24 +366,42 @@ function CC.generate_for_dir(config, notify, dir)
     notify.err('Not a directory: ' .. tostring(dir))
     return
   end
-  local patterns = { '**/*.c', '**/*.cpp', '**/*.cc', '**/*.cxx' }
-  local seen, sources = {}, {}
-  for _, pat in ipairs(patterns) do
-    -- Use globpath to search inside the specified directory recursively
-    local list = vim.fn.globpath(dir, pat, true, true)
-    for _, f in ipairs(list) do
-      local p = vim.fn.fnamemodify(f, ':p')
-      if vim.fn.filereadable(p) == 1 and not seen[p] then
-        seen[p] = true
-        table.insert(sources, p)
+  local ccfg = config.compile_commands or {}
+  local ignores = {}
+  for _, v in ipairs(ccfg.ignore_dirs or { '.git', 'node_modules', '.cache' }) do ignores[v] = true end
+  local include_hidden = ccfg.include_hidden ~= false
+  local max_depth = ccfg.max_depth
+  local throttle = tonumber(ccfg.progress_throttle_ms) or 600
+  local last = 0
+  collect_sources_async(dir, ignores, include_hidden, max_depth, function(files, dirs)
+    local uvn = vim.loop
+    if uvn and uvn.now then
+      local now = uvn.now()
+      if now - (last or 0) >= throttle then
+        notify.info(string.format('Scanning dir: %d files, %d dirs', files or 0, dirs or 0))
+        last = now
       end
     end
-  end
-  if #sources == 0 then
-    notify.warn('No C/C++ sources found under: ' .. dir)
-    return
-  end
-  CC.generate_for_sources(config, notify, sources)
+  end, function(list)
+    local seen, sources = {}, {}
+    for _, p in ipairs(list) do
+      local abs = vim.fn.fnamemodify(p, ':p')
+      if vim.fn.filereadable(abs) == 1 and not seen[abs] then
+        seen[abs] = true
+        sources[#sources + 1] = abs
+      end
+    end
+    if #sources == 0 then
+      notify.warn('No C/C++ sources found under: ' .. dir)
+      return
+    end
+    local cfg = vim.tbl_deep_extend('force', {}, config)
+    cfg.compile_commands = cfg.compile_commands or {}
+    if cfg.compile_commands.outdir == 'source' then
+      cfg.compile_commands.outdir = dir
+    end
+    CC.generate_for_sources(cfg, notify, sources)
+  end)
 end
 
 return CC
diff --git a/lua/quick-c/config.lua b/lua/quick-c/config.lua
@@ -66,6 +66,10 @@ C.defaults = {
     --   相对路径 : 相对 :pwd
     --   绝对路径 : 例如 'C:/proj/compile_commands'
     outdir = 'source',
+    ignore_dirs = { '.git', 'node_modules', '.cache' },
+    include_hidden = true,
+    progress_throttle_ms = 1200,
+    max_depth = 4,
     -- 当 mode = 'use' 时，从此路径复制 compile_commands.json
     use_path = nil,
   },
