Fix formatting issue

Hackerpilot · Hackerpilot · commit cac45e3607c1 · 2016-01-20T02:58:42.000-08:00
diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
@@ -288,10 +288,8 @@ private:
         case conditional_newline:
             immutable l = currentLineLength + betweenParenLength(tokens[index + 1 .. $]);
             if (l > config.dfmt_soft_max_line_length)
-            {
                 newline();
-            }
-            else
+            else if (peekBackIs(tok!")"))
                 write(" ");
             break;
         case always_newline:
@@ -304,7 +302,7 @@ private:
                 pushWrapIndent(tok!"!");
                 newline();
             }
-            else
+            else if (peekBackIs(tok!")"))
                 write(" ");
             break;
         case always_newline_indent:
@@ -542,7 +540,7 @@ private:
                 write(" ");
         }
         else if ((peekIsKeyword() || peekIs(tok!"@")) && spaceAfterParens
-                && !peekIs(tok!"in") && !peekIs(tok!"is"))
+                && !peekIs(tok!"in") && !peekIs(tok!"is") && !peekIs(tok!"if"))
         {
             writeToken();
             write(" ");
diff --git a/tests/allman/issue0153.d.ref b/tests/allman/issue0153.d.ref
@@ -1,4 +1,5 @@
-class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName if (is(T : Bar))
+class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName 
+        if (is(T : Bar))
 {
     void foo()
     {
diff --git a/tests/allman/issue0215a.d.ref b/tests/allman/issue0215a.d.ref
@@ -10,7 +10,7 @@ unittest
         bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
                 Three charlie, double delta)
                 if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
-                && foxtrot && golf && hotel && india && juliet)
+                        && foxtrot && golf && hotel && india && juliet)
         {
 
         }
diff --git a/tests/allman/issue0215d.d.ref b/tests/allman/issue0215d.d.ref
@@ -11,7 +11,7 @@ unittest
         bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
                 Three charlie, double delta)
                 if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
-                && foxtrot && golf && hotel && india && juliet)
+                        && foxtrot && golf && hotel && india && juliet)
         {
 
         }
diff --git a/tests/otbs/issue0153.d.ref b/tests/otbs/issue0153.d.ref
@@ -1,4 +1,5 @@
-class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName if (is(T : Bar)) {
+class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName 
+        if (is(T : Bar)) {
     void foo() {
     }
 }
diff --git a/tests/otbs/issue0215a.d.ref b/tests/otbs/issue0215a.d.ref
@@ -8,7 +8,7 @@ unittest {
         bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
                 Three charlie, double delta)
                 if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
-                && foxtrot && golf && hotel && india && juliet) {
+                        && foxtrot && golf && hotel && india && juliet) {
 
         }
     }
diff --git a/tests/otbs/issue0215d.d.ref b/tests/otbs/issue0215d.d.ref
@@ -9,7 +9,7 @@ unittest {
         bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,
                 Three charlie, double delta)
                 if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo
-                && foxtrot && golf && hotel && india && juliet) {
+                        && foxtrot && golf && hotel && india && juliet) {
 
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName if (is(T : Bar))`
	`1`	`+class Foo(T) : FirstInterfaceWithVeryLongName, SecondInterfaceWithVeryLongName`
	`2`	`+ if (is(T : Bar))`
`2`	`3`	`{`
`3`	`4`	`void foo()`
`4`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ unittest`
`10`	`10`	`bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,`
`11`	`11`	`Three charlie, double delta)`
`12`	`12`	`if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo`
`13`		`- && foxtrot && golf && hotel && india && juliet)`
	`13`	`+ && foxtrot && golf && hotel && india && juliet)`
`14`	`14`	`{`
`15`	`15`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ unittest`
`11`	`11`	`bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,`
`12`	`12`	`Three charlie, double delta)`
`13`	`13`	`if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo`
`14`		`- && foxtrot && golf && hotel && india && juliet)`
	`14`	`+ && foxtrot && golf && hotel && india && juliet)`
`15`	`15`	`{`
`16`	`16`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ unittest {`
`8`	`8`	`bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,`
`9`	`9`	`Three charlie, double delta)`
`10`	`10`	`if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo`
`11`		`- && foxtrot && golf && hotel && india && juliet) {`
	`11`	`+ && foxtrot && golf && hotel && india && juliet) {`
`12`	`12`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ unittest {`
`9`	`9`	`bool anotherTemplatedFunction(One, Two, Three)(One alpha, Two bravo,`
`10`	`10`	`Three charlie, double delta)`
`11`	`11`	`if (isNumeric!One && isNumeric!Two && isNumeric!Three && echo`
`12`		`- && foxtrot && golf && hotel && india && juliet) {`
	`12`	`+ && foxtrot && golf && hotel && india && juliet) {`
`13`	`13`
`14`	`14`	`}`
`15`	`15`	`}`