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

Support end_of_line option. #16

This commit is contained in:
Hackerpilot 2015-04-20 09:59:23 -07:00
parent 512cd5fb73
commit 1b15ae6e05
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/dfmt/formatter.d
View File

@ -298,7 +298,7 @@ private:
} }
else if ((t == tok!"import" && !currentIs(tok!"import") && !currentIs(tok!"}"))) else if ((t == tok!"import" && !currentIs(tok!"import") && !currentIs(tok!"}")))
{ {
write("\n"); simpleNewline();
currentLineLength = 0; currentLineLength = 0;
justAddedExtraNewline = true; justAddedExtraNewline = true;
newline(); newline();
@ -581,7 +581,7 @@ private:
&& astInformation.doubleNewlineLocations.canFindIndex(tokens[index].index) && astInformation.doubleNewlineLocations.canFindIndex(tokens[index].index)
&& !peekIs(tok!"}") && !peekIs(tok!";")) && !peekIs(tok!"}") && !peekIs(tok!";"))
{ {
write("\n"); simpleNewline();
currentLineLength = 0; currentLineLength = 0;
justAddedExtraNewline = true; justAddedExtraNewline = true;
} }
@ -926,10 +926,24 @@ private:
regenLineBreakHints(i); regenLineBreakHints(i);
} }
void simpleNewline()
{
import dfmt.editorconfig : EOL;
final switch (config.end_of_line)
{
case EOL.cr: output.put("\r"); break;
case EOL.lf: output.put("\n"); break;
case EOL.crlf: output.put("\r\n"); break;
case EOL.unspecified: assert(false, "config.end_of_line was unspecified");
}
}
void newline() void newline()
{ {
import std.range : assumeSorted; import std.range : assumeSorted;
import std.algorithm : max; import std.algorithm : max;
import dfmt.editorconfig : OptionalBoolean;
if (currentIs(tok!"comment") && index > 0 && current.line == tokenEndLine(tokens[index - 1])) if (currentIs(tok!"comment") && index > 0 && current.line == tokenEndLine(tokens[index - 1]))
return; return;
@ -944,12 +958,12 @@ private:
return; return;
} }
output.put("\n"); simpleNewline();
if (!justAddedExtraNewline && index > 0 && hasCurrent if (!justAddedExtraNewline && index > 0 && hasCurrent
&& tokens[index].line - tokenEndLine(tokens[index - 1]) > 1) && tokens[index].line - tokenEndLine(tokens[index - 1]) > 1)
{ {
output.put("\n"); simpleNewline();
} }
justAddedExtraNewline = false; justAddedExtraNewline = false;