From 070bbcdd1d61606691fb3ebd9ff0065e21c51bf0 Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Wed, 13 May 2015 14:43:42 -0700
Subject: [PATCH] Fix #155

---
 src/dfmt/formatter.d         | 3 ++-
 tests/allman/issue0155.d.ref | 3 +++
 tests/issue0155.d            | 3 +++
 tests/otbs/issue0155.d.ref   | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 tests/allman/issue0155.d.ref
 create mode 100644 tests/issue0155.d
 create mode 100644 tests/otbs/issue0155.d.ref

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 3a26888..bb5381f 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -301,7 +301,8 @@ private:
                 {
                     break;
                 }
-                else if ((t == tok!"import" && !currentIs(tok!"import") && !currentIs(tok!"}")))
+                else if (t == tok!"import" && !currentIs(tok!"import") && !currentIs(tok!"}")
+						&& !(currentIs(tok!"public") && peekIs(tok!"import")))
                 {
                     simpleNewline();
                     currentLineLength = 0;
diff --git a/tests/allman/issue0155.d.ref b/tests/allman/issue0155.d.ref
new file mode 100644
index 0000000..ee25a4d
--- /dev/null
+++ b/tests/allman/issue0155.d.ref
@@ -0,0 +1,3 @@
+import foo;
+public import bar;
+import baz;
diff --git a/tests/issue0155.d b/tests/issue0155.d
new file mode 100644
index 0000000..ee25a4d
--- /dev/null
+++ b/tests/issue0155.d
@@ -0,0 +1,3 @@
+import foo;
+public import bar;
+import baz;
diff --git a/tests/otbs/issue0155.d.ref b/tests/otbs/issue0155.d.ref
new file mode 100644
index 0000000..ee25a4d
--- /dev/null
+++ b/tests/otbs/issue0155.d.ref
@@ -0,0 +1,3 @@
+import foo;
+public import bar;
+import baz;