Fix #508

src/dfmt/formatter.d

@@ -11,7 +11,6 @@ import dparse.parser;
 import dparse.rollback_allocator;
 import dfmt.ast_info;
 import dfmt.config;
-import dfmt.editorconfig : OptionalBoolean;
 import dfmt.indentation;
 import dfmt.tokens;
 import dfmt.wrapping;
@@ -480,8 +479,7 @@ private:
         immutable j = justAddedExtraNewline;
         if (currIsSlashSlash)
         {
-            if (config.dfmt_keep_line_breaks != OptionalBoolean.t)
-                newline();
+            newline();
             justAddedExtraNewline = j;
         }
         else if (hasCurrent)
@@ -588,6 +586,8 @@ private:
     }
     do
     {
+        import dfmt.editorconfig : OptionalBoolean;
+
         immutable p = current.type;
         regenLineBreakHintsIfNecessary(index);
         writeToken();
@@ -765,6 +765,7 @@ private:
         }
         else if (hasCurrent && (currentIs(tok!"@")
                 || isBasicType(tokens[index].type)
+                || currentIs(tok!"invariant")
                 || currentIs(tok!"extern")
                 || currentIs(tok!"identifier"))
                 && !currentIsIndentedTemplateConstraint())

tests/allman/issue0490.d.ref

@@ -1,6 +0,0 @@
-void foo()
-{
-    afdsafds
-        .asdf // blah
-        .flub;
-}

tests/allman/issue0508.d.ref

@@ -0,0 +1,7 @@
+struct S
+{
+    @safe invariant
+    {
+        assert(true);
+    }
+}

tests/issue0490.args

@@ -1 +0,0 @@
---keep_line_breaks=true

tests/issue0490.d

@@ -1,6 +0,0 @@
-void foo()
-{
-    afdsafds
-        .asdf // blah
-        .flub;
-}

tests/issue0508.d

@@ -0,0 +1 @@
+struct S {@safe invariant { assert(true); }}

tests/otbs/issue0490.d.ref

@@ -1,5 +0,0 @@
-void foo() {
-    afdsafds
-        .asdf // blah
-        .flub;
-}

tests/otbs/issue0508.d.ref

@@ -0,0 +1,5 @@
+struct S {
+    @safe invariant {
+        assert(true);
+    }
+}