From e71c7af21b49946df57f636852631e7698db96f7 Mon Sep 17 00:00:00 2001 From: Josh Baker Date: Thu, 24 Aug 2017 10:11:16 -0700 Subject: [PATCH] varadic optional arguments, #213 --- core/commands.go | 6 +++++- core/commands_gen.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/commands.go b/core/commands.go index b4bf3c35..5e98c021 100644 --- a/core/commands.go +++ b/core/commands.go @@ -105,7 +105,11 @@ func (a Argument) String() string { subs = strings.TrimSpace(subs) s += " " + subs if a.Variadic { - s += " [" + subs + " ...]" + if len(names) == 0 { + s += " [" + subs + " ...]" + } else { + s += " [" + names[len(names)-1] + " ...]" + } } if a.Multiple { s += " ..." diff --git a/core/commands_gen.go b/core/commands_gen.go index b36ef6e6..099dff91 100644 --- a/core/commands_gen.go +++ b/core/commands_gen.go @@ -105,7 +105,11 @@ func (a Argument) String() string { subs = strings.TrimSpace(subs) s += " " + subs if a.Variadic { - s += " [" + subs + " ...]" + if len(names) == 0 { + s += " [" + subs + " ...]" + } else { + s += " [" + names[len(names)-1] + " ...]" + } } if a.Multiple { s += " ..."