diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 730ef48..7219123 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1314,7 +1314,8 @@ private: { if (isWrapToken) { - pushWrapIndent(); + if (!indents.topIs(tok!"enum")) + pushWrapIndent(); write(" "); writeToken(); newline(); @@ -1331,7 +1332,8 @@ private: { if (isWrapToken) { - pushWrapIndent(); + if (!indents.topIs(tok!"enum")) + pushWrapIndent(); newline(); writeToken(); } diff --git a/tests/allman/issue0286.d.ref b/tests/allman/issue0286.d.ref index d3e7816..1ee7afb 100644 --- a/tests/allman/issue0286.d.ref +++ b/tests/allman/issue0286.d.ref @@ -2,14 +2,14 @@ void foo() { if (true) enum vectorizeable = aLongExpressionThatCausesWrapping() - && aLongExpressionThatCausesWrapping(); + && aLongExpressionThatCausesWrapping(); else enum vectorizeable = false; if (true) { enum vectorizeable = aLongExpressionThatCausesWrapping() - && aLongExpressionThatCausesWrapping(); + && aLongExpressionThatCausesWrapping(); } else enum vectorizeable = false; diff --git a/tests/otbs/issue0286.d.ref b/tests/otbs/issue0286.d.ref index 1844006..a56988e 100644 --- a/tests/otbs/issue0286.d.ref +++ b/tests/otbs/issue0286.d.ref @@ -1,13 +1,13 @@ void foo() { if (true) enum vectorizeable = aLongExpressionThatCausesWrapping() - && aLongExpressionThatCausesWrapping(); + && aLongExpressionThatCausesWrapping(); else enum vectorizeable = false; if (true) { enum vectorizeable = aLongExpressionThatCausesWrapping() - && aLongExpressionThatCausesWrapping(); + && aLongExpressionThatCausesWrapping(); } else enum vectorizeable = false; }