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

Fix #226

This commit is contained in:
Hackerpilot 2016-01-26 12:56:19 -08:00
parent e6fe5df515
commit 0ea6b340a4
5 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dfmt/formatter.d
View File

@ -1022,11 +1022,13 @@ private:
}
break;
}
else if (!astInformation.unaryLocations.canFindIndex(current.index))
goto binary;
else
else if (astInformation.unaryLocations.canFindIndex(current.index))
{
writeToken();
break;
break;
}
regenLineBreakHintsIfNecessary(index);
goto binary;
case tok!"~":
if (peekIs(tok!"this"))
{
@ -1048,6 +1050,7 @@ private:
writeToken();
break;
}
regenLineBreakHintsIfNecessary(index);
goto binary;
case tok!"[":
case tok!"(":

2
src/dfmt/tokens.d
View File

@ -111,6 +111,7 @@ bool isBreakToken(IdType t) pure nothrow @safe @nogc
case tok!"/":
case tok!"..":
case tok!"*=":
case tok!"*":
case tok!"&=":
case tok!"%=":
case tok!"%":
@ -173,6 +174,7 @@ int breakCost(IdType p, IdType c) pure nothrow @safe @nogc
case tok!"/":
case tok!"..":
case tok!"*=":
case tok!"*":
case tok!"&=":
case tok!"%=":
case tok!"%":

15
tests/allman/issue0226.d.ref Normal file
View File

@ -0,0 +1,15 @@
unittest
{
auto a = 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890
+ 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890
+ 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890
+ 1234567890 + 1234567890 + 1234567890;
auto a = 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890
- 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890
- 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890
- 1234567890 - 1234567890 - 1234567890;
auto a = 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890
* 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890
* 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890
* 1234567890 * 1234567890 * 1234567890;
}

6
tests/issue0226.d Normal file
View File

@ -0,0 +1,6 @@
unittest
{
auto a = 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890;
auto a = 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890;
auto a = 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890;
}

14
tests/otbs/issue0226.d.ref Normal file
View File

@ -0,0 +1,14 @@
unittest {
auto a = 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890
+ 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890
+ 1234567890 + 1234567890 + 1234567890 + 1234567890 + 1234567890
+ 1234567890 + 1234567890 + 1234567890;
auto a = 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890
- 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890
- 1234567890 - 1234567890 - 1234567890 - 1234567890 - 1234567890
- 1234567890 - 1234567890 - 1234567890;
auto a = 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890
* 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890
* 1234567890 * 1234567890 * 1234567890 * 1234567890 * 1234567890
* 1234567890 * 1234567890 * 1234567890;
}