forks
/
dfmt
mirror of https://github.com/dlang-community/dfmt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #409 from LaurentTreguier/empty-braces-double-spaces 

Spaces inside empty braces
merged-on-behalf-of: Brian Schott <Hackerpilot@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2018-11-09 10:51:13 +01:00 committed by GitHub
parent dc8e7a087c 67664c2835
commit fd1f2f5161
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dfmt/formatter.d
View File

@ -805,7 +805,8 @@ private:
else else
{ {
niBraceDepth++; niBraceDepth++;
write(" "); if (!currentIs(tok!"}"))
write(" ");
} }
} }
else else
@ -872,7 +873,7 @@ private:
{ {
if (niBraceDepth > 0) if (niBraceDepth > 0)
{ {
if (!peekBackIsSlashSlash()) if (!peekBackIsSlashSlash() && !peekBackIs(tok!"{"))
write(" "); write(" ");
niBraceDepth--; niBraceDepth--;
} }

4
tests/allman/issue0119.d.ref
View File

@ -1,5 +1,5 @@
auto fun = function() { }; auto fun = function() {};
auto fun = () { }; auto fun = () {};
auto fun = {}; auto fun = {};
auto fun = { int i; }; auto fun = { int i; };

2
tests/allman/issue0287.d.ref
View File

@ -1,3 +1,3 @@
alias foo = typeof({ import std.math; }); alias foo = typeof({ import std.math; });
alias bar = typeof({ write("aaa"); }); alias bar = typeof({ write("aaa"); });
alias baz = typeof({ }); alias baz = typeof({});

4
tests/otbs/issue0119.d.ref
View File

@ -1,5 +1,5 @@
auto fun = function() { }; auto fun = function() {};
auto fun = () { }; auto fun = () {};
auto fun = {}; auto fun = {};
auto fun = { int i; }; auto fun = { int i; };

2
tests/otbs/issue0287.d.ref
View File

@ -1,3 +1,3 @@
alias foo = typeof({ import std.math; }); alias foo = typeof({ import std.math; });
alias bar = typeof({ write("aaa"); }); alias bar = typeof({ write("aaa"); });
alias baz = typeof({ }); alias baz = typeof({});