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

Fix break after comma, before this

This commit is contained in:
Eugen Wissner 2020-03-22 17:54:59 +01:00
parent 66faac49f1
commit 394da5d02a
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dfmt/formatter.d
View File

@ -1574,13 +1574,6 @@ private:
newline();
regenLineBreakHints(index - 1);
}
else if (!peekIs(tok!"}") && (linebreakHints.canFind(index)
|| (linebreakHints.length == 0 && currentLineLength > config.max_line_length)))
{
pushWrapIndent();
writeToken();
newline();
}
else if (config.dfmt_keep_line_breaks == OptionalBoolean.t)
{
const commaLine = tokens[index].line;
@ -1599,6 +1592,13 @@ private:
}
}
}
else if (!peekIs(tok!"}") && (linebreakHints.canFind(index)
|| (linebreakHints.length == 0 && currentLineLength > config.max_line_length)))
{
pushWrapIndent();
writeToken();
newline();
}
else
{
writeToken();

4
tests/allman/keep_line_breaks.d.ref
View File

@ -21,6 +21,10 @@ int[] func(int argument_1_1, int argument_1_2,
.func(argument_2_1)
.func(argument_2_2);
auto x = func(argument_1_1, argument_1_2,
this.argument_2_1, this.argument_2_2,
argument_3_1, argument_3_2);
return [
3, 5,
5, 7,

4
tests/keep_line_breaks.d
View File

@ -21,6 +21,10 @@ int[] func(int argument_1_1, int argument_1_2,
.func(argument_2_1)
.func(argument_2_2);
auto x = func(argument_1_1, argument_1_2,
this.argument_2_1, this.argument_2_2,
argument_3_1, argument_3_2);
return [
3, 5,
5, 7,

4
tests/otbs/keep_line_breaks.d.ref
View File

@ -17,6 +17,10 @@ int[] func(int argument_1_1, int argument_1_2,
.func(argument_2_1)
.func(argument_2_2);
auto x = func(argument_1_1, argument_1_2,
this.argument_2_1, this.argument_2_2,
argument_3_1, argument_3_2);
return [
3, 5,
5, 7,