Fix #286 - Weird indentation in else branch after wrapping expression (#393)

Fix #286 - Weird indentation in else branch after wrapping expression
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>

src/dfmt/formatter.d

@@ -730,6 +730,7 @@ private:
         else
         {
             writeToken();
+            indents.popWrapIndents();
             linebreakHints = [];
             while (indents.topIs(tok!"enum"))
                 indents.pop();
@@ -1313,6 +1314,7 @@ private:
             {
                 if (isWrapToken)
                 {
+                    if (!indents.topIs(tok!"enum"))
                         pushWrapIndent();
                     write(" ");
                     writeToken();
@@ -1330,6 +1332,7 @@ private:
             {
                 if (isWrapToken)
                 {
+                    if (!indents.topIs(tok!"enum"))
                         pushWrapIndent();
                     newline();
                     writeToken();

tests/allman/issue0286.d.ref

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

tests/issue0286.d

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

tests/otbs/issue0286.d.ref

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