From 699ae10458a4c453a34074c9a01957a1c605861f Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Mon, 24 Aug 2015 12:44:52 -0700 Subject: [PATCH] #172 --- src/dfmt/formatter.d | 2 +- tests/allman/issue0153.d.ref | 3 +-- tests/allman/issue0172.d.ref | 7 +++++++ tests/issue0172.d | 7 +++++++ tests/otbs/issue0153.d.ref | 3 +-- tests/otbs/issue0172.d.ref | 5 +++++ 6 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 tests/allman/issue0172.d.ref create mode 100644 tests/issue0172.d create mode 100644 tests/otbs/issue0172.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 9d53775..2ab30ab 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1271,7 +1271,7 @@ const pure @safe @nogc: break; if (depths[i] < d) break; - if (!braces && tokens[i].type == tok!";") + if (!braces && (tokens[i].type == tok!";" || tokens[i].type == tok!"{")) break; i++; } diff --git a/tests/allman/issue0153.d.ref b/tests/allman/issue0153.d.ref index c9ac2df..64b99c1 100644 --- a/tests/allman/issue0153.d.ref +++ b/tests/allman/issue0153.d.ref @@ -1,5 +1,4 @@ -class Foo(T) : FirstInterfaceWithVeryLongName, - SecondInterfaceWithVeryLongName if (is(T : Bar)) +class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName if (is(T : Bar)) { void foo() { diff --git a/tests/allman/issue0172.d.ref b/tests/allman/issue0172.d.ref new file mode 100644 index 0000000..e4608ad --- /dev/null +++ b/tests/allman/issue0172.d.ref @@ -0,0 +1,7 @@ +final class FormatVisitor : ASTVisitor +{ + this(ASTInformation* astInformation) + { + this.astInformation = astInformation; + } +} diff --git a/tests/issue0172.d b/tests/issue0172.d new file mode 100644 index 0000000..9e0772e --- /dev/null +++ b/tests/issue0172.d @@ -0,0 +1,7 @@ +final class FormatVisitor : ASTVisitor +{ + this(ASTInformation* astInformation) + { + this.astInformation = astInformation; + } +} diff --git a/tests/otbs/issue0153.d.ref b/tests/otbs/issue0153.d.ref index 51e2cd2..f55efed 100644 --- a/tests/otbs/issue0153.d.ref +++ b/tests/otbs/issue0153.d.ref @@ -1,5 +1,4 @@ -class Foo(T) : FirstInterfaceWithVeryLongName, - SecondInterfaceWithVeryLongName if (is(T : Bar)) { +class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName if (is(T : Bar)) { void foo() { } } diff --git a/tests/otbs/issue0172.d.ref b/tests/otbs/issue0172.d.ref new file mode 100644 index 0000000..8002155 --- /dev/null +++ b/tests/otbs/issue0172.d.ref @@ -0,0 +1,5 @@ +final class FormatVisitor : ASTVisitor { + this(ASTInformation* astInformation) { + this.astInformation = astInformation; + } +}