Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix indentation of callchains with comments #563

Merged
merged 1 commit into from
Aug 6, 2022
Merged

Fix indentation of callchains with comments #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/dfmt/formatter.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,9 @@ private:

if (peekIs(tok!"(") && (peekBackIs(tok!")") || peekBack2Is(tok!"!")))
pushWrapIndent(tok!"(");

if (peekIs(tok!".") && !indents.topIs(tok!"."))
indents.push(tok!".");
}
writeToken();
immutable j = justAddedExtraNewline;
Expand Down
2 changes: 1 addition & 1 deletion tests/allman/comments.d.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/
{
// comment on its own line
foo() // comment on same line
.bar(); // also on same line
.bar(); // also on same line
/* again */ // same line
}
2 changes: 1 addition & 1 deletion tests/knr/comments.d.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/
{
// comment on its own line
foo() // comment on same line
.bar(); // also on same line
.bar(); // also on same line
/* again */ // same line
}
2 changes: 1 addition & 1 deletion tests/otbs/comments.d.ref
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
int /*sneaky*/ foo( /*comments*/ ) /*everywhere*/ {
// comment on its own line
foo() // comment on same line
.bar(); // also on same line
.bar(); // also on same line
/* again */ // same line
}