From c84db53c7cd49a6fd183e2d346ad951416b65a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= <laurent@treguier.org>
Date: Mon, 8 Oct 2018 13:32:15 +0200
Subject: [PATCH] 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         |  4 +---
 tests/allman/issue0372.d.ref | 22 ++++++++++++++++++++++
 tests/issue0372.d            | 22 ++++++++++++++++++++++
 tests/otbs/issue0372.d.ref   | 21 +++++++++++++++++++++
 4 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 tests/allman/issue0372.d.ref
 create mode 100644 tests/issue0372.d
 create mode 100644 tests/otbs/issue0372.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 2fa02a1..eae3ac7 100644
--- a/src/dfmt/formatter.d
+++ b/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
diff --git a/tests/allman/issue0372.d.ref b/tests/allman/issue0372.d.ref
new file mode 100644
index 0000000..e47a83c
--- /dev/null
+++ b/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();
+}
diff --git a/tests/issue0372.d b/tests/issue0372.d
new file mode 100644
index 0000000..7842b4f
--- /dev/null
+++ b/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();
+}
diff --git a/tests/otbs/issue0372.d.ref b/tests/otbs/issue0372.d.ref
new file mode 100644
index 0000000..2c97f83
--- /dev/null
+++ b/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();
+}