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

Fix #99

This commit is contained in:
Hackerpilot 2015-03-14 03:27:25 -07:00
parent 65ae9dd4a0
commit 0b7bc366f2
3 changed files with 147 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
src/dfmt.d
View File

@ -303,7 +303,6 @@ private:
{ {
writeToken(); writeToken();
write(" "); write(" ");
writeParens(true);
} }
else if ((isBlockHeader() || currentIs(tok!"version") || currentIs(tok!"debug")) else if ((isBlockHeader() || currentIs(tok!"version") || currentIs(tok!"debug"))
&& peekIs(tok!"(", false)) && peekIs(tok!"(", false))
@ -356,7 +355,6 @@ private:
break; break;
case tok!"cast": case tok!"cast":
writeToken(); writeToken();
writeParens(true);
break; break;
case tok!"in": case tok!"in":
case tok!"is": case tok!"is":
@ -433,8 +431,43 @@ private:
} }
goto binary; goto binary;
case tok!"(": case tok!"(":
writeParens(true); spaceAfterParens = true;
writeToken();
parenDepth++;
if (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0
&& currentLineLength > config.columnSoftLimit && !currentIs(tok!")")))
{
indents.push(tok!"(");
newline();
}
regenLineBreakHintsIfNecessary(index - 1);
break; break;
case tok!")":
parenDepth--;
if (parenDepth == 0)
while (indents.length > 0 && isWrapIndent(indents.top))
indents.pop();
if (parenDepth == 0 && (peekIs(tok!"in") || peekIs(tok!"out")
|| peekIs(tok!"body")))
{
writeToken(); // )
newline();
writeToken(); // in/out/body
}
else if (peekIsLiteralOrIdent() || peekIsBasicType() || peekIsKeyword())
{
writeToken();
if (spaceAfterParens || parenDepth > 0)
write(" ");
}
else if ((peekIsKeyword() || peekIs(tok!"@")) && spaceAfterParens)
{
writeToken();
write(" ");
}
else
writeToken();
break;
case tok!"!": case tok!"!":
if (peekIs(tok!"is")) if (peekIs(tok!"is"))
write(" "); write(" ");
@ -487,9 +520,20 @@ private:
write(" "); write(" ");
break; break;
case tok!";": case tok!";":
writeToken(); if (parenDepth > 0)
linebreakHints = []; {
newline(); if (!(peekIs(tok!";") || peekIs(tok!")") || peekIs(tok!"}")))
write("; ");
else
write(";");
index++;
}
else
{
writeToken();
linebreakHints = [];
newline();
}
break; break;
case tok!"{": case tok!"{":
if (astInformation.structInitStartLocations.canFindIndex( if (astInformation.structInitStartLocations.canFindIndex(
@ -724,66 +768,21 @@ private:
return i; return i;
} }
void writeParens(bool space_afterwards) void writeParens(bool spaceAfter)
in in
{ {
assert (currentIs(tok!"("), str(current.type)); assert(currentIs(tok!"("), str(current.type));
} }
body body
{ {
int depth = 0; immutable int depth = parenDepth;
do do
{ {
if (currentIs(tok!";")) formatStep();
{ spaceAfterParens = spaceAfter;
if (!(peekIs(tok!";") || peekIs(tok!")") || peekIs(tok!"}"))) }
write("; "); while (index < tokens.length && parenDepth > depth);
else }
write(";");
index++;
}
else if (currentIs(tok!"("))
{
writeToken();
depth++;
if (linebreakHints.canFindIndex(index - 1) || (linebreakHints.length == 0
&& currentLineLength > config.columnSoftLimit && !currentIs(tok!")")))
{
indents.push(tok!"(");
newline();
}
regenLineBreakHintsIfNecessary(index - 1);
}
else if (currentIs(tok!")"))
{
depth--;
if (depth == 0 && (peekIs(tok!"in") || peekIs(tok!"out")
|| peekIs(tok!"body")))
{
writeToken(); // )
newline();
writeToken(); // in/out/body
}
else if (peekIsLiteralOrIdent() || peekIsBasicType() || peekIsKeyword())
{
writeToken();
if (space_afterwards || depth > 0)
write(" ");
}
else if ((peekIsKeyword() || peekIs(tok!"@")) && space_afterwards)
{
writeToken();
write(" ");
}
else
writeToken();
}
else
formatStep();
}
while (index < tokens.length && depth > 0);
linebreakHints = [];
}
bool peekIsKeyword() bool peekIsKeyword()
{ {
@ -1126,6 +1125,10 @@ private:
/// Keep track of whether or not an extra newline was just added because of /// Keep track of whether or not an extra newline was just added because of
/// an import statement. /// an import statement.
bool justAddedExtraNewline; bool justAddedExtraNewline;
int parenDepth;
bool spaceAfterParens;
} }
bool isWrapIndent(IdType type) pure nothrow @nogc @safe bool isWrapIndent(IdType type) pure nothrow @nogc @safe

37
tests/issue0099.d Normal file
View File

@ -0,0 +1,37 @@
unittest
{
if (a)
{
if (b)
if (c)
{
if (excessivelyLongVariableName.longAttributeName && excessivelyLongVariableName.longAttributeName && excessivelyLongVariableName.longAttributeName)
excessivelyLongFunctionName(true);
else
{
excessivelyLongFunctionName(false);
}
}
else
a();
}
}
unittest
{
if (a)
{
if (b)
{
if (c)
{
if (excessivelyLongVariableName.longAttributeName && excessivelyLongVariableName.longAttributeName && excessivelyLongVariableName.longAttributeName)
excessivelyLongFunctionName(true);
else
{
excessivelyLongFunctionName(false);
}
}
}
}
}

41
tests/issue0099.d.ref Normal file
View File

@ -0,0 +1,41 @@
unittest
{
if (a)
{
if (b)
if (c)
{
if (excessivelyLongVariableName.longAttributeName
&& excessivelyLongVariableName.longAttributeName
&& excessivelyLongVariableName.longAttributeName)
excessivelyLongFunctionName(true);
else
{
excessivelyLongFunctionName(false);
}
}
else
a();
}
}
unittest
{
if (a)
{
if (b)
{
if (c)
{
if (excessivelyLongVariableName.longAttributeName
&& excessivelyLongVariableName.longAttributeName
&& excessivelyLongVariableName.longAttributeName)
excessivelyLongFunctionName(true);
else
{
excessivelyLongFunctionName(false);
}
}
}
}
}