JoBoEVD/UglifyJS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor brackets to braces (#3005)

Browse Source
This commit is contained in:
Alex Lam S.L
2018-03-15 15:46:45 +08:00
committed by GitHub
parent 90585e29c2
commit b29d435bb5
11 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/output.js
View File

@@ -56,7 +56,7 @@ function OutputStream(options) {
options = defaults(options, {
ascii_only : false,
beautify : false,
bracketize : false,
braces : false,
comments : false,
ie8 : false,
indent_level : 4,
@@ -886,22 +886,22 @@ function OutputStream(options) {
self.body.print(output);
output.semicolon();
});
function print_bracketed_empty(self, output) {
function print_braced_empty(self, output) {
output.print("{");
output.with_indent(output.next_indent(), function() {
output.append_comments(self, true);
});
output.print("}");
}
function print_bracketed(self, output, allow_directives) {
function print_braced(self, output, allow_directives) {
if (self.body.length > 0) {
output.with_block(function() {
display_body(self.body, false, output, allow_directives);
});
} else print_bracketed_empty(self, output);
} else print_braced_empty(self, output);
};
DEFPRINT(AST_BlockStatement, function(self, output){
print_bracketed(self, output);
print_braced(self, output);
});
DEFPRINT(AST_EmptyStatement, function(self, output){
output.semicolon();
@@ -996,7 +996,7 @@ function OutputStream(options) {
});
});
output.space();
print_bracketed(self, output, true);
print_braced(self, output, true);
});
DEFPRINT(AST_Lambda, function(self, output){
self._do_print(output);
@@ -1037,7 +1037,7 @@ function OutputStream(options) {
/* -----[ if ]----- */
function make_then(self, output) {
var b = self.body;
if (output.option("bracketize")
if (output.option("braces")
|| output.option("ie8") && b instanceof AST_Do)
return make_block(b, output);
// The squeezer replaces "block"-s that contain only a single
@@ -1046,7 +1046,7 @@ function OutputStream(options) {
// IF having an ELSE clause where the THEN clause ends in an
// IF *without* an ELSE block (then the outer ELSE would refer
// to the inner IF). This function checks for this case and
// adds the block brackets if needed.
// adds the block braces if needed.
if (!b) return output.force_semicolon();
while (true) {
if (b instanceof AST_If) {
@@ -1093,7 +1093,7 @@ function OutputStream(options) {
});
output.space();
var last = self.body.length - 1;
if (last < 0) print_bracketed_empty(self, output);
if (last < 0) print_braced_empty(self, output);
else output.with_block(function(){
self.body.forEach(function(branch, i){
output.indent(true);
@@ -1127,7 +1127,7 @@ function OutputStream(options) {
DEFPRINT(AST_Try, function(self, output){
output.print("try");
output.space();
print_bracketed(self, output);
print_braced(self, output);
if (self.bcatch) {
output.space();
self.bcatch.print(output);
@@ -1144,12 +1144,12 @@ function OutputStream(options) {
self.argname.print(output);
});
output.space();
print_bracketed(self, output);
print_braced(self, output);
});
DEFPRINT(AST_Finally, function(self, output){
output.print("finally");
output.space();
print_bracketed(self, output);
print_braced(self, output);
});
/* -----[ var/const ]----- */
@@ -1348,7 +1348,7 @@ function OutputStream(options) {
});
output.newline();
});
else print_bracketed_empty(self, output);
else print_braced_empty(self, output);
});
function print_property_name(key, quote, output) {
@@ -1420,7 +1420,7 @@ function OutputStream(options) {
});
function force_statement(stat, output) {
if (output.option("bracketize")) {
if (output.option("braces")) {
make_block(stat, output);
} else {
if (!stat || stat instanceof AST_EmptyStatement)