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

fix array item access regression

This commit is contained in:
WebFreak001 2019-01-12 12:25:46 +01:00
parent 989c0da60c
commit 7f41c8ae7f
4 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dfmt/formatter.d
View File

@ -611,6 +611,15 @@ private:
indents.push(tok!"]", detail);
}
else if (p == tok!"[")
{
// array item access
IndentStack.Details detail;
detail.wrap = false;
detail.temp = true;
detail.mini = true;
indents.push(tok!"]", detail);
}
else if (!currentIs(tok!")") && !currentIs(tok!"]")
&& (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0
&& currentLineLength > config.max_line_length)))
@ -664,7 +673,7 @@ private:
indents.popWrapIndents();
if (indents.topIs(tok!"]"))
{
if (!indents.topDetails.mini)
if (!indents.topDetails.mini && !indents.topDetails.temp)
newline();
else
indents.pop();
@ -839,6 +848,8 @@ private:
}
else if (astInformation.funLitStartLocations.canFindIndex(tIndex))
{
indents.popWrapIndents();
sBraceDepth++;
if (peekBackIsOneOf(true, tok!")", tok!"identifier"))
write(" ");

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

@ -0,0 +1,7 @@
unittest
{
foo([
target.value.region[1], target.value.region[1],
target.value.region[1], target.value.region[1], target.value.region[1]
]);
}

4
tests/array_access.d Normal file
View File

@ -0,0 +1,4 @@
unittest
{
foo([target.value.region[1], target.value.region[1], target.value.region[1], target.value.region[1], target.value.region[1]]);
}

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

@ -0,0 +1,6 @@
unittest {
foo([
target.value.region[1], target.value.region[1],
target.value.region[1], target.value.region[1], target.value.region[1]
]);
}