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>
2018-11-09 10:51:13 +01:00 · 2018-11-09 10:51:13 +01:00 · fd1f2f5161
parent dc8e7a087c 67664c2835
commit fd1f2f5161
5 changed files with 9 additions and 8 deletions
--- a/src/dfmt/formatter.d
+++ b/src/dfmt/formatter.d
@ -805,6 +805,7 @@ private:
            else
            {
                niBraceDepth++;
+                if (!currentIs(tok!"}"))
                    write(" ");
            }
        }
@ -872,7 +873,7 @@ private:
        {
            if (niBraceDepth > 0)
            {
-                if (!peekBackIsSlashSlash())
+                if (!peekBackIsSlashSlash() && !peekBackIs(tok!"{"))
                    write(" ");
                niBraceDepth--;
            }