From f3463cdd3401c8692f4b514fc64aaa3cc8e299bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= Date: Sun, 7 Oct 2018 20:47:28 +0200 Subject: [PATCH] Fix #326 - Spaces missing after attributes in function literals (#394) Fix #326 - Spaces missing after attributes in function literals merged-on-behalf-of: BBasile --- src/dfmt/formatter.d | 2 +- tests/allman/issue0326.d.ref | 4 ++++ tests/issue0326.d | 1 + tests/otbs/issue0326.d.ref | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 tests/allman/issue0326.d.ref create mode 100644 tests/issue0326.d create mode 100644 tests/otbs/issue0326.d.ref diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d index 7219123..2fa02a1 100644 --- a/src/dfmt/formatter.d +++ b/src/dfmt/formatter.d @@ -786,7 +786,7 @@ private: else if (astInformation.funLitStartLocations.canFindIndex(tIndex)) { sBraceDepth++; - if (peekBackIs(tok!")")) + if (peekBackIsOneOf(true, tok!")", tok!"identifier")) write(" "); auto e = expressionEndIndex(index); immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a)) diff --git a/tests/allman/issue0326.d.ref b/tests/allman/issue0326.d.ref new file mode 100644 index 0000000..0a51d21 --- /dev/null +++ b/tests/allman/issue0326.d.ref @@ -0,0 +1,4 @@ +void main() +{ + () @trusted { stderr.writeln("\033[01;33m", url, "\033[0m"); }(); +} diff --git a/tests/issue0326.d b/tests/issue0326.d new file mode 100644 index 0000000..1024b56 --- /dev/null +++ b/tests/issue0326.d @@ -0,0 +1 @@ +void main(){()@trusted{stderr.writeln("\033[01;33m", url, "\033[0m");}();} diff --git a/tests/otbs/issue0326.d.ref b/tests/otbs/issue0326.d.ref new file mode 100644 index 0000000..99c1ba4 --- /dev/null +++ b/tests/otbs/issue0326.d.ref @@ -0,0 +1,3 @@ +void main() { + () @trusted { stderr.writeln("\033[01;33m", url, "\033[0m"); }(); +}