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

Fix indentation of callchains with comments 

Weird formatting and indentation of multiline callchains with comments
in the middle.
This commit is contained in:
Eugen Wissner 2022-08-06 00:21:53 +02:00
parent 2a4af7a2b2
commit b0555b99c3
No known key found for this signature in database
GPG Key ID: A27FDC1E8EE902C0
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/dfmt/formatter.d
View File

@ -499,6 +499,9 @@ private:
if (peekIs(tok!"(") && (peekBackIs(tok!")") || peekBack2Is(tok!"!"))) if (peekIs(tok!"(") && (peekBackIs(tok!")") || peekBack2Is(tok!"!")))
pushWrapIndent(tok!"("); pushWrapIndent(tok!"(");
if (peekIs(tok!".") && !indents.topIs(tok!"."))
indents.push(tok!".");
} }
writeToken(); writeToken();
immutable j = justAddedExtraNewline; immutable j = justAddedExtraNewline;

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

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

2
tests/knr/comments.d.ref
View File

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

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

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