fix auto complete

7 files changed, 8 insertions, 25 deletions

diff --git a/xmake/actions/build/xmake.lua b/xmake/actions/build/xmake.lua
index 8d3b28291..700bb8996 100644
--- a/xmake/actions/build/xmake.lua
+++ b/xmake/actions/build/xmake.lua
@@ -59,7 +59,7 @@ task("build")
                
                 ,   {}
                 ,   {nil, "target",     "v",  nil   , "The target name. It will build all default targets if this parameter is not specified."
-                                                    , values = function () return try{ function () return table.keys(import("core.project.project").targets()) end } end }
+                                                    , values = function (complete, opt) return import("private.utils.complete_helper.targets")(complete, opt) end }
                 }
             }
 
diff --git a/xmake/actions/clean/xmake.lua b/xmake/actions/clean/xmake.lua
index 0d9b265c1..2c0213d37 100644
--- a/xmake/actions/clean/xmake.lua
+++ b/xmake/actions/clean/xmake.lua
@@ -45,7 +45,7 @@ task("clean")
                 
                 ,   {}
                 ,   {nil, "target",     "v",  nil   , "The target name. It will clean all default targets if this parameter is not specified."
-                                                    , values = function () return try{ function () return table.keys(import("core.project.project").targets()) end } end }
+                                                    , values = function (complete, opt) return import("private.utils.complete_helper.targets")(complete, opt) end }
                 }
             }
 
diff --git a/xmake/actions/config/xmake.lua b/xmake/actions/config/xmake.lua
index c53844e5c..2c8bb97c1 100644
--- a/xmake/actions/config/xmake.lua
+++ b/xmake/actions/config/xmake.lua
@@ -206,11 +206,7 @@ task("config")
 
                 ,   {}
                 ,   {nil, "target",     "v" , nil       , "Configure for the given target."
-                                                        , values = function ()
-                                                            return try { function ()
-                                                                return table.keys(import("core.project.project").targets())
-                                                            end }
-                                                        end                                                                 }
+                                                        , values = function (complete, opt) return import("private.utils.complete_helper.targets")(complete, opt) end }
                 }
             }
 
diff --git a/xmake/actions/install/xmake.lua b/xmake/actions/install/xmake.lua
index 09ecc883f..3b859238a 100644
--- a/xmake/actions/install/xmake.lua
+++ b/xmake/actions/install/xmake.lua
@@ -50,7 +50,7 @@ task("install")
 
                 ,   {                                                                               }
                 ,   {nil, "target",     "v",  nil   , "The target name. It will install all default targets if this parameter is not specified."
-                                                    , values = function () return try{ function () return table.keys(import("core.project.project").targets()) end } end }
+                                                    , values = function (complete, opt) return import("private.utils.complete_helper.targets")(complete, opt) end }
                 }
             }
 
diff --git a/xmake/actions/package/xmake.lua b/xmake/actions/package/xmake.lua
index 13c3f4b28..d15c3eec1 100644
--- a/xmake/actions/package/xmake.lua
+++ b/xmake/actions/package/xmake.lua
@@ -45,7 +45,7 @@ task("package")
                 ,   {'a', "all",        "k",  nil   , "Package all targets."                                          }
                 ,   {}
                 ,   {nil, "target",     "v",  nil   , "The target name. It will package all default targets if this parameter is not specified."
-                                                    , values = function () return try{ function () return table.keys(import("core.project.project").targets()) end } end }
+                                                    , values = function (complete, opt) return import("private.utils.complete_helper.targets")(complete, opt) end }
                 }
             } 
 
diff --git a/xmake/actions/run/xmake.lua b/xmake/actions/run/xmake.lua
index bfdce3af1..a44eb1158 100644
--- a/xmake/actions/run/xmake.lua
+++ b/xmake/actions/run/xmake.lua
@@ -49,21 +49,8 @@ task("run")
                                                       "    --workdir=`pwd`"                                                }
                 ,   {}  
                 ,   {nil, "target",     "v",   nil  , "The target name. It will run all default targets if this parameter is not specified."
-                                                    , values = function () 
-                                                        return try{
-                                                            function ()
-                                                                import("core.project.project")
-                                                                local targets = project.targets()
-                                                                local runable = {}
-                                                                for k, v in pairs(targets) do
-                                                                    if v:script("run") or v:get("kind") == "binary" then
-                                                                        table.insert(runable, k)
-                                                                    end
-                                                                end
-                                                                return runable
-                                                            end
-                                                        }
-                                                      end                                                                  }
+                                                    , values = function (complete, opt) return import("private.utils.complete_helper.runable_targets")(complete, opt) end }
+
                 ,   {nil, "arguments",  "vs",  nil  , "The target arguments"                                               }
                 }
             }
diff --git a/xmake/actions/uninstall/xmake.lua b/xmake/actions/uninstall/xmake.lua
index 4f70922c2..882499668 100644
--- a/xmake/actions/uninstall/xmake.lua
+++ b/xmake/actions/uninstall/xmake.lua
@@ -52,7 +52,7 @@ task("uninstall")
                                                       "or  $ PREFIX=local xmake uninstall"          }
                 ,   {                                                                               }
                 ,   {nil, "target",     "v",  nil   , "The target name. It will uninstall all default targets if this parameter is not specified."
-                                                    , values = function () return try{ function () return table.keys(import("core.project.project").targets()) end } end }
+                                                    , values = function (complete, opt) return import("private.utils.complete_helper.targets")(complete, opt) end }
                 }
             }