🐛 (strip): Make --strip flag more consistent

Now, comments will be stripped from output even if a template error occurs

internal/visitor/template_comments.go

@@ -26,6 +26,10 @@ func (t TemplateComments) Run(n *yaml.Node) error {
 		// Node has no children. Template current node.
 		tmplSrc, tmplTag := comment.Parse(t.conf.Prefix, n)
 		if tmplSrc != "" {
+			if t.conf.Strip {
+				n.LineComment = ""
+			}
+
 			if err := t.Template(n, tmplSrc, tmplTag); err != nil {
 				if t.conf.Fail {
 					return err
@@ -45,6 +49,10 @@ func (t TemplateComments) Run(n *yaml.Node) error {
 
 			tmplSrc, tmplTag := comment.Parse(t.conf.Prefix, key)
 			if tmplSrc != "" {
+				if t.conf.Strip {
+					key.LineComment = ""
+				}
+
 				if err := t.Template(val, tmplSrc, tmplTag); err != nil {
 					if t.conf.Fail {
 						return err
@@ -53,11 +61,7 @@ func (t TemplateComments) Run(n *yaml.Node) error {
 					}
 				} else {
 					// Current node was templated, do not need to traverse children
-					if t.conf.Strip {
-						key.LineComment = ""
-					} else {
-						comment.Move(key, val)
-					}
+					comment.Move(key, val)
 					continue
 				}
 			}
@@ -99,10 +103,6 @@ func (t TemplateComments) Template(n *yaml.Node, tmplSrc string, tmplTag comment
 		t.conf.Values["Value"] = n.Value
 	}
 
-	if t.conf.Strip {
-		n.LineComment = ""
-	}
-
 	var buf bytes.Buffer
 	if err = tmpl.Execute(&buf, t.conf.Values); err != nil {
 		return NodeErr{Err: err, Node: n}