Merge pull request #2846 from alexandear/refactor/prefix-string

refactor: Improve textutil.PrefixString
lima-vm · Nov 5, 2024 · dab750e · dab750e
2 parents efaec2c + e26d192
commit dab750e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/pkg/textutil/textutil.go b/pkg/textutil/textutil.go
@@ -26,15 +26,13 @@ func ExecuteTemplate(tmpl string, args interface{}) ([]byte, error) {
 
 // PrefixString adds prefix to beginning of each line.
 func PrefixString(prefix, text string) string {
-	result := []string{}
-	for _, line := range strings.Split(text, "\n") {
-		if line == "" {
-			result = append(result, "")
-			continue
+	lines := strings.Split(text, "\n")
+	for i, line := range lines {
+		if line != "" {
+			lines[i] = prefix + line
 		}
-		result = append(result, prefix+line)
 	}
-	return strings.Join(result, "\n")
+	return strings.Join(lines, "\n")
 }
 
 // IndentString add spaces to beginning of each line.

diff --git a/pkg/textutil/textutil_test.go b/pkg/textutil/textutil_test.go
@@ -9,8 +9,11 @@ import (
 )
 
 func TestPrefixString(t *testing.T) {
+	assert.Equal(t, "", PrefixString("- ", ""))
+	assert.Equal(t, "\n", PrefixString("- ", "\n"))
 	assert.Equal(t, "- foo", PrefixString("- ", "foo"))
 	assert.Equal(t, "- foo\n- bar\n", PrefixString("- ", "foo\nbar\n"))
+	assert.Equal(t, "- foo\n\n- bar\n", PrefixString("- ", "foo\n\nbar\n"))
 }
 
 func TestIndentString(t *testing.T) {