Add newline to body only on well-known error

tflint/client/decode.go

@@ -62,12 +62,35 @@ func decodeBlock(block *Block) (*hcl.Block, hcl.Diagnostics) {
 	}, nil
 }
 
+func hasUnterminatedTemplateString(diags []*hcl.Diagnostic) bool {
+	for _, diag := range diags {
+		if diag.Summary == "Unterminated template string" &&
+			diag.Detail == "No closing marker was found for the string." {
+			return true
+		}
+	}
+
+	return false
+}
+
 func parseExpression(src []byte, filename string, start hcl.Pos) (hcl.Expression, hcl.Diagnostics) {
 	if strings.HasSuffix(filename, ".tf") {
-		// HACK: Always add a newline to avoid heredoc parse errors.
-		// @see https://github.com/hashicorp/hcl/issues/441
-		src = []byte(string(src) + "\n")
-		return hclsyntax.ParseExpression(src, filename, start)
+		expr, diags := hclsyntax.ParseExpression(src, filename, start)
+		if hasUnterminatedTemplateString(diags) {
+			// HACK: Add a newline to avoid heredoc parse errors.
+			// @see https://github.com/hashicorp/hcl/issues/441
+			src = []byte(string(src) + "\n")
+			fixedExpr, fixedDiags := hclsyntax.ParseExpression(src, filename, start)
+
+			// Still has error? Return first result
+			if hasUnterminatedTemplateString(fixedDiags) {
+				return expr, diags
+			}
+
+			return fixedExpr, fixedDiags
+		}
+
+		return expr, diags
 	}
 
 	if strings.HasSuffix(filename, ".tf.json") {