From 8f779b33bff8baf2530708484b5caeb430bccbbf Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Sat, 4 Jan 2020 23:23:08 +0100
Subject: [PATCH] Put a space in contract expressions

Fixes #448.
---
 src/dfmt/formatter.d         | 9 +++++++--
 tests/allman/dip1009.d.ref   | 4 ++--
 tests/allman/issue0448.d.ref | 4 ++++
 tests/issue0448.d            | 4 ++++
 tests/otbs/dip1009.d.ref     | 4 ++--
 tests/otbs/issue0448.d.ref   | 3 +++
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 tests/allman/issue0448.d.ref
 create mode 100644 tests/issue0448.d
 create mode 100644 tests/otbs/issue0448.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index c8d63a6..15be43e 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -1135,7 +1135,7 @@ private:
             else if (peekBackIsKeyword)
                 write(" ");
             writeToken();
-            if (!currentIs(tok!"(") && !currentIs(tok!"{") && !currentIs(tok!"comment"))
+            if (!currentIs(tok!"{") && !currentIs(tok!"comment"))
                 write(" ");
             break;
         case tok!"try":
@@ -1169,7 +1169,7 @@ private:
                     current.index);
             if (isFunctionLit && config.dfmt_brace_style == BraceStyle.allman)
                 newline();
-            else if (!isContract)
+            else if (!isContract || currentIs(tok!"("))
                 write(" ");
             break;
         case tok!"is":
@@ -1218,6 +1218,11 @@ private:
                 }
             }
             goto default;
+        case tok!"invariant":
+            writeToken();
+            if (currentIs(tok!"("))
+                write(" ");
+            break;
         default:
             if (peekBackIs(tok!"identifier"))
                 write(" ");
diff --git a/tests/allman/dip1009.d.ref b/tests/allman/dip1009.d.ref
index 1b65b6b..8383266 100644
--- a/tests/allman/dip1009.d.ref
+++ b/tests/allman/dip1009.d.ref
@@ -13,8 +13,8 @@ do
 }
 
 int bar(int arg)
-in(arg > 0)
-out(; true)
+in (arg > 0)
+out (; true)
 out /*Major*/ ( /*Tom*/ result /*To ground control*/ ; result == 0)
 {
     return 0;
diff --git a/tests/allman/issue0448.d.ref b/tests/allman/issue0448.d.ref
new file mode 100644
index 0000000..fd820ce
--- /dev/null
+++ b/tests/allman/issue0448.d.ref
@@ -0,0 +1,4 @@
+struct S
+{
+    invariant (true);
+}
diff --git a/tests/issue0448.d b/tests/issue0448.d
new file mode 100644
index 0000000..a643618
--- /dev/null
+++ b/tests/issue0448.d
@@ -0,0 +1,4 @@
+struct S
+{
+    invariant(true);
+}
diff --git a/tests/otbs/dip1009.d.ref b/tests/otbs/dip1009.d.ref
index e65b139..ef6b9c8 100644
--- a/tests/otbs/dip1009.d.ref
+++ b/tests/otbs/dip1009.d.ref
@@ -10,8 +10,8 @@ do {
 }
 
 int bar(int arg)
-in(arg > 0)
-out(; true)
+in (arg > 0)
+out (; true)
 out /*Major*/ ( /*Tom*/ result /*To ground control*/ ; result == 0) {
     return 0;
 }
diff --git a/tests/otbs/issue0448.d.ref b/tests/otbs/issue0448.d.ref
new file mode 100644
index 0000000..d3392c2
--- /dev/null
+++ b/tests/otbs/issue0448.d.ref
@@ -0,0 +1,3 @@
+struct S {
+    invariant (true);
+}