improve tab complete

6 files changed, 215 insertions, 123 deletions

diff --git a/xmake/plugins/lua/main.lua b/xmake/plugins/lua/main.lua
new file mode 100644
index 000000000..7586ab65a
--- /dev/null
+++ b/xmake/plugins/lua/main.lua
@@ -0,0 +1,134 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        main.lua
+--
+
+-- imports
+import("core.base.option")
+import("core.sandbox.module")
+import("core.sandbox.sandbox")
+
+-- get all lua scripts
+function scripts()
+    local names = {}
+    local files = os.match(path.join(os.scriptdir(), "scripts/*.lua"))
+    for _, file in ipairs(files) do
+        table.insert(names, path.basename(file))
+    end
+    return names
+end
+
+-- list all lua scripts
+function _list()
+    print("scripts:")
+    for _, file in ipairs(scripts()) do
+        print("    " .. file)
+    end
+end
+
+function _run_commanad(command, args)
+    local tmpfile = os.tmpfile() .. ".lua"
+    io.writefile(tmpfile, "function main(...)\n" .. command .. "\nend")
+    return _run_script(tmpfile, args)
+end
+
+function _run_script(script, args)
+
+    local func
+    local printresult = false
+
+    -- import and run script
+    if path.extension(script) == ".lua" and os.isfile(script) then
+
+        -- run the given lua script file (xmake lua /tmp/script.lua)
+        vprint("running given lua script file: %s", path.relative(script))
+        func = import(path.basename(script), {rootdir = path.directory(script), anonymous = true})
+
+    elseif os.isfile(path.join(os.scriptdir(), "scripts", script .. ".lua")) then
+
+        -- run builtin lua script (xmake lua echo "hello xmake")
+        vprint("running builtin lua script: %s", script)
+        func = import("scripts." .. script, {anonymous = true})(table.unpack(args, 1, args.n))
+    else
+
+        -- attempt to find the builtin module
+        local object = nil
+        for _, name in ipairs(script:split("%.")) do
+            object = object and object[name] or module.get(name)
+            if not object then
+                break
+            end
+        end
+        if object then
+            -- run builtin modules (xmake lua core.xxx.xxx)
+            vprint("running builtin module: %s", script)
+            func = object
+        else
+            -- run imported modules (xmake lua core.xxx.xxx)
+            vprint("running imported module: %s", script)
+            func = import(script, {anonymous = true})
+        end
+        printresult = true
+    end
+
+    local result = table.pack(func(table.unpack(args, 1, args.n)))
+    if printresult and result and result.n ~= 0 then
+        utils.dump(unpack(result, 1, result.n))
+    end
+end
+
+function _get_args()
+
+    local args = option.get("arguments") or {}
+    args.n = #args
+    for i, value in ipairs(args) do
+        if value:startswith('@') then
+            -- deserialize @ prefixed arg
+            local v, err = string.deserialize(value:sub(2))
+            if err then
+                -- for strings that failed to deserialize, regaed it as a normal string, just show a warning message
+                utils.warning(err)
+            else
+                args[i] = v
+            end
+        end
+    end
+
+    return args
+end
+
+function main()
+
+    if option.get("list") then
+        return _list()
+    end
+
+    -- run command?
+    local script = option.get("script")
+    if option.get("command") and script then
+        return _run_commanad(script, _get_args())
+    end
+
+    -- get script
+    if script then
+        return _run_script(script, _get_args())
+    end
+
+    -- enter interactive mode
+    sandbox.interactive()
+end
diff --git a/xmake/plugins/lua/xmake.lua b/xmake/plugins/lua/xmake.lua
index e264ba14d..7b7bb8dd3 100644
--- a/xmake/plugins/lua/xmake.lua
+++ b/xmake/plugins/lua/xmake.lua
@@ -25,87 +25,7 @@ task("lua")
     set_category("plugin")
 
     -- on run
