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

Fix an incredibly annoying bug where line break info was being ignored when wrapping at commas

This commit is contained in:
Hackerpilot 2016-01-20 03:28:31 -08:00
parent 74d7644106
commit 3c6ea77a12
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dfmt/formatter.d
View File

@ -1158,7 +1158,7 @@ private:
} }
else if (!peekIs(tok!"}") && (linebreakHints.canFind(index) else if (!peekIs(tok!"}") && (linebreakHints.canFind(index)
|| (linebreakHints.length == 0 || (linebreakHints.length == 0
&& currentLineLength > config.dfmt_soft_max_line_length))) && currentLineLength > config.max_line_length)))
{ {
pushWrapIndent(); pushWrapIndent();
writeToken(); writeToken();

3
tests/allman/guessnumber.d.ref
View File

@ -3,8 +3,7 @@ import std.stdio, std.random, std.typecons, std.conv, std.string, std.range;
void main() void main()
{ {
immutable interval = tuple(1, 100); immutable interval = tuple(1, 100);
writefln("Guess my target number that is between " ~ "%d and %d (inclusive).\n", writefln("Guess my target number that is between " ~ "%d and %d (inclusive).\n", interval[]);
interval[]);
immutable target = uniform!"[]"(interval[]); immutable target = uniform!"[]"(interval[]);
foreach (immutable i; sequence!q{n}) foreach (immutable i; sequence!q{n})

3
tests/allman/issue0047.d.ref
View File

@ -16,8 +16,7 @@ unittest
} }
void doStuff(const Token[] tokens, ref const State current, void doStuff(const Token[] tokens, ref const State current,
const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel, const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel, int depth)
int depth)
{ {
return; return;
} }

3
tests/otbs/guessnumber.d.ref
View File

@ -2,8 +2,7 @@ import std.stdio, std.random, std.typecons, std.conv, std.string, std.range;
void main() { void main() {
immutable interval = tuple(1, 100); immutable interval = tuple(1, 100);
writefln("Guess my target number that is between " ~ "%d and %d (inclusive).\n", writefln("Guess my target number that is between " ~ "%d and %d (inclusive).\n", interval[]);
interval[]);
immutable target = uniform!"[]"(interval[]); immutable target = uniform!"[]"(interval[]);
foreach (immutable i; sequence!q{n}) { foreach (immutable i; sequence!q{n}) {

3
tests/otbs/issue0047.d.ref
View File

@ -15,8 +15,7 @@ unittest {
} }
void doStuff(const Token[] tokens, ref const State current, void doStuff(const Token[] tokens, ref const State current,
const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel, const FormatterConfig* formatterConfig, int currentLineLength, int indentLevel, int depth) {
int depth) {
return; return;
} }