Fix shorthands after interpolated key in objects

Fixes #4324.
jashkenas · Sep 29, 2016 · 46841d9 · 46841d9 · jashkenas · Sep 29, 2016
1 parent 0b2d852
commit 46841d9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -1019,6 +1019,7 @@ exports.Obj = class Obj extends Base
             value = prop.value
           else
             [key, value] = prop.base.cache o
+            key = new PropertyName key.value if key instanceof IdentifierLiteral
           prop = new Assign (new Value (new IdentifierLiteral oref), [new Access key]), value
       if indent then answer.push @makeCode indent
       answer.push prop.compileToFragments(o, LEVEL_TOP)...

diff --git a/test/objects.coffee b/test/objects.coffee
@@ -569,3 +569,9 @@ test "object keys with interpolations", ->
     interpolated:
       nested:
         123: 456
+
+test "#4324: Shorthand after interpolated key", ->
+  a = 2
+  obj = {"#{1}": 1, a}
+  eq 1, obj[1]
+  eq 2, obj.a