[feat]: BlockVal should reflects WithNewLine option

hcledit_test.go

@@ -155,6 +155,19 @@ prev {}`,
 			want: `
 prev {}
 // test comment
+block "label1" "label2" {
+}
+`,
+		},
+
+		"Block with new line": {
+			input: `
+`,
+			query: "block",
+			opts:  []hcledit.Option{hcledit.WithNewLine()},
+			value: hcledit.BlockVal("label1", "label2"),
+			want: `
+
 block "label1" "label2" {
 }
 `,

internal/handler/block.go

@@ -14,27 +14,32 @@ type BlockVal struct {
 }
 
 type blockHandler struct {
-	labels  []string
-	comment string
+	labels        []string
+	comment       string
+	beforeNewLine bool
 }
 
-func newBlockHandler(labels []string, comment string) (Handler, error) {
+func newBlockHandler(labels []string, comment string, beforeNewLine bool) (Handler, error) {
 	return &blockHandler{
-		labels:  labels,
-		comment: comment,
+		labels:        labels,
+		comment:       comment,
+		beforeNewLine: beforeNewLine,
 	}, nil
 }
 
 func (h *blockHandler) HandleBody(body *hclwrite.Body, name string, _ []string) error {
 	if h.comment != "" {
+		// Note: intuitively, adding a new line should be determined by `h.beforeNewLine`.
+		// However, for the backward compatibility, we add a new line whenever comment is set to a non empty string.
 		body.AppendUnstructuredTokens(
 			beforeTokens(
 				fmt.Sprintf("// %s", strings.TrimSpace(strings.TrimPrefix(h.comment, "//"))),
 				true,
 			),
 		)
+	} else {
+		body.AppendUnstructuredTokens(beforeTokens(h.comment, h.beforeNewLine))
 	}
-
 	body.AppendNewBlock(name, h.labels)
 	return nil
 }

internal/handler/handler.go

@@ -18,7 +18,7 @@ type Handler interface {
 func New(input interface{}, comment, afterKey string, beforeNewline bool) (Handler, error) {
 	switch v := input.(type) {
 	case *BlockVal:
-		return newBlockHandler(v.Labels, comment)
+		return newBlockHandler(v.Labels, comment, beforeNewline)
 	case *RawVal:
 		return newRawHandler(v.RawString)
 	}