diff --git a/interpolate.go b/interpolate.go index 9de1ff7..8c6f742 100644 --- a/interpolate.go +++ b/interpolate.go @@ -8,9 +8,18 @@ import ( var interpolationRegex = regexp.MustCompile(`((?:\${([[:alpha:]_][[:word:]]*))(?:=([^}]+))?})|(\$)|([^$]+)`) // Interpolate variables from vars into s for substrings in the form ${var} or ${var=default}. -func interpolate(s string, vars map[string]string) (string, error) { +func interpolate(s string, vars Vars, updatedVars map[string]string) (string, error) { out := "" matches := interpolationRegex.FindAllStringSubmatch(s, -1) + if len(matches) == 0 { + return s, nil + } + for key, val := range updatedVars { + if vars[key] != val { + vars = vars.CloneWith(updatedVars) + break + } + } for _, match := range matches { if name := match[2]; name != "" { value, ok := vars[name] diff --git a/interpolate_test.go b/interpolate_test.go index a2c9df1..38d9266 100644 --- a/interpolate_test.go +++ b/interpolate_test.go @@ -10,7 +10,10 @@ func TestInterpolate(t *testing.T) { vars := map[string]string{ "age": "35", } - actual, err := interpolate("${name=Bobby Brown} is ${age} years old", vars) + updatedVars := map[string]string{ + "height": "180", + } + actual, err := interpolate("${name=Bobby Brown} is ${age} years old and ${height} cm tall", vars, updatedVars) require.NoError(t, err) - require.Equal(t, `Bobby Brown is 35 years old`, actual) + require.Equal(t, `Bobby Brown is 35 years old and 180 cm tall`, actual) } diff --git a/kong.go b/kong.go index 6a4b2c5..a17a2f0 100644 --- a/kong.go +++ b/kong.go @@ -128,7 +128,7 @@ func (k *Kong) interpolate(node *Node) (err error) { switch node := node.(type) { case *Node: vars := stack.push(node.Vars()) - node.Help, err = interpolate(node.Help, vars) + node.Help, err = interpolate(node.Help, vars, nil) if err != nil { return fmt.Errorf("help for %s: %s", node.Path(), err) } @@ -147,19 +147,17 @@ func (k *Kong) interpolateValue(value *Value, vars Vars) (err error) { 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, nil); err != nil { 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, nil); err != nil { return fmt.Errorf("enum value for %s: %s", value.Summary(), err) } - if vars["default"] != value.Default || vars["enum"] != value.Enum { - vars = vars.CloneWith(map[string]string{ - "default": value.Default, - "enum": value.Enum, - }) - } - if value.Help, err = interpolate(value.Help, vars); err != nil { + value.Help, err = interpolate(value.Help, vars, map[string]string{ + "default": value.Default, + "enum": value.Enum, + }) + if err != nil { return fmt.Errorf("help for %s: %s", value.Summary(), err) } return nil @@ -346,7 +344,7 @@ func (k *Kong) FatalIfErrorf(err error, args ...interface{}) { func (k *Kong) LoadConfig(path string) (Resolver, error) { var err error path = ExpandPath(path) - path, err = interpolate(path, k.vars) + path, err = interpolate(path, k.vars, nil) if err != nil { return nil, err }