diff --git a/caddyconfig/caddyfile/formatter.go b/caddyconfig/caddyfile/formatter.go index 15a84c5ea..69f5027c5 100644 --- a/caddyconfig/caddyfile/formatter.go +++ b/caddyconfig/caddyfile/formatter.go @@ -386,7 +386,7 @@ func hasUnformattableToken(tokens []Token) bool { // anyNonCommentBefore reports whether any token before index i is not a comment. func anyNonCommentBefore(tokens []Token, i int) bool { - for j := 0; j < i; j++ { + for j := range i { if !tokens[j].isComment { return true } @@ -478,7 +478,7 @@ func formatTokens(tokens []Token) []byte { prevTopClose := false writeIndent := func() { - for i := 0; i < nesting; i++ { + for range nesting { out.WriteByte('\t') } } @@ -646,7 +646,7 @@ func formatTokens(tokens []Token) []byte { body := tk.Raw() if tk.continuation && !atLineStart { out.WriteString(" \\\n") - for j := 0; j < nesting+1; j++ { + for range nesting + 1 { out.WriteByte('\t') } body = strings.TrimLeft(strings.TrimPrefix(body, "\\"), " \t\r\n") diff --git a/caddyconfig/caddyfile/formatter_test.go b/caddyconfig/caddyfile/formatter_test.go index 8208479f7..4ef78a048 100644 --- a/caddyconfig/caddyfile/formatter_test.go +++ b/caddyconfig/caddyfile/formatter_test.go @@ -532,7 +532,7 @@ func TestFormatImportStandaloneBrace(t *testing.T) { func TestFormatDeepNestingNoCap(t *testing.T) { // 12 levels deep; every level indents (no 10-level clamp) var b strings.Builder - for i := 0; i < 12; i++ { + for i := range 12 { b.WriteString(strings.Repeat("\t", i) + "l" + strconv.Itoa(i) + " {\n") } b.WriteString(strings.Repeat("\t", 12) + "x\n")