AST: interpolated string is computed key (#5267)

* interpolated string key is computed

* lhs test

Author: helixbass

lib/coffeescript/nodes.js

@@ -2632,7 +2632,7 @@ exports.ObjectProperty = class ObjectProperty extends Base
       @locationData = key.locationData
 
   astProperties: (o) ->
-    isComputedPropertyName = @key instanceof Value and @key.base instanceof ComputedPropertyName
+    isComputedPropertyName = (@key instanceof Value and @key.base instanceof ComputedPropertyName) or @key.unwrap() instanceof StringWithInterpolations
     keyAst = @key.ast o, LEVEL_LIST
 
     return
@@ -3177,7 +3177,7 @@ exports.ClassPrototypeProperty = class ClassPrototypeProperty extends Base
     return
       key: @name.ast o, LEVEL_LIST
       value: @value.ast o, LEVEL_LIST
-      computed: @name instanceof ComputedPropertyName
+      computed: @name instanceof ComputedPropertyName or @name instanceof StringWithInterpolations
 
 #### Import and Export
 
@@ -4243,9 +4243,7 @@ exports.Code = class Code extends Base
 
   methodAstProperties: (o) ->
     getIsComputed = =>
-      if @name instanceof Index
-        return no if @name.index instanceof StringWithInterpolations
-        return yes
+      return yes if @name instanceof Index
       return yes if @name instanceof ComputedPropertyName
       return yes if @name.name instanceof ComputedPropertyName
       no

src/nodes.coffee

@@ -1534,6 +1534,23 @@ test "AST as expected for Obj node", ->
     ]
     implicit: yes
 
+  testExpression '"#{a}": 1',
+    type: 'ObjectExpression'
+    properties: [
+      type: 'ObjectProperty'
+      key:
+        type: 'TemplateLiteral'
+        expressions: [
+          ID 'a'
+        ]
+      value:
+        type: 'NumericLiteral'
+        value: 1
+      shorthand: no
+      computed: yes
+    ]
+    implicit: yes
+
 test "AST as expected for Arr node", ->
   testExpression '[]',
     type: 'ArrayExpression'
@@ -1837,6 +1854,9 @@ test "AST as expected for Class node", ->
       @[b] = ->
       "#{c}": ->
       @[d] = 1
+      [e]: 2
+      "#{f}": 3
+      @[g]: 4
   ''',
     type: 'ClassDeclaration'
     body:
@@ -1845,7 +1865,16 @@ test "AST as expected for Class node", ->
         computed: yes
       ,
         type: 'ClassMethod'
-        computed: no
+        computed: yes
+      ,
+        type: 'ClassProperty'
+        computed: yes
+      ,
+        type: 'ClassPrototypeProperty'
+        computed: yes
+      ,
+        type: 'ClassPrototypeProperty'
+        computed: yes
       ,
         type: 'ClassProperty'
         computed: yes
@@ -2362,6 +2391,19 @@ test "AST as expected for Assign node", ->
     left:
       type: 'ObjectPattern'
 
+  testExpression '{"#{a}": b} = c',
+    left:
+      type: 'ObjectPattern'
+      properties: [
+        type: 'ObjectProperty'
+        key:
+          type: 'TemplateLiteral'
+          expressions: [
+            ID 'a'
+          ]
+        computed: yes
+      ]
+
 test "AST as expected for Code node", ->
   testExpression '=>',
     type: 'ArrowFunctionExpression'