From e3893d46ec056636f833fbb36014221fd08b9adf Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Tue, 24 Mar 2015 14:48:04 -0700
Subject: [PATCH] Fix #123

---
 src/dfmt/formatter.d         | 17 ++++++++++++++++-
 tests/allman/issue0123.d.ref |  7 +++++++
 tests/issue0123.d            |  4 ++++
 tests/otbs/issue0123.d.ref   |  5 +++++
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 tests/allman/issue0123.d.ref
 create mode 100644 tests/issue0123.d
 create mode 100644 tests/otbs/issue0123.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 1bef9d6..de203d2 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -968,7 +968,7 @@ private:
                 indents.popWrapIndents();
                 indents.push(tok!"{");
                 if (index == 1 || peekBackIsOneOf(true, tok!":", tok!"{",
-                        tok!"}", tok!")", tok!";"))
+                        tok!"}", tok!")", tok!";", tok!"identifier") || peekBackIsKeyword())
                 {
                     indentLevel = indents.indentSize - 1;
                 }
@@ -1209,6 +1209,21 @@ const pure @safe @nogc:
         return peekImplementation(tokenType, -1, ignoreComments);
     }
 
+	bool peekBackIsKeyword(bool ignoreComments = true)
+	{
+		if (index == 0)
+            return false;
+        auto i = index - 1;
+        if (ignoreComments)
+            while (tokens[i].type == tok!"comment")
+            {
+                if (i == 0)
+                    return false;
+                i--;
+            }
+		return isKeyword(tokens[i].type);
+	}
+
     bool peekBackIsOneOf(bool ignoreComments, IdType[] tokenTypes...)
     {
         if (index == 0)
diff --git a/tests/allman/issue0123.d.ref b/tests/allman/issue0123.d.ref
new file mode 100644
index 0000000..33e1296
--- /dev/null
+++ b/tests/allman/issue0123.d.ref
@@ -0,0 +1,7 @@
+struct State
+{
+    this(uint breaks, const Token[] tokens, immutable short[] depths,
+        const Config* config, int currentLineLength, int indentLevel) pure @safe
+    {
+    }
+}
diff --git a/tests/issue0123.d b/tests/issue0123.d
new file mode 100644
index 0000000..4e0fd4d
--- /dev/null
+++ b/tests/issue0123.d
@@ -0,0 +1,4 @@
+struct State
+{
+	this(uint breaks, const Token[] tokens, immutable short[] depths, const Config* config, int currentLineLength, int indentLevel) pure @safe {}
+}
diff --git a/tests/otbs/issue0123.d.ref b/tests/otbs/issue0123.d.ref
new file mode 100644
index 0000000..28bc34a
--- /dev/null
+++ b/tests/otbs/issue0123.d.ref
@@ -0,0 +1,5 @@
+struct State {
+    this(uint breaks, const Token[] tokens, immutable short[] depths,
+        const Config* config, int currentLineLength, int indentLevel) pure @safe {
+    }
+}