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

Fix #210 and run dfmt on itself

This commit is contained in:
Hackerpilot 2016-01-18 15:10:39 -08:00
parent 65a55493da
commit 7a9a895f64
4 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/dfmt/formatter.d
View File

@ -481,7 +481,7 @@ private:
if (parenDepth == 0) if (parenDepth == 0)
indents.popWrapIndents(); indents.popWrapIndents();
if (parenDepth == 0 && (peekIs(tok!"in") || peekIs(tok!"out") || peekIs(tok!"body"))) if (parenDepth == 0 && (peekIs(tok!"is") || peekIs(tok!"in") || peekIs(tok!"out") || peekIs(tok!"body")))
writeToken(); writeToken();
else if (peekIsLiteralOrIdent() || peekIsBasicType()) else if (peekIsLiteralOrIdent() || peekIsBasicType())
{ {
@ -489,7 +489,7 @@ private:
if (spaceAfterParens || parenDepth > 0) if (spaceAfterParens || parenDepth > 0)
write(" "); write(" ");
} }
else if ((peekIsKeyword() || peekIs(tok!"@")) && spaceAfterParens && !peekIs(tok!"in")) else if ((peekIsKeyword() || peekIs(tok!"@")) && spaceAfterParens && !peekIs(tok!"in") && !peekIs(tok!"is"))
{ {
writeToken(); writeToken();
write(" "); write(" ");
@ -623,7 +623,8 @@ private:
{ {
sBraceDepth++; sBraceDepth++;
auto e = expressionEndIndex(index); auto e = expressionEndIndex(index);
immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a)).sum(); immutable int l = currentLineLength + tokens[index .. e].map!(
a => tokenLength(a)).sum();
writeToken(); writeToken();
if (l > config.dfmt_soft_max_line_length) if (l > config.dfmt_soft_max_line_length)
{ {
@ -639,7 +640,8 @@ private:
if (peekBackIs(tok!")")) if (peekBackIs(tok!")"))
write(" "); write(" ");
auto e = expressionEndIndex(index); auto e = expressionEndIndex(index);
immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a)).sum(); immutable int l = currentLineLength + tokens[index .. e].map!(
a => tokenLength(a)).sum();
immutable bool multiline = l > config.dfmt_soft_max_line_length immutable bool multiline = l > config.dfmt_soft_max_line_length
|| tokens[index .. e].canFind!(a => a.type == tok!"comment" || tokens[index .. e].canFind!(a => a.type == tok!"comment"
|| isBlockHeaderToken(a.type))(); || isBlockHeaderToken(a.type))();
@ -717,9 +719,9 @@ private:
newline(); newline();
write("}"); write("}");
if (index + 1 < tokens.length if (index + 1 < tokens.length
&& astInformation.doubleNewlineLocations.canFindIndex(tokens[index].index) && astInformation.doubleNewlineLocations.canFindIndex(
&& !peekIs(tok!"}") && !peekIs(tok!";") && !peekIs(tok!"comment", tokens[index].index) && !peekIs(tok!"}")
false)) && !peekIs(tok!";") && !peekIs(tok!"comment", false))
{ {
simpleNewline(); simpleNewline();
currentLineLength = 0; currentLineLength = 0;
@ -781,8 +783,7 @@ private:
write(" "); write(" ");
} }
else if (!currentIs(tok!"{") && !currentIs(tok!";") else if (!currentIs(tok!"{") && !currentIs(tok!";")
&& !currentIs(tok!"in") && !currentIs(tok!"out") && !currentIs(tok!"in") && !currentIs(tok!"out") && !currentIs(tok!"body"))
&& !currentIs(tok!"body"))
newline(); newline();
} }
@ -862,8 +863,8 @@ private:
write(" "); write(" ");
break; break;
case tok!"is": case tok!"is":
if (!peekBackIsOneOf(false, tok!"!", tok!"(", tok!",", if (!peekBackIsOneOf(false, tok!"!", tok!"(",
tok!"}", tok!"=", tok!"&&", tok!"||") && !peekBackIsKeyword()) tok!",", tok!"}", tok!"=", tok!"&&", tok!"||") && !peekBackIsKeyword())
write(" "); write(" ");
writeToken(); writeToken();
if (!currentIs(tok!"(") && !currentIs(tok!"{")) if (!currentIs(tok!"(") && !currentIs(tok!"{"))
@ -964,7 +965,8 @@ private:
formatAt(); formatAt();
break; break;
case tok!"!": case tok!"!":
if ((peekIs(tok!"is") || peekIs(tok!"in")) && !peekBackIsOperator()) if (((peekIs(tok!"is") || peekIs(tok!"in"))
&& !peekBackIsOperator()) || peekBackIs(tok!")"))
write(" "); write(" ");
goto case; goto case;
case tok!"...": case tok!"...":
@ -1167,7 +1169,8 @@ private:
if (niBraceDepth > 0 && !peekBackIsSlashSlash() && hasCurrent if (niBraceDepth > 0 && !peekBackIsSlashSlash() && hasCurrent
&& tokens[index].type == tok!"}" && tokens[index].type == tok!"}"
&& !assumeSorted(astInformation.funLitEndLocations).equalRange(tokens[index].index).empty) && !assumeSorted(astInformation.funLitEndLocations).equalRange(
tokens[index].index).empty)
{ {
write(" "); write(" ");
return; return;
@ -1220,8 +1223,8 @@ private:
} }
immutable l = indents.indentToMostRecent(tok!"switch"); immutable l = indents.indentToMostRecent(tok!"switch");
if (l != -1) if (l != -1)
indentLevel = config.dfmt_align_switch_statements == OptionalBoolean.t ? l indentLevel = config.dfmt_align_switch_statements == OptionalBoolean.t
: indents.indentLevel; ? l : indents.indentLevel;
} }
else if (currentIs(tok!"{")) else if (currentIs(tok!"{"))
{ {

2
tests/allman/issue0210.d.ref Normal file
View File

@ -0,0 +1,2 @@
static assert(call(x) !is y);
static assert(call(x) is y);

2
tests/issue0210.d Normal file
View File

@ -0,0 +1,2 @@
static assert(call(x) !is y);
static assert(call(x) is y);

2
tests/otbs/issue0210.d.ref Normal file
View File

@ -0,0 +1,2 @@
static assert(call(x) !is y);
static assert(call(x) is y);