Skip to content

Commit 7659b1a

Browse files
authored
Fix Issue 508 (#511)
Fix Issue 508 merged-on-behalf-of: Brian Schott <Hackerpilot@users.noreply.github.com>
1 parent eab4cac commit 7659b1a

File tree

4 files changed

+15
-1
lines changed

4 files changed

+15
-1
lines changed

src/dfmt/formatter.d

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ module dfmt.formatter;
99
import dparse.lexer;
1010
import dparse.parser;
1111
import dparse.rollback_allocator;
12-
import dfmt.config;
1312
import dfmt.ast_info;
13+
import dfmt.config;
1414
import dfmt.indentation;
1515
import dfmt.tokens;
1616
import dfmt.wrapping;
@@ -765,6 +765,7 @@ private:
765765
}
766766
else if (hasCurrent && (currentIs(tok!"@")
767767
|| isBasicType(tokens[index].type)
768+
|| currentIs(tok!"invariant")
768769
|| currentIs(tok!"extern")
769770
|| currentIs(tok!"identifier"))
770771
&& !currentIsIndentedTemplateConstraint())

tests/allman/issue0508.d.ref

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
struct S
2+
{
3+
@safe invariant
4+
{
5+
assert(true);
6+
}
7+
}

tests/issue0508.d

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
struct S {@safe invariant { assert(true); }}

tests/otbs/issue0508.d.ref

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
struct S {
2+
@safe invariant {
3+
assert(true);
4+
}
5+
}

0 commit comments

Comments
 (0)