From f34a6b6d07cec63226bf374681df6be415172887 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Tue, 28 Apr 2015 22:21:27 -0700
Subject: [PATCH] Fix #147

---
 src/dfmt/formatter.d         | 4 ++--
 tests/allman/issue0063.d.ref | 8 ++++----
 tests/allman/issue0147.d.ref | 1 +
 tests/issue0147.d            | 2 ++
 tests/otbs/issue0063.d.ref   | 8 ++++----
 tests/otbs/issue0147.d.ref   | 1 +
 6 files changed, 14 insertions(+), 10 deletions(-)
 create mode 100644 tests/allman/issue0147.d.ref
 create mode 100644 tests/issue0147.d
 create mode 100644 tests/otbs/issue0147.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 001b9ed..7d26609 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -308,8 +308,8 @@ private:
             }
             else if (currentIs(tok!","))
             {
-                // compute length until next , or ;
-                int lengthOfNextChunk = INVALID_TOKEN_LENGTH;
+                // compute length until next ',' or ';'
+                int lengthOfNextChunk;
                 for (size_t i = index + 1; i < tokens.length; i++)
                 {
                     if (tokens[i].type == tok!"," || tokens[i].type == tok!";")
diff --git a/tests/allman/issue0063.d.ref b/tests/allman/issue0063.d.ref
index 1edc122..e670eb6 100644
--- a/tests/allman/issue0063.d.ref
+++ b/tests/allman/issue0063.d.ref
@@ -1,4 +1,4 @@
-import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration, ddmd.dmodule,
-    ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func, ddmd.globals,
-    ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array, ddmd.root.file,
-    ddmd.root.rootobject, ddmd.statement;
+import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration,
+    ddmd.dmodule, ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func,
+    ddmd.globals, ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array,
+    ddmd.root.file, ddmd.root.rootobject, ddmd.statement;
diff --git a/tests/allman/issue0147.d.ref b/tests/allman/issue0147.d.ref
new file mode 100644
index 0000000..df7761e
--- /dev/null
+++ b/tests/allman/issue0147.d.ref
@@ -0,0 +1 @@
+import ae.utils.meta : singleton, I;
diff --git a/tests/issue0147.d b/tests/issue0147.d
new file mode 100644
index 0000000..dca2ff5
--- /dev/null
+++ b/tests/issue0147.d
@@ -0,0 +1,2 @@
+
+import ae.utils.meta : singleton, I;
diff --git a/tests/otbs/issue0063.d.ref b/tests/otbs/issue0063.d.ref
index 1edc122..e670eb6 100644
--- a/tests/otbs/issue0063.d.ref
+++ b/tests/otbs/issue0063.d.ref
@@ -1,4 +1,4 @@
-import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration, ddmd.dmodule,
-    ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func, ddmd.globals,
-    ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array, ddmd.root.file,
-    ddmd.root.rootobject, ddmd.statement;
+import ddmd.aggregate, ddmd.backend, ddmd.dclass, ddmd.declaration,
+    ddmd.dmodule, ddmd.dsymbol, ddmd.dtemplate, ddmd.expression, ddmd.func,
+    ddmd.globals, ddmd.identifier, ddmd.init, ddmd.mtype, ddmd.root.array,
+    ddmd.root.file, ddmd.root.rootobject, ddmd.statement;
diff --git a/tests/otbs/issue0147.d.ref b/tests/otbs/issue0147.d.ref
new file mode 100644
index 0000000..df7761e
--- /dev/null
+++ b/tests/otbs/issue0147.d.ref
@@ -0,0 +1 @@
+import ae.utils.meta : singleton, I;