From b868dbcaa6acaf9a49a0d9a66a9afa284d91aa2b Mon Sep 17 00:00:00 2001
From: Hackerpilot <briancschott@gmail.com>
Date: Wed, 29 Apr 2015 11:39:37 -0700
Subject: [PATCH] Fix #148

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

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 9d740aa..ffb4328 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -404,7 +404,8 @@ private:
             else
                 write(" ");
         }
-        else if (index < tokens.length && (currentIs(tok!"@") || isBasicType(tokens[index].type)))
+        else if (index < tokens.length && (currentIs(tok!"@") || isBasicType(tokens[index].type)
+                || currentIs(tok!"identifier")))
             write(" ");
     }
 
diff --git a/tests/allman/issue0148.d.ref b/tests/allman/issue0148.d.ref
new file mode 100644
index 0000000..ba5e2f2
--- /dev/null
+++ b/tests/allman/issue0148.d.ref
@@ -0,0 +1,7 @@
+class Foo
+{
+    @property Socket socket()
+    {
+        return this.socket;
+    }
+}
diff --git a/tests/issue0148.d b/tests/issue0148.d
new file mode 100644
index 0000000..0bf74f0
--- /dev/null
+++ b/tests/issue0148.d
@@ -0,0 +1,7 @@
+class Foo
+{
+	@property Socket socket()
+	{
+		return this.socket;
+	}
+}
diff --git a/tests/otbs/issue0148.d.ref b/tests/otbs/issue0148.d.ref
new file mode 100644
index 0000000..46b7751
--- /dev/null
+++ b/tests/otbs/issue0148.d.ref
@@ -0,0 +1,5 @@
+class Foo {
+    @property Socket socket() {
+        return this.socket;
+    }
+}