♻️ Refactor comment template parsing

internal/node/has_comment.go

@@ -14,6 +14,8 @@ func (t TmplTag) ToYaml() string {
 	return "!!" + string(t)
 }
 
+const tagSep = ":"
+
 var (
 	DynamicTag TmplTag = ""
 	BoolTag    TmplTag = "bool"
@@ -33,16 +35,28 @@ var tags = []TmplTag{
 	MapTag,
 }
 
+// GetCommentTmpl returns the template and tag from a yaml.Node LineComment
 func GetCommentTmpl(prefix string, n *yaml.Node) (string, TmplTag) {
 	comment := n.LineComment
-	fullPrefix := prefix + " "
-	if strings.HasPrefix(comment, fullPrefix) {
-		return comment[len(fullPrefix):], DynamicTag
-	}
-	for _, tag := range tags {
-		fullPrefix := prefix + ":" + string(tag) + " "
-		if strings.HasPrefix(comment, fullPrefix) {
-			return comment[len(fullPrefix):], tag
+	if strings.HasPrefix(comment, prefix) {
+		// Comment has #yampl prefix
+		comment = strings.TrimPrefix(comment, prefix)
+
+		if strings.HasPrefix(comment, " ") {
+			// Tag not provided
+			return comment[1:], DynamicTag
+		}
+
+		if strings.HasPrefix(comment, tagSep) {
+			// Match comment tag
+			comment = strings.TrimPrefix(comment, tagSep)
+
+			for _, tag := range tags {
+				prefix := string(tag) + " "
+				if strings.HasPrefix(comment, prefix) {
+					return comment[len(prefix):], tag
+				}
+			}
 		}
 	}
 	return "", DynamicTag