Merge pull request #2662 from Microsoft/fixDecoratorEmitForComputedProperties

Fixes computed name caching for decorators

Author: rbuckton

src/compiler/emitter.ts

@@ -1136,16 +1136,16 @@ var __param = this.__param || function(index, decorator) { return function (targ
                         if (!computedPropertyNamesToGeneratedNames) {
                             computedPropertyNamesToGeneratedNames = [];
                         }
-
-                        let generatedName = computedPropertyNamesToGeneratedNames[node.id];
+                        
+                        let generatedName = computedPropertyNamesToGeneratedNames[getNodeId(node)];
                         if (generatedName) {
                             // we have already generated a variable for this node, write that value instead.
                             write(generatedName);
                             return;
                         }
 
                         generatedName = createAndRecordTempVariable(TempFlags.Auto).text;
-                        computedPropertyNamesToGeneratedNames[node.id] = generatedName;
+                        computedPropertyNamesToGeneratedNames[getNodeId(node)] = generatedName;
                         write(generatedName);
                         write(" = ");
                     }

tests/baselines/reference/decoratorOnClassMethod11.js

@@ -1,11 +1,11 @@
 //// [decoratorOnClassMethod11.ts]
-module M {
-    class C {
-        decorator(target: Object, key: string): void { }
-
-        @this.decorator
-        method() { }
-    }
+module M {
+    class C {
+        decorator(target: Object, key: string): void { }
+
+        @this.decorator
+        method() { }
+    }
 }
 
 //// [decoratorOnClassMethod11.js]

tests/baselines/reference/decoratorOnClassMethod13.js

@@ -0,0 +1,29 @@
+//// [decoratorOnClassMethod13.ts]
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+
+class C {
+    @dec ["1"]() { }
+    @dec ["b"]() { }
+}
+
+//// [decoratorOnClassMethod13.js]
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key, desc) {
+    switch (arguments.length) {
+        case 2: return decorators.reduceRight(function(o, d) { return (d && d(o)) || o; }, target);
+        case 3: return decorators.reduceRight(function(o, d) { return (d && d(target, key)), void 0; }, void 0);
+        case 4: return decorators.reduceRight(function(o, d) { return (d && d(target, key, o)) || o; }, desc);
+    }
+};
+class C {
+    [_a = "1"]() { }
+    [_b = "b"]() { }
+}
+Object.defineProperty(C.prototype, _a,
+    __decorate([
+        dec
+    ], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
+Object.defineProperty(C.prototype, _b,
+    __decorate([
+        dec
+    ], C.prototype, _b, Object.getOwnPropertyDescriptor(C.prototype, _b)));
+var _a, _b;

tests/baselines/reference/decoratorOnClassMethod13.types

@@ -0,0 +1,21 @@
+=== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod13.ts ===
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+>dec : () => <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>T : T
+>target : any
+>propertyKey : string
+>descriptor : TypedPropertyDescriptor<T>
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+>TypedPropertyDescriptor : TypedPropertyDescriptor<T>
+>T : T
+
+class C {
+>C : C
+
+    @dec ["1"]() { }
+>dec : unknown
+
+    @dec ["b"]() { }
+>dec : unknown
+}

tests/cases/conformance/decorators/class/method/decoratorOnClassMethod13.ts

@@ -0,0 +1,7 @@
+// @target: ES6
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+
+class C {
+    @dec ["1"]() { }
+    @dec ["b"]() { }
+}