Merge commit 'b1286752b9f6ccfba9c9c9f05b0e3d52aad835c2' into 2.1.0

GeoffreyBooth · Dec 10, 2017 · e80b6a9 · e80b6a9
2 parents 7dd20f9 + b128675
commit e80b6a9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/lib/coffeescript/nodes.js b/lib/coffeescript/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -2472,7 +2472,8 @@ exports.Assign = class Assign extends Base
       unless obj instanceof Elision
         assigns.push new Assign(obj, val, null, param: @param, subpattern: yes).compileToFragments o, LEVEL_LIST
       else
-        assigns.push idx.compileToFragments o, LEVEL_LIST
+        # Output `Elision` only if `idx` is `i++`, e.g. expandedIdx.
+        assigns.push idx.compileToFragments o, LEVEL_LIST if expandedIdx
 
     assigns.push vvar unless top or @subpattern
     fragments = @joinFragmentArrays assigns, ', '

diff --git a/test/arrays.coffee b/test/arrays.coffee
@@ -74,8 +74,8 @@ test "array elisions destructuring with splats and expansions", ->
   arrayEq [a,b], [2,[5,6,7,8,9]]
   [,c,...,,d,,e] = arr
   arrayEq [c,d,e], [2,7,9]
-  [...,e,,,f,,,] = arr
-  arrayEq [e,f], [4,7]
+  [...,f,,,g,,,] = arr
+  arrayEq [f,g], [4,7]
 
 test "array elisions as function parameters", ->
   arr = [1,2,3,4,5,6,7,8,9]