Fix #372 - Improper indentation after single-line catch (#395)

Fix #372 - Improper indentation after single-line catch
merged-on-behalf-of: BBasile <BBasile@users.noreply.github.com>

src/dfmt/formatter.d

@@ -732,7 +732,7 @@ private:
             writeToken();
             indents.popWrapIndents();
             linebreakHints = [];
-            while (indents.topIs(tok!"enum"))
+            while (indents.topIsOneOf(tok!"enum", tok!"try", tok!"catch", tok!"finally"))
                 indents.pop();
             if (indents.topAre(tok!"static", tok!"else"))
             {
@@ -1547,8 +1547,6 @@ private:
             }
             else if (currentIs(tok!"catch") || currentIs(tok!"finally"))
             {
-                while (indents.topIsOneOf(tok!"catch", tok!"try"))
-                    indents.pop();
                 indentLevel = indents.indentLevel;
             }
             else

tests/allman/issue0372.d.ref

@@ -0,0 +1,22 @@
+void main(string[] args)
+{
+    // Test with catch
+    if (args.length > 1)
+        try
+            doSomeStuff();
+        catch (Exception error)
+            ohNoSomeErrorHappened();
+    else
+        thatsNotHowYouUseThisProgram();
+
+    // Test with finally
+    if (args.length > 2)
+        try
+            doOtherStuff();
+        catch (Exception error)
+            ohNoSomeErrorHappened();
+        finally
+            doSomeCleanup();
+    else
+        dontDoOtherStuff();
+}

tests/issue0372.d

@@ -0,0 +1,22 @@
+void main(string[] args)
+{
+// Test with catch
+if (args.length > 1)
+try
+doSomeStuff();
+catch (Exception error)
+ohNoSomeErrorHappened();
+else
+thatsNotHowYouUseThisProgram();
+
+// Test with finally
+if (args.length > 2)
+try
+doOtherStuff();
+catch (Exception error)
+ohNoSomeErrorHappened();
+finally
+doSomeCleanup();
+else
+dontDoOtherStuff();
+}

tests/otbs/issue0372.d.ref

@@ -0,0 +1,21 @@
+void main(string[] args) {
+    // Test with catch
+    if (args.length > 1)
+        try
+            doSomeStuff();
+        catch (Exception error)
+            ohNoSomeErrorHappened();
+    else
+        thatsNotHowYouUseThisProgram();
+
+    // Test with finally
+    if (args.length > 2)
+        try
+            doOtherStuff();
+        catch (Exception error)
+            ohNoSomeErrorHappened();
+        finally
+            doSomeCleanup();
+    else
+        dontDoOtherStuff();
+}