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

Merge pull request #289 from stefan-koch-sociomantic/perf_fixes 

small perf fix chaching the eol string instead of switching all the time
merged-on-behalf-of: Petar Kirov <ZombineDev@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2017-10-07 10:24:47 +02:00 committed by GitHub
parent 45c2a961a6 7c0e4747ed
commit 87fd168e06
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/dfmt/formatter.d
View File

@ -92,6 +92,18 @@ struct TokenFormatter(OutputRange)
this.output = output;
this.astInformation = astInformation;
this.config = config;
{
auto eol = config.end_of_line;
if (eol == eol.cr)
this.eolString = "\r";
else if (eol == eol.lf)
this.eolString = "\n";
else if (eol == eol.crlf)
this.eolString = "\r\n";
else if (eol == eol.unspecified)
assert(false, "config.end_of_line was unspecified");
}
}
/// Runs the formatting process
@ -136,6 +148,9 @@ private:
/// Configuration
const Config* config;
/// chached end of line string
const string eolString;
/// Keep track of whether or not an extra newline was just added because of
/// an import statement.
bool justAddedExtraNewline;
@ -1247,20 +1262,7 @@ private:
{
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");
}
output.put(eolString);
}
void newline()