From 27929e4cc52e50ac69a3414ca203a6255c23ae21 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Sun, 5 Jan 2020 18:52:01 +0100
Subject: [PATCH] Wrap the argument list of a template function

Fixes #454.
---
 src/dfmt/formatter.d         |  3 +++
 tests/allman/issue0454.d.ref | 10 ++++++++++
 tests/issue0454.d            |  9 +++++++++
 tests/otbs/issue0454.d.ref   |  9 +++++++++
 4 files changed, 31 insertions(+)
 create mode 100644 tests/allman/issue0454.d.ref
 create mode 100644 tests/issue0454.d
 create mode 100644 tests/otbs/issue0454.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 8236032..49d8e18 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -452,6 +452,9 @@ private:
                 write(" ");
             else if (canAddNewline || (peekIs(tok!"{") && t == tok!"}"))
                 newline();
+
+            if (peekIs(tok!"(") && (peekBackIs(tok!")") || peekBack2Is(tok!"!")))
+                pushWrapIndent(tok!"(");
         }
         writeToken();
         immutable j = justAddedExtraNewline;
diff --git a/tests/allman/issue0454.d.ref b/tests/allman/issue0454.d.ref
new file mode 100644
index 0000000..27b0ef1
--- /dev/null
+++ b/tests/allman/issue0454.d.ref
@@ -0,0 +1,10 @@
+void main()
+{
+    format!"%s" //
+            ("");
+    format!("%s") //
+            ("");
+    format!("%s") //
+            ("", argument1, argument2, argument3, argument4, argument5,
+            argument6, argument7, argument8, argument9, argument10);
+}
diff --git a/tests/issue0454.d b/tests/issue0454.d
new file mode 100644
index 0000000..9561fb3
--- /dev/null
+++ b/tests/issue0454.d
@@ -0,0 +1,9 @@
+void main()
+{
+    format!"%s" //
+        ("");
+    format!("%s") //
+        ("");
+    format!("%s") //
+        ("", argument1, argument2, argument3, argument4, argument5, argument6, argument7, argument8, argument9, argument10);
+}
diff --git a/tests/otbs/issue0454.d.ref b/tests/otbs/issue0454.d.ref
new file mode 100644
index 0000000..d1c12ed
--- /dev/null
+++ b/tests/otbs/issue0454.d.ref
@@ -0,0 +1,9 @@
+void main() {
+    format!"%s" //
+            ("");
+    format!("%s") //
+            ("");
+    format!("%s") //
+            ("", argument1, argument2, argument3, argument4, argument5,
+            argument6, argument7, argument8, argument9, argument10);
+}