go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-21 12:16:54 +02:00
Code Issues Releases Activity

fix: fix ReplacePlaceholderString

Browse Source
This commit is contained in:
Ryooooooga 2023-01-18 20:56:22 +09:00
parent 48df9b7f4e
commit 7149cfeb11
No known key found for this signature in database
GPG Key ID: 07CF200DFCC20C25
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/utils/template.go
View File

@ -22,9 +22,12 @@ func ResolveTemplate(templateStr string, object interface{}, funcs template.Func
// ResolvePlaceholderString populates a template with values // ResolvePlaceholderString populates a template with values
func ResolvePlaceholderString(str string, arguments map[string]string) string { func ResolvePlaceholderString(str string, arguments map[string]string) string {
oldnews := make([]string, 0, len(arguments)*4)
for key, value := range arguments { for key, value := range arguments {
str = strings.Replace(str, "{{"+key+"}}", value, -1) oldnews = append(oldnews,
str = strings.Replace(str, "{{."+key+"}}", value, -1) "{{"+key+"}}", value,
"{{."+key+"}}", value,
)
} }
return str return strings.NewReplacer(oldnews...).Replace(str)
} }

7
pkg/utils/template_test.go
View File

@ -53,6 +53,13 @@ func TestResolvePlaceholderString(t *testing.T) {
}, },
"{{}} {{ this }} { should not throw}} an {{{{}}}} error", "{{}} {{ this }} { should not throw}} an {{{{}}}} error",
}, },
{
"{{a}}",
map[string]string{
"a": "X{{.a}}X",
},
"X{{.a}}X",
},
} }
for _, s := range scenarios { for _, s := range scenarios {