From 6ff47e106a98963a88aebf9701ccae0dc44c6d05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= <laurent@treguier.org>
Date: Tue, 9 Oct 2018 11:30:29 +0200
Subject: [PATCH] Fix else indentation after debug conditions

---
 src/dfmt/formatter.d                | 3 ++-
 tests/allman/debug_with_param.d.ref | 7 +++++++
 tests/debug_with_param.d            | 4 ++++
 tests/otbs/debug_with_param.d.ref   | 6 ++++++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 tests/allman/debug_with_param.d.ref
 create mode 100644 tests/debug_with_param.d
 create mode 100644 tests/otbs/debug_with_param.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index f77a86a..68a2b1c 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -732,13 +732,14 @@ private:
             writeToken();
             indents.popWrapIndents();
             linebreakHints = [];
-            while (indents.topIsOneOf(tok!"enum", tok!"try", tok!"catch", tok!"finally"))
+            while (indents.topIsOneOf(tok!"enum", tok!"try", tok!"catch", tok!"finally", tok!"debug"))
                 indents.pop();
             if (indents.topAre(tok!"static", tok!"else"))
             {
                 indents.pop();
                 indents.pop();
             }
+            indentLevel = indents.indentLevel;
             if (config.dfmt_brace_style == BraceStyle.allman)
             {
                 if (!currentIs(tok!"{"))
diff --git a/tests/allman/debug_with_param.d.ref b/tests/allman/debug_with_param.d.ref
new file mode 100644
index 0000000..b2c9baa
--- /dev/null
+++ b/tests/allman/debug_with_param.d.ref
@@ -0,0 +1,7 @@
+void main()
+{
+    debug (0)
+        foo();
+    else
+        bar();
+}
diff --git a/tests/debug_with_param.d b/tests/debug_with_param.d
new file mode 100644
index 0000000..d13fd86
--- /dev/null
+++ b/tests/debug_with_param.d
@@ -0,0 +1,4 @@
+void main()
+{
+debug(0) foo(); else bar();
+}
diff --git a/tests/otbs/debug_with_param.d.ref b/tests/otbs/debug_with_param.d.ref
new file mode 100644
index 0000000..9b9cf75
--- /dev/null
+++ b/tests/otbs/debug_with_param.d.ref
@@ -0,0 +1,6 @@
+void main() {
+    debug (0)
+        foo();
+    else
+        bar();
+}