Fix estools#365

Fix broken parens on return statements with leading comments
micschro · Apr 10, 2018 · 26be28d · 26be28d
1 parent f0488e1
commit 26be28d
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/escodegen.js b/escodegen.js
@@ -1738,10 +1738,19 @@
 
         ReturnStatement: function (stmt, flags) {
             if (stmt.argument) {
-                return [join(
-                    'return',
-                    this.generateExpression(stmt.argument, Precedence.Sequence, E_TTT)
-                ), this.semicolon(flags)];
+                var shouldParenthesize = stmt.argument.leadingComments && stmt.argument.leadingComments.length > 0;
+                var result = [];
+                if (shouldParenthesize) {
+                    var that = this;
+                    result.push('(', newline)
+                    withIndent(function () {
+                        result.push(addIndent(that.generateExpression(stmt.argument, Precedence.Sequence, E_TTT)), newline)
+                    });
+                    result.push(addIndent(')'))
+                } else {
+                    result.push(this.generateExpression(stmt.argument, Precedence.Sequence, E_TTT));
+                }
+                return [join('return', result), this.semicolon(flags)];
             }
             return ['return' + this.semicolon(flags)];
         },