[steadytao]

Improves the UX around #7639.

Summary

This fixes two parts of the issue when import directives appear before the global options block.

First, caddy fmt no longer rewrites:

import ./conf.d/matcher_my_subnet.caddy
import ./conf.d/matcher_not_my_subnet.caddy
{
	order crowdsec first
	order appsec after crowdsec
}

into the more confusing shape:

import ./conf.d/matcher_not_my_subnet.caddy {

Second, caddy validate --adapter caddyfile now gives a clearer error message for this unsupported layout.

Behaviour

• fmt preserves the standalone top-level { after import lines instead of collapsing it into import ... {
• validate now reports:
  • global options block must appear before import directives; move the global options block to the top of the Caddyfile
• the layout remains unsupported, but the failure mode is now much clearer

Tests

Added:

• formatter regression coverage for preserving the standalone global-options brace after import lines
• parser regression coverage for the clearer validation error when imports precede the global options block

Tested with:

go test ./caddyconfig/caddyfile -run "TestFormatter|TestGlobalOptionsAfterImportedSnippetsGivesHelpfulError" -count=1

Also verified directly with:

go run ./cmd/caddy validate --config tmp.Caddyfile --adapter caddyfile

Should close #7639

Assistance Disclosure

No AI was used.

[mholt]

Thank you. The Caddyfile syntax is truly a mess (lol), I appreciate the patches that keep it tidy as possible.

[steadytao]

Thank you. The Caddyfile syntax is truly a mess (lol), I appreciate the patches that keep it tidy as possible.

Always good to do some tidying up here and there 😁