Merge pull request #6843 from 24bit-xjkp/dev

feat(clang-tidy): Improve clang-tidy support

1 files changed, 25 insertions, 47 deletions

diff --git a/xmake/modules/private/check/checkers/clang/tidy.lua b/xmake/modules/private/check/checkers/clang/tidy.lua
index e9fb9e60b..03de479f8 100644
--- a/xmake/modules/private/check/checkers/clang/tidy.lua
+++ b/xmake/modules/private/check/checkers/clang/tidy.lua
@@ -40,8 +40,8 @@ local options = {
     {nil, "fix_errors", "k",  nil,  "Apply suggested errors fixes."},
     {nil, "fix_notes",  "k",  nil,  "Apply suggested notes fixes."},
     {nil, "create",     "k",  nil,  "Create a .clang-tidy file."},
-    {nil, "configfile", "kv", nil,  "Specify the path of .clang-tidy or custom config file"},
-    {nil, "compdb",     "kv", nil,  "Specify the path of the compile_commands.json file"},
+    {nil, "configfile", "kv", nil,  "Specify the path of .clang-tidy or custom config file."},
+    {nil, "compdb",     "kv", nil,  "Specify the path of the compile_commands.json file or the directory containing the file."},
     {nil, "checks",     "kv", nil,  "Set the given checks.",
                                     "e.g.",
                                     "    - xmake check clang.tidy --checks=\"*\""},
@@ -83,19 +83,6 @@ function _add_target_files(sourcefiles, target)
     end
 end
 
-function _run_clang_tidy(clang_tidy, argv, opt)
-    -- https://github.com/llvm/llvm-project/pull/120547
-    if clang_tidy.version and semver.compare(clang_tidy.version, "19.1.6") > 0 and #argv > 10 then
-        local argsfile = os.tmpfile() .. ".args.txt"
-        io.writefile(argsfile, os.args(argv))
-        argv = {"@" .. argsfile}
-        os.vrunv(clang_tidy.program, argv, opt)
-        os.rm(argsfile)
-    else
-        os.vrunv(clang_tidy.program, argv, opt)
-    end
-end
-
 -- check sourcefiles
 function _check_sourcefiles(clang_tidy, sourcefiles, opt)
     opt = opt or {}
@@ -124,30 +111,16 @@ function _check_sourcefiles(clang_tidy, sourcefiles, opt)
         table.insert(argv, "--quiet")
     end
 
-    -- split sourcefiles
-    local arguments_maxn = 32
-    local sourcefiles_argv = {}
-    local sourcefiles_jobs = {}
-    for _, sourcefile in ipairs(sourcefiles) do
-        if not path.is_absolute(sourcefile) then
-            sourcefile = path.absolute(sourcefile, projectdir)
-        end
-        table.insert(sourcefiles_argv, sourcefile)
-        if #sourcefiles_argv >= arguments_maxn then
-            table.insert(sourcefiles_jobs, sourcefiles_argv)
-            sourcefiles_argv = {}
-        end
-    end
-    if #sourcefiles_argv > 0 then
-        table.insert(sourcefiles_jobs, sourcefiles_argv)
-    end
-
+    local analyze_time = os.mclock()
     -- run clang-tidy
     runjobs("checker.tidy", function (index, total, opt)
-        local tidy_argv = sourcefiles_jobs[index]
-        progress.show(index * 100 / total, "clang-tidy.analyzing %s .. %d", tidy_argv[1], #tidy_argv)
-        _run_clang_tidy(clang_tidy, tidy_argv, {curdir = projectdir})
-    end, {total = #sourcefiles_jobs, comax = opt.jobs or os.default_njob()})
+        local sourcefile = sourcefiles[index]
+        local tidy_argv = table.join(argv, {sourcefile})
+        progress.show(index * 100 / total, "clang-tidy.analyzing %s", sourcefile)
+        os.execv(clang_tidy.program, tidy_argv, {curdir = projectdir})
+    end, {total = #sourcefiles, comax = opt.jobs or os.default_njob()})
+    analyze_time = os.mclock() - analyze_time
+    progress.show(100, "${color.success}clang-tidy analyzed %d files, spent %.3fs", #sourcefiles, analyze_time / 1000)
 end
 
 -- do check
@@ -155,8 +128,8 @@ function _check(clang_tidy, opt)
     opt = opt or {}
 
     -- generate compile_commands.json first
-    local filepath = option.get("compdb")
-    if not filepath then
+    local db_path = opt.compdb
+    if not db_path then
         -- @see https://github.com/xmake-io/xmake/issues/5583#issuecomment-2337696628
         local outputdir
         local extraconf = project.extraconf("target.rules", "plugin.compile_commands.autoupdate")
@@ -164,19 +137,25 @@ function _check(clang_tidy, opt)
             outputdir = extraconf.outputdir
         end
         if outputdir then
-            filepath = path.join(outputdir, "compile_commands.json")
+            db_path = path.join(outputdir, "compile_commands.json")
         end
     end
-    if not filepath then
-        filepath = "compile_commands.json"
+    if not db_path then
+        db_path = "compile_commands.json"
     end
-    if not os.isfile(filepath) then
+    if os.isdir(db_path) then
+        local db_file_path = path.join(db_path, "compile_commands.json")
+        if os.isfile(db_file_path) then
+            db_path = db_file_path
+        end
+    end
+    if not os.isfile(db_path) then
         local outputdir = os.tmpfile() .. ".dir"
-        local filename = path.filename(filepath)
-        filepath = outputdir and path.join(outputdir, filename) or filename
+        local filename = path.filename(db_path)
+        db_path = outputdir and path.join(outputdir, filename) or filename
         task.run("project", {quiet = true, kind = "compile_commands", lsp = "clangd", outputdir = outputdir})
     end
-    opt.compdbfile = path.absolute(filepath)
+    opt.compdbfile = path.absolute(db_path)
 
     -- get sourcefiles
     local sourcefiles = {}
@@ -243,4 +222,3 @@ function main(argv)
     end
     os.setenvs(oldenvs)
 end
-