Skip to content

Commit 7952562

Browse files
committed
Fix #62
1 parent e732807 commit 7952562

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

src/dfmt.d

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,6 +839,8 @@ private:
839839
else
840840
newline();
841841
writeToken();
842+
if (!currentIs(tok!"case") && !currentIs(tok!"default") && !currentIs(tok!"}"))
843+
indentLevel++;
842844
newline();
843845
while (index < tokens.length)
844846
{
@@ -850,7 +852,7 @@ private:
850852
newline();
851853
return;
852854
}
853-
else if (current.type == tok!";" && peekIs(tok!"}"))
855+
else if (current.type == tok!";" && peekIs(tok!"}", false))
854856
{
855857
writeToken();
856858
newline();
@@ -886,6 +888,8 @@ private:
886888
else
887889
goto peek;
888890
}
891+
else if (currentIs(tok!"}", false))
892+
break;
889893
else
890894
{
891895
peek:

tests/issue0062.d

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
unittest
2+
{
3+
switch (op)
4+
{
5+
return -1; // memory blocks are different
6+
}
7+
}

tests/issue0062.d.ref

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
unittest
2+
{
3+
switch (op)
4+
{
5+
return -1; // memory blocks are different
6+
}
7+
}

0 commit comments

Comments
 (0)