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

Fix #156

This commit is contained in:
Hackerpilot 2015-05-20 02:48:48 -07:00
parent 221e89cab0
commit 8889dff850
4 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dfmt/formatter.d
View File

@ -630,6 +630,8 @@ private:
immutable bool c = b immutable bool c = b
|| astInformation.conditionalStatementLocations.canFindIndex(current.index); || astInformation.conditionalStatementLocations.canFindIndex(current.index);
immutable bool shouldPushIndent = c && !(currentIs(tok!"if") && indents.topIsWrap()); immutable bool shouldPushIndent = c && !(currentIs(tok!"if") && indents.topIsWrap());
if (currentIs(tok!"out") && !peekBackIs(tok!"}"))
newline();
if (shouldPushIndent) if (shouldPushIndent)
indents.push(current.type); indents.push(current.type);
writeToken(); writeToken();
@ -1016,7 +1018,7 @@ private:
{ {
auto i = indents.indentToMostRecent(tok!"if"); auto i = indents.indentToMostRecent(tok!"if");
auto v = indents.indentToMostRecent(tok!"version"); auto v = indents.indentToMostRecent(tok!"version");
auto mostRecent = max(i, v); immutable mostRecent = max(i, v);
if (mostRecent != -1) if (mostRecent != -1)
indentLevel = mostRecent; indentLevel = mostRecent;
} }
@ -1027,7 +1029,7 @@ private:
{ {
indents.pop(); indents.pop();
} }
auto l = indents.indentToMostRecent(tok!"switch"); immutable l = indents.indentToMostRecent(tok!"switch");
if (l != -1) if (l != -1)
{ {
indentLevel = l; indentLevel = l;
@ -1035,7 +1037,7 @@ private:
} }
else if (!isBlockHeader(2) || peek2Is(tok!"if")) else if (!isBlockHeader(2) || peek2Is(tok!"if"))
{ {
auto l2 = indents.indentToMostRecent(tok!"{"); immutable l2 = indents.indentToMostRecent(tok!"{");
indentLevel = l2 == -1 ? indentLevel : l2; indentLevel = l2 == -1 ? indentLevel : l2;
} }
else else
@ -1048,7 +1050,7 @@ private:
{ {
indents.pop(); indents.pop();
} }
auto l = indents.indentToMostRecent(tok!"switch"); immutable l = indents.indentToMostRecent(tok!"switch");
if (l != -1) if (l != -1)
indentLevel = l; indentLevel = l;
} }
@ -1086,7 +1088,7 @@ private:
} }
else if (astInformation.attributeDeclarationLines.canFindIndex(current.line)) else if (astInformation.attributeDeclarationLines.canFindIndex(current.line))
{ {
auto l = indents.indentToMostRecent(tok!"{"); immutable l = indents.indentToMostRecent(tok!"{");
if (l != -1) if (l != -1)
indentLevel = l; indentLevel = l;
} }
@ -1112,7 +1114,7 @@ private:
{ {
if (current.text is null) if (current.text is null)
{ {
auto s = str(current.type); immutable s = str(current.type);
currentLineLength += s.length; currentLineLength += s.length;
output.put(str(current.type)); output.put(str(current.type));
} }

10
tests/allman/issue0156.d.ref Normal file
View File

@ -0,0 +1,10 @@
class C
{
int foo() const
out (bar)
{
}
body
{
}
}

10
tests/issue0156.d Normal file
View File

@ -0,0 +1,10 @@
class C
{
int foo() const
out (bar)
{
}
body
{
}
}

7
tests/otbs/issue0156.d.ref Normal file
View File

@ -0,0 +1,7 @@
class C {
int foo() const
out (bar) {
}
body {
}
}