From 67664c28351d13ac66e36d8b6b2e92908c761aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laurent=20Tr=C3=A9guier?= <laurent@treguier.org>
Date: Tue, 6 Nov 2018 16:40:25 +0100
Subject: [PATCH] Don't put spaces inside empty braces

---
 src/dfmt/formatter.d         | 5 +++--
 tests/allman/issue0119.d.ref | 4 ++--
 tests/allman/issue0287.d.ref | 2 +-
 tests/otbs/issue0119.d.ref   | 4 ++--
 tests/otbs/issue0287.d.ref   | 2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
index 19b5312..bd47b93 100644
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@@ -805,7 +805,8 @@ private:
             else
             {
                 niBraceDepth++;
-                write(" ");
+                if (!currentIs(tok!"}"))
+                    write(" ");
             }
         }
         else
@@ -872,7 +873,7 @@ private:
         {
             if (niBraceDepth > 0)
             {
-                if (!peekBackIsSlashSlash())
+                if (!peekBackIsSlashSlash() && !peekBackIs(tok!"{"))
                     write(" ");
                 niBraceDepth--;
             }
diff --git a/tests/allman/issue0119.d.ref b/tests/allman/issue0119.d.ref
index cf1d9c3..57fcdd0 100644
--- a/tests/allman/issue0119.d.ref
+++ b/tests/allman/issue0119.d.ref
@@ -1,5 +1,5 @@
-auto fun = function() {  };
-auto fun = () {  };
+auto fun = function() {};
+auto fun = () {};
 auto fun = {};
 
 auto fun = { int i; };
diff --git a/tests/allman/issue0287.d.ref b/tests/allman/issue0287.d.ref
index 461addf..9966542 100644
--- a/tests/allman/issue0287.d.ref
+++ b/tests/allman/issue0287.d.ref
@@ -1,3 +1,3 @@
 alias foo = typeof({ import std.math; });
 alias bar = typeof({ write("aaa"); });
-alias baz = typeof({  });
+alias baz = typeof({});
diff --git a/tests/otbs/issue0119.d.ref b/tests/otbs/issue0119.d.ref
index 7ca23f6..9f0d8d1 100644
--- a/tests/otbs/issue0119.d.ref
+++ b/tests/otbs/issue0119.d.ref
@@ -1,5 +1,5 @@
-auto fun = function() {  };
-auto fun = () {  };
+auto fun = function() {};
+auto fun = () {};
 auto fun = {};
 
 auto fun = { int i; };
diff --git a/tests/otbs/issue0287.d.ref b/tests/otbs/issue0287.d.ref
index 461addf..9966542 100644
--- a/tests/otbs/issue0287.d.ref
+++ b/tests/otbs/issue0287.d.ref
@@ -1,3 +1,3 @@
 alias foo = typeof({ import std.math; });
 alias bar = typeof({ write("aaa"); });
-alias baz = typeof({  });
+alias baz = typeof({});