Merge pull request #409 from LaurentTreguier/empty-braces-double-spaces

Spaces inside empty braces
merged-on-behalf-of: Brian Schott <Hackerpilot@users.noreply.github.com>

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--;
             }

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; };

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({});

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; };

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({});