Add --force_curly_braces option to insert braces around single-statem…#614
Open
burner wants to merge 6 commits intodlang-community:masterfrom
Open
Add --force_curly_braces option to insert braces around single-statem…#614burner wants to merge 6 commits intodlang-community:masterfrom
burner wants to merge 6 commits intodlang-community:masterfrom
Conversation
…ent bodies.
When enabled, the preprocessor inserts synthetic `{` and `}` tokens around
braceless bodies for all block header constructs: if, else, for, foreach,
while, do, scope, synchronized, with, catch, debug, version, finally, and
their combinations (static if, static foreach, etc.).
Implementation uses token stream preprocessing so the formatter's existing
brace-handling logic handles style and indentation naturally. Synthetic tokens
use size_t.max-based indices to avoid collisions with AST info lookups.
Handles compound constructs correctly:
- try/catch/finally chains as single statements
- Nested braceless blocks (each level gets its own braces)
- Mixed braced/braceless siblings (only braceless branches get braces)
- else if/else version/else static if chains (no double-wrapping)
- debug/version with and without parens
- Respects // dfmt off / // dfmt on regions
WebFreak001
reviewed
Feb 25, 2026
Member
|
I just edited the code locally to enable your flag by default ( Some bugs I encountered: results in weird whitespace - I would like if the empty line could be after the closing brace instead: and it would be nice if you could make comments work, but not a dealbreaker: -> The whitespace here is a bit broken, but the braces are fine imo: -> It doesn't support debug / else debug / else blocks yet: -> Perhaps should stay and not get the |
When a 'debug' conditional is followed by an 'else' clause, the 'else'
was incorrectly indented one level too deep. This was caused by:
1. 'debug' was being popped from the indent stack too early (after closing brace)
2. 'debug' was not being preserved when there's a following 'else'
3. 'debug' was not considered when aligning 'else' with its parent construct
4. 'debug' was not popped before pushing 'else' for non-braced bodies
The fix adds 'debug' to the same handling as 'if' and 'version':
- Check for 'debug' when aligning 'else' indentation (line 1800)
- Don't pop 'debug' after closing brace (line 943)
- Keep 'debug' on stack when there's a following 'else' (line 1877)
- Pop 'debug' before pushing 'else' for non-braced bodies (line 1266)
Fixes issue where complex chains like:
version (Windows) { ... }
else { debug { ... } else { ... } }
Would incorrectly format as:
else { debug { ... }
else { ... } } // wrong indentation
Instead of:
else { debug { ... }
else { ... } } // correct indentation
Added comprehensive test coverage for the bug fix: 1. Test 27 in force_curly_braces.d: - Complex version/else/debug/else chain - Tests nested conditionals with multiple else clauses 2. New test file issue_else_after_debug.d with edge cases: - Simple debug with else - Nested version with debug/else - Nested debug inside if/else with another else - Static if with debug/else - Multiple nested levels - Debug with parens and else - Deep nesting: version/debug/else chain All tests verify correct indentation alignment of 'else' with its parent conditional construct (if/version/debug) across all three brace styles (allman, otbs, knr).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
…ent bodies.
When enabled, the preprocessor inserts synthetic
{and}tokens around braceless bodies for all block header constructs: if, else, for, foreach, while, do, scope, synchronized, with, catch, debug, version, finally, and their combinations (static if, static foreach, etc.). Implementation uses token stream preprocessing so the formatter's existing brace-handling logic handles style and indentation naturally. Synthetic tokens use size_t.max-based indices to avoid collisions with AST info lookups. Handles compound constructs correctly: