improve --beautify bracketize

reduce whitespaces from if-else statements

fixes #1482
closes #1483

lib/output.js

@@ -938,6 +938,9 @@ function OutputStream(options) {
             output.space();
             output.print("else");
             output.space();
+            if (self.alternative instanceof AST_If)
+                self.alternative.print(output);
+            else
                 force_statement(self.alternative, output);
         } else {
             self._do_print_body(output);

test/input/issue-1482/bracketize.js

@@ -0,0 +1,73 @@
+if (x) {
+    foo();
+}
+
+if (x) {
+    foo();
+} else {
+    baz();
+}
+
+if (x) {
+    foo();
+} else if (y) {
+    bar();
+} else {
+    baz();
+}
+
+if (x) {
+    if (y) {
+        foo();
+    } else {
+        bar();
+    }
+} else {
+    baz();
+}
+
+if (x) {
+    foo();
+} else if (y) {
+    bar();
+} else if (z) {
+    baz();
+} else {
+    moo();
+}
+
+function f() {
+    if (x) {
+        foo();
+    }
+    if (x) {
+        foo();
+    } else {
+        baz();
+    }
+    if (x) {
+        foo();
+    } else if (y) {
+        bar();
+    } else {
+        baz();
+    }
+    if (x) {
+        if (y) {
+            foo();
+        } else {
+            bar();
+        }
+    } else {
+        baz();
+    }
+    if (x) {
+        foo();
+    } else if (y) {
+        bar();
+    } else if (z) {
+        baz();
+    } else {
+        moo();
+    }
+}

test/input/issue-1482/default.js

@@ -0,0 +1,17 @@
+if (x) foo();
+
+if (x) foo(); else baz();
+
+if (x) foo(); else if (y) bar(); else baz();
+
+if (x) if (y) foo(); else bar(); else baz();
+
+if (x) foo(); else if (y) bar(); else if (z) baz(); else moo();
+
+function f() {
+    if (x) foo();
+    if (x) foo(); else baz();
+    if (x) foo(); else if (y) bar(); else baz();
+    if (x) if (y) foo(); else bar(); else baz();
+    if (x) foo(); else if (y) bar(); else if (z) baz(); else moo();
+}

test/input/issue-1482/input.js

@@ -0,0 +1,12 @@
+if (x) foo();
+if (x) foo(); else baz();
+if (x) foo(); else if (y) bar(); else baz();
+if (x) if (y) foo(); else bar(); else baz();
+if (x) foo(); else if (y) bar(); else if (z) baz(); else moo();
+function f() {
+if (x) foo();
+if (x) foo(); else baz();
+if (x) foo(); else if (y) bar(); else baz();
+if (x) if (y) foo(); else bar(); else baz();
+if (x) foo(); else if (y) bar(); else if (z) baz(); else moo();
+}

test/mocha/cli.js

@@ -1,5 +1,6 @@
 var assert = require("assert");
 var exec = require("child_process").exec;
+var readFileSync = require("fs").readFileSync;
 
 describe("bin/uglifyjs", function () {
     var uglifyjscmd = '"' + process.argv[0] + '" bin/uglifyjs';
@@ -130,4 +131,24 @@ describe("bin/uglifyjs", function () {
            done();
        });
     });
+    it("Should work with `--beautify`", function (done) {
+       var command = uglifyjscmd + ' test/input/issue-1482/input.js -b';
+
+       exec(command, function (err, stdout) {
+           if (err) throw err;
+
+           assert.strictEqual(stdout, readFileSync("test/input/issue-1482/default.js", "utf8"));
+           done();
+       });
+    });
+    it("Should work with `--beautify bracketize`", function (done) {
+       var command = uglifyjscmd + ' test/input/issue-1482/input.js -b bracketize';
+
+       exec(command, function (err, stdout) {
+           if (err) throw err;
+
+           assert.strictEqual(stdout, readFileSync("test/input/issue-1482/bracketize.js", "utf8"));
+           done();
+       });
+    });
 });