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

make multiline checking code modular 

Arrays and delegates now use the check whether a line is longer
than the max line length using easy to reuse code
This commit is contained in:
WebFreak001 2019-01-11 00:48:59 +01:00
parent 053b775cd1
commit 85c7d57167
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/dfmt/formatter.d
View File

@ -569,9 +569,9 @@ private:
// No heuristics apply if we can't look before the opening paren/bracket // No heuristics apply if we can't look before the opening paren/bracket
if (index < 1) if (index < 1)
return; return;
immutable bool arrayInitializerStart = p == tok!"[" && linebreakHints.length != 0 immutable bool arrayInitializerStart = p == tok!"["
&& astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index);
if (arrayInitializerStart) if (arrayInitializerStart && isMultilineAt(index))
{ {
// Use the close bracket as the indent token to distinguish // Use the close bracket as the indent token to distinguish
// the array initialiazer from an array index in the newline // the array initialiazer from an array index in the newline
@ -790,12 +790,7 @@ private:
sBraceDepth++; sBraceDepth++;
if (peekBackIsOneOf(true, tok!")", tok!"identifier")) if (peekBackIsOneOf(true, tok!")", tok!"identifier"))
write(" "); write(" ");
auto e = expressionEndIndex(index); immutable bool multiline = isMultilineAt(index);
immutable int l = currentLineLength + tokens[index .. e].map!(a => tokenLength(a))
.sum();
immutable bool multiline = l > config.dfmt_soft_max_line_length
|| tokens[index .. e].canFind!(a => a.type == tok!"comment"
|| isBlockHeaderToken(a.type))();
writeToken(); writeToken();
if (multiline) if (multiline)
{ {
@ -1698,6 +1693,7 @@ const pure @safe @nogc:
size_t expressionEndIndex(size_t i) nothrow size_t expressionEndIndex(size_t i) nothrow
{ {
immutable bool braces = i < tokens.length && tokens[i].type == tok!"{"; immutable bool braces = i < tokens.length && tokens[i].type == tok!"{";
immutable bool brackets = i < tokens.length && tokens[i].type == tok!"[";
immutable d = depths[i]; immutable d = depths[i];
while (true) while (true)
{ {
@ -1705,13 +1701,23 @@ const pure @safe @nogc:
break; break;
if (depths[i] < d) if (depths[i] < d)
break; break;
if (!braces && (tokens[i].type == tok!";" || tokens[i].type == tok!"{")) if (!braces && !brackets && (tokens[i].type == tok!";" || tokens[i].type == tok!"{"))
break; break;
i++; i++;
} }
return i; return i;
} }
bool isMultilineAt(size_t i)
{
import std.algorithm : map, sum, canFind;
auto e = expressionEndIndex(i);
immutable int l = currentLineLength + tokens[i .. e].map!(a => tokenLength(a)).sum();
return l > config.dfmt_soft_max_line_length
|| tokens[i .. e].canFind!(a => a.type == tok!"comment" || isBlockHeaderToken(a.type))();
}
bool peekIsKeyword() nothrow bool peekIsKeyword() nothrow
{ {
return index + 1 < tokens.length && isKeyword(tokens[index + 1].type); return index + 1 < tokens.length && isKeyword(tokens[index + 1].type);