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

Add support for `static foreach` 

Fix #303
This commit is contained in:
Kotet 2017-11-25 13:20:49 +09:00
parent b227c66146
commit a163eb105f
5 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dfmt/formatter.d
View File

@ -895,6 +895,20 @@ private:
indents.push(tok!"if");
formatLeftBrace();
}
else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach"))
{
indents.pop();
indents.pop();
indents.push(tok!"foreach");
formatLeftBrace();
}
else if (currentIs(tok!"{") && indents.topAre(tok!"static", tok!"foreach_reverse"))
{
indents.pop();
indents.pop();
indents.push(tok!"foreach_reverse");
formatLeftBrace();
}
}
void formatElse()

3
src/dfmt/indentation.d
View File

@ -197,7 +197,8 @@ private:
immutable currentIsNonWrapTemp = !isWrapIndent(arr[i])
&& isTempIndent(arr[i]) && arr[i] != tok!")" && arr[i] != tok!"!";
if (arr[i] == tok!"static" && (arr[i + 1] == tok!"if"
|| arr[i + 1] == tok!"else") && (i + 2 >= index || arr[i + 2] != tok!"{"))
|| arr[i + 1] == tok!"else" || arr[i + 1] == tok!"foreach"
|| arr[i + 1] == tok!"foreach_reverse") && (i + 2 >= index || arr[i + 2] != tok!"{"))
{
parenCount = pc;
continue;

12
tests/allman/issue0303.d.ref Normal file
View File

@ -0,0 +1,12 @@
static foreach (thing; things)
{
doStuff();
}
static foreach_reverse (thing; things)
{
doStuff();
}
static foreach (thing; things)
doStuff();
static foreach_reverse (thing; things)
doStuff();

4
tests/issue0303.d Normal file
View File

@ -0,0 +1,4 @@
static foreach (thing; things){doStuff();}
static foreach_reverse (thing; things){doStuff();}
static foreach (thing; things) doStuff();
static foreach_reverse (thing; things) doStuff();

10
tests/otbs/issue0303.d.ref Normal file
View File

@ -0,0 +1,10 @@
static foreach (thing; things) {
doStuff();
}
static foreach_reverse (thing; things) {
doStuff();
}
static foreach (thing; things)
doStuff();
static foreach_reverse (thing; things)
doStuff();