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

Revert chain indentation in an argument list

This commit is contained in:
Eugen Wissner 2023-01-15 19:47:57 +01:00 committed by Jan Jurzitza
parent 57f57d95de
commit a4fbc6f881
11 changed files with 128 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dfmt/formatter.d
View File

@ -1625,6 +1625,10 @@ private:
const commaLine = tokens[index].line; const commaLine = tokens[index].line;
writeToken(); writeToken();
if (indents.topIs(tok!"."))
{
indents.pop;
}
if (!currentIs(tok!")") && !currentIs(tok!"]") if (!currentIs(tok!")") && !currentIs(tok!"]")
&& !currentIs(tok!"}") && !currentIs(tok!"comment")) && !currentIs(tok!"}") && !currentIs(tok!"comment"))
{ {
@ -1643,6 +1647,10 @@ private:
{ {
pushWrapIndent(); pushWrapIndent();
writeToken(); writeToken();
if (indents.topIs(tok!"."))
{
indents.pop;
}
newline(); newline();
} }
else else

13
tests/allman/argument_chain_indent.d.ref Normal file
View File

@ -0,0 +1,13 @@
class C
{
void f()
{
if (true)
{
f(map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
}
}
}

15
tests/allman/argument_chain_keep_breaks.d.ref Normal file
View File

@ -0,0 +1,15 @@
class C
{
void f()
{
if (true)
{
f(
array.map!(a => a.prop)
.array
.to!string,
__FILE__,
__LINE__);
}
}
}

1
tests/argument_chain_indent.args Normal file
View File

@ -0,0 +1 @@
--single_indent=true

28
tests/argument_chain_indent.d Normal file
View File

@ -0,0 +1,28 @@
class C
{
void f()
{
if (true)
{
f(
map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__LINE__);
}
}
}

2
tests/argument_chain_keep_breaks.args Normal file
View File

@ -0,0 +1,2 @@
--single_indent=true
--keep_line_breaks=true

15
tests/argument_chain_keep_breaks.d Normal file
View File

@ -0,0 +1,15 @@
class C
{
void f()
{
if (true)
{
f(
array.map!(a => a.prop)
.array
.to!string,
__FILE__,
__LINE__);
}
}
}

11
tests/knr/argument_chain_indent.d.ref Normal file
View File

@ -0,0 +1,11 @@
class C {
void f()
{
if (true) {
f(map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
}
}
}

13
tests/knr/argument_chain_keep_breaks.d.ref Normal file
View File

@ -0,0 +1,13 @@
class C {
void f()
{
if (true) {
f(
array.map!(a => a.prop)
.array
.to!string,
__FILE__,
__LINE__);
}
}
}

10
tests/otbs/argument_chain_indent.d.ref Normal file
View File

@ -0,0 +1,10 @@
class C {
void f() {
if (true) {
f(map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
}
}
}

12
tests/otbs/argument_chain_keep_breaks.d.ref Normal file
View File

@ -0,0 +1,12 @@
class C {
void f() {
if (true) {
f(
array.map!(a => a.prop)
.array
.to!string,
__FILE__,
__LINE__);
}
}
}