internal: fix parsing for structures

i582 · Apr 9, 2021 · efcebeb · efcebeb
1 parent 282da01
commit efcebeb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/internal/parser.go b/internal/parser.go
@@ -122,6 +122,19 @@ func Parse(text string) string {
 			}
 
 			if s == '}' {
+				countBracketInRow := 0
+				for i := 0; ; i++ {
+					if index+i < formatLen && text[index+i] != '}' {
+						break
+					}
+					countBracketInRow++
+				}
+
+				if countBracketInRow > 2 {
+					index += countBracketInRow - 2 - 1
+					continue
+				}
+
 				endBracketFound = true
 				continue
 			}

diff --git a/tests/parser_test.go b/tests/parser_test.go
@@ -6,6 +6,11 @@ import (
 	"github.com/i582/cfmt"
 )
 
+type TestStruct struct {
+	field1 string
+	field2 int
+}
+
 func TestParse(t *testing.T) {
 	cfmt.RegisterStyle("code", func(s string) string {
 		return cfmt.Sprintf("{{%s}}::red|underline", s)
@@ -20,4 +25,6 @@ func TestParse(t *testing.T) {
 	cfmt.Println(cfmt.Sprint("{{blink group}}::blink"))
 	cfmt.Printf("{{hex %s}}::#ff00ff sfas\n", "color group")
 	cfmt.Printf(cfmt.Sprintf("{{background color %s}}::bg#ffff00\n", "hex color"))
+	cfmt.Printf("{{{hello}}}::red|underline\n")
+	cfmt.Printf("{{some test struct: %v}}::red|underline\n", TestStruct{"hello", 1})
 }