-    on_run(function ()
-           
-        -- imports
-        import("core.base.option")
-        import("core.sandbox.module")
-        import("core.sandbox.sandbox")
-
-        -- list all lua scripts?
-        if option.get("list") then
-            print("scripts:")
-            local files = os.match(path.join(os.scriptdir(), "scripts/*.lua"))
-            for _, file in ipairs(files) do
-                print("    " .. path.basename(file))
-            end
-            return
-        end
-
-        -- run command?
-        local script = option.get("script")
-        if option.get("command") and script then
-            local tmpfile = os.tmpfile() .. ".lua"
-            io.writefile(tmpfile, "function main(...)\n" .. script .. "\nend")
-            script = tmpfile
-        end
-
-        -- get script
-        if script then
-
-            local args = option.get("arguments") or {}
-            args.n = #args
-            for i, value in ipairs(args) do
-                if value:startswith('@') then
-                    local v, err = string.deserialize(value:sub(2))
-                    if err then
-                        -- for strings that failed to deserialize, regaed it as a normal string, just show a warning message
-                        utils.warning(err)
-                    else
-                        args[i] = v
-                    end
-                end
-            end
-
-            -- import and run script
-            if path.extension(script) == ".lua" and os.isfile(script) then
-
-                -- run the given lua script file (xmake lua /tmp/script.lua)
-                vprint("running given lua script file: %s", path.relative(script))
-                import(path.basename(script), {rootdir = path.directory(script), anonymous = true})(table.unpack(args, 1, args.n))
-
-            elseif os.isfile(path.join(os.scriptdir(), "scripts", script .. ".lua")) then
-
-                -- run builtin lua script (xmake lua echo "hello xmake")
-                vprint("running builtin lua script: %s", script)
-                import("scripts." .. script, {anonymous = true})(table.unpack(args, 1, args.n))
-            else
-
-                -- attempt to find the builtin module
-                local object = nil
-                for _, name in ipairs(script:split("%.")) do
-                    object = object and object[name] or module.get(name)
-                    if not object then
-                        break
-                    end
-                end
-                local result = nil
-                if object then
-                    -- run builtin modules (xmake lua core.xxx.xxx)
-                    vprint("running builtin module: %s", script)
-                    result = table.pack(object(table.unpack(args, 1, args.n)))
-                else
-                    -- run imported modules (xmake lua core.xxx.xxx)
-                    vprint("running imported module: %s", script)
-                    result = table.pack(import(script, {anonymous = true})(table.unpack(args, 1, args.n)))
-                end
-                if result and result.n ~= 0 then utils.dump(unpack(result, 1, result.n)) end
-            end
-        else
-            -- enter interactive mode
-            sandbox.interactive()
-        end
-    end)
+    on_run("main")
 
     -- set menu
     set_menu {
@@ -119,21 +39,26 @@ task("lua")
             ,   shortname = 'l'
 
                 -- options
-            ,   options = 
+            ,   options =
                 {
 
-                    {'l', "list",       "k",  nil,          "List all scripts."                              }
-                ,   {'c', "command",    "k",  nil,          "Run script as command"                          }
-                ,   {nil, "script",     "v",  nil,          "Run the given lua script name, file or module and enter interactive mode if no given script.",
+                    {'l', "list"        , "k"   , nil   ,   "List all scripts."                                             }
+                ,   {'c', "command"     , "k"   , nil   ,   "Run script as command"                                         }
+                ,   {nil, "script"      , "v"   , nil   ,   "Run the given lua script name, file or module and enter interactive mode if no given script.",
                                                             "e.g.",
                                                             "    - xmake lua (enter interactive mode)",
                                                             "    - xmake lua /tmp/script.lua",
                                                             "    - xmake lua echo 'hello xmake'",
                                                             "    - xmake lua core.xxx.xxx",
-                                                            "    - xmake lua -c 'print(...)' hello xmake!"   }
-                ,   {nil, "arguments",  "vs", nil,          "The script arguments, use '@' to enable deserializing.",
+                                                            "    - xmake lua -c 'print(...)' hello xmake!"
+                                                        ,   values = function (complete, opt)
+                                                                if not complete or opt.command or opt.list then return end
+
+                                                                return import("main.scripts")()
+                                                            end                                                             }
+                ,   {nil, "arguments"   ,  "vs" , nil   ,   "The script arguments, use '@' to enable deserializing.",
                                                             "e.g.",
-                                                            "    - xmake lua lib.detect.find_tool tar @{version=true}" }
+                                                            "    - xmake lua lib.detect.find_tool tar @{version=true}"      }
                 }
             }
 
