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

Fix #53

This commit is contained in:
Hackerpilot 2015-03-07 19:28:12 -08:00
parent 85247f77f7
commit 5eef96e797
3 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/dfmt.d
View File

@ -489,11 +489,10 @@ private:
else else
{ {
writeToken(); writeToken();
if (!currentIs(tok!")", false) && !currentIs(tok!"}", false) if (currentIs(tok!"}", false))
&& !currentIs(tok!"]", false)) tempIndent = 0;
{ else if (!currentIs(tok!")", false) && !currentIs(tok!"]", false))
write(" "); write(" ");
}
} }
regenLineBreakHintsIfNecessary(index - 1); regenLineBreakHintsIfNecessary(index - 1);
break; break;
@ -648,6 +647,7 @@ private:
{ {
import std.range : assumeSorted; import std.range : assumeSorted;
int depth = 0; int depth = 0;
immutable l = indentLevel;
do do
{ {
if (current.type == tok!"{") if (current.type == tok!"{")
@ -700,20 +700,11 @@ private:
index++; index++;
if (index < tokens.length && current.type == tok!"else") if (index < tokens.length && current.type == tok!"else")
write(" "); write(" ");
else
{
if (peekIs(tok!"case") || peekIs(tok!"default"))
indentLevel--;
newline();
}
}
else
{
index++;
if (peekIs(tok!"case") || peekIs(tok!"default"))
indentLevel--;
newline();
} }
index++;
if (peekIs(tok!"case") || peekIs(tok!"default"))
indentLevel--;
newline();
} }
} }
else else

6
tests/issue0053.d Normal file
View File

@ -0,0 +1,6 @@
enum DYNCAST : int
{
DYNCAST_OBJECT, DYNCAST_EXPRESSION, DYNCAST_DSYMBOL, DYNCAST_TYPE,
DYNCAST_IDENTIFIER, DYNCAST_TUPLE, DYNCAST_PARAMETER,
}
alias MATCHnomatch = MATCH.MATCHnomatch;

7
tests/issue0053.d.ref Normal file
View File

@ -0,0 +1,7 @@
enum DYNCAST : int
{
DYNCAST_OBJECT, DYNCAST_EXPRESSION, DYNCAST_DSYMBOL, DYNCAST_TYPE,
DYNCAST_IDENTIFIER, DYNCAST_TUPLE, DYNCAST_PARAMETER,
}
alias MATCHnomatch = MATCH.MATCHnomatch;