From a8ac4008305ba24e94121eb8820633e676323ba6 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Fri, 2 Feb 2018 04:48:57 -0800
Subject: [PATCH] Fix #313, and implement a better fix for #314

---
 src/dfmt/formatter.d                  | 36 ++++++++++++++++++---------
 src/dfmt/indentation.d                |  6 ++---
 tests/allman/issue0313.d.ref          | 20 +++++++++++++++
 tests/issue0313.d                     |  4 +++
 tests/otbs/catchExceptionNested.d.ref |  3 +--
 tests/otbs/guessnumber.d.ref          |  3 +--
 tests/otbs/issue0313.d.ref            | 12 +++++++++
 7 files changed, 65 insertions(+), 19 deletions(-)
 create mode 100644 tests/allman/issue0313.d.ref
 create mode 100644 tests/issue0313.d
 create mode 100644 tests/otbs/issue0313.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 760b4f7..b36273f 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -794,7 +794,6 @@ private:
                     write(" ");
                 writeToken();
             }
-
             indents.push(tok!"{");
             if (!currentIs(tok!"{"))
                 newline();
@@ -841,8 +840,11 @@ private:
                 justAddedExtraNewline = true;
             }
             if (config.dfmt_brace_style == BraceStyle.otbs
-                    && peekIs(tok!"else") && !indents.topAre(tok!"static", tok!"if")
-                    && !indents.topIs(tok!"foreach"))
+                    && ((peekIs(tok!"else")
+                            && !indents.topAre(tok!"static", tok!"if")
+                            && !indents.topIs(tok!"foreach") && !indents.topIs(tok!"for")
+                            && !indents.topIs(tok!"while") && !indents.topIs(tok!"do"))
+                        || peekIs(tok!"catch") || peekIs(tok!"finally")))
             {
                 write(" ");
                 index++;
@@ -853,7 +855,7 @@ private:
                         && !peekIs(tok!";") && !peekIs(tok!"{"))
                 {
                     index++;
-                    if (indents.topIsOneOf(tok!"static", tok!"foreach"))
+                    if (indents.topIs(tok!"static"))
                         indents.pop();
                     newline();
                 }
@@ -955,6 +957,9 @@ private:
         }
         else if (!currentIs(tok!"{") && !currentIs(tok!"comment"))
         {
+            //indents.dump();
+            while (indents.topIsOneOf(tok!"foreach", tok!"for", tok!"while"))
+                indents.pop();
             if (indents.topIsOneOf(tok!"if", tok!"version"))
                 indents.pop();
             indents.push(tok!"else");
@@ -993,14 +998,11 @@ private:
                 write(" ");
             break;
         case tok!"try":
-            if (peekIs(tok!"{"))
-                writeToken();
-            else
-            {
-                writeToken();
-                indents.push(tok!"try");
+        case tok!"finally":
+            indents.push(current.type);
+            writeToken();
+            if (!currentIs(tok!"{"))
                 newline();
-            }
             break;
         case tok!"body":
             if (!peekBackIs(tok!"}"))
@@ -1430,7 +1432,11 @@ private:
                     indentLevel = indents.indentToMostRecent(tok!"{");
                     indents.pop();
                 }
-                while (sBraceDepth == 0 && indents.topIsTemp()
+                if (indents.topIsOneOf(tok!"try", tok!"catch"))
+                {
+                    indents.pop();
+                }
+                else while (sBraceDepth == 0 && indents.topIsTemp()
                         && ((!indents.topIsOneOf(tok!"else", tok!"if",
                             tok!"static", tok!"version")) || !peekIs(tok!"else")))
                 {
@@ -1461,6 +1467,12 @@ private:
                     indentLevel = indents.indentLevel;
                 }
             }
+            else if (currentIs(tok!"catch") || currentIs(tok!"finally"))
+            {
+                while (indents.topIsOneOf(tok!"catch", tok!"try"))
+                    indents.pop();
+                indentLevel = indents.indentLevel;
+            }
             else
             {
                 if (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}",
diff --git a/src/dfmt/indentation.d b/src/dfmt/indentation.d
index f992ec3..e009d12 100644
--- a/src/dfmt/indentation.d
+++ b/src/dfmt/indentation.d
@@ -162,13 +162,13 @@ struct IndentStack
     /**
      * Dumps the current state of the indentation stack to `stderr`. Used for debugging.
      */
-    void dump()
+    void dump(string file = __FILE__, uint line = __LINE__)
     {
-        import std.stdio : stderr;
         import dparse.lexer : str;
         import std.algorithm.iteration : map;
+        import std.stdio : stderr;
 
-        stderr.writefln("\033[31m%(%s %)\033[0m", arr[0 .. index].map!(a => str(a)));
+        stderr.writefln("\033[31m%s:%d %(%s %)\033[0m", file, line, arr[0 .. index].map!(a => str(a)));
     }
 
 private:
diff --git a/tests/allman/issue0313.d.ref b/tests/allman/issue0313.d.ref
new file mode 100644
index 0000000..32ae127
--- /dev/null
+++ b/tests/allman/issue0313.d.ref
@@ -0,0 +1,20 @@
+void main()
+{
+    foreach (v; a)
+        try
+        {
+            foo();
+        }
+        catch (Exception e)
+        {
+            bar();
+        }
+        catch (Exception e)
+        {
+            bar();
+        }
+        finally
+        {
+        }
+    stuff();
+}
diff --git a/tests/issue0313.d b/tests/issue0313.d
new file mode 100644
index 0000000..2fd2264
--- /dev/null
+++ b/tests/issue0313.d
@@ -0,0 +1,4 @@
+void main()
+{
+	foreach (v; a) try { foo(); } catch (Exception e) { bar(); } catch (Exception e) { bar(); } finally {} stuff();
+}
diff --git a/tests/otbs/catchExceptionNested.d.ref b/tests/otbs/catchExceptionNested.d.ref
index 4534cc3..50f1468 100644
--- a/tests/otbs/catchExceptionNested.d.ref
+++ b/tests/otbs/catchExceptionNested.d.ref
@@ -16,8 +16,7 @@ void foo() {
     foreach (immutable i; 0 .. 2) {
         try {
             i.bar;
-        }
-        catch (U0) {
+        } catch (U0) {
             "Function foo caught exception U0".writeln;
         }
     }
diff --git a/tests/otbs/guessnumber.d.ref b/tests/otbs/guessnumber.d.ref
index 5ece444..8fb4c65 100644
--- a/tests/otbs/guessnumber.d.ref
+++ b/tests/otbs/guessnumber.d.ref
@@ -12,8 +12,7 @@ void main() {
         Nullable!int answer;
         try {
             answer = txt.to!int;
-        }
-        catch (ConvException e) {
+        } catch (ConvException e) {
             writefln("  I don't understand your input '%s'", txt);
             continue;
         }
diff --git a/tests/otbs/issue0313.d.ref b/tests/otbs/issue0313.d.ref
new file mode 100644
index 0000000..6e3e80c
--- /dev/null
+++ b/tests/otbs/issue0313.d.ref
@@ -0,0 +1,12 @@
+void main() {
+    foreach (v; a)
+        try {
+            foo();
+        } catch (Exception e) {
+            bar();
+        } catch (Exception e) {
+            bar();
+        } finally {
+        }
+    stuff();
+}