Skip to content

Fix 383 - Formatting AST including @trusted delegate produces inval… #399

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

Merged
dlang-bot merged 2 commits into from
May 12, 2020
Merged

Fix 383 - Formatting AST including @trusted delegate produces inval… #399

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bcb45e
Fix 383 - Formatting AST including `@trusted` delegate produces inval…
MoonlightSentinel May 2, 2020
6448b28
Ensure proper newline/indentation for in/out/do
MoonlightSentinel May 2, 2020
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
105 changes: 100 additions & 5 deletions src/dparse/formatter.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@ class Formatter(Sink)
void format(const InContractExpression expression)
{
debug(verbose) writeln("InContractExpression");

newlineIndent();
put("in (");
format(expression.assertArguments);
put(")");
Expand All @@ -1904,7 +1904,6 @@ class Formatter(Sink)
{
if (inContractExpression) format(inContractExpression);
if (outContractExpression) format(outContractExpression);
newline();
}
}

Expand All @@ -1922,6 +1921,7 @@ class Formatter(Sink)
void format(const InStatement inStatement)
{
debug(verbose) writeln("InStatement");
newlineIndent();
put("in");
format(inStatement.blockStatement);
}
Expand Down Expand Up @@ -2346,7 +2346,7 @@ class Formatter(Sink)
void format(const OutContractExpression expression)
{
debug(verbose) writeln("OutContractExpression");

newlineIndent();
put("out (");
if (expression.parameter != tok!"")
format(expression.parameter);
Expand All @@ -2363,7 +2363,7 @@ class Formatter(Sink)
Token parameter;
BlockStatement blockStatement;
**/

newlineIndent();
put("out");
if (stmnt.parameter != tok!"")
{
Expand Down Expand Up @@ -2678,7 +2678,11 @@ class Formatter(Sink)
{
foreach (contract; functionContracts)
format(contract);
put("do");
if (specifiedFunctionBody.hasDo)
{
newlineIndent();
put("do");
}
if (blockStatement)
format(blockStatement);
}
Expand Down Expand Up @@ -4144,4 +4148,95 @@ do{}
testFormatNode!(AliasDeclaration)("alias f(T) = void(int, int, int) const pure nothrow;");

testFormatNode!(AliasDeclaration)("alias MT = mixin (strEnum1, strEnum2);");

testFormatNode!(Module)("static assert(() @trusted { return bar()(3); }() == 4);",
`static assert (() @trusted
{ return bar()(3);
}() == 4)`
);
testFormatNode!(Module)("int foo() { return 2; }",
`int foo()
{
return 2;
}`
);

testFormatNode!(Module)("int foo() do { return 2; }",
`int foo()
do
{
return 2;
}`
);

testFormatNode!(Module)("int foo(int i) in(i > 0) do { return 2; }",
`int foo(int i)
in (i > 0)
do
{
return 2;
}`
);

testFormatNode!(Module)("int foo(int i) in { assert(i > 0); } do { return 2; }",
`int foo(int i)
in
{
assert (i > 0);
}
do
{
return 2;
}`
);

testFormatNode!(Module)("int foo() out(j; j > 0) do { return 2; }",
`int foo()
out (j; j > 0)
do
{
return 2;
}`
);

testFormatNode!(Module)("int foo() out(j) { assert(j > 0); } do { return 2; }",
`int foo()
out (j)
{
assert (j > 0);
}
do
{
return 2;
}`
);

testFormatNode!(Module)("version(BAR) {
int foo(int i)
in(i > 0) in { assert(i > 0); }
out(j; j > 0) out(j) { assert(j>0); }
do { return 2; } int i; }
",
`version (BAR)
{

int foo(int i)
in (i > 0)
in
{
assert (i > 0);
}
out (j; j > 0)
out (j)
{
assert (j > 0);
}
do
{
return 2;
}

int i;
}`
);
}