From 019d42a4dcaf07fcb8b98039bdbf482b211d9d84 Mon Sep 17 00:00:00 2001 From: Hackerpilot Date: Tue, 7 Mar 2017 16:12:27 -0800 Subject: [PATCH] Fix #273 --- dub.json | 2 +- libdparse | 2 +- src/dfmt/formatter.d | 2 +- tests/allman/issue0273.d.ref | 4 ++++ tests/issue0273.d | 4 ++++ tests/otbs/issue0273.d.ref | 3 +++ 6 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 tests/allman/issue0273.d.ref create mode 100644 tests/issue0273.d create mode 100644 tests/otbs/issue0273.d.ref diff --git a/dub.json b/dub.json index f9019ed..91132a8 100644 --- a/dub.json +++ b/dub.json @@ -4,6 +4,6 @@ "targetType": "executable", "license": "BSL-1.0", "dependencies": { - "libdparse": "~>0.7.0-beta.6" + "libdparse": "~>0.7.1-beta.1" } } diff --git a/libdparse b/libdparse index ca51bd1..eb8309c 160000 --- a/libdparse +++ b/libdparse @@ -1 +1 @@ -Subproject commit ca51bd13cf68646eaf9d6987db100cc3b288cffe +Subproject commit eb8309c9cd4272ec130c13d7f1addafe2b03edec diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 237cbd6..141e7c2 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -1038,7 +1038,7 @@ private: regenLineBreakHintsIfNecessary(index); goto binary; case tok!"~": - if (peekIs(tok!"this")) + if (peekIs(tok!"this") && peek2Is(tok!"(")) { if (!(index == 0 || peekBackIs(tok!"{", true) || peekBackIs(tok!"}", true) || peekBackIs(tok!";", true))) diff --git a/tests/allman/issue0273.d.ref b/tests/allman/issue0273.d.ref new file mode 100644 index 0000000..23afad9 --- /dev/null +++ b/tests/allman/issue0273.d.ref @@ -0,0 +1,4 @@ +void main() +{ + writeln("Expected " ~ descStr(type, data) ~ " but got " ~ this.descStr); +} diff --git a/tests/issue0273.d b/tests/issue0273.d new file mode 100644 index 0000000..f50e8f9 --- /dev/null +++ b/tests/issue0273.d @@ -0,0 +1,4 @@ +void main() +{ + writeln("Expected " ~ descStr( type, data ) ~ " but got " ~ this.descStr); +} diff --git a/tests/otbs/issue0273.d.ref b/tests/otbs/issue0273.d.ref new file mode 100644 index 0000000..59118c8 --- /dev/null +++ b/tests/otbs/issue0273.d.ref @@ -0,0 +1,3 @@ +void main() { + writeln("Expected " ~ descStr(type, data) ~ " but got " ~ this.descStr); +}