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 #304 from kotet/issue-303 

Add support for `static foreach`
merged-on-behalf-of: Brian Schott <Hackerpilot@users.noreply.github.com>
This commit is contained in:
The Dlang Bot 2017-11-29 07:17:03 +01:00 committed by GitHub
parent 5ed20e0a3c 01a1716183
commit 4feb467dab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dub.json
View File

@ -4,6 +4,6 @@
"targetType": "autodetect",
"license": "BSL-1.0",
"dependencies": {
"libdparse": "~>0.7.1-beta.7"
"libdparse": "~>0.7.2-alpha.3"
}
}

2
libdparse

@ -1 +1 @@
Subproject commit 4229f11828a901ea5379409015f14a033e742906
Subproject commit a2b492d8c7a84881657de85939d9c6b14f867d5b

14
src/dfmt/formatter.d
View File

@ -898,6 +898,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()

6
src/dfmt/indentation.d
View File

@ -176,6 +176,7 @@ private:
int indentSize(const size_t k = size_t.max) const pure nothrow @safe @nogc
{
import std.algorithm : among;
if (index == 0 || k == 0)
return 0;
immutable size_t j = k == size_t.max ? index : k;
@ -196,8 +197,9 @@ private:
continue;
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!"{"))
if (arr[i] == tok!"static"
&& arr[i + 1].among!(tok!"if", tok!"else", tok!"foreach", 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)
{
pragma(msg, thing);
}
static foreach_reverse (thing; things)
{
pragma(msg, thing);
}
static foreach (thing; things)
pragma(msg, thing);
static foreach_reverse (thing; things)
pragma(msg, thing);

4
tests/issue0303.d Normal file
View File

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

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

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