Simplify comma formatting

Fixes #459
beautifier · May 2, 2014 · 496fa0d · 496fa0d
1 parent e0d8131
commit 496fa0d
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 35 deletions.
diff --git a/js/lib/beautify.js b/js/lib/beautify.js
@@ -1512,27 +1512,18 @@
                 return;
             }
 
-            if (last_type === 'TK_END_BLOCK' && flags.mode !== MODE.Expression) {
-                print_token();
-                if (flags.mode === MODE.ObjectLiteral && flags.last_text === '}') {
-                    print_newline();
-                } else {
-                    output_space_before_token = true;
+            print_token();
+            if (flags.mode === MODE.ObjectLiteral || 
+                (flags.mode === MODE.Statement && flags.parent.mode === MODE.ObjectLiteral)) {
+                if (flags.mode === MODE.Statement) {
+                    restore_mode();
                 }
+                print_newline();
             } else {
-                if (flags.mode === MODE.ObjectLiteral || 
-                    (flags.mode === MODE.Statement && flags.parent.mode === MODE.ObjectLiteral)) {
-                    if (flags.mode === MODE.Statement) {
-                        restore_mode();
-                    }
-                    print_token();
-                    print_newline();
-                } else {
-                    // EXPR or DO_BLOCK
-                    print_token();
-                    output_space_before_token = true;
-                }
+                // EXPR or DO_BLOCK
+                output_space_before_token = true;
             }
+
         }
 
         function handle_operator() {

diff --git a/js/test/beautify-tests.js b/js/test/beautify-tests.js
@@ -1623,6 +1623,17 @@ function run_beautifier_tests(test_obj, Urlencoded, js_beautify, html_beautify,
            '    });');
         // END tests for issue 281
 
+        // START tests for issue 459
+        bt( '(function() {\n' +
+            '    return {\n' +
+            '        foo: function() {\n' +
+            '            return "bar";\n' +
+            '        },\n' +
+            '        bar: ["bar"]\n' +
+            '    };\n' +
+            '}());');
+        // END tests for issue 459
+
         bt('var a=1,b={bang:2},c=3;',
             'var a = 1,\n    b = {\n        bang: 2\n    },\n    c = 3;');
         bt('var a={bing:1},b=2,c=3;',

diff --git a/python/jsbeautifier/__init__.py b/python/jsbeautifier/__init__.py
@@ -1306,24 +1306,17 @@ def handle_comma(self, token_text):
 
             return
 
-        if self.last_type == 'TK_END_BLOCK' and self.flags.mode != MODE.Expression:
-            self.append_token(token_text)
-            if self.flags.mode == MODE.ObjectLiteral and self.flags.last_text == '}':
-                self.append_newline()
-            else:
-                self.output_space_before_token = True
+        self.append_token(token_text)
+
+        if self.flags.mode == MODE.ObjectLiteral \
+            or (self.flags.mode == MODE.Statement and self.flags.parent.mode ==  MODE.ObjectLiteral):
+            if self.flags.mode == MODE.Statement:
+                self.restore_mode()
+
+            self.append_newline()
         else:
-            if self.flags.mode == MODE.ObjectLiteral \
-                or (self.flags.mode == MODE.Statement and self.flags.parent.mode ==  MODE.ObjectLiteral):
-                if self.flags.mode == MODE.Statement:
-                    self.restore_mode()
-
-                self.append_token(token_text)
-                self.append_newline()
-            else:
-                # EXPR or DO_BLOCK
-                self.append_token(token_text)
-                self.output_space_before_token = True
+            # EXPR or DO_BLOCK
+            self.output_space_before_token = True
 
 
     def handle_operator(self, token_text):

diff --git a/python/jsbeautifier/tests/testjsbeautifier.py b/python/jsbeautifier/tests/testjsbeautifier.py
@@ -1494,6 +1494,17 @@ def test_beautifier(self):
            '    });');
         # END tests for issue 281
 
+        # START tests for issue 459
+        bt( '(function() {\n' +
+            '    return {\n' +
+            '        foo: function() {\n' +
+            '            return "bar";\n' +
+            '        },\n' +
+            '        bar: ["bar"]\n' +
+            '    };\n' +
+            '}());');
+        # END tests for issue 459
+
         bt('var a=1,b={bang:2},c=3;',
             'var a = 1,\n    b = {\n        bang: 2\n    },\n    c = 3;');
         bt('var a={bing:1},b=2,c=3;',