options: Add a printable_choices method to UserOption

This provides a method to get choices for options in a printable form.
The goal is to make refactoring options simpler.

1 files changed, 4 insertions, 3 deletions

diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index b9b09c557..cd68911ce 100644
--- a/mesonbuild/mintro.py
+++ b/mesonbuild/mintro.py
@@ -315,14 +315,15 @@ def list_buildoptions(coredata: cdata.CoreData, subprojects: T.Optional[T.List[s
             elif isinstance(opt, options.UserBooleanOption):
                 typestr = 'boolean'
             elif isinstance(opt, options.UserComboOption):
-                optdict['choices'] = opt.choices
+                optdict['choices'] = opt.printable_choices()
                 typestr = 'combo'
             elif isinstance(opt, options.UserIntegerOption):
                 typestr = 'integer'
             elif isinstance(opt, options.UserArrayOption):
                 typestr = 'array'
-                if opt.choices:
-                    optdict['choices'] = opt.choices
+                c = opt.printable_choices()
+                if c:
+                    optdict['choices'] = c
             else:
                 raise RuntimeError("Unknown option type")
             optdict['type'] = typestr