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

Revert operator indentation in an argument list

This commit is contained in:
Eugen Wissner 2023-01-25 12:32:02 +01:00 committed by Jan Jurzitza
parent a4fbc6f881
commit dba8c87ebc
9 changed files with 128 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dfmt/formatter.d
View File

@ -1625,7 +1625,7 @@ private:
const commaLine = tokens[index].line; const commaLine = tokens[index].line;
writeToken(); writeToken();
if (indents.topIs(tok!".")) if (indents.topIsWrap && !indents.topIs(tok!","))
{ {
indents.pop; indents.pop;
} }
@ -1647,7 +1647,7 @@ private:
{ {
pushWrapIndent(); pushWrapIndent();
writeToken(); writeToken();
if (indents.topIs(tok!".")) if (indents.topIsWrap && !indents.topIs(tok!","))
{ {
indents.pop; indents.pop;
} }

10
tests/allman/argument_chain_indent.d.ref
View File

@ -8,6 +8,16 @@ class C
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, .map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__); __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
g(map && map && map && map && map && map && map && map && map && map && map
&& map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __LINE__);
h(map || map || map || map || map || map || map || map || map || map || map
|| map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __LINE__);
i(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__, __LINE__);
} }
} }
} }

16
tests/allman/argument_chain_keep_breaks.d.ref
View File

@ -10,6 +10,22 @@ class C
.to!string, .to!string,
__FILE__, __FILE__,
__LINE__); __LINE__);
g(
map &&
map,
__FILE__,
__LINE__);
h(
map ||
map,
__FILE__,
__LINE__);
i(
map
+ map,
__FILE__,
__LINE__);
} }
} }
} }

32
tests/argument_chain_indent.d
View File

@ -23,6 +23,38 @@ class C
__FILE__, __FILE__,
__FILE__, __FILE__,
__LINE__); __LINE__);
g(
map && map && map && map && map && map && map && map && map && map && map && map,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__LINE__);
h(
map || map || map || map || map || map || map || map || map || map || map || map,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__FILE__,
__LINE__);
i(
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__,
__LINE__);
} }
} }
} }

16
tests/argument_chain_keep_breaks.d
View File

@ -10,6 +10,22 @@ class C
.to!string, .to!string,
__FILE__, __FILE__,
__LINE__); __LINE__);
g(
map &&
map,
__FILE__,
__LINE__);
h(
map ||
map,
__FILE__,
__LINE__);
i(
map
+ map,
__FILE__,
__LINE__);
} }
} }
} }

10
tests/knr/argument_chain_indent.d.ref
View File

@ -6,6 +6,16 @@ class C {
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, .map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__); __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
g(map && map && map && map && map && map && map && map && map && map && map
&& map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __LINE__);
h(map || map || map || map || map || map || map || map || map || map || map
|| map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __LINE__);
i(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__, __LINE__);
} }
} }
} }

16
tests/knr/argument_chain_keep_breaks.d.ref
View File

@ -8,6 +8,22 @@ class C {
.to!string, .to!string,
__FILE__, __FILE__,
__LINE__); __LINE__);
g(
map &&
map,
__FILE__,
__LINE__);
h(
map ||
map,
__FILE__,
__LINE__);
i(
map
+ map,
__FILE__,
__LINE__);
} }
} }
} }

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

@ -5,6 +5,16 @@ class C {
.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, .map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__); __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
g(map && map && map && map && map && map && map && map && map && map && map
&& map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __LINE__);
h(map || map || map || map || map || map || map || map || map || map || map
|| map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
__FILE__, __FILE__, __LINE__);
i(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__, __LINE__);
} }
} }
} }

16
tests/otbs/argument_chain_keep_breaks.d.ref
View File

@ -7,6 +7,22 @@ class C {
.to!string, .to!string,
__FILE__, __FILE__,
__LINE__); __LINE__);
g(
map &&
map,
__FILE__,
__LINE__);
h(
map ||
map,
__FILE__,
__LINE__);
i(
map
+ map,
__FILE__,
__LINE__);
} }
} }
} }