astAsBlockIfNeeded(); eachName checkAssignability (#5258)

👍

Author: helixbass

lib/coffeescript/nodes.js

@@ -1454,10 +1454,10 @@ exports.Value = class Value extends Base
         return new If new Existence(fst), snd, soak: on
       no
 
-  eachName: (iterator) ->
+  eachName: (iterator, {checkAssignability = yes} = {}) ->
     if @hasProperties()
       iterator @
-    else if @base.isAssignable()
+    else if not checkAssignability or @base.isAssignable()
       @base.eachName iterator
     else
       @error 'tried to assign to unassignable value'
@@ -1654,7 +1654,7 @@ exports.JSXExpressionContainer = class JSXExpressionContainer extends Base
 
   astProperties: (o) ->
     return
-      expression: @expression.ast o
+      expression: astAsBlockIfNeeded @expression, o
 
 exports.JSXEmptyExpression = class JSXEmptyExpression extends Base
 
@@ -5071,7 +5071,7 @@ exports.StringWithInterpolations = class StringWithInterpolations extends Base
             emptyInterpolation
           else
             expression.unwrapAll()
-        expressions.push node.ast o
+        expressions.push astAsBlockIfNeeded node, o
 
     {expressions, quasis, @quote}
 
@@ -5253,8 +5253,8 @@ exports.For = class For extends While
     addToScope = (name) ->
       alreadyDeclared = o.scope.find name.value
       name.isDeclaration = not alreadyDeclared
-    @name?.eachName addToScope
-    @index?.eachName addToScope
+    @name?.eachName addToScope, checkAssignability: no
+    @index?.eachName addToScope, checkAssignability: no
     super o
 
   astType: -> 'For'
@@ -5702,6 +5702,14 @@ sniffDirectives = (expressions, {notFinalExpression} = {}) ->
       .withLocationDataFrom expression
     index++
 
+astAsBlockIfNeeded = (node, o) ->
+  unwrapped = node.unwrap()
+  if unwrapped instanceof Block and unwrapped.expressions.length > 1
+    unwrapped.makeReturn null, yes
+    unwrapped.ast o, LEVEL_TOP
+  else
+    node.ast o, LEVEL_PAREN
+
 # Helpers for `mergeLocationData` and `mergeAstLocationData` below.
 lesser  = (a, b) -> if a < b then a else b
 greater = (a, b) -> if a > b then a else b

src/nodes.coffee

@@ -613,6 +613,28 @@ test "AST as expected for JSXTag node", ->
           type: 'JSXIdentifier'
           name: 'a'
 
+  testExpression '''
+    <div b={
+      c
+      d
+    } />
+  ''',
+    type: 'JSXElement'
+    openingElement:
+      attributes: [
+        value:
+          type: 'JSXExpressionContainer'
+          expression:
+            type: 'BlockStatement'
+            body: [
+              type: 'ExpressionStatement'
+            ,
+              type: 'ExpressionStatement'
+              expression:
+                returns: yes
+            ]
+      ]
+
 test "AST as expected for ComputedPropertyName node", ->
   testExpression '[fn]: ->',
     type: 'ObjectExpression'
@@ -3335,6 +3357,27 @@ test "AST as expected for StringWithInterpolations node", ->
     ]
     quote: '"'
 
+  testExpression '''
+    a "#{
+      b
+      c
+    }"
+  ''',
+    type: 'CallExpression'
+    arguments: [
+      type: 'TemplateLiteral'
+      expressions: [
+        type: 'BlockStatement'
+        body: [
+          type: 'ExpressionStatement'
+        ,
+          type: 'ExpressionStatement'
+          expression:
+            returns: yes
+        ]
+      ]
+    ]
+
 test "AST as expected for For node", ->
   testStatement 'for x, i in arr when x? then return',
     type: 'For'
@@ -3544,6 +3587,14 @@ test "AST as expected for For node", ->
     postfix: no
     await: no
 
+  testStatement '''
+    for [x..., y] in z
+      y()
+  ''',
+    type: 'For'
+    name:
+      type: 'ArrayPattern'
+
 #   # TODO: Figure out the purpose of `pattern` and `returns`.
 
 test "AST as expected for Switch node", ->