fix quoted backticks not formatted correctly

caddyconfig/caddyfile/formatter.go

@@ -62,7 +62,9 @@ func Format(input []byte) []byte {
 		heredocClosingMarker []rune
 
 		nesting              int // indentation level
-		withinBackquote bool
+		withinBacktick       bool
+		afterQuotedBacktick  bool // after "`
+		afterBacktickedQuote bool // after `"
 	)
 
 	write := func(ch rune) {
@@ -89,10 +91,6 @@ func Format(input []byte) []byte {
 			}
 			panic(err)
 		}
-		if ch == '`' {
-			withinBackquote = !withinBackquote
-		}
-
 		// detect whether we have the start of a heredoc
 		if !quoted && !(heredoc != heredocClosed || heredocEscaped) &&
 			space && last == '<' && ch == '<' {
@@ -180,14 +178,41 @@ func Format(input []byte) []byte {
 			continue
 		}
 
+		if ch == '`' {
+			if afterQuotedBacktick {
+				afterBacktickedQuote = false
+				withinBacktick = false
+			} else if withinBacktick {
+				withinBacktick = false
+			} else if quoted {
+				afterQuotedBacktick = true
+				withinBacktick = true
+			} else {
+				withinBacktick = true
+			}
+		}
+
 		if quoted {
 			if ch == '"' {
+				if afterQuotedBacktick {
+					withinBacktick = false
+				}
+				afterQuotedBacktick = false
 				quoted = false
 			}
 			write(ch)
 			continue
 		}
 
+		if ch == '"' && afterQuotedBacktick {
+			withinBacktick = false
+			afterQuotedBacktick = false
+		}
+		if ch == '"' && afterBacktickedQuote {
+			withinBacktick = false
+			afterBacktickedQuote = false
+		}
+
 		if space && ch == '"' {
 			quoted = true
 		}
@@ -245,7 +270,7 @@ func Format(input []byte) []byte {
 				write(' ')
 			}
 			openBraceWritten = false
-			if withinBackquote {
+			if withinBacktick && !afterQuotedBacktick && !afterBacktickedQuote {
 				write('{')
 				openBraceWritten = true
 				continue
@@ -253,7 +278,7 @@ func Format(input []byte) []byte {
 			continue
 
 		case ch == '}' && (spacePrior || !openBrace):
-			if withinBackquote {
+			if withinBacktick && !afterQuotedBacktick && !afterBacktickedQuote {
 				write('}')
 				continue
 			}

caddyconfig/caddyfile/formatter_test.go

@@ -444,6 +444,11 @@ block2 {
 			input:       "block {respond \"All braces should remain: {{now | date `2006`}}\"}",
 			expect:      "block {respond \"All braces should remain: {{now | date `2006`}}\"}",
 		},
+		{
+			description: "Preserve quoted backticks and backticked quotes",
+			input:       "block { respond \"`\" } block { respond `\"`}",
+			expect:      "block {\n\trespond \"`\"\n}\n\nblock {\n\trespond `\"`\n}",
+		},
 	} {
 		// the formatter should output a trailing newline,
 		// even if the tests aren't written to expect that