improve choice help menu

2 files changed, 26 insertions, 0 deletions

diff --git a/xmake/core/base/option.lua b/xmake/core/base/option.lua
index 4037e6331..a6a87ad7c 100644
--- a/xmake/core/base/option.lua
+++ b/xmake/core/base/option.lua
@@ -1108,6 +1108,26 @@ function option.show_options(options)
                 end
             end
         end
+
+        -- print values
+        local values = opt.values
+        if type(values) == "function" then
+            values = values()
+        end
+        if values then
+            
+            for _, value in ipairs(table.wrap(values)) do
+
+                -- make spaces 
+                local spaces = ""
+                for i = 0, padding do
+                    spaces = spaces .. " "
+                end
+
+                -- print this value
+                print(option._inwidth_append(spaces, "    - " .. tostring(value), padding + 1, console_width))
+            end
+        end
     end
 end  
 
diff --git a/xmake/core/ui/mconfdialog.lua b/xmake/core/ui/mconfdialog.lua
index 4f0fb5283..5c1941f36 100644
--- a/xmake/core/ui/mconfdialog.lua
+++ b/xmake/core/ui/mconfdialog.lua
@@ -204,6 +204,12 @@ function mconfdialog:show_help()
         if config.default then
             text = text .. "\ndefault: " .. tostring(config.default)
         end
+        if config.kind == "choice" then
+            text = text .. "\nvalues: "
+            for _, value in ipairs(config.values) do
+                text = text .. "\n    - " .. value
+            end
+        end
         self:helpdialog():text():text_set(text)
 
         -- show help