From 41dc8ef9e9751c48a219b8543cab5ccae8e4bc4c Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Sun, 8 Mar 2015 18:33:59 -0700 Subject: [PATCH] Fix #69 --- src/dfmt.d | 2 +- tests/issue0069.d | 10 ++++++++++ tests/issue0069.d.ref | 10 ++++++++++ 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 tests/issue0069.d create mode 100644 tests/issue0069.d.ref diff --git a/src/dfmt.d b/src/dfmt.d index 1254694..7052a4a 100644 --- a/src/dfmt.d +++ b/src/dfmt.d @@ -1088,7 +1088,7 @@ private: } else if ((!assumeSorted(astInformation.attributeDeclarationLines) .equalRange(current.line).empty) || (currentIs(tok!"identifier") - && peekIs(tok!":") && !isBlockHeader(2))) + && peekIs(tok!":") && (!isBlockHeader(2) || peek2Is(tok!"if")))) { tempIndent--; } diff --git a/tests/issue0069.d b/tests/issue0069.d new file mode 100644 index 0000000..9982ff6 --- /dev/null +++ b/tests/issue0069.d @@ -0,0 +1,10 @@ +unittest +{ + if (0) + { + L1: + if (0) + { + } + } +} diff --git a/tests/issue0069.d.ref b/tests/issue0069.d.ref new file mode 100644 index 0000000..9e0ec1e --- /dev/null +++ b/tests/issue0069.d.ref @@ -0,0 +1,10 @@ +unittest +{ + if (0) + { + L1: + if (0) + { + } + } +}