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

Run dfmt on itself

This commit is contained in:
Hackerpilot 2016-01-19 05:22:32 -08:00
parent 24be6ddc2e
commit 93c80460cd
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dfmt/formatter.d
View File

@ -1329,12 +1329,10 @@ private:
} }
else else
{ {
indents.dump();
if (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}", if (indents.topIsTemp() && (peekBackIsOneOf(true, tok!"}",
tok!";") && indents.top != tok!";")) tok!";") && indents.top != tok!";"))
indents.popTempIndents(); indents.popTempIndents();
indentLevel = indents.indentLevel; indentLevel = indents.indentLevel;
indents.dump();
} }
indent(); indent();
} }

10
src/dfmt/indentation.d
View File

@ -151,14 +151,14 @@ struct IndentStack
return cast(int) index; return cast(int) index;
} }
void dump() /+void dump()
{ {
/+import std.stdio : stderr; import std.stdio : stderr;
import dparse.lexer : str; import dparse.lexer : str;
import std.algorithm.iteration : map; import std.algorithm.iteration : map;
stderr.writefln("\033[31m%(%s %)\033[0m", arr[0 .. index].map!(a => str(a)));+/ stderr.writefln("\033[31m%(%s %)\033[0m", arr[0 .. index].map!(a => str(a)));
} }+/
private: private:
@ -188,7 +188,7 @@ private:
parenCount = 0; parenCount = 0;
continue; continue;
} }
//parenCount = 0; parenCount = 0;
} }
immutable currentIsNonWrapTemp = !isWrapIndent(arr[i]) && isTempIndent(arr[i]); immutable currentIsNonWrapTemp = !isWrapIndent(arr[i]) && isTempIndent(arr[i]);
immutable nextIsParenOrSwitch = arr[i + 1] == tok!"(" immutable nextIsParenOrSwitch = arr[i + 1] == tok!"("