🐛 Fix bug when value is not set

clevyr · Jun 8, 2022 · 0b2f5a9 · 0b2f5a9
1 parent 70b4d97
commit 0b2f5a9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/internal/node/template.go b/internal/node/template.go
@@ -13,7 +13,23 @@ import (
 func Template(conf config.Config, n ast.Node) error {
 	switch n := n.(type) {
 	case *ast.MappingValueNode:
-		if comment := GetCommentTmpl(conf.Prefix, n.Value); comment != "" {
+		// Comment after value
+		comment := GetCommentTmpl(conf.Prefix, n.Value)
+
+		// Edge case where comment is set on key
+		if comment == "" {
+			if comment = GetCommentTmpl(conf.Prefix, n.Key); comment != "" {
+				// Move comment from key to value
+				if err := n.Value.SetComment(n.Key.GetComment()); err != nil {
+					return err
+				}
+				if err := n.Key.SetComment(nil); err != nil {
+					return err
+				}
+			}
+		}
+
+		if comment != "" {
 			newNode, err := templateComment(conf, comment, n.Value)
 			if err != nil {
 				return err

diff --git a/internal/visitor/template_comments_test.go b/internal/visitor/template_comments_test.go
@@ -99,6 +99,7 @@ func TestTemplateComments_Visit(t *testing.T) {
 		{"mapping invalid variable error", args{failConf, "test: a #yampl {{ .z }}"}, "", true},
 		{"sequence invalid variable error", args{failConf, "- a #yampl {{ .z }}"}, "", true},
 		{"strip", args{stripConf, "test: a #yampl b"}, "test: b", false},
+		{"no value", args{defaultConf, "test: #yampl a"}, "test: a #yampl a", false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {