👔 up(str/text): update the replacement format parse logic, allow one …

…left char
gookit · Mar 5, 2023 · ccf2430 · ccf2430
1 parent b40b237
commit ccf2430
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/strutil/textutil/textutil_test.go b/strutil/textutil/textutil_test.go
@@ -75,7 +75,7 @@ func TestRenderSMap(t *testing.T) {
 
 	// custom format
 	assert.Equal(t, "hi inhere", textutil.RenderSMap("hi {$name}", tplVars, "{$,}"))
-	assert.Equal(t, "hi inhere age is 234", textutil.RenderSMap("hi $name age is $age", tplVars, "$,"))
+	assert.Equal(t, "hi inhere age is 234", textutil.RenderSMap("hi $name age is $age", tplVars, "$"))
 	assert.Equal(t, "hi inhere age is 234.", textutil.RenderSMap("hi $name age is $age.", tplVars, "$,"))
 	assert.Equal(t, "hi {$name}", textutil.RenderSMap("hi {$name}", nil, "{$,}"))
 }

diff --git a/strutil/textutil/var_replacer.go b/strutil/textutil/var_replacer.go
@@ -26,7 +26,7 @@ func NewVarReplacer(format string) *VarReplacer {
 
 // WithFormat custom var template
 func (r *VarReplacer) WithFormat(format string) *VarReplacer {
-	r.Left, r.Right = strutil.MustCut(strutil.OrElse(format, defaultVarFormat), ",")
+	r.Left, r.Right = strutil.QuietCut(strutil.OrElse(format, defaultVarFormat), ",")
 	r.Init()
 	return r
 }