Skip to content

Commit a4fbc6f

Browse files
belka-ewWebFreak001
authored andcommitted
Revert chain indentation in an argument list
1 parent 57f57d9 commit a4fbc6f

11 files changed

+128
-0
lines changed

src/dfmt/formatter.d

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1625,6 +1625,10 @@ private:
16251625
const commaLine = tokens[index].line;
16261626

16271627
writeToken();
1628+
if (indents.topIs(tok!"."))
1629+
{
1630+
indents.pop;
1631+
}
16281632
if (!currentIs(tok!")") && !currentIs(tok!"]")
16291633
&& !currentIs(tok!"}") && !currentIs(tok!"comment"))
16301634
{
@@ -1643,6 +1647,10 @@ private:
16431647
{
16441648
pushWrapIndent();
16451649
writeToken();
1650+
if (indents.topIs(tok!"."))
1651+
{
1652+
indents.pop;
1653+
}
16461654
newline();
16471655
}
16481656
else
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
class C
2+
{
3+
void f()
4+
{
5+
if (true)
6+
{
7+
f(map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map
8+
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
9+
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
10+
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
11+
}
12+
}
13+
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
class C
2+
{
3+
void f()
4+
{
5+
if (true)
6+
{
7+
f(
8+
array.map!(a => a.prop)
9+
.array
10+
.to!string,
11+
__FILE__,
12+
__LINE__);
13+
}
14+
}
15+
}

tests/argument_chain_indent.args

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--single_indent=true

tests/argument_chain_indent.d

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
class C
2+
{
3+
void f()
4+
{
5+
if (true)
6+
{
7+
f(
8+
map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map,
9+
__FILE__,
10+
__FILE__,
11+
__FILE__,
12+
__FILE__,
13+
__FILE__,
14+
__FILE__,
15+
__FILE__,
16+
__FILE__,
17+
__FILE__,
18+
__FILE__,
19+
__FILE__,
20+
__FILE__,
21+
__FILE__,
22+
__FILE__,
23+
__FILE__,
24+
__FILE__,
25+
__LINE__);
26+
}
27+
}
28+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--single_indent=true
2+
--keep_line_breaks=true

tests/argument_chain_keep_breaks.d

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
class C
2+
{
3+
void f()
4+
{
5+
if (true)
6+
{
7+
f(
8+
array.map!(a => a.prop)
9+
.array
10+
.to!string,
11+
__FILE__,
12+
__LINE__);
13+
}
14+
}
15+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
class C {
2+
void f()
3+
{
4+
if (true) {
5+
f(map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map
6+
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
7+
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
8+
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
9+
}
10+
}
11+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
class C {
2+
void f()
3+
{
4+
if (true) {
5+
f(
6+
array.map!(a => a.prop)
7+
.array
8+
.to!string,
9+
__FILE__,
10+
__LINE__);
11+
}
12+
}
13+
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
class C {
2+
void f() {
3+
if (true) {
4+
f(map.map.map.map.map.map.map.map.map.map.map.map.map.map.map.map
5+
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
6+
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
7+
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
8+
}
9+
}
10+
}

0 commit comments

Comments
 (0)