mirrors/dfmt
1
0
Fork 0
mirror of https://github.com/dlang-community/dfmt.git synced 2025-04-25 21:00:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix else indentation after debug conditions

Browse source
This commit is contained in:
Laurent Tréguier 2018-10-09 11:30:29 +02:00
parent 72dd6e83b3
commit 6ff47e106a
No known key found for this signature in database
GPG key ID: 09530BFFC32D4A69
4 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/dfmt/formatter.d
View file

@ -732,13 +732,14 @@ private:
writeToken();
indents.popWrapIndents();
linebreakHints = [];
while (indents.topIsOneOf(tok!"enum", tok!"try", tok!"catch", tok!"finally"))
while (indents.topIsOneOf(tok!"enum", tok!"try", tok!"catch", tok!"finally", tok!"debug"))
indents.pop();
if (indents.topAre(tok!"static", tok!"else"))
{
indents.pop();
indents.pop();
}
indentLevel = indents.indentLevel;
if (config.dfmt_brace_style == BraceStyle.allman)
{
if (!currentIs(tok!"{"))

7
tests/allman/debug_with_param.d.ref Normal file
View file

@ -0,0 +1,7 @@
void main()
{
debug (0)
foo();
else
bar();
}

4
tests/debug_with_param.d Normal file
View file

@ -0,0 +1,4 @@
void main()
{
debug(0) foo(); else bar();
}

6
tests/otbs/debug_with_param.d.ref Normal file
View file

@ -0,0 +1,6 @@
void main() {
debug (0)
foo();
else
bar();
}