factor CloneWith out of most interpolate cases

This commit is contained in:
Will Roden
2020-05-15 15:54:00 -05:00
committed by Alec Thomas
parent 1ccbbb9db4
commit f19cb8c69d
2 changed files with 10 additions and 6 deletions
+9 -5
View File
@@ -144,17 +144,21 @@ func (k *Kong) interpolate(node *Node) (err error) {
} }
func (k *Kong) interpolateValue(value *Value, vars Vars) (err error) { func (k *Kong) interpolateValue(value *Value, vars Vars) (err error) {
vars = vars.CloneWith(value.Tag.Vars) if len(value.Tag.Vars) > 0 {
vars = vars.CloneWith(value.Tag.Vars)
}
if value.Default, err = interpolate(value.Default, vars); err != nil { if value.Default, err = interpolate(value.Default, vars); err != nil {
return fmt.Errorf("default value for %s: %s", value.Summary(), err) return fmt.Errorf("default value for %s: %s", value.Summary(), err)
} }
if value.Enum, err = interpolate(value.Enum, vars); err != nil { if value.Enum, err = interpolate(value.Enum, vars); err != nil {
return fmt.Errorf("enum value for %s: %s", value.Summary(), err) return fmt.Errorf("enum value for %s: %s", value.Summary(), err)
} }
vars = vars.CloneWith(map[string]string{ if vars["default"] != value.Default || vars["enum"] != value.Enum {
"default": value.Default, vars = vars.CloneWith(map[string]string{
"enum": value.Enum, "default": value.Default,
}) "enum": value.Enum,
})
}
if value.Help, err = interpolate(value.Help, vars); err != nil { if value.Help, err = interpolate(value.Help, vars); err != nil {
return fmt.Errorf("help for %s: %s", value.Summary(), err) return fmt.Errorf("help for %s: %s", value.Summary(), err)
} }
+1 -1
View File
@@ -35,7 +35,7 @@ func (v Vars) Apply(k *Kong) error {
// CloneWith clones the current Vars and merges "vars" onto the clone. // CloneWith clones the current Vars and merges "vars" onto the clone.
func (v Vars) CloneWith(vars Vars) Vars { func (v Vars) CloneWith(vars Vars) Vars {
out := Vars{} out := make(Vars, len(v)+len(vars))
for key, value := range v { for key, value := range v {
out[key] = value out[key] = value
} }