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

tuning whitespace around comments

This commit is contained in:
Andreas Zwinkau 2015-01-14 22:39:45 +01:00 committed by Andreas Zwinkau
parent 158c679349
commit 8983dc8b15
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dfmt.d
View File

@ -115,9 +115,26 @@ private:
assert (index < tokens.length);
if (current.type == tok!"comment")
{
writeToken();
const i = index;
if (i > 0)
{
if (tokens[i-1].line < tokens[i].line)
{
if (tokens[i-1].type != tok!"comment"
&& tokens[i-1].type != tok!"{")
newline();
}
else
write(" ");
}
writeToken();
if (i >= tokens.length-1)
newline();
else if (tokens[i+1].line > tokens[i].line)
newline();
else if (tokens[i+1].type != tok!"{")
write(" ");
}
else if (isStringLiteral(current.type) || isNumberLiteral(current.type)
|| current.type == tok!"characterLiteral")
{
@ -245,6 +262,7 @@ private:
case tok!";":
tempIndent = 0;
writeToken();
if (current.type != tok!"comment")
newline();
break;
case tok!"{":

6
tests/comments.d Normal file
View File

@ -0,0 +1,6 @@
int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/ {
// comment on its own line
foo() // comment on same line
.bar(); // also on same line
/* again */ // same line
}

7
tests/comments.d.ref Normal file
View File

@ -0,0 +1,7 @@
int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/
{
// comment on its own line
foo() // comment on same line
.bar(); // also on same line
/* again */ // same line
}