From 97d405a4aba0fde30a3e95505d446bb32d238b5a Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 4 Jun 2015 17:56:52 -0700 Subject: [PATCH 1/2] Fix #158 --- src/dfmt/formatter.d | 2 ++ tests/allman/issue0158.d.ref | 7 +++++++ tests/issue0158.d | 2 ++ tests/otbs/issue0158.d.ref | 5 +++++ 4 files changed, 16 insertions(+) create mode 100644 tests/allman/issue0158.d.ref create mode 100644 tests/issue0158.d create mode 100644 tests/otbs/issue0158.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 12d7df1..312d55e 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -726,6 +726,8 @@ private: write(" "); break; case tok!"enum": + if (peekBackIs(tok!"identifier")) + write(" "); indents.push(tok!"enum"); writeToken(); if (!currentIs(tok!":")) diff --git a/tests/allman/issue0158.d.ref b/tests/allman/issue0158.d.ref new file mode 100644 index 0000000..0a30381 --- /dev/null +++ b/tests/allman/issue0158.d.ref @@ -0,0 +1,7 @@ +@Foo enum Bar +{ +} + +@foo class Baz +{ +} diff --git a/tests/issue0158.d b/tests/issue0158.d new file mode 100644 index 0000000..b2522d8 --- /dev/null +++ b/tests/issue0158.d @@ -0,0 +1,2 @@ +@Foo enum Bar {} +@foo class Baz {} diff --git a/tests/otbs/issue0158.d.ref b/tests/otbs/issue0158.d.ref new file mode 100644 index 0000000..b85e074 --- /dev/null +++ b/tests/otbs/issue0158.d.ref @@ -0,0 +1,5 @@ +@Foo enum Bar { +} + +@foo class Baz { +} From 1f5801891232c78d80331b108e302c2f75fc14fa Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Thu, 4 Jun 2015 17:58:56 -0700 Subject: [PATCH 2/2] 0.3.6 --- src/dfmt/main.d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dfmt/main.d b/src/dfmt/main.d index 8040426..e44d998 100644 --- a/src/dfmt/main.d +++ b/src/dfmt/main.d @@ -144,7 +144,7 @@ else private void printHelp() { - writeln(`dfmt 0.3.5 + writeln(`dfmt 0.3.6 Options: --help | -h Print this help message