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

Format multiline arrays first

This commit is contained in:
Eugen Wissner 2021-06-10 18:45:56 +02:00
parent 995c21ab87
commit 96b27011f4
5 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/dfmt/formatter.d
View File

@ -612,22 +612,7 @@ private:
immutable bool arrayInitializerStart = p == tok!"["
&& astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index);
if (p == tok!"[" && config.dfmt_keep_line_breaks == OptionalBoolean.t)
{
IndentStack.Details detail;
detail.wrap = false;
detail.temp = false;
detail.breakEveryItem = false;
detail.mini = tokens[index].line == tokens[index - 1].line;
indents.push(tok!"]", detail);
if (!detail.mini)
{
newline();
}
}
else if (arrayInitializerStart && isMultilineAt(index - 1))
if (arrayInitializerStart && isMultilineAt(index - 1))
{
if (peekBack2Is(tok!"(")) {
indents.pop();
@ -653,6 +638,21 @@ private:
linebreakHints = chooseLineBreakTokens(index, tokens[index .. j],
depths[index .. j], config, currentLineLength, indentLevel);
}
else if (p == tok!"[" && config.dfmt_keep_line_breaks == OptionalBoolean.t)
{
IndentStack.Details detail;
detail.wrap = false;
detail.temp = false;
detail.breakEveryItem = false;
detail.mini = tokens[index].line == tokens[index - 1].line;
indents.push(tok!"]", detail);
if (!detail.mini)
{
newline();
}
}
else if (arrayInitializerStart)
{
// This is a short (non-breaking) array/AA value

7
tests/allman/keep_break_in_array_chain.d.ref Normal file
View File

@ -0,0 +1,7 @@
unittest
{
functionLengthDoesMatter([
firstFunctionInChain("A").seconFunctionInChain("B").value,
firstFunctionInChain("A").seconFunctionInChain("B").value
]);
}

7
tests/keep_break_in_array_chain.d Normal file
View File

@ -0,0 +1,7 @@
unittest
{
functionLengthDoesMatter([
firstFunctionInChain("A").seconFunctionInChain("B").value,
firstFunctionInChain("A").seconFunctionInChain("B").value
]);
}

1
tests/keep_break_in_array_chain.d.args Normal file
View File

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

6
tests/otbs/keep_break_in_array_chain.d.ref Normal file
View File

@ -0,0 +1,6 @@
unittest {
functionLengthDoesMatter([
firstFunctionInChain("A").seconFunctionInChain("B").value,
firstFunctionInChain("A").seconFunctionInChain("B").value
]);
}