forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix enum constants wrapping

This commit is contained in:
Laurent Tréguier 2018-10-07 14:41:21 +02:00
parent 0ac3f1b291
commit d30208ee1f
No known key found for this signature in database
GPG Key ID: 09530BFFC32D4A69
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dfmt/formatter.d
View File

@ -1314,7 +1314,8 @@ private:
{ {
if (isWrapToken) if (isWrapToken)
{ {
pushWrapIndent(); if (!indents.topIs(tok!"enum"))
pushWrapIndent();
write(" "); write(" ");
writeToken(); writeToken();
newline(); newline();
@ -1331,7 +1332,8 @@ private:
{ {
if (isWrapToken) if (isWrapToken)
{ {
pushWrapIndent(); if (!indents.topIs(tok!"enum"))
pushWrapIndent();
newline(); newline();
writeToken(); writeToken();
} }

4
tests/allman/issue0286.d.ref
View File

@ -2,14 +2,14 @@ void foo()
{ {
if (true) if (true)
enum vectorizeable = aLongExpressionThatCausesWrapping() enum vectorizeable = aLongExpressionThatCausesWrapping()
&& aLongExpressionThatCausesWrapping(); && aLongExpressionThatCausesWrapping();
else else
enum vectorizeable = false; enum vectorizeable = false;
if (true) if (true)
{ {
enum vectorizeable = aLongExpressionThatCausesWrapping() enum vectorizeable = aLongExpressionThatCausesWrapping()
&& aLongExpressionThatCausesWrapping(); && aLongExpressionThatCausesWrapping();
} }
else else
enum vectorizeable = false; enum vectorizeable = false;

4
tests/otbs/issue0286.d.ref
View File

@ -1,13 +1,13 @@
void foo() { void foo() {
if (true) if (true)
enum vectorizeable = aLongExpressionThatCausesWrapping() enum vectorizeable = aLongExpressionThatCausesWrapping()
&& aLongExpressionThatCausesWrapping(); && aLongExpressionThatCausesWrapping();
else else
enum vectorizeable = false; enum vectorizeable = false;
if (true) { if (true) {
enum vectorizeable = aLongExpressionThatCausesWrapping() enum vectorizeable = aLongExpressionThatCausesWrapping()
&& aLongExpressionThatCausesWrapping(); && aLongExpressionThatCausesWrapping();
} else } else
enum vectorizeable = false; enum vectorizeable = false;
} }