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

Allow line breaking on ':' token

This commit is contained in:
Hackerpilot 2015-03-16 14:14:04 -07:00
parent 3cdfeead48
commit a82eb7aa57
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dfmt.d
View File

@ -402,8 +402,9 @@ private:
linebreakHints = chooseLineBreakTokens(index, tokens[index .. j], linebreakHints = chooseLineBreakTokens(index, tokens[index .. j],
depths[index .. j], config, currentLineLength, indentLevel); depths[index .. j], config, currentLineLength, indentLevel);
} }
else if (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0 else if (!currentIs(tok!")") && !currentIs(tok!"]")
&& currentLineLength > config.columnHardLimit && !currentIs(tok!")"))) && (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0
&& currentLineLength > config.columnHardLimit)))
{ {
pushWrapIndent(p); pushWrapIndent(p);
newline(); newline();
@ -456,7 +457,15 @@ private:
void formatColon() void formatColon()
{ {
if (astInformation.caseEndLocations.canFindIndex(current.index) regenLineBreakHintsIfNecessary(index);
if (linebreakHints.canFindIndex(index))
{
pushWrapIndent();
newline();
writeToken();
write(" ");
}
else if (astInformation.caseEndLocations.canFindIndex(current.index)
|| astInformation.attributeDeclarationLines.canFindIndex(current.line)) || astInformation.attributeDeclarationLines.canFindIndex(current.line))
{ {
writeToken(); writeToken();
@ -492,7 +501,12 @@ private:
{ {
if (parenDepth > 0) if (parenDepth > 0)
{ {
if (!(peekIs(tok!";") || peekIs(tok!")") || peekIs(tok!"}"))) if (linebreakHints.canFindIndex(index))
{
writeToken();
newline();
}
else if (!(peekIs(tok!";") || peekIs(tok!")") || peekIs(tok!"}")))
write("; "); write("; ");
else else
write(";"); write(";");
@ -1614,6 +1628,7 @@ bool isBreakToken(IdType t)
case tok!"(": case tok!"(":
case tok!"[": case tok!"[":
case tok!",": case tok!",":
case tok!":":
case tok!"^^": case tok!"^^":
case tok!"^=": case tok!"^=":
case tok!"^": case tok!"^":
@ -1674,6 +1689,7 @@ int breakCost(IdType t)
return 60; return 60;
case tok!"[": case tok!"[":
return 400; return 400;
case tok!":":
case tok!"^^": case tok!"^^":
case tok!"^=": case tok!"^=":
case tok!"^": case tok!"^":