diff --git a/xmake/plugins/macro/main.lua b/xmake/plugins/macro/main.lua
index 0bbbaa53b..c55b4f680 100644
--- a/xmake/plugins/macro/main.lua
+++ b/xmake/plugins/macro/main.lua
@@ -75,12 +75,10 @@ function _wfile(macroname)
     return path.join(path.join(config.directory(), "macros"), macroname .. ".lua")
 end
 
--- list macros
-function _list()
-
-    -- trace
-    cprint("${bright}macros:")
+-- get all macros
+function macros(anonymousname)
 
+    local results = {}
     -- find all macros
     for _, dir in ipairs(_directories()) do
         local macrofiles = os.match(path.join(dir, "*.lua"))
@@ -88,14 +86,28 @@ function _list()
 
             -- get macro name
             local macroname = path.basename(macrofile)
-            if macroname == "anonymous" then
-                macroname = ".<anonymous>"
+
+            if macroname == "anonymous" and anonymousname then
+                macroname = anonymousname
             end
 
-            -- show it
-            print("    " .. macroname)
+            table.insert(results, macroname)
         end
     end
+    return results
+end
+
+-- list macros
+function _list()
+
+    -- trace
+    cprint("${bright}macros:")
+
+    -- find all macros
+    for _, macroname in ipairs(macros(".<anonymous>")) do
+        -- show it
+        print("    " .. macroname)
+    end
 end
 
 -- show macro
diff --git a/xmake/plugins/macro/xmake.lua b/xmake/plugins/macro/xmake.lua
index 24157dfe0..e414ba246 100644
--- a/xmake/plugins/macro/xmake.lua
+++ b/xmake/plugins/macro/xmake.lua
@@ -41,10 +41,10 @@ task("macro")
                 -- options
             ,   options = 
                 {
-                    {'b', "begin",      "k",  nil,  "Start to record macro."                          
+                    {'b', "begin",      "k",  nil,  "Start to record macro."
                                                 ,   "e.g."
                                                 ,   "Record macro with name: test"
-                                                ,   "    xmake macro --begin"                   
+                                                ,   "    xmake macro --begin"
                                                 ,   "    xmake config --plat=macosx"
                                                 ,   "    xmake clean"
                                                 ,   "    xmake -r"
@@ -68,9 +68,19 @@ task("macro")
                 ,   {}
                 ,   {nil, "name",       "v",  ".",  "Set the macro name."
                                                 ,   "e.g."
-                                                ,   "   Run the given macro:     xmake macro test"        
-                                                ,   "   Run the anonymous macro: xmake macro ."     
-                                                ,   "   Run the last command:    xmake macro .."    }
+                                                ,   "   Run the given macro:     xmake macro test"
+                                                ,   "   Run the anonymous macro: xmake macro ."
+                                                ,   "   Run the last command:    xmake macro .."
+                                                ,   values = function (complete, opt)
+                                                        -- hide in help menu
+                                                        if not complete then return end
+                                                        -- don't need name
+                                                        if opt.begin or opt.list or opt.clear then return end
+                                                        -- name should be given by user
+                                                        if opt["end"] or opt.import then return end
+
+                                                        return import("main.macros")(".")
+                                                    end                                             }
                 ,   {nil, "arguments",  "vs", nil,  "Set the macro arguments."                      }
                 }
             }
diff --git a/xmake/plugins/project/main.lua b/xmake/plugins/project/main.lua
index 147cee3d6..b24a3b47f 100755
--- a/xmake/plugins/project/main.lua
+++ b/xmake/plugins/project/main.lua
@@ -31,13 +31,11 @@ import("vsxmake.vsxmake")
 import("clang.compile_flags")
 import("clang.compile_commands")
 
--- make project
-function _make(kind)
+function makers()
 
     -- the maps
-    local maps = 
-    {
-        makefile         = makefile.make
+    return
+    {   makefile         = makefile.make
     ,   xmakefile        = xmakefile.make
     ,   cmakelists       = cmakelists.make
     ,   vs2002           = vs.make(2002)
@@ -61,6 +59,12 @@ function _make(kind)
     ,   compile_flags    = compile_flags.make
     ,   compile_commands = compile_commands.make
     }
+end
+
+-- make project
+function _make(kind)
+
+    local maps = makers()
     assert(maps[kind], "the project kind(%s) is not supported!", kind)
 
     -- make it
diff --git a/xmake/plugins/project/xmake.lua b/xmake/plugins/project/xmake.lua
index 31be1e90b..f5c6c6b30 100644
--- a/xmake/plugins/project/xmake.lua
+++ b/xmake/plugins/project/xmake.lua
@@ -38,22 +38,29 @@ task("project")
                 -- options
             ,   options = 
                 {
-                    {'k', "kind",      "kv", "makefile",    "Set the project kind." 
-                                                       ,    "    - makefile"
-                                                       ,    "    - xmakefile (makefile with xmake)"
-                                                       ,    "    - cmakelists"
-                                                       ,    "    - compile_flags"
-                                                       ,    "    - compile_commands (clang compilation database with json format)"
-                                                       ,    "    - vs (auto detect), vs2002, vs2003, vs2005, vs2008"
-                                                       ,    "    - vs2010, vs2012, vs2013, vs2015, vs2017, vs2019"
-                                                       ,    "    - vsxmake (auto detect), vsxmake2010 ~ vsxmake2019" }
-                ,   {'m', "modes",     "kv", nil,           "Set the project modes."
-                                                       ,    "    e.g. "
-                                                       ,    "    - xmake project -k vsxmake -m \"release" .. path.envsep() ..  "debug\"" }
-                ,   {'a', "archs",     "kv", nil,           "Set the project archs."
-                                                       ,    "    e.g. "
-                                                       ,    "    - xmake project -k vsxmake -a \"x86" .. path.envsep() ..  "x64\"" }
-                ,   {nil, "outputdir", "v",  ".",           "Set the output directory." }
+                    {'k', "kind",      "kv" , "makefile",   "Set the project kind." 
+                                                        ,   "    - makefile"
+                                                        ,   "    - xmakefile (makefile with xmake)"
+                                                        ,   "    - cmakelists"
+                                                        ,   "    - compile_flags"
+                                                        ,   "    - compile_commands (clang compilation database with json format)"
+                                                        ,   "    - vs (auto detect), vs2002, vs2003, vs2005, vs2008"
+                                                        ,   "    - vs2010, vs2012, vs2013, vs2015, vs2017, vs2019"
+                                                        ,   "    - vsxmake (auto detect), vsxmake2010 ~ vsxmake2019"
+                                                        ,   values = function (complete, opt)
+                                                                if not complete then return end
+
+                                                                local values = table.keys(import("main.makers")())
+                                                                table.sort(values, function (a, b) return a > b end)
+                                                                return values
+                                                            end                                                                             }
+                ,   {'m', "modes",     "kv" , nil       ,   "Set the project modes."
+                                                        ,   "    e.g. "
+                                                        ,   "    - xmake project -k vsxmake -m \"release" .. path.envsep() ..  "debug\""    }
+                ,   {'a', "archs",     "kv" , nil       ,          "Set the project archs."
+                                                        ,   "    e.g. "
+                                                        ,   "    - xmake project -k vsxmake -a \"x86" .. path.envsep() ..  "x64\""          }
+                ,   {nil, "outputdir", "v"  , "."       ,   "Set the output directory."                                                     }
                 }
             }