Use strconv.Quote instead

goncalo-rodrigues · goncalo-rodrigues · commit f06dcfda9ef8 · 2022-02-19T21:13:47.000+01:00
diff --git a/_tests/basic.hcl b/_tests/basic.hcl
@@ -1,6 +1,6 @@
 String = "bar"
 
-EscapedString = "\"\\"
+EscapedString = "\"\\\n\t"
 
 Int = 123
 
diff --git a/hclencoder_test.go b/hclencoder_test.go
@@ -32,7 +32,8 @@ func TestEncoder(t *testing.T) {
 				Float         float64
 			}{
 				"bar",
-				`"\`,
+				`"\
+	`,
 				123,
 				true,
 				4.56,
diff --git a/nodes.go b/nodes.go
@@ -370,18 +370,13 @@ func tokenize(in reflect.Value, unquotedString bool) (t token.Token, err error)
 		}
 		return token.Token{
 			Type: token.STRING,
-			Text: fmt.Sprintf(`"%s"`, escapeString(in.String())),
+			Text: strconv.Quote(in.String()),
 		}, nil
 	}
 
 	return t, fmt.Errorf("cannot encode primitive kind %s to token", in.Kind())
 }
 
-// escapes \ and "
-func escapeString(s string) string {
-	return strings.ReplaceAll(strings.ReplaceAll(s, `\`, `\\`), `"`, `\"`)
-}
-
 // extractFieldMeta pulls information about struct fields and the optional HCL tags
 func extractFieldMeta(f reflect.StructField) (meta fieldMeta) {
 	if f.Anonymous {

-Original file line number
+Diff line change
 				Float         float64
 			}{
 				"bar",
 -				`"\`,
 +				`"\
 +	`,
 ,
 				true,
 .56,
Original file line number	Diff line number	Diff line change
`@@ -370,18 +370,13 @@ func tokenize(in reflect.Value, unquotedString bool) (t token.Token, err error)`
`370`	`370`	`}`
`371`	`371`	`return token.Token{`
`372`	`372`	`Type: token.STRING,`
`373`		- Text: fmt.Sprintf(`"%s"`, escapeString(in.String())),
	`373`	`+ Text: strconv.Quote(in.String()),`
`374`	`374`	`}, nil`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`return t, fmt.Errorf("cannot encode primitive kind %s to token", in.Kind())`
`378`	`378`	`}`
`379`	`379`
`380`		`-// escapes \ and "`
`381`		`-func escapeString(s string) string {`
`382`		- return strings.ReplaceAll(strings.ReplaceAll(s, `\`, `\\`), `"`, `\"`)
`383`		`-}`
`384`		`-`
`385`	`380`	`// extractFieldMeta pulls information about struct fields and the optional HCL tags`
`386`	`381`	`func extractFieldMeta(f reflect.StructField) (meta fieldMeta) {`
`387`	`382`	`if f.Anonymous {`