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

Fix #100

This commit is contained in:
Hackerpilot 2015-03-14 03:58:23 -07:00
parent 0b7bc366f2
commit ce1c20e847
3 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/dfmt.d
View File

@ -307,10 +307,11 @@ private:
else if ((isBlockHeader() || currentIs(tok!"version") || currentIs(tok!"debug"))
&& peekIs(tok!"(", false))
{
immutable bool shouldPushIndent = (!currentIs(tok!"version")
&& !currentIs(tok!"debug")) || astInformation.conditionalWithElseLocations
.canFindIndex(current.index) || astInformation.conditionalStatementLocations.canFindIndex(
current.index);
immutable bool a = !currentIs(tok!"version") && !currentIs(tok!"debug") ;
immutable bool b = a || astInformation.conditionalWithElseLocations
.canFindIndex(current.index);
immutable bool shouldPushIndent = b || astInformation.conditionalStatementLocations
.canFindIndex(current.index);
if (shouldPushIndent)
indents.push(current.type);
writeToken();
@ -1764,7 +1765,7 @@ struct IndentStack
foreach (i; 1 .. j + 1)
{
if ((i + 1 <= index && !isWrapIndent(arr[i]) && isTempIndent(arr[i])
&& (!isTempIndent(arr[i + 1]))))
&& (!isTempIndent(arr[i + 1]) || arr[i + 1] == tok!"switch")))
{
continue;
}

14
tests/issue0100.d Normal file
View File

@ -0,0 +1,14 @@
unittest
{
loop: while (i < tokens.length) switch (tokens[i].type)
{
case tok!"(":
parenDepth++;
i++;
break;
case tok!"{":
braceDepth++;
i++;
break;
}
}

14
tests/issue0100.d.ref Normal file
View File

@ -0,0 +1,14 @@
unittest
{
loop: while (i < tokens.length) switch (tokens[i].type)
{
case tok!"(":
parenDepth++;
i++;
break;
case tok!"{":
braceDepth++;
i++;
break;
}
}