Some more whitespace stripping

Fixes #232

src/JS.php

@@ -364,8 +364,12 @@ protected function stripWhitespace($content)
         /*
          * Whitespace after `return` can be omitted in a few occasions
          * (such as when followed by a string or regex)
+         * Same for whitespace in between `)` and `{`, or between `{` and some
+         * keywords.
          */
         $content = preg_replace('/\breturn\s+(["\'\/\+\-])/', 'return$1', $content);
+        $content = preg_replace('/\)\s+\{/', '){', $content);
+        $content = preg_replace('/}\n(else|catch|finally)\b/', '}$1', $content);
 
         /*
          * Get rid of double semicolons, except where they can be used like:

tests/js/JSTest.php

@@ -257,9 +257,7 @@ public function dataProvider()
              else
              {
              }',
-            'if(!0)
-{}
-else{}',
+            'if(!0){}else{}',
         );
         $tests[] = array(
             'do
@@ -376,9 +374,7 @@ public function dataProvider()
                 // already a text element
                 else newElement = currentElement;
 ',
-            'if(currentElement.attr(\'type\')!=\'text\')
-{currentElement.remove()}
-else newElement=currentElement',
+            'if(currentElement.attr(\'type\')!=\'text\'){currentElement.remove()}else newElement=currentElement',
         );
         $tests[] = array(
             'var jsBackend =
@@ -514,10 +510,8 @@ function foo (a, b)
 {
     return a / b;
 }',
-            'function foo(a,b)
-{return a/b}
-function foo(a,b)
-{return a/b}',
+            'function foo(a,b){return a/b}
+function foo(a,b){return a/b}',
         );
 
         // https://github.com/matthiasmullie/minify/issues/15
@@ -803,8 +797,7 @@ function otherFuncName() {
 func()
 { alert(\'hey\'); }',
             'function func(){}
-func()
-{alert(\'hey\')}',
+func(){alert(\'hey\')}',
         );
 
         // https://github.com/matthiasmullie/minify/issues/133