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

Fix #199

This commit is contained in:
Hackerpilot 2016-01-11 14:30:40 -08:00
parent 8e67e52f96
commit c80e1a067e
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libdparse

@ -1 +1 @@
Subproject commit 4bf4e5aa09453570121134a819a4f436275fe3f7 Subproject commit 52d73335854c12a608e0592181a83a0d6ec12fd5

2
makefile
View File

@ -23,7 +23,7 @@ ldc: $(SRC)
gdc: $(SRC) gdc: $(SRC)
$(GDC) $(GDC_FLAGS) $^ -obin/dfmt $(GDC) $(GDC_FLAGS) $^ -obin/dfmt
test: bin/dfmt test: debug
cd tests && ./test.sh cd tests && ./test.sh
bin/dfmt-test: $(SRC) bin/dfmt-test: $(SRC)

2
src/dfmt/ast_info.d
View File

@ -91,7 +91,7 @@ final class FormatVisitor : ASTVisitor
override void visit(const ConditionalDeclaration dec) override void visit(const ConditionalDeclaration dec)
{ {
if (dec.falseDeclaration !is null) if (dec.hasElse)
{ {
auto condition = dec.compileCondition; auto condition = dec.compileCondition;
if (condition.versionCondition !is null) if (condition.versionCondition !is null)

6
src/dfmt/formatter.d
View File

@ -773,13 +773,13 @@ private:
if (currentIs(tok!"if") || currentIs(tok!"version") if (currentIs(tok!"if") || currentIs(tok!"version")
|| (currentIs(tok!"static") && peekIs(tok!"if"))) || (currentIs(tok!"static") && peekIs(tok!"if")))
{ {
if (indents.top() == tok!"if" || indents.top == tok!"version") if (indents.topIs(tok!"if") || indents.topIs(tok!"version"))
indents.pop(); indents.pop();
write(" "); write(" ");
} }
else if (!currentIs(tok!"{") && !currentIs(tok!"comment")) else if (!currentIs(tok!"{") && !currentIs(tok!"comment"))
{ {
if (indents.top() == tok!"if" || indents.top == tok!"version") if (indents.topIs(tok!"if") || indents.topIs(tok!"version"))
indents.pop(); indents.pop();
indents.push(tok!"else"); indents.push(tok!"else");
newline(); newline();
@ -1065,7 +1065,7 @@ private:
regenLineBreakHintsIfNecessary(index); regenLineBreakHintsIfNecessary(index);
if (indents.indentToMostRecent(tok!"enum") != -1 if (indents.indentToMostRecent(tok!"enum") != -1
&& !peekIs(tok!"}") && indents.top == tok!"{" && parenDepth == 0) && !peekIs(tok!"}") && indents.topIs(tok!"{") && parenDepth == 0)
{ {
writeToken(); writeToken();
newline(); newline();