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

Fix isMultilineAt for array + refactor right bracket 

Refactor formatRightBracket into own function
This commit is contained in:
WebFreak001 2019-01-11 20:19:50 +01:00
parent 48b2b84c33
commit 1da1ca6545
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/dfmt/formatter.d
View File

@ -571,7 +571,7 @@ private:
return; return;
immutable bool arrayInitializerStart = p == tok!"[" immutable bool arrayInitializerStart = p == tok!"["
&& astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index); && astInformation.arrayStartLocations.canFindIndex(tokens[index - 1].index);
if (arrayInitializerStart && isMultilineAt(index)) if (arrayInitializerStart && isMultilineAt(index - 1))
{ {
// 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
@ -644,6 +644,26 @@ private:
writeToken(); writeToken();
} }
void formatRightBracket()
in
{
assert(currentIs(tok!"]"));
}
body
{
indents.popWrapIndents();
if (indents.topIs(tok!"]"))
{
if (!indents.topDetails.mini)
newline();
else
indents.pop();
}
writeToken();
if (currentIs(tok!"identifier"))
write(" ");
}
void formatAt() void formatAt()
{ {
immutable size_t atIndex = tokens[index].index; immutable size_t atIndex = tokens[index].index;
@ -1258,17 +1278,7 @@ private:
formatColon(); formatColon();
break; break;
case tok!"]": case tok!"]":
indents.popWrapIndents(); formatRightBracket();
if (indents.topIs(tok!"]"))
{
if (!indents.topDetails.mini)
newline();
else
indents.pop();
}
writeToken();
if (currentIs(tok!"identifier"))
write(" ");
break; break;
case tok!";": case tok!";":
formatSemicolon(); formatSemicolon();