From 6751fc1cf7c317b6728a021d5d287d3b3c2aa479 Mon Sep 17 00:00:00 2001
From: Oleksandr T <oleksandr.tarasiuk@outlook.com>
Date: Fri, 4 Jun 2021 08:41:21 +0300
Subject: [PATCH] feat(7342): class expression decorators

---
 src/compiler/transformers/ts.ts               |  56 +++--
 src/compiler/utilities.ts                     |  17 +-
 .../decoratorChecksFunctionBodies.errors.txt  |  19 +-
 .../decoratorChecksFunctionBodies.js          |  28 ++-
 .../decoratorChecksFunctionBodies.symbols     |  25 ++
 .../decoratorChecksFunctionBodies.types       |  30 +++
 ...ratorInstantiateModulesInFunctionBodies.js |  33 ++-
 ...InstantiateModulesInFunctionBodies.symbols |  21 +-
 ...orInstantiateModulesInFunctionBodies.types |  24 +-
 .../decoratorMetadata-jsdoc.errors.txt        |  23 +-
 .../reference/decoratorMetadata-jsdoc.js      |  27 +-
 .../reference/decoratorMetadata-jsdoc.symbols |  23 ++
 .../reference/decoratorMetadata-jsdoc.types   |  27 ++
 .../reference/decoratorOnClassAccessor1.js    |  20 +-
 .../decoratorOnClassAccessor1.symbols         |   9 +
 .../reference/decoratorOnClassAccessor1.types |  11 +
 .../reference/decoratorOnClassAccessor2.js    |  20 +-
 .../decoratorOnClassAccessor2.symbols         |   9 +
 .../reference/decoratorOnClassAccessor2.types |  11 +
 .../decoratorOnClassAccessor3.errors.txt      |  12 +-
 .../reference/decoratorOnClassAccessor3.js    |  20 +-
 .../decoratorOnClassAccessor3.symbols         |  10 +
 .../reference/decoratorOnClassAccessor3.types |  12 +
 .../reference/decoratorOnClassAccessor4.js    |  20 +-
 .../decoratorOnClassAccessor4.symbols         |  10 +
 .../reference/decoratorOnClassAccessor4.types |  11 +
 .../reference/decoratorOnClassAccessor5.js    |  20 +-
 .../decoratorOnClassAccessor5.symbols         |  10 +
 .../reference/decoratorOnClassAccessor5.types |  11 +
 .../decoratorOnClassAccessor6.errors.txt      |  12 +-
 .../reference/decoratorOnClassAccessor6.js    |  20 +-
 .../decoratorOnClassAccessor6.symbols         |  11 +
 .../reference/decoratorOnClassAccessor6.types |  12 +
 .../decoratorOnClassAccessor7.errors.txt      |  41 +++-
 .../reference/decoratorOnClassAccessor7.js    | 112 ++++++++-
 .../decoratorOnClassAccessor7.symbols         |  75 ++++++
 .../reference/decoratorOnClassAccessor7.types |  87 +++++++
 .../reference/decoratorOnClassAccessor8.js    | 120 ++++++++-
 .../decoratorOnClassAccessor8.symbols         |  66 +++++
 .../reference/decoratorOnClassAccessor8.types |  77 ++++++
 .../decoratorOnClassConstructor1.errors.txt   |  12 +-
 .../reference/decoratorOnClassConstructor1.js |  12 +-
 .../decoratorOnClassConstructor1.symbols      |   8 +
 .../decoratorOnClassConstructor1.types        |   9 +
 .../decoratorOnClassConstructor2.errors.txt   |  12 +-
 .../reference/decoratorOnClassConstructor2.js |  21 +-
 .../decoratorOnClassConstructor2.symbols      |  17 +-
 .../decoratorOnClassConstructor2.types        |  18 +-
 .../reference/decoratorOnClassConstructor3.js |  20 +-
 .../decoratorOnClassConstructor3.symbols      |  16 +-
 .../decoratorOnClassConstructor3.types        |  18 +-
 .../decoratorOnClassConstructorParameter1.js  |  12 +-
 ...oratorOnClassConstructorParameter1.symbols |   9 +
 ...ecoratorOnClassConstructorParameter1.types |  10 +
 ...torOnClassConstructorParameter4.errors.txt |  12 +-
 .../decoratorOnClassConstructorParameter4.js  |  12 +-
 ...oratorOnClassConstructorParameter4.symbols |  10 +
 ...ecoratorOnClassConstructorParameter4.types |  11 +
 .../reference/decoratorOnClassMethod1.js      |  16 +-
 .../reference/decoratorOnClassMethod1.symbols |   9 +
 .../reference/decoratorOnClassMethod1.types   |  10 +
 .../decoratorOnClassMethod10.errors.txt       |  14 +-
 .../reference/decoratorOnClassMethod10.js     |  16 +-
 .../decoratorOnClassMethod10.symbols          |   9 +
 .../reference/decoratorOnClassMethod10.types  |  10 +
 .../decoratorOnClassMethod11.errors.txt       |  15 +-
 .../reference/decoratorOnClassMethod11.js     |  20 +-
 .../decoratorOnClassMethod11.symbols          |  15 ++
 .../reference/decoratorOnClassMethod11.types  |  19 ++
 .../decoratorOnClassMethod12.errors.txt       |  16 +-
 .../reference/decoratorOnClassMethod12.js     |  20 +-
 .../decoratorOnClassMethod12.symbols          |  13 +-
 .../reference/decoratorOnClassMethod12.types  |  16 ++
 .../reference/decoratorOnClassMethod13.js     |  17 +-
 .../decoratorOnClassMethod13.symbols          |  15 ++
 .../reference/decoratorOnClassMethod13.types  |  16 ++
 .../reference/decoratorOnClassMethod2.js      |  16 +-
 .../reference/decoratorOnClassMethod2.symbols |   9 +
 .../reference/decoratorOnClassMethod2.types   |  10 +
 .../decoratorOnClassMethod3.errors.txt        |  12 +-
 .../reference/decoratorOnClassMethod3.js      |  16 +-
 .../reference/decoratorOnClassMethod3.symbols |  10 +
 .../reference/decoratorOnClassMethod3.types   |  11 +
 .../reference/decoratorOnClassMethod4.js      |  13 +-
 .../reference/decoratorOnClassMethod4.symbols |  10 +
 .../reference/decoratorOnClassMethod4.types   |  11 +
 .../reference/decoratorOnClassMethod5.js      |  13 +-
 .../reference/decoratorOnClassMethod5.symbols |  10 +
 .../reference/decoratorOnClassMethod5.types   |  12 +
 .../decoratorOnClassMethod6.errors.txt        |  12 +-
 .../reference/decoratorOnClassMethod6.js      |  13 +-
 .../reference/decoratorOnClassMethod6.symbols |  10 +
 .../reference/decoratorOnClassMethod6.types   |  11 +
 .../reference/decoratorOnClassMethod7.js      |  13 +-
 .../reference/decoratorOnClassMethod7.symbols |  10 +
 .../reference/decoratorOnClassMethod7.types   |  11 +
 .../decoratorOnClassMethod8.errors.txt        |  17 +-
 .../reference/decoratorOnClassMethod8.js      |  16 +-
 .../reference/decoratorOnClassMethod8.symbols |   9 +
 .../reference/decoratorOnClassMethod8.types   |  10 +
 ...decoratorOnClassMethodOverload1.errors.txt |  14 +-
 .../decoratorOnClassMethodOverload1.js        |  15 +-
 .../decoratorOnClassMethodOverload1.symbols   |  14 ++
 .../decoratorOnClassMethodOverload1.types     |  15 ++
 .../decoratorOnClassMethodOverload2.js        |  18 +-
 .../decoratorOnClassMethodOverload2.symbols   |  14 ++
 .../decoratorOnClassMethodOverload2.types     |  15 ++
 .../decoratorOnClassMethodParameter1.js       |  16 +-
 .../decoratorOnClassMethodParameter1.symbols  |  10 +
 .../decoratorOnClassMethodParameter1.types    |  11 +
 .../decoratorOnClassMethodParameter2.js       |  16 +-
 .../decoratorOnClassMethodParameter2.symbols  |  11 +
 .../decoratorOnClassMethodParameter2.types    |  12 +
 ...ratorOnClassMethodThisParameter.errors.txt |   3 +-
 .../decoratorOnClassMethodThisParameter.js    |   3 +-
 ...ecoratorOnClassMethodThisParameter.symbols |   1 +
 .../decoratorOnClassMethodThisParameter.types |   1 +
 .../reference/decoratorOnClassProperty1.js    |  15 +-
 .../decoratorOnClassProperty1.symbols         |   9 +
 .../reference/decoratorOnClassProperty1.types |  10 +
 .../reference/decoratorOnClassProperty10.js   |  15 +-
 .../decoratorOnClassProperty10.symbols        |   9 +
 .../decoratorOnClassProperty10.types          |  11 +
 .../decoratorOnClassProperty11.errors.txt     |  12 +-
 .../reference/decoratorOnClassProperty11.js   |  15 +-
 .../decoratorOnClassProperty11.symbols        |   9 +
 .../decoratorOnClassProperty11.types          |  10 +
 .../reference/decoratorOnClassProperty2.js    |  15 +-
 .../decoratorOnClassProperty2.symbols         |   9 +
 .../reference/decoratorOnClassProperty2.types |  10 +
 .../decoratorOnClassProperty3.errors.txt      |  12 +-
 .../reference/decoratorOnClassProperty3.js    |  15 +-
 .../decoratorOnClassProperty3.symbols         |  10 +
 .../reference/decoratorOnClassProperty3.types |  11 +
 .../decoratorOnClassProperty6.errors.txt      |  12 +-
 .../reference/decoratorOnClassProperty6.js    |  15 +-
 .../decoratorOnClassProperty6.symbols         |   9 +
 .../reference/decoratorOnClassProperty6.types |  10 +
 .../decoratorOnClassProperty7.errors.txt      |  12 +-
 .../reference/decoratorOnClassProperty7.js    |  15 +-
 .../decoratorOnClassProperty7.symbols         |   9 +
 .../reference/decoratorOnClassProperty7.types |  10 +
 .../decoratorsOnComputedProperties.errors.txt | 185 +++++---------
 .../decoratorsOnComputedProperties.js         | 232 ++++++++++++------
 .../reference/missingDecoratorType.errors.txt |   4 +
 .../reference/missingDecoratorType.js         |  13 +
 .../reference/missingDecoratorType.symbols    |   9 +
 .../reference/missingDecoratorType.types      |  10 +
 .../accessor/decoratorOnClassAccessor1.ts     |   8 +-
 .../accessor/decoratorOnClassAccessor2.ts     |   8 +-
 .../accessor/decoratorOnClassAccessor3.ts     |   8 +-
 .../accessor/decoratorOnClassAccessor4.ts     |   8 +-
 .../accessor/decoratorOnClassAccessor5.ts     |   8 +-
 .../accessor/decoratorOnClassAccessor6.ts     |   8 +-
 .../accessor/decoratorOnClassAccessor7.ts     |  34 ++-
 .../accessor/decoratorOnClassAccessor8.ts     |  32 ++-
 .../decoratorOnClassConstructor1.ts           |   8 +-
 .../decoratorOnClassConstructor2.ts           |  11 +-
 .../decoratorOnClassConstructor3.ts           |  10 +-
 .../decoratorOnClassConstructorParameter1.ts  |   8 +-
 .../decoratorOnClassConstructorParameter4.ts  |   8 +-
 .../class/decoratorChecksFunctionBodies.ts    |  15 +-
 ...ratorInstantiateModulesInFunctionBodies.ts |  13 +-
 .../class/method/decoratorOnClassMethod1.ts   |   6 +-
 .../class/method/decoratorOnClassMethod10.ts  |   6 +-
 .../class/method/decoratorOnClassMethod11.ts  |   9 +-
 .../class/method/decoratorOnClassMethod12.ts  |   8 +-
 .../class/method/decoratorOnClassMethod13.ts  |   7 +-
 .../class/method/decoratorOnClassMethod2.ts   |   6 +-
 .../class/method/decoratorOnClassMethod3.ts   |   6 +-
 .../class/method/decoratorOnClassMethod4.ts   |   6 +-
 .../class/method/decoratorOnClassMethod5.ts   |   6 +-
 .../class/method/decoratorOnClassMethod6.ts   |   6 +-
 .../class/method/decoratorOnClassMethod7.ts   |   6 +-
 .../class/method/decoratorOnClassMethod8.ts   |   6 +-
 .../method/decoratorOnClassMethodOverload1.ts |   8 +-
 .../method/decoratorOnClassMethodOverload2.ts |   8 +-
 .../decoratorOnClassMethodParameter1.ts       |   8 +-
 .../decoratorOnClassMethodParameter2.ts       |   8 +-
 .../decoratorOnClassMethodThisParameter.ts    |   4 +-
 .../property/decoratorOnClassProperty1.ts     |   6 +-
 .../property/decoratorOnClassProperty10.ts    |   6 +-
 .../property/decoratorOnClassProperty11.ts    |   6 +-
 .../property/decoratorOnClassProperty2.ts     |   6 +-
 .../property/decoratorOnClassProperty3.ts     |   6 +-
 .../property/decoratorOnClassProperty6.ts     |   6 +-
 .../property/decoratorOnClassProperty7.ts     |   6 +-
 .../decorators/decoratorMetadata-jsdoc.ts     |  11 +-
 .../decorators/missingDecoratorType.ts        |   4 +
 189 files changed, 2895 insertions(+), 386 deletions(-)

diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
index 5d927b8622d08..eeae064befba8 100644
--- a/src/compiler/transformers/ts.ts
+++ b/src/compiler/transformers/ts.ts
@@ -569,7 +569,7 @@ namespace ts {
         /**
          * Tests whether we should emit a __decorate call for a class declaration.
          */
-        function shouldEmitDecorateCallForClass(node: ClassDeclaration) {
+        function shouldEmitDecorateCallForClass(node: ClassDeclaration | ClassExpression) {
             if (node.decorators && node.decorators.length > 0) {
                 return true;
             }
@@ -589,7 +589,7 @@ namespace ts {
             return parameter.decorators !== undefined && parameter.decorators.length > 0;
         }
 
-        function getClassFacts(node: ClassDeclaration, staticProperties: readonly PropertyDeclaration[]) {
+        function getClassFacts(node: ClassDeclaration | ClassExpression, staticProperties: readonly PropertyDeclaration[]) {
             let facts = ClassFacts.None;
             if (some(staticProperties)) facts |= ClassFacts.HasStaticInitializedProperties;
             const extendsClauseElement = getEffectiveBaseTypeNode(node);
@@ -635,8 +635,8 @@ namespace ts {
 
 
             // Write any decorators of the node.
-            addClassElementDecorationStatements(statements, node, /*isStatic*/ false);
-            addClassElementDecorationStatements(statements, node, /*isStatic*/ true);
+            addClassElementDecorationStatements(statements, createClassPrototype(factory.getDeclarationName(node)), node, /*isStatic*/ false);
+            addClassElementDecorationStatements(statements, factory.getDeclarationName(node), node, /*isStatic*/ true);
             addConstructorDecorationStatement(statements, node);
 
             if (facts & ClassFacts.UseImmediatelyInvokedFunctionExpression) {
@@ -880,6 +880,9 @@ namespace ts {
                 return visitEachChild(node, visitor, context);
             }
 
+            const staticProperties = getProperties(node, /*requireInitializer*/ true, /*isStatic*/ true);
+            const facts = getClassFacts(node, staticProperties);
+
             const classExpression = factory.createClassExpression(
                 /*decorators*/ undefined,
                 /*modifiers*/ undefined,
@@ -889,6 +892,14 @@ namespace ts {
                 transformClassMembers(node)
             );
 
+            if (facts & ClassFacts.HasMemberDecorators) {
+                const temp = factory.createTempVariable(hoistVariableDeclaration);
+                const expressions: Expression[] = [factory.createAssignment(temp, classExpression)];
+                addClassElementDecorationExpressions(expressions, createClassPrototype(temp), node, /*isStatic*/ false);
+                addClassElementDecorationExpressions(expressions, temp, node, /*isStatic*/ true);
+                return factory.inlineExpressions([...expressions, temp]);
+            }
+
             setOriginalNode(classExpression, node);
             setTextRange(classExpression, node);
 
@@ -1124,31 +1135,44 @@ namespace ts {
             return decoratorExpressions;
         }
 
+        /**
+         * Generates expressions used to apply decorators to either the static or instance member of a class.
+         *
+         * @param target
+         * @param node The class node.
+         * @param isStatic A value indicating whether to generate expressions for static or instance members.
+         */
+        function addClassElementDecorationExpressions(expressions: Expression[], target: Identifier | PropertyAccessExpression, node: ClassLikeDeclaration, isStatic: boolean) {
+            addRange(expressions, map(generateClassElementDecorationExpressions(target, node, isStatic), expression => expression));
+        }
+
         /**
          * Generates statements used to apply decorators to either the static or instance members
          * of a class.
          *
+         * @param target
          * @param node The class node.
          * @param isStatic A value indicating whether to generate statements for static or
          *                 instance members.
          */
-        function addClassElementDecorationStatements(statements: Statement[], node: ClassDeclaration, isStatic: boolean) {
-            addRange(statements, map(generateClassElementDecorationExpressions(node, isStatic), expressionToStatement));
+        function addClassElementDecorationStatements(statements: Statement[], target: Identifier | PropertyAccessExpression, node: ClassLikeDeclaration, isStatic: boolean) {
+            addRange(statements, map(generateClassElementDecorationExpressions(target, node, isStatic), expressionToStatement));
         }
 
         /**
          * Generates expressions used to apply decorators to either the static or instance members
          * of a class.
          *
+         * @param target
          * @param node The class node.
          * @param isStatic A value indicating whether to generate expressions for static or
          *                 instance members.
          */
-        function generateClassElementDecorationExpressions(node: ClassExpression | ClassDeclaration, isStatic: boolean) {
+        function generateClassElementDecorationExpressions(target: Identifier | PropertyAccessExpression, node: ClassExpression | ClassDeclaration, isStatic: boolean) {
             const members = getDecoratedClassElements(node, isStatic);
             let expressions: Expression[] | undefined;
             for (const member of members) {
-                const expression = generateClassElementDecorationExpression(node, member);
+                const expression = generateClassElementDecorationExpression(target, node, member);
                 if (expression) {
                     if (!expressions) {
                         expressions = [expression];
@@ -1164,10 +1188,11 @@ namespace ts {
         /**
          * Generates an expression used to evaluate class element decorators at runtime.
          *
+         * @param target
          * @param node The class node that contains the member.
          * @param member The class member.
          */
-        function generateClassElementDecorationExpression(node: ClassExpression | ClassDeclaration, member: ClassElement) {
+        function generateClassElementDecorationExpression(target: Identifier | PropertyAccessExpression, node: ClassExpression | ClassDeclaration, member: ClassElement) {
             const allDecorators = getAllDecoratorsOfClassElement(node, member);
             const decoratorExpressions = transformAllDecoratorsOfDeclaration(member, node, allDecorators);
             if (!decoratorExpressions) {
@@ -1205,7 +1230,6 @@ namespace ts {
             //   ], C.prototype, "prop");
             //
 
-            const prefix = getClassMemberPrefix(node, member);
             const memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             const descriptor = languageVersion > ScriptTarget.ES3
                 ? member.kind === SyntaxKind.PropertyDeclaration
@@ -1220,7 +1244,7 @@ namespace ts {
 
             const helper = emitHelpers().createDecorateHelper(
                 decoratorExpressions,
-                prefix,
+                target,
                 memberName,
                 descriptor
             );
@@ -3152,14 +3176,8 @@ namespace ts {
             }
         }
 
-        function getClassPrototype(node: ClassExpression | ClassDeclaration) {
-            return factory.createPropertyAccessExpression(factory.getDeclarationName(node), "prototype");
-        }
-
-        function getClassMemberPrefix(node: ClassExpression | ClassDeclaration, member: ClassElement) {
-            return hasSyntacticModifier(member, ModifierFlags.Static)
-                ? factory.getDeclarationName(node)
-                : getClassPrototype(node);
+        function createClassPrototype(expression: Expression) {
+            return factory.createPropertyAccessExpression(expression, "prototype");
         }
 
         function enableSubstitutionForNonQualifiedEnumMembers() {
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 71689f76c7013..832852a6332dd 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -1803,23 +1803,23 @@ namespace ts {
                 return true;
 
             case SyntaxKind.PropertyDeclaration:
-                // property declarations are valid if their parent is a class declaration.
-                return parent!.kind === SyntaxKind.ClassDeclaration;
+                // property declarations are valid if their parent is a class declaration/expression.
+                return isClassLike(parent!);
 
             case SyntaxKind.GetAccessor:
             case SyntaxKind.SetAccessor:
             case SyntaxKind.MethodDeclaration:
-                // if this method has a body and its parent is a class declaration, this is a valid target.
+                // if this method has a body and its parent is a class declaration/expression, this is a valid target.
                 return (node as FunctionLikeDeclaration).body !== undefined
-                    && parent!.kind === SyntaxKind.ClassDeclaration;
+                    && isClassLike(parent!);
 
             case SyntaxKind.Parameter:
-                // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
+                // if the parameter's parent has a body and its grandparent is a class declaration/expression, this is a valid target;
                 return (parent as FunctionLikeDeclaration).body !== undefined
                     && (parent!.kind === SyntaxKind.Constructor
                         || parent!.kind === SyntaxKind.MethodDeclaration
                         || parent!.kind === SyntaxKind.SetAccessor)
-                    && grandparent!.kind === SyntaxKind.ClassDeclaration;
+                    && isClassLike(grandparent!);
         }
 
         return false;
@@ -1840,12 +1840,13 @@ namespace ts {
         return nodeIsDecorated(node, parent!, grandparent!) || childIsDecorated(node, parent!); // TODO: GH#18217
     }
 
-    export function childIsDecorated(node: ClassDeclaration): boolean;
+    export function childIsDecorated(node: ClassLikeDeclaration): boolean;
     export function childIsDecorated(node: Node, parent: Node): boolean;
     export function childIsDecorated(node: Node, parent?: Node): boolean {
         switch (node.kind) {
+            case SyntaxKind.ClassExpression:
             case SyntaxKind.ClassDeclaration:
-                return some((node as ClassDeclaration).members, m => nodeOrChildIsDecorated(m, node, parent!)); // TODO: GH#18217
+                return some((node as ClassDeclaration | ClassExpression).members, m => nodeOrChildIsDecorated(m, node, parent!)); // TODO: GH#18217
             case SyntaxKind.MethodDeclaration:
             case SyntaxKind.SetAccessor:
                 return some((node as FunctionLikeDeclaration).parameters, p => nodeIsDecorated(p, node, parent!)); // TODO: GH#18217
diff --git a/tests/baselines/reference/decoratorChecksFunctionBodies.errors.txt b/tests/baselines/reference/decoratorChecksFunctionBodies.errors.txt
index f9dd5b63b57e5..1ecdc199c3891 100644
--- a/tests/baselines/reference/decoratorChecksFunctionBodies.errors.txt
+++ b/tests/baselines/reference/decoratorChecksFunctionBodies.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts(8,14): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
+tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts(19,14): error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
 
 
-==== tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts (2 errors) ====
     // from #2971
     function func(s: string): void {
     }
@@ -17,4 +18,18 @@ tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts(8,14):
         m() {
     
         }
-    }
\ No newline at end of file
+    }
+    
+    const A1 = class {
+        @((x, p) => {
+            var a = 3;
+            func(a);
+                 ~
+!!! error TS2345: Argument of type 'number' is not assignable to parameter of type 'string'.
+            return x; 
+        })
+        m() {
+    
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorChecksFunctionBodies.js b/tests/baselines/reference/decoratorChecksFunctionBodies.js
index 38f0784939f1e..7c752c37793da 100644
--- a/tests/baselines/reference/decoratorChecksFunctionBodies.js
+++ b/tests/baselines/reference/decoratorChecksFunctionBodies.js
@@ -12,7 +12,19 @@ class A {
     m() {
 
     }
-}
+}
+
+const A1 = class {
+    @((x, p) => {
+        var a = 3;
+        func(a);
+        return x; 
+    })
+    m() {
+
+    }
+}
+
 
 //// [decoratorChecksFunctionBodies.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -21,6 +33,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 // from #2971
 function func(s) {
 }
@@ -38,3 +51,16 @@ var A = /** @class */ (function () {
     ], A.prototype, "m", null);
     return A;
 }());
+var A1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.m = function () {
+    };
+    return class_1;
+}()), __decorate([
+    (function (x, p) {
+        var a = 3;
+        func(a);
+        return x;
+    })
+], _a.prototype, "m", null), _a);
diff --git a/tests/baselines/reference/decoratorChecksFunctionBodies.symbols b/tests/baselines/reference/decoratorChecksFunctionBodies.symbols
index d199350138578..76b1a99e11b24 100644
--- a/tests/baselines/reference/decoratorChecksFunctionBodies.symbols
+++ b/tests/baselines/reference/decoratorChecksFunctionBodies.symbols
@@ -28,3 +28,28 @@ class A {
 
     }
 }
+
+const A1 = class {
+>A1 : Symbol(A1, Decl(decoratorChecksFunctionBodies.ts, 15, 5))
+
+    @((x, p) => {
+>x : Symbol(x, Decl(decoratorChecksFunctionBodies.ts, 16, 7))
+>p : Symbol(p, Decl(decoratorChecksFunctionBodies.ts, 16, 9))
+
+        var a = 3;
+>a : Symbol(a, Decl(decoratorChecksFunctionBodies.ts, 17, 11))
+
+        func(a);
+>func : Symbol(func, Decl(decoratorChecksFunctionBodies.ts, 0, 0))
+>a : Symbol(a, Decl(decoratorChecksFunctionBodies.ts, 17, 11))
+
+        return x; 
+>x : Symbol(x, Decl(decoratorChecksFunctionBodies.ts, 16, 7))
+
+    })
+    m() {
+>m : Symbol(A1.m, Decl(decoratorChecksFunctionBodies.ts, 15, 18))
+
+    }
+}
+
diff --git a/tests/baselines/reference/decoratorChecksFunctionBodies.types b/tests/baselines/reference/decoratorChecksFunctionBodies.types
index c1f5c581b2194..caae110f674b6 100644
--- a/tests/baselines/reference/decoratorChecksFunctionBodies.types
+++ b/tests/baselines/reference/decoratorChecksFunctionBodies.types
@@ -32,3 +32,33 @@ class A {
 
     }
 }
+
+const A1 = class {
+>A1 : typeof A1
+>class {    @((x, p) => {        var a = 3;        func(a);        return x;     })    m() {    }} : typeof A1
+
+    @((x, p) => {
+>((x, p) => {        var a = 3;        func(a);        return x;     }) : (x: any, p: any) => any
+>(x, p) => {        var a = 3;        func(a);        return x;     } : (x: any, p: any) => any
+>x : any
+>p : any
+
+        var a = 3;
+>a : number
+>3 : 3
+
+        func(a);
+>func(a) : void
+>func : (s: string) => void
+>a : number
+
+        return x; 
+>x : any
+
+    })
+    m() {
+>m : () => void
+
+    }
+}
+
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
index 8e2c941c65d11..63dc181b772b1 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.js
@@ -13,12 +13,20 @@ function filter(handler: any) {
     };
 }
 
-class Wat {
+class A {
     @filter(() => test == 'abc')
     static whatever() {
         // ...
     }
-}
+}
+
+const A1 = class {
+    @filter(() => test == 'abc')
+    static whatever() {
+        // ...
+    }
+}
+
 
 //// [a.js]
 "use strict";
@@ -34,6 +42,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 var a_1 = require("./a");
 function filter(handler) {
@@ -41,14 +50,24 @@ function filter(handler) {
         // ...
     };
 }
-var Wat = /** @class */ (function () {
-    function Wat() {
+var A = /** @class */ (function () {
+    function A() {
     }
-    Wat.whatever = function () {
+    A.whatever = function () {
         // ...
     };
     __decorate([
         filter(function () { return a_1.test == 'abc'; })
-    ], Wat, "whatever", null);
-    return Wat;
+    ], A, "whatever", null);
+    return A;
 }());
+var A1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.whatever = function () {
+        // ...
+    };
+    return class_1;
+}()), __decorate([
+    filter(function () { return a_1.test == 'abc'; })
+], _a, "whatever", null), _a);
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.symbols b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.symbols
index 15993fc6b5a61..2efcf0b7d6e36 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.symbols
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.symbols
@@ -19,16 +19,31 @@ function filter(handler: any) {
     };
 }
 
-class Wat {
->Wat : Symbol(Wat, Decl(b.ts, 6, 1))
+class A {
+>A : Symbol(A, Decl(b.ts, 6, 1))
 
     @filter(() => test == 'abc')
 >filter : Symbol(filter, Decl(b.ts, 0, 27))
 >test : Symbol(test, Decl(b.ts, 0, 8))
 
     static whatever() {
->whatever : Symbol(Wat.whatever, Decl(b.ts, 8, 11))
+>whatever : Symbol(A.whatever, Decl(b.ts, 8, 9))
 
         // ...
     }
 }
+
+const A1 = class {
+>A1 : Symbol(A1, Decl(b.ts, 15, 5))
+
+    @filter(() => test == 'abc')
+>filter : Symbol(filter, Decl(b.ts, 0, 27))
+>test : Symbol(test, Decl(b.ts, 0, 8))
+
+    static whatever() {
+>whatever : Symbol(A1.whatever, Decl(b.ts, 15, 18))
+
+        // ...
+    }
+}
+
diff --git a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.types b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.types
index d93f3d119d2c4..c7c80c247c8c6 100644
--- a/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.types
+++ b/tests/baselines/reference/decoratorInstantiateModulesInFunctionBodies.types
@@ -21,8 +21,8 @@ function filter(handler: any) {
     };
 }
 
-class Wat {
->Wat : Wat
+class A {
+>A : A
 
     @filter(() => test == 'abc')
 >filter(() => test == 'abc') : (target: any, propertyKey: string) => void
@@ -38,3 +38,23 @@ class Wat {
         // ...
     }
 }
+
+const A1 = class {
+>A1 : typeof A1
+>class {    @filter(() => test == 'abc')    static whatever() {        // ...    }} : typeof A1
+
+    @filter(() => test == 'abc')
+>filter(() => test == 'abc') : (target: any, propertyKey: string) => void
+>filter : (handler: any) => (target: any, propertyKey: string) => void
+>() => test == 'abc' : () => boolean
+>test == 'abc' : boolean
+>test : string
+>'abc' : "abc"
+
+    static whatever() {
+>whatever : () => void
+
+        // ...
+    }
+}
+
diff --git a/tests/baselines/reference/decoratorMetadata-jsdoc.errors.txt b/tests/baselines/reference/decoratorMetadata-jsdoc.errors.txt
index a2af419361d64..a4fa8599ab3fd 100644
--- a/tests/baselines/reference/decoratorMetadata-jsdoc.errors.txt
+++ b/tests/baselines/reference/decoratorMetadata-jsdoc.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts(5,9): error TS8020: JSDoc types can only be used inside documentation comments.
 tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts(7,9): error TS8020: JSDoc types can only be used inside documentation comments.
 tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts(9,9): error TS8020: JSDoc types can only be used inside documentation comments.
+tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts(14,9): error TS8020: JSDoc types can only be used inside documentation comments.
+tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts(16,9): error TS8020: JSDoc types can only be used inside documentation comments.
+tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts(18,9): error TS8020: JSDoc types can only be used inside documentation comments.
 
 
-==== tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts (3 errors) ====
+==== tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts (6 errors) ====
     declare var decorator: any;
     
     class X {
@@ -19,4 +22,20 @@ tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts(9,9): error TS8020
         c?: *;
             ~
 !!! error TS8020: JSDoc types can only be used inside documentation comments.
-    }
\ No newline at end of file
+    }
+    
+    const X1 = class {
+        @decorator()
+        a?: string?;
+            ~~~~~~~
+!!! error TS8020: JSDoc types can only be used inside documentation comments.
+        @decorator()
+        b?: string!;
+            ~~~~~~~
+!!! error TS8020: JSDoc types can only be used inside documentation comments.
+        @decorator()
+        c?: *;
+            ~
+!!! error TS8020: JSDoc types can only be used inside documentation comments.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorMetadata-jsdoc.js b/tests/baselines/reference/decoratorMetadata-jsdoc.js
index ff7b1acbec5f2..64cd768973ee4 100644
--- a/tests/baselines/reference/decoratorMetadata-jsdoc.js
+++ b/tests/baselines/reference/decoratorMetadata-jsdoc.js
@@ -8,7 +8,17 @@ class X {
     b?: string!;
     @decorator()
     c?: *;
-}
+}
+
+const X1 = class {
+    @decorator()
+    a?: string?;
+    @decorator()
+    b?: string!;
+    @decorator()
+    c?: *;
+}
+
 
 //// [decoratorMetadata-jsdoc.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -20,6 +30,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var _a;
 var X = /** @class */ (function () {
     function X() {
     }
@@ -37,3 +48,17 @@ var X = /** @class */ (function () {
     ], X.prototype, "c", void 0);
     return X;
 }());
+var X1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}()), __decorate([
+    decorator(),
+    __metadata("design:type", String)
+], _a.prototype, "a", void 0), __decorate([
+    decorator(),
+    __metadata("design:type", String)
+], _a.prototype, "b", void 0), __decorate([
+    decorator(),
+    __metadata("design:type", Object)
+], _a.prototype, "c", void 0), _a);
diff --git a/tests/baselines/reference/decoratorMetadata-jsdoc.symbols b/tests/baselines/reference/decoratorMetadata-jsdoc.symbols
index 260214db22a7c..975e90c1b4698 100644
--- a/tests/baselines/reference/decoratorMetadata-jsdoc.symbols
+++ b/tests/baselines/reference/decoratorMetadata-jsdoc.symbols
@@ -23,3 +23,26 @@ class X {
     c?: *;
 >c : Symbol(X.c, Decl(decoratorMetadata-jsdoc.ts, 6, 16))
 }
+
+const X1 = class {
+>X1 : Symbol(X1, Decl(decoratorMetadata-jsdoc.ts, 11, 5))
+
+    @decorator()
+>decorator : Symbol(decorator, Decl(decoratorMetadata-jsdoc.ts, 0, 11))
+
+    a?: string?;
+>a : Symbol(X1.a, Decl(decoratorMetadata-jsdoc.ts, 11, 18))
+
+    @decorator()
+>decorator : Symbol(decorator, Decl(decoratorMetadata-jsdoc.ts, 0, 11))
+
+    b?: string!;
+>b : Symbol(X1.b, Decl(decoratorMetadata-jsdoc.ts, 13, 16))
+
+    @decorator()
+>decorator : Symbol(decorator, Decl(decoratorMetadata-jsdoc.ts, 0, 11))
+
+    c?: *;
+>c : Symbol(X1.c, Decl(decoratorMetadata-jsdoc.ts, 15, 16))
+}
+
diff --git a/tests/baselines/reference/decoratorMetadata-jsdoc.types b/tests/baselines/reference/decoratorMetadata-jsdoc.types
index ef618b7cda05a..1bd474d51e212 100644
--- a/tests/baselines/reference/decoratorMetadata-jsdoc.types
+++ b/tests/baselines/reference/decoratorMetadata-jsdoc.types
@@ -26,3 +26,30 @@ class X {
     c?: *;
 >c : any
 }
+
+const X1 = class {
+>X1 : typeof X1
+>class {    @decorator()    a?: string?;    @decorator()    b?: string!;    @decorator()    c?: *;} : typeof X1
+
+    @decorator()
+>decorator() : any
+>decorator : any
+
+    a?: string?;
+>a : string
+
+    @decorator()
+>decorator() : any
+>decorator : any
+
+    b?: string!;
+>b : string
+
+    @decorator()
+>decorator() : any
+>decorator : any
+
+    c?: *;
+>c : any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.js b/tests/baselines/reference/decoratorOnClassAccessor1.js
index 81f3141177a7e..e016449b218b8 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec get accessor() { return 1; }
-}
+}
+
+const C1 = class {
+    @dec get accessor() { return 1; }
+}
+
 
 //// [decoratorOnClassAccessor1.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -25,3 +31,15 @@ var C = /** @class */ (function () {
     ], C.prototype, "accessor", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    Object.defineProperty(class_1.prototype, "accessor", {
+        get: function () { return 1; },
+        enumerable: false,
+        configurable: true
+    });
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "accessor", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.symbols b/tests/baselines/reference/decoratorOnClassAccessor1.symbols
index 1fd51cc19a733..81383d5d2cc05 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.symbols
@@ -17,3 +17,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassAccessor1.ts, 0, 0))
 >accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor1.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassAccessor1.ts, 6, 5))
+
+    @dec get accessor() { return 1; }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor1.ts, 0, 0))
+>accessor : Symbol(C1.accessor, Decl(decoratorOnClassAccessor1.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.types b/tests/baselines/reference/decoratorOnClassAccessor1.types
index 83c4c80ba6d7f..c5e459b3ff08c 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.types
@@ -13,3 +13,14 @@ class C {
 >accessor : number
 >1 : 1
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec get accessor() { return 1; }} : typeof C1
+
+    @dec get accessor() { return 1; }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>accessor : number
+>1 : 1
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.js b/tests/baselines/reference/decoratorOnClassAccessor2.js
index f32960a9e1213..443f166f3a281 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor2.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec public get accessor() { return 1; }
-}
+}
+
+const C1 = class {
+    @dec public get accessor() { return 1; }
+}
+
 
 //// [decoratorOnClassAccessor2.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -25,3 +31,15 @@ var C = /** @class */ (function () {
     ], C.prototype, "accessor", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    Object.defineProperty(class_1.prototype, "accessor", {
+        get: function () { return 1; },
+        enumerable: false,
+        configurable: true
+    });
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "accessor", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.symbols b/tests/baselines/reference/decoratorOnClassAccessor2.symbols
index 8717ec53fe18f..40af98a0f0a72 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor2.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.symbols
@@ -17,3 +17,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassAccessor2.ts, 0, 0))
 >accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor2.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassAccessor2.ts, 6, 5))
+
+    @dec public get accessor() { return 1; }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor2.ts, 0, 0))
+>accessor : Symbol(C1.accessor, Decl(decoratorOnClassAccessor2.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.types b/tests/baselines/reference/decoratorOnClassAccessor2.types
index 8b0cec0d732d5..059fe45abf6a7 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor2.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.types
@@ -13,3 +13,14 @@ class C {
 >accessor : number
 >1 : 1
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec public get accessor() { return 1; }} : typeof C1
+
+    @dec public get accessor() { return 1; }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>accessor : number
+>1 : 1
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt b/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt
index 98b96b9b1c44e..7f2eb69736641 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(4,12): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts(8,12): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts (2 errors) ====
     declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
     class C {
         public @dec get accessor() { return 1; }
                ~
 !!! error TS1005: ';' expected.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        public @dec get accessor() { return 1; }
+               ~
+!!! error TS1005: ';' expected.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.js b/tests/baselines/reference/decoratorOnClassAccessor3.js
index cc056160a9d3f..2dc414b4e15c6 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     public @dec get accessor() { return 1; }
-}
+}
+
+const C1 = class {
+    public @dec get accessor() { return 1; }
+}
+
 
 //// [decoratorOnClassAccessor3.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -25,3 +31,15 @@ var C = /** @class */ (function () {
     ], C.prototype, "accessor", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    Object.defineProperty(class_1.prototype, "accessor", {
+        get: function () { return 1; },
+        enumerable: false,
+        configurable: true
+    });
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "accessor", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.symbols b/tests/baselines/reference/decoratorOnClassAccessor3.symbols
index 449fac653ca3b..d0e900876c115 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.symbols
@@ -18,3 +18,13 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassAccessor3.ts, 0, 0))
 >accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor3.ts, 3, 10))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassAccessor3.ts, 6, 5))
+
+    public @dec get accessor() { return 1; }
+>public : Symbol(C1.public, Decl(decoratorOnClassAccessor3.ts, 6, 18))
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor3.ts, 0, 0))
+>accessor : Symbol(C1.accessor, Decl(decoratorOnClassAccessor3.ts, 7, 10))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor3.types b/tests/baselines/reference/decoratorOnClassAccessor3.types
index 5caf6f1290800..91bbf9cbd3e19 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor3.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor3.types
@@ -14,3 +14,15 @@ class C {
 >accessor : number
 >1 : 1
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    public @dec get accessor() { return 1; }} : typeof C1
+
+    public @dec get accessor() { return 1; }
+>public : any
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>accessor : number
+>1 : 1
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.js b/tests/baselines/reference/decoratorOnClassAccessor4.js
index ae7295764aa89..67a35599c5f99 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor4.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec set accessor(value: number) { }
-}
+}
+
+const C1 = class {
+    @dec set accessor(value: number) { }
+}
+
 
 //// [decoratorOnClassAccessor4.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -25,3 +31,15 @@ var C = /** @class */ (function () {
     ], C.prototype, "accessor", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    Object.defineProperty(class_1.prototype, "accessor", {
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "accessor", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.symbols b/tests/baselines/reference/decoratorOnClassAccessor4.symbols
index 40a6983393234..f4b2d571d3de8 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor4.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.symbols
@@ -18,3 +18,13 @@ class C {
 >accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor4.ts, 2, 9))
 >value : Symbol(value, Decl(decoratorOnClassAccessor4.ts, 3, 22))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassAccessor4.ts, 6, 5))
+
+    @dec set accessor(value: number) { }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor4.ts, 0, 0))
+>accessor : Symbol(C1.accessor, Decl(decoratorOnClassAccessor4.ts, 6, 18))
+>value : Symbol(value, Decl(decoratorOnClassAccessor4.ts, 7, 22))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.types b/tests/baselines/reference/decoratorOnClassAccessor4.types
index 29dfa2e397872..2533161c12b8a 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor4.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.types
@@ -13,3 +13,14 @@ class C {
 >accessor : number
 >value : number
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec set accessor(value: number) { }} : typeof C1
+
+    @dec set accessor(value: number) { }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>accessor : number
+>value : number
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.js b/tests/baselines/reference/decoratorOnClassAccessor5.js
index 91e07d81603c7..b61095d9ab562 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor5.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec public set accessor(value: number) { }
-}
+}
+
+const C1 = class {
+    @dec public set accessor(value: number) { }
+}
+
 
 //// [decoratorOnClassAccessor5.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -25,3 +31,15 @@ var C = /** @class */ (function () {
     ], C.prototype, "accessor", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    Object.defineProperty(class_1.prototype, "accessor", {
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "accessor", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.symbols b/tests/baselines/reference/decoratorOnClassAccessor5.symbols
index a46b93d555581..f248b8e9b5272 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor5.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.symbols
@@ -18,3 +18,13 @@ class C {
 >accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor5.ts, 2, 9))
 >value : Symbol(value, Decl(decoratorOnClassAccessor5.ts, 3, 29))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassAccessor5.ts, 6, 5))
+
+    @dec public set accessor(value: number) { }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor5.ts, 0, 0))
+>accessor : Symbol(C1.accessor, Decl(decoratorOnClassAccessor5.ts, 6, 18))
+>value : Symbol(value, Decl(decoratorOnClassAccessor5.ts, 7, 29))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.types b/tests/baselines/reference/decoratorOnClassAccessor5.types
index c184b205acbc8..48ed8ace7ce96 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor5.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.types
@@ -13,3 +13,14 @@ class C {
 >accessor : number
 >value : number
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec public set accessor(value: number) { }} : typeof C1
+
+    @dec public set accessor(value: number) { }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>accessor : number
+>value : number
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt b/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt
index e430b4cf1eea5..4660eccdff2f6 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(4,12): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts(8,12): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts (2 errors) ====
     declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
     class C {
         public @dec set accessor(value: number) { }
                ~
 !!! error TS1005: ';' expected.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        public @dec set accessor(value: number) { }
+               ~
+!!! error TS1005: ';' expected.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.js b/tests/baselines/reference/decoratorOnClassAccessor6.js
index ff6ccdb8a60ed..3cce866bf6f96 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     public @dec set accessor(value: number) { }
-}
+}
+
+const C1 = class {
+    public @dec set accessor(value: number) { }
+}
+
 
 //// [decoratorOnClassAccessor6.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -25,3 +31,15 @@ var C = /** @class */ (function () {
     ], C.prototype, "accessor", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    Object.defineProperty(class_1.prototype, "accessor", {
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "accessor", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.symbols b/tests/baselines/reference/decoratorOnClassAccessor6.symbols
index 2778d97c90276..d691b956e398d 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.symbols
@@ -19,3 +19,14 @@ class C {
 >accessor : Symbol(C.accessor, Decl(decoratorOnClassAccessor6.ts, 3, 10))
 >value : Symbol(value, Decl(decoratorOnClassAccessor6.ts, 3, 29))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassAccessor6.ts, 6, 5))
+
+    public @dec set accessor(value: number) { }
+>public : Symbol(C1.public, Decl(decoratorOnClassAccessor6.ts, 6, 18))
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor6.ts, 0, 0))
+>accessor : Symbol(C1.accessor, Decl(decoratorOnClassAccessor6.ts, 7, 10))
+>value : Symbol(value, Decl(decoratorOnClassAccessor6.ts, 7, 29))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor6.types b/tests/baselines/reference/decoratorOnClassAccessor6.types
index 14ecb325eaf2f..a66ca8b3599b7 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor6.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor6.types
@@ -14,3 +14,15 @@ class C {
 >accessor : number
 >value : number
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    public @dec set accessor(value: number) { }} : typeof C1
+
+    public @dec set accessor(value: number) { }
+>public : any
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>accessor : number
+>value : number
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor7.errors.txt b/tests/baselines/reference/decoratorOnClassAccessor7.errors.txt
index d776297fcf461..e4bfdc80d21cd 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor7.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassAccessor7.errors.txt
@@ -1,8 +1,10 @@
 tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts(26,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
 tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts(31,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts(56,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
+tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts(61,5): error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
 
 
-==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts (2 errors) ====
+==== tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts (4 errors) ====
     declare function dec1<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     declare function dec2<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
@@ -38,4 +40,39 @@ tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts(3
         @dec2 get x() { return 0; }
         ~
 !!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
-    }
\ No newline at end of file
+    }
+    
+    const A1 = class {
+        @dec1 get x() { return 0; }
+        set x(value: number) { }
+    }
+    
+    const B1 = class {
+        get x() { return 0; }
+        @dec2 set x(value: number) { }
+    }
+    
+    const C1 = class {
+        @dec1 set x(value: number) { }
+        get x() { return 0; }
+    }
+    
+    const D1 = class {
+        set x(value: number) { }
+        @dec2 get x() { return 0; }
+    }
+    
+    const E1 = class {
+        @dec1 get x() { return 0; }
+        @dec2 set x(value: number) { }
+        ~
+!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
+    }
+    
+    const F1 = class {
+        @dec1 set x(value: number) { }
+        @dec2 get x() { return 0; }
+        ~
+!!! error TS1207: Decorators cannot be applied to multiple get/set accessors of the same name.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassAccessor7.js b/tests/baselines/reference/decoratorOnClassAccessor7.js
index 5ad01245e8bda..72dd7a2769bc8 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor7.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor7.js
@@ -30,7 +30,38 @@ class E {
 class F {
     @dec1 set x(value: number) { }
     @dec2 get x() { return 0; }
-}
+}
+
+const A1 = class {
+    @dec1 get x() { return 0; }
+    set x(value: number) { }
+}
+
+const B1 = class {
+    get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+const C1 = class {
+    @dec1 set x(value: number) { }
+    get x() { return 0; }
+}
+
+const D1 = class {
+    set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
+
+const E1 = class {
+    @dec1 get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+const F1 = class {
+    @dec1 set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
+
 
 //// [decoratorOnClassAccessor7.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -39,6 +70,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a, _b, _c, _d, _e, _f;
 var A = /** @class */ (function () {
     function A() {
     }
@@ -123,3 +155,81 @@ var F = /** @class */ (function () {
     ], F.prototype, "x", null);
     return F;
 }());
+var A1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    Object.defineProperty(class_1.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_1;
+}()), __decorate([
+    dec1
+], _a.prototype, "x", null), _a);
+var B1 = (_b = /** @class */ (function () {
+    function class_2() {
+    }
+    Object.defineProperty(class_2.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_2;
+}()), __decorate([
+    dec2
+], _b.prototype, "x", null), _b);
+var C1 = (_c = /** @class */ (function () {
+    function class_3() {
+    }
+    Object.defineProperty(class_3.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_3;
+}()), __decorate([
+    dec1
+], _c.prototype, "x", null), _c);
+var D1 = (_d = /** @class */ (function () {
+    function class_4() {
+    }
+    Object.defineProperty(class_4.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_4;
+}()), __decorate([
+    dec2
+], _d.prototype, "x", null), _d);
+var E1 = (_e = /** @class */ (function () {
+    function class_5() {
+    }
+    Object.defineProperty(class_5.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_5;
+}()), __decorate([
+    dec1
+], _e.prototype, "x", null), _e);
+var F1 = (_f = /** @class */ (function () {
+    function class_6() {
+    }
+    Object.defineProperty(class_6.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_6;
+}()), __decorate([
+    dec1
+], _f.prototype, "x", null), _f);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor7.symbols b/tests/baselines/reference/decoratorOnClassAccessor7.symbols
index d1af7cce1f2eb..8c4a7360c2ff5 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor7.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor7.symbols
@@ -94,3 +94,78 @@ class F {
 >dec2 : Symbol(dec2, Decl(decoratorOnClassAccessor7.ts, 0, 127))
 >x : Symbol(F.x, Decl(decoratorOnClassAccessor7.ts, 28, 9), Decl(decoratorOnClassAccessor7.ts, 29, 34))
 }
+
+const A1 = class {
+>A1 : Symbol(A1, Decl(decoratorOnClassAccessor7.ts, 33, 5))
+
+    @dec1 get x() { return 0; }
+>dec1 : Symbol(dec1, Decl(decoratorOnClassAccessor7.ts, 0, 0))
+>x : Symbol(A1.x, Decl(decoratorOnClassAccessor7.ts, 33, 18), Decl(decoratorOnClassAccessor7.ts, 34, 31))
+
+    set x(value: number) { }
+>x : Symbol(A1.x, Decl(decoratorOnClassAccessor7.ts, 33, 18), Decl(decoratorOnClassAccessor7.ts, 34, 31))
+>value : Symbol(value, Decl(decoratorOnClassAccessor7.ts, 35, 10))
+}
+
+const B1 = class {
+>B1 : Symbol(B1, Decl(decoratorOnClassAccessor7.ts, 38, 5))
+
+    get x() { return 0; }
+>x : Symbol(B1.x, Decl(decoratorOnClassAccessor7.ts, 38, 18), Decl(decoratorOnClassAccessor7.ts, 39, 25))
+
+    @dec2 set x(value: number) { }
+>dec2 : Symbol(dec2, Decl(decoratorOnClassAccessor7.ts, 0, 127))
+>x : Symbol(B1.x, Decl(decoratorOnClassAccessor7.ts, 38, 18), Decl(decoratorOnClassAccessor7.ts, 39, 25))
+>value : Symbol(value, Decl(decoratorOnClassAccessor7.ts, 40, 16))
+}
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassAccessor7.ts, 43, 5))
+
+    @dec1 set x(value: number) { }
+>dec1 : Symbol(dec1, Decl(decoratorOnClassAccessor7.ts, 0, 0))
+>x : Symbol(C1.x, Decl(decoratorOnClassAccessor7.ts, 43, 18), Decl(decoratorOnClassAccessor7.ts, 44, 34))
+>value : Symbol(value, Decl(decoratorOnClassAccessor7.ts, 44, 16))
+
+    get x() { return 0; }
+>x : Symbol(C1.x, Decl(decoratorOnClassAccessor7.ts, 43, 18), Decl(decoratorOnClassAccessor7.ts, 44, 34))
+}
+
+const D1 = class {
+>D1 : Symbol(D1, Decl(decoratorOnClassAccessor7.ts, 48, 5))
+
+    set x(value: number) { }
+>x : Symbol(D1.x, Decl(decoratorOnClassAccessor7.ts, 48, 18), Decl(decoratorOnClassAccessor7.ts, 49, 28))
+>value : Symbol(value, Decl(decoratorOnClassAccessor7.ts, 49, 10))
+
+    @dec2 get x() { return 0; }
+>dec2 : Symbol(dec2, Decl(decoratorOnClassAccessor7.ts, 0, 127))
+>x : Symbol(D1.x, Decl(decoratorOnClassAccessor7.ts, 48, 18), Decl(decoratorOnClassAccessor7.ts, 49, 28))
+}
+
+const E1 = class {
+>E1 : Symbol(E1, Decl(decoratorOnClassAccessor7.ts, 53, 5))
+
+    @dec1 get x() { return 0; }
+>dec1 : Symbol(dec1, Decl(decoratorOnClassAccessor7.ts, 0, 0))
+>x : Symbol(E1.x, Decl(decoratorOnClassAccessor7.ts, 53, 18), Decl(decoratorOnClassAccessor7.ts, 54, 31))
+
+    @dec2 set x(value: number) { }
+>dec2 : Symbol(dec2, Decl(decoratorOnClassAccessor7.ts, 0, 127))
+>x : Symbol(E1.x, Decl(decoratorOnClassAccessor7.ts, 53, 18), Decl(decoratorOnClassAccessor7.ts, 54, 31))
+>value : Symbol(value, Decl(decoratorOnClassAccessor7.ts, 55, 16))
+}
+
+const F1 = class {
+>F1 : Symbol(F1, Decl(decoratorOnClassAccessor7.ts, 58, 5))
+
+    @dec1 set x(value: number) { }
+>dec1 : Symbol(dec1, Decl(decoratorOnClassAccessor7.ts, 0, 0))
+>x : Symbol(F1.x, Decl(decoratorOnClassAccessor7.ts, 58, 18), Decl(decoratorOnClassAccessor7.ts, 59, 34))
+>value : Symbol(value, Decl(decoratorOnClassAccessor7.ts, 59, 16))
+
+    @dec2 get x() { return 0; }
+>dec2 : Symbol(dec2, Decl(decoratorOnClassAccessor7.ts, 0, 127))
+>x : Symbol(F1.x, Decl(decoratorOnClassAccessor7.ts, 58, 18), Decl(decoratorOnClassAccessor7.ts, 59, 34))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor7.types b/tests/baselines/reference/decoratorOnClassAccessor7.types
index 45aa0ffaa6642..a37bc0e16ca5c 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor7.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor7.types
@@ -90,3 +90,90 @@ class F {
 >x : number
 >0 : 0
 }
+
+const A1 = class {
+>A1 : typeof A1
+>class {    @dec1 get x() { return 0; }    set x(value: number) { }} : typeof A1
+
+    @dec1 get x() { return 0; }
+>dec1 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>0 : 0
+
+    set x(value: number) { }
+>x : number
+>value : number
+}
+
+const B1 = class {
+>B1 : typeof B1
+>class {    get x() { return 0; }    @dec2 set x(value: number) { }} : typeof B1
+
+    get x() { return 0; }
+>x : number
+>0 : 0
+
+    @dec2 set x(value: number) { }
+>dec2 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>value : number
+}
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec1 set x(value: number) { }    get x() { return 0; }} : typeof C1
+
+    @dec1 set x(value: number) { }
+>dec1 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>value : number
+
+    get x() { return 0; }
+>x : number
+>0 : 0
+}
+
+const D1 = class {
+>D1 : typeof D1
+>class {    set x(value: number) { }    @dec2 get x() { return 0; }} : typeof D1
+
+    set x(value: number) { }
+>x : number
+>value : number
+
+    @dec2 get x() { return 0; }
+>dec2 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>0 : 0
+}
+
+const E1 = class {
+>E1 : typeof E1
+>class {    @dec1 get x() { return 0; }    @dec2 set x(value: number) { }} : typeof E1
+
+    @dec1 get x() { return 0; }
+>dec1 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>0 : 0
+
+    @dec2 set x(value: number) { }
+>dec2 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>value : number
+}
+
+const F1 = class {
+>F1 : typeof F1
+>class {    @dec1 set x(value: number) { }    @dec2 get x() { return 0; }} : typeof F1
+
+    @dec1 set x(value: number) { }
+>dec1 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>value : number
+
+    @dec2 get x() { return 0; }
+>dec2 : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>0 : 0
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor8.js b/tests/baselines/reference/decoratorOnClassAccessor8.js
index 1f74cf74c07c6..52f9399a0fb75 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor8.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor8.js
@@ -27,7 +27,36 @@ class E {
 
 class F {
     @dec set x(value: number) { }
-}
+}
+
+const A1 = class {
+    @dec get x() { return 0; }
+    set x(value: number) { }
+}
+
+const B1 = class {
+    get x() { return 0; }
+    @dec set x(value: number) { }
+}
+
+const C1 = class {
+    @dec set x(value: number) { }
+    get x() { return 0; }
+}
+
+const D1 = class {
+    set x(value: number) { }
+    @dec get x() { return 0; }
+}
+
+const E1 = class {
+    @dec get x() { return 0; }
+}
+
+const F1 = class {
+    @dec set x(value: number) { }
+}
+
 
 //// [decoratorOnClassAccessor8.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -39,6 +68,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var _a, _b, _c, _d, _e, _f;
 var A = /** @class */ (function () {
     function A() {
     }
@@ -133,3 +163,91 @@ var F = /** @class */ (function () {
     ], F.prototype, "x", null);
     return F;
 }());
+var A1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    Object.defineProperty(class_1.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_1;
+}()), __decorate([
+    dec,
+    __metadata("design:type", Number),
+    __metadata("design:paramtypes", [Number])
+], _a.prototype, "x", null), _a);
+var B1 = (_b = /** @class */ (function () {
+    function class_2() {
+    }
+    Object.defineProperty(class_2.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_2;
+}()), __decorate([
+    dec,
+    __metadata("design:type", Number),
+    __metadata("design:paramtypes", [Number])
+], _b.prototype, "x", null), _b);
+var C1 = (_c = /** @class */ (function () {
+    function class_3() {
+    }
+    Object.defineProperty(class_3.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_3;
+}()), __decorate([
+    dec,
+    __metadata("design:type", Number),
+    __metadata("design:paramtypes", [Number])
+], _c.prototype, "x", null), _c);
+var D1 = (_d = /** @class */ (function () {
+    function class_4() {
+    }
+    Object.defineProperty(class_4.prototype, "x", {
+        get: function () { return 0; },
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_4;
+}()), __decorate([
+    dec,
+    __metadata("design:type", Number),
+    __metadata("design:paramtypes", [Number])
+], _d.prototype, "x", null), _d);
+var E1 = (_e = /** @class */ (function () {
+    function class_5() {
+    }
+    Object.defineProperty(class_5.prototype, "x", {
+        get: function () { return 0; },
+        enumerable: false,
+        configurable: true
+    });
+    return class_5;
+}()), __decorate([
+    dec,
+    __metadata("design:type", Object),
+    __metadata("design:paramtypes", [])
+], _e.prototype, "x", null), _e);
+var F1 = (_f = /** @class */ (function () {
+    function class_6() {
+    }
+    Object.defineProperty(class_6.prototype, "x", {
+        set: function (value) { },
+        enumerable: false,
+        configurable: true
+    });
+    return class_6;
+}()), __decorate([
+    dec,
+    __metadata("design:type", Number),
+    __metadata("design:paramtypes", [Number])
+], _f.prototype, "x", null), _f);
diff --git a/tests/baselines/reference/decoratorOnClassAccessor8.symbols b/tests/baselines/reference/decoratorOnClassAccessor8.symbols
index 2454f2727b2be..690d193ecc8b6 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor8.symbols
+++ b/tests/baselines/reference/decoratorOnClassAccessor8.symbols
@@ -74,3 +74,69 @@ class F {
 >x : Symbol(F.x, Decl(decoratorOnClassAccessor8.ts, 26, 9))
 >value : Symbol(value, Decl(decoratorOnClassAccessor8.ts, 27, 15))
 }
+
+const A1 = class {
+>A1 : Symbol(A1, Decl(decoratorOnClassAccessor8.ts, 30, 5))
+
+    @dec get x() { return 0; }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor8.ts, 0, 0))
+>x : Symbol(A1.x, Decl(decoratorOnClassAccessor8.ts, 30, 18), Decl(decoratorOnClassAccessor8.ts, 31, 30))
+
+    set x(value: number) { }
+>x : Symbol(A1.x, Decl(decoratorOnClassAccessor8.ts, 30, 18), Decl(decoratorOnClassAccessor8.ts, 31, 30))
+>value : Symbol(value, Decl(decoratorOnClassAccessor8.ts, 32, 10))
+}
+
+const B1 = class {
+>B1 : Symbol(B1, Decl(decoratorOnClassAccessor8.ts, 35, 5))
+
+    get x() { return 0; }
+>x : Symbol(B1.x, Decl(decoratorOnClassAccessor8.ts, 35, 18), Decl(decoratorOnClassAccessor8.ts, 36, 25))
+
+    @dec set x(value: number) { }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor8.ts, 0, 0))
+>x : Symbol(B1.x, Decl(decoratorOnClassAccessor8.ts, 35, 18), Decl(decoratorOnClassAccessor8.ts, 36, 25))
+>value : Symbol(value, Decl(decoratorOnClassAccessor8.ts, 37, 15))
+}
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassAccessor8.ts, 40, 5))
+
+    @dec set x(value: number) { }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor8.ts, 0, 0))
+>x : Symbol(C1.x, Decl(decoratorOnClassAccessor8.ts, 40, 18), Decl(decoratorOnClassAccessor8.ts, 41, 33))
+>value : Symbol(value, Decl(decoratorOnClassAccessor8.ts, 41, 15))
+
+    get x() { return 0; }
+>x : Symbol(C1.x, Decl(decoratorOnClassAccessor8.ts, 40, 18), Decl(decoratorOnClassAccessor8.ts, 41, 33))
+}
+
+const D1 = class {
+>D1 : Symbol(D1, Decl(decoratorOnClassAccessor8.ts, 45, 5))
+
+    set x(value: number) { }
+>x : Symbol(D1.x, Decl(decoratorOnClassAccessor8.ts, 45, 18), Decl(decoratorOnClassAccessor8.ts, 46, 28))
+>value : Symbol(value, Decl(decoratorOnClassAccessor8.ts, 46, 10))
+
+    @dec get x() { return 0; }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor8.ts, 0, 0))
+>x : Symbol(D1.x, Decl(decoratorOnClassAccessor8.ts, 45, 18), Decl(decoratorOnClassAccessor8.ts, 46, 28))
+}
+
+const E1 = class {
+>E1 : Symbol(E1, Decl(decoratorOnClassAccessor8.ts, 50, 5))
+
+    @dec get x() { return 0; }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor8.ts, 0, 0))
+>x : Symbol(E1.x, Decl(decoratorOnClassAccessor8.ts, 50, 18))
+}
+
+const F1 = class {
+>F1 : Symbol(F1, Decl(decoratorOnClassAccessor8.ts, 54, 5))
+
+    @dec set x(value: number) { }
+>dec : Symbol(dec, Decl(decoratorOnClassAccessor8.ts, 0, 0))
+>x : Symbol(F1.x, Decl(decoratorOnClassAccessor8.ts, 54, 18))
+>value : Symbol(value, Decl(decoratorOnClassAccessor8.ts, 55, 15))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassAccessor8.types b/tests/baselines/reference/decoratorOnClassAccessor8.types
index f7e7d98753700..031b0033103bc 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor8.types
+++ b/tests/baselines/reference/decoratorOnClassAccessor8.types
@@ -74,3 +74,80 @@ class F {
 >x : number
 >value : number
 }
+
+const A1 = class {
+>A1 : typeof A1
+>class {    @dec get x() { return 0; }    set x(value: number) { }} : typeof A1
+
+    @dec get x() { return 0; }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>0 : 0
+
+    set x(value: number) { }
+>x : number
+>value : number
+}
+
+const B1 = class {
+>B1 : typeof B1
+>class {    get x() { return 0; }    @dec set x(value: number) { }} : typeof B1
+
+    get x() { return 0; }
+>x : number
+>0 : 0
+
+    @dec set x(value: number) { }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>value : number
+}
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec set x(value: number) { }    get x() { return 0; }} : typeof C1
+
+    @dec set x(value: number) { }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>value : number
+
+    get x() { return 0; }
+>x : number
+>0 : 0
+}
+
+const D1 = class {
+>D1 : typeof D1
+>class {    set x(value: number) { }    @dec get x() { return 0; }} : typeof D1
+
+    set x(value: number) { }
+>x : number
+>value : number
+
+    @dec get x() { return 0; }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>0 : 0
+}
+
+const E1 = class {
+>E1 : typeof E1
+>class {    @dec get x() { return 0; }} : typeof E1
+
+    @dec get x() { return 0; }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>0 : 0
+}
+
+const F1 = class {
+>F1 : typeof F1
+>class {    @dec set x(value: number) { }} : typeof F1
+
+    @dec set x(value: number) { }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>x : number
+>value : number
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt b/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt
index 279cf38894f1c..160663250ac30 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassConstructor1.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts(4,5): error TS1206: Decorators are not valid here.
+tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts(8,5): error TS1206: Decorators are not valid here.
 
 
-==== tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts (2 errors) ====
     declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
     class C {
         @dec constructor() {}
         ~
 !!! error TS1206: Decorators are not valid here.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        @dec constructor() {}
+        ~
+!!! error TS1206: Decorators are not valid here.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.js b/tests/baselines/reference/decoratorOnClassConstructor1.js
index f3278b1bc75d1..1e866b6c25841 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor1.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor1.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec constructor() {}
-}
+}
+
+const C1 = class {
+    @dec constructor() {}
+}
+
 
 //// [decoratorOnClassConstructor1.js]
 var C = /** @class */ (function () {
@@ -11,3 +16,8 @@ var C = /** @class */ (function () {
     }
     return C;
 }());
+var C1 = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}());
diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.symbols b/tests/baselines/reference/decoratorOnClassConstructor1.symbols
index af313609f0fd7..aacab0e55034a 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor1.symbols
+++ b/tests/baselines/reference/decoratorOnClassConstructor1.symbols
@@ -16,3 +16,11 @@ class C {
     @dec constructor() {}
 >dec : Symbol(dec, Decl(decoratorOnClassConstructor1.ts, 0, 0))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassConstructor1.ts, 6, 5))
+
+    @dec constructor() {}
+>dec : Symbol(dec, Decl(decoratorOnClassConstructor1.ts, 0, 0))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructor1.types b/tests/baselines/reference/decoratorOnClassConstructor1.types
index 8088fe8b10b3c..071f44fb62f1f 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor1.types
+++ b/tests/baselines/reference/decoratorOnClassConstructor1.types
@@ -11,3 +11,12 @@ class C {
     @dec constructor() {}
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec constructor() {}} : typeof C1
+
+    @dec constructor() {}
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.errors.txt b/tests/baselines/reference/decoratorOnClassConstructor2.errors.txt
index 603c449aeb466..60d4046613812 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.errors.txt
@@ -13,8 +13,16 @@ tests/cases/conformance/decorators/class/constructor/2.ts(2,19): error TS2691: A
     import {foo} from "./0.ts"
                       ~~~~~~~~
 !!! error TS2691: An import path cannot end with a '.ts' extension. Consider importing './0' instead.
-    export class C  extends base{
+    
+    export class C  extends base {
+        constructor(@foo prop: any) {
+            super();
+        }
+    }
+    
+    export const C1 = class extends base {
         constructor(@foo prop: any) {
             super();
         }
-    }
\ No newline at end of file
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index 23dbbf69036da..1b701fc39d2c1 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -7,11 +7,19 @@ export function foo(target: Object, propertyKey: string | symbol, parameterIndex
 //// [2.ts]
 import {base} from "./0.ts"
 import {foo} from "./0.ts"
-export class C  extends base{
+
+export class C  extends base {
     constructor(@foo prop: any) {
         super();
     }
-}
+}
+
+export const C1 = class extends base {
+    constructor(@foo prop: any) {
+        super();
+    }
+}
+
 
 //// [0.js]
 "use strict";
@@ -52,7 +60,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.C = void 0;
+exports.C1 = exports.C = void 0;
 var _0_ts_1 = require("./0.ts");
 var _0_ts_2 = require("./0.ts");
 var C = /** @class */ (function (_super) {
@@ -66,3 +74,10 @@ var C = /** @class */ (function (_super) {
     return C;
 }(_0_ts_1.base));
 exports.C = C;
+exports.C1 = /** @class */ (function (_super) {
+    __extends(class_1, _super);
+    function class_1(prop) {
+        return _super.call(this) || this;
+    }
+    return class_1;
+}(_0_ts_1.base));
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.symbols b/tests/baselines/reference/decoratorOnClassConstructor2.symbols
index de782500d87c5..50c273e5ee93c 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.symbols
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.symbols
@@ -16,14 +16,27 @@ import {base} from "./0.ts"
 import {foo} from "./0.ts"
 >foo : Symbol(foo, Decl(2.ts, 1, 8))
 
-export class C  extends base{
+export class C  extends base {
 >C : Symbol(C, Decl(2.ts, 1, 26))
 >base : Symbol(base, Decl(2.ts, 0, 8))
 
     constructor(@foo prop: any) {
 >foo : Symbol(foo, Decl(2.ts, 1, 8))
->prop : Symbol(prop, Decl(2.ts, 3, 16))
+>prop : Symbol(prop, Decl(2.ts, 4, 16))
 
         super();
     }
 }
+
+export const C1 = class extends base {
+>C1 : Symbol(C1, Decl(2.ts, 9, 12))
+>base : Symbol(base, Decl(2.ts, 0, 8))
+
+    constructor(@foo prop: any) {
+>foo : Symbol(foo, Decl(2.ts, 1, 8))
+>prop : Symbol(prop, Decl(2.ts, 10, 16))
+
+        super();
+    }
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.types b/tests/baselines/reference/decoratorOnClassConstructor2.types
index 60e5506d3cd87..38da306338635 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.types
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.types
@@ -15,7 +15,7 @@ import {base} from "./0.ts"
 import {foo} from "./0.ts"
 >foo : any
 
-export class C  extends base{
+export class C  extends base {
 >C : C
 >base : any
 
@@ -28,3 +28,19 @@ export class C  extends base{
 >super : any
     }
 }
+
+export const C1 = class extends base {
+>C1 : typeof C1
+>class extends base {    constructor(@foo prop: any) {        super();    }} : typeof C1
+>base : any
+
+    constructor(@foo prop: any) {
+>foo : any
+>prop : any
+
+        super();
+>super() : void
+>super : any
+    }
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index ff584adb5f043..8f24f7793eeac 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -9,11 +9,18 @@ import {base} from "./0"
 import {foo} from "./0"
 
 /* Comment on the Class Declaration */
-export class C  extends base{
+export class C  extends base {
     constructor(@foo prop: any) {
         super();
     }
-}
+}
+
+export const C1 = class extends base {
+    constructor(@foo prop: any) {
+        super();
+    }
+}
+
 
 //// [0.js]
 "use strict";
@@ -54,7 +61,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.C = void 0;
+exports.C1 = exports.C = void 0;
 var _0_1 = require("./0");
 var _0_2 = require("./0");
 /* Comment on the Class Declaration */
@@ -69,3 +76,10 @@ var C = /** @class */ (function (_super) {
     return C;
 }(_0_1.base));
 exports.C = C;
+exports.C1 = /** @class */ (function (_super) {
+    __extends(class_1, _super);
+    function class_1(prop) {
+        return _super.call(this) || this;
+    }
+    return class_1;
+}(_0_1.base));
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.symbols b/tests/baselines/reference/decoratorOnClassConstructor3.symbols
index 2ace8ae263082..5cbd495932075 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.symbols
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.symbols
@@ -17,7 +17,7 @@ import {foo} from "./0"
 >foo : Symbol(foo, Decl(2.ts, 1, 8))
 
 /* Comment on the Class Declaration */
-export class C  extends base{
+export class C  extends base {
 >C : Symbol(C, Decl(2.ts, 1, 23))
 >base : Symbol(base, Decl(2.ts, 0, 8))
 
@@ -29,3 +29,17 @@ export class C  extends base{
 >super : Symbol(base, Decl(0.ts, 0, 0))
     }
 }
+
+export const C1 = class extends base {
+>C1 : Symbol(C1, Decl(2.ts, 10, 12))
+>base : Symbol(base, Decl(2.ts, 0, 8))
+
+    constructor(@foo prop: any) {
+>foo : Symbol(foo, Decl(2.ts, 1, 8))
+>prop : Symbol(prop, Decl(2.ts, 11, 16))
+
+        super();
+>super : Symbol(base, Decl(0.ts, 0, 0))
+    }
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.types b/tests/baselines/reference/decoratorOnClassConstructor3.types
index da9d1e32ece17..439c286630745 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.types
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.types
@@ -16,7 +16,7 @@ import {foo} from "./0"
 >foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 
 /* Comment on the Class Declaration */
-export class C  extends base{
+export class C  extends base {
 >C : C
 >base : base
 
@@ -29,3 +29,19 @@ export class C  extends base{
 >super : typeof base
     }
 }
+
+export const C1 = class extends base {
+>C1 : typeof C1
+>class extends base {    constructor(@foo prop: any) {        super();    }} : typeof C1
+>base : base
+
+    constructor(@foo prop: any) {
+>foo : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+>prop : any
+
+        super();
+>super() : void
+>super : typeof base
+    }
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
index cdc6dc94744dd..34d868ab96c62 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
@@ -3,7 +3,12 @@ declare function dec(target: Function, propertyKey: string | symbol, parameterIn
 
 class C {
     constructor(@dec p: number) {}
-}
+}
+
+const C1 = class {
+    constructor(@dec p: number) {}
+}
+
 
 //// [decoratorOnClassConstructorParameter1.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -23,3 +28,8 @@ var C = /** @class */ (function () {
     ], C);
     return C;
 }());
+var C1 = /** @class */ (function () {
+    function class_1(p) {
+    }
+    return class_1;
+}());
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.symbols b/tests/baselines/reference/decoratorOnClassConstructorParameter1.symbols
index c6866a8b15e6f..2babf2d1f3fb1 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.symbols
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.symbols
@@ -13,3 +13,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassConstructorParameter1.ts, 0, 0))
 >p : Symbol(p, Decl(decoratorOnClassConstructorParameter1.ts, 3, 16))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassConstructorParameter1.ts, 6, 5))
+
+    constructor(@dec p: number) {}
+>dec : Symbol(dec, Decl(decoratorOnClassConstructorParameter1.ts, 0, 0))
+>p : Symbol(p, Decl(decoratorOnClassConstructorParameter1.ts, 7, 16))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.types b/tests/baselines/reference/decoratorOnClassConstructorParameter1.types
index b55eceb4f3245..91a95ee3645d3 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.types
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.types
@@ -12,3 +12,13 @@ class C {
 >dec : (target: Function, propertyKey: string | symbol, parameterIndex: number) => void
 >p : number
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    constructor(@dec p: number) {}} : typeof C1
+
+    constructor(@dec p: number) {}
+>dec : (target: Function, propertyKey: string | symbol, parameterIndex: number) => void
+>p : number
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.errors.txt b/tests/baselines/reference/decoratorOnClassConstructorParameter4.errors.txt
index 5969cfca06973..ecdbf57906bb5 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts(4,24): error TS1005: ',' expected.
+tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts(8,24): error TS1005: ',' expected.
 
 
-==== tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts (2 errors) ====
     declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
     
     class C {
         constructor(public @dec p: number) {}
                            ~
 !!! error TS1005: ',' expected.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        constructor(public @dec p: number) {}
+                           ~
+!!! error TS1005: ',' expected.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
index 248957771a3cb..2ac220d4a0a3d 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
@@ -3,7 +3,12 @@ declare function dec(target: Function, propertyKey: string | symbol, parameterIn
 
 class C {
     constructor(public @dec p: number) {}
-}
+}
+
+const C1 = class {
+    constructor(public @dec p: number) {}
+}
+
 
 //// [decoratorOnClassConstructorParameter4.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -23,3 +28,8 @@ var C = /** @class */ (function () {
     ], C);
     return C;
 }());
+var C1 = /** @class */ (function () {
+    function class_1(public, p) {
+    }
+    return class_1;
+}());
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.symbols b/tests/baselines/reference/decoratorOnClassConstructorParameter4.symbols
index be12cb4246379..3e3d697f4a416 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.symbols
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.symbols
@@ -14,3 +14,13 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassConstructorParameter4.ts, 0, 0))
 >p : Symbol(p, Decl(decoratorOnClassConstructorParameter4.ts, 3, 22))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassConstructorParameter4.ts, 6, 5))
+
+    constructor(public @dec p: number) {}
+>public : Symbol(public, Decl(decoratorOnClassConstructorParameter4.ts, 7, 16))
+>dec : Symbol(dec, Decl(decoratorOnClassConstructorParameter4.ts, 0, 0))
+>p : Symbol(p, Decl(decoratorOnClassConstructorParameter4.ts, 7, 22))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.types b/tests/baselines/reference/decoratorOnClassConstructorParameter4.types
index 6843d70a635d3..b1f1a05f6ab00 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.types
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.types
@@ -13,3 +13,14 @@ class C {
 >dec : (target: Function, propertyKey: string | symbol, parameterIndex: number) => void
 >p : number
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    constructor(public @dec p: number) {}} : typeof C1
+
+    constructor(public @dec p: number) {}
+>public : any
+>dec : (target: Function, propertyKey: string | symbol, parameterIndex: number) => void
+>p : number
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.js b/tests/baselines/reference/decoratorOnClassMethod1.js
index c5d778a831316..e3f63f1a2e610 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.js
+++ b/tests/baselines/reference/decoratorOnClassMethod1.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec method() {}
-}
+}
+
+const C1 = class {
+    @dec method() {}
+}
+
 
 //// [decoratorOnClassMethod1.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -21,3 +27,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function () { };
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.symbols b/tests/baselines/reference/decoratorOnClassMethod1.symbols
index 5c51ee112f751..6deadddb3ac4a 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod1.symbols
@@ -17,3 +17,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassMethod1.ts, 0, 0))
 >method : Symbol(C.method, Decl(decoratorOnClassMethod1.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod1.ts, 6, 5))
+
+    @dec method() {}
+>dec : Symbol(dec, Decl(decoratorOnClassMethod1.ts, 0, 0))
+>method : Symbol(C1.method, Decl(decoratorOnClassMethod1.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.types b/tests/baselines/reference/decoratorOnClassMethod1.types
index f3e4f68f344f0..e9e5646515bc7 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.types
+++ b/tests/baselines/reference/decoratorOnClassMethod1.types
@@ -12,3 +12,13 @@ class C {
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
 >method : () => void
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec method() {}} : typeof C1
+
+    @dec method() {}
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>method : () => void
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.errors.txt b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
index 49c45b4a6f9fc..c01c687ff9d5f 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
@@ -1,8 +1,10 @@
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,6): error TS2345: Argument of type 'C' is not assignable to parameter of type 'Function'.
   Type 'C' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(8,6): error TS2345: Argument of type 'C1' is not assignable to parameter of type 'Function'.
+  Type 'C1' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
 
 
-==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts (2 errors) ====
     declare function dec(target: Function, paramIndex: number): void;
     
     class C {
@@ -10,4 +12,12 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,6)
          ~~~
 !!! error TS2345: Argument of type 'C' is not assignable to parameter of type 'Function'.
 !!! error TS2345:   Type 'C' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        @dec method() {}
+         ~~~
+!!! error TS2345: Argument of type 'C1' is not assignable to parameter of type 'Function'.
+!!! error TS2345:   Type 'C1' is missing the following properties from type 'Function': apply, call, bind, prototype, and 3 more.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.js b/tests/baselines/reference/decoratorOnClassMethod10.js
index 6f54f442f7a11..12179c450b059 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.js
+++ b/tests/baselines/reference/decoratorOnClassMethod10.js
@@ -3,7 +3,12 @@ declare function dec(target: Function, paramIndex: number): void;
 
 class C {
     @dec method() {}
-}
+}
+
+const C1 = class {
+    @dec method() {}
+}
+
 
 //// [decoratorOnClassMethod10.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -21,3 +27,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function () { };
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.symbols b/tests/baselines/reference/decoratorOnClassMethod10.symbols
index ba4ada26a2a4d..ab2f57b4c8fa8 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod10.symbols
@@ -12,3 +12,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassMethod10.ts, 0, 0))
 >method : Symbol(C.method, Decl(decoratorOnClassMethod10.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod10.ts, 6, 5))
+
+    @dec method() {}
+>dec : Symbol(dec, Decl(decoratorOnClassMethod10.ts, 0, 0))
+>method : Symbol(C1.method, Decl(decoratorOnClassMethod10.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.types b/tests/baselines/reference/decoratorOnClassMethod10.types
index 580dc929cbaa9..b5017a5fdb3f4 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.types
+++ b/tests/baselines/reference/decoratorOnClassMethod10.types
@@ -11,3 +11,13 @@ class C {
 >dec : (target: Function, paramIndex: number) => void
 >method : () => void
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec method() {}} : typeof C1
+
+    @dec method() {}
+>dec : (target: Function, paramIndex: number) => void
+>method : () => void
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.errors.txt b/tests/baselines/reference/decoratorOnClassMethod11.errors.txt
index 8e284f496a289..a12f48f747bcc 100644
--- a/tests/baselines/reference/decoratorOnClassMethod11.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod11.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts(5,10): error TS2331: 'this' cannot be referenced in a module or namespace body.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts(12,10): error TS2331: 'this' cannot be referenced in a module or namespace body.
 
 
-==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts (2 errors) ====
     module M {
         class C {
             decorator(target: Object, key: string): void { }
@@ -11,4 +12,14 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts(5,10
 !!! error TS2331: 'this' cannot be referenced in a module or namespace body.
             method() { }
         }
-    }
\ No newline at end of file
+    
+        const C1 = class {
+            decorator(target: Object, key: string): void { }
+    
+            @this.decorator
+             ~~~~
+!!! error TS2331: 'this' cannot be referenced in a module or namespace body.
+            method() { }
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.js b/tests/baselines/reference/decoratorOnClassMethod11.js
index 2600681c64746..d82b652c0fdfc 100644
--- a/tests/baselines/reference/decoratorOnClassMethod11.js
+++ b/tests/baselines/reference/decoratorOnClassMethod11.js
@@ -6,7 +6,15 @@ module M {
         @this.decorator
         method() { }
     }
-}
+
+    const C1 = class {
+        decorator(target: Object, key: string): void { }
+
+        @this.decorator
+        method() { }
+    }
+}
+
 
 //// [decoratorOnClassMethod11.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -17,6 +25,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 var M;
 (function (M) {
+    var _a;
     var C = /** @class */ (function () {
         function C() {
         }
@@ -27,4 +36,13 @@ var M;
         ], C.prototype, "method", null);
         return C;
     }());
+    var C1 = (_a = /** @class */ (function () {
+        function class_1() {
+        }
+        class_1.prototype.decorator = function (target, key) { };
+        class_1.prototype.method = function () { };
+        return class_1;
+    }()), __decorate([
+        this.decorator
+    ], _a.prototype, "method", null), _a);
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.symbols b/tests/baselines/reference/decoratorOnClassMethod11.symbols
index e4a66cc88dcbc..3b9b392fcaf73 100644
--- a/tests/baselines/reference/decoratorOnClassMethod11.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod11.symbols
@@ -15,4 +15,19 @@ module M {
         method() { }
 >method : Symbol(C.method, Decl(decoratorOnClassMethod11.ts, 2, 56))
     }
+
+    const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod11.ts, 8, 9))
+
+        decorator(target: Object, key: string): void { }
+>decorator : Symbol(C1.decorator, Decl(decoratorOnClassMethod11.ts, 8, 22))
+>target : Symbol(target, Decl(decoratorOnClassMethod11.ts, 9, 18))
+>Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
+>key : Symbol(key, Decl(decoratorOnClassMethod11.ts, 9, 33))
+
+        @this.decorator
+        method() { }
+>method : Symbol(C1.method, Decl(decoratorOnClassMethod11.ts, 9, 56))
+    }
 }
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod11.types b/tests/baselines/reference/decoratorOnClassMethod11.types
index afd9a4847488e..5f654dabefb9d 100644
--- a/tests/baselines/reference/decoratorOnClassMethod11.types
+++ b/tests/baselines/reference/decoratorOnClassMethod11.types
@@ -13,9 +13,28 @@ module M {
         @this.decorator
 >this.decorator : any
 >this : any
+>decorator : any
+
+        method() { }
+>method : () => void
+    }
+
+    const C1 = class {
+>C1 : typeof C1
+>class {        decorator(target: Object, key: string): void { }        @this.decorator        method() { }    } : typeof C1
+
+        decorator(target: Object, key: string): void { }
+>decorator : (target: Object, key: string) => void
+>target : Object
+>key : string
+
+        @this.decorator
+>this.decorator : any
+>this : any
 >decorator : any
 
         method() { }
 >method : () => void
     }
 }
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod12.errors.txt b/tests/baselines/reference/decoratorOnClassMethod12.errors.txt
index c285d5f12c914..5a53b6fc040b7 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod12.errors.txt
@@ -1,15 +1,25 @@
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts(6,10): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts(7,10): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts(12,10): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
 
 
-==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts (2 errors) ====
     module M {
         class S {
             decorator(target: Object, key: string): void { }
         }
+    
         class C extends S {
             @super.decorator
              ~~~~~
 !!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
             method() { }
         }
-    }
\ No newline at end of file
+    
+        const C1 = class extends S {
+            @super.decorator
+             ~~~~~
+!!! error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
+            method() { }
+        }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod12.js b/tests/baselines/reference/decoratorOnClassMethod12.js
index 25a9ebbe79186..727a1715b156a 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.js
+++ b/tests/baselines/reference/decoratorOnClassMethod12.js
@@ -3,11 +3,18 @@ module M {
     class S {
         decorator(target: Object, key: string): void { }
     }
+
     class C extends S {
         @super.decorator
         method() { }
     }
-}
+
+    const C1 = class extends S {
+        @super.decorator
+        method() { }
+    }
+}
+
 
 //// [decoratorOnClassMethod12.js]
 var __extends = (this && this.__extends) || (function () {
@@ -33,6 +40,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 var M;
 (function (M) {
+    var _a;
     var S = /** @class */ (function () {
         function S() {
         }
@@ -50,4 +58,14 @@ var M;
         ], C.prototype, "method", null);
         return C;
     }(S));
+    var C1 = (_a = /** @class */ (function (_super) {
+        __extends(class_1, _super);
+        function class_1() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        class_1.prototype.method = function () { };
+        return class_1;
+    }(S)), __decorate([
+        _super.decorator
+    ], _a.prototype, "method", null), _a);
 })(M || (M = {}));
diff --git a/tests/baselines/reference/decoratorOnClassMethod12.symbols b/tests/baselines/reference/decoratorOnClassMethod12.symbols
index e1407eb789b14..42ad6b01bfc47 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod12.symbols
@@ -11,12 +11,23 @@ module M {
 >Object : Symbol(Object, Decl(lib.es5.d.ts, --, --), Decl(lib.es5.d.ts, --, --))
 >key : Symbol(key, Decl(decoratorOnClassMethod12.ts, 2, 33))
     }
+
     class C extends S {
 >C : Symbol(C, Decl(decoratorOnClassMethod12.ts, 3, 5))
 >S : Symbol(S, Decl(decoratorOnClassMethod12.ts, 0, 10))
 
         @super.decorator
         method() { }
->method : Symbol(C.method, Decl(decoratorOnClassMethod12.ts, 4, 23))
+>method : Symbol(C.method, Decl(decoratorOnClassMethod12.ts, 5, 23))
+    }
+
+    const C1 = class extends S {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod12.ts, 10, 9))
+>S : Symbol(S, Decl(decoratorOnClassMethod12.ts, 0, 10))
+
+        @super.decorator
+        method() { }
+>method : Symbol(C1.method, Decl(decoratorOnClassMethod12.ts, 10, 32))
     }
 }
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod12.types b/tests/baselines/reference/decoratorOnClassMethod12.types
index 6a30567f4a78d..2517f4d5dc87e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod12.types
+++ b/tests/baselines/reference/decoratorOnClassMethod12.types
@@ -10,6 +10,7 @@ module M {
 >target : Object
 >key : string
     }
+
     class C extends S {
 >C : C
 >S : S
@@ -17,9 +18,24 @@ module M {
         @super.decorator
 >super.decorator : any
 >super : any
+>decorator : any
+
+        method() { }
+>method : () => void
+    }
+
+    const C1 = class extends S {
+>C1 : typeof C1
+>class extends S {        @super.decorator        method() { }    } : typeof C1
+>S : S
+
+        @super.decorator
+>super.decorator : any
+>super : any
 >decorator : any
 
         method() { }
 >method : () => void
     }
 }
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod13.js b/tests/baselines/reference/decoratorOnClassMethod13.js
index e8a913070fcea..7dbdaf94d720e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod13.js
+++ b/tests/baselines/reference/decoratorOnClassMethod13.js
@@ -4,7 +4,13 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 class C {
     @dec ["1"]() { }
     @dec ["b"]() { }
-}
+}
+
+const C1 = class {
+    @dec ["1"]() { }
+    @dec ["b"]() { }
+}
+
 
 //// [decoratorOnClassMethod13.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -13,6 +19,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 class C {
     ["1"]() { }
     ["b"]() { }
@@ -23,3 +30,11 @@ __decorate([
 __decorate([
     dec
 ], C.prototype, "b", null);
+const C1 = (_a = class {
+    ["1"]() { }
+    ["b"]() { }
+}, __decorate([
+    dec
+], _a.prototype, "1", null), __decorate([
+    dec
+], _a.prototype, "b", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod13.symbols b/tests/baselines/reference/decoratorOnClassMethod13.symbols
index 0c8aa1bb2aaa1..52b942aa6f206 100644
--- a/tests/baselines/reference/decoratorOnClassMethod13.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod13.symbols
@@ -23,3 +23,18 @@ class C {
 >["b"] : Symbol(C["b"], Decl(decoratorOnClassMethod13.ts, 3, 20))
 >"b" : Symbol(C["b"], Decl(decoratorOnClassMethod13.ts, 3, 20))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod13.ts, 7, 5))
+
+    @dec ["1"]() { }
+>dec : Symbol(dec, Decl(decoratorOnClassMethod13.ts, 0, 0))
+>["1"] : Symbol(C1["1"], Decl(decoratorOnClassMethod13.ts, 7, 18))
+>"1" : Symbol(C1["1"], Decl(decoratorOnClassMethod13.ts, 7, 18))
+
+    @dec ["b"]() { }
+>dec : Symbol(dec, Decl(decoratorOnClassMethod13.ts, 0, 0))
+>["b"] : Symbol(C1["b"], Decl(decoratorOnClassMethod13.ts, 8, 20))
+>"b" : Symbol(C1["b"], Decl(decoratorOnClassMethod13.ts, 8, 20))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod13.types b/tests/baselines/reference/decoratorOnClassMethod13.types
index 3a305588da3c5..58327d885e735 100644
--- a/tests/baselines/reference/decoratorOnClassMethod13.types
+++ b/tests/baselines/reference/decoratorOnClassMethod13.types
@@ -18,3 +18,19 @@ class C {
 >["b"] : () => void
 >"b" : "b"
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec ["1"]() { }    @dec ["b"]() { }} : typeof C1
+
+    @dec ["1"]() { }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>["1"] : () => void
+>"1" : "1"
+
+    @dec ["b"]() { }
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>["b"] : () => void
+>"b" : "b"
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.js b/tests/baselines/reference/decoratorOnClassMethod2.js
index 62e0b12515cd1..d641c845caad4 100644
--- a/tests/baselines/reference/decoratorOnClassMethod2.js
+++ b/tests/baselines/reference/decoratorOnClassMethod2.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec public method() {}
-}
+}
+
+const C1 = class {
+    @dec public method() {}
+}
+
 
 //// [decoratorOnClassMethod2.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -21,3 +27,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function () { };
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.symbols b/tests/baselines/reference/decoratorOnClassMethod2.symbols
index 1cf192b5244e1..5d692501d5653 100644
--- a/tests/baselines/reference/decoratorOnClassMethod2.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod2.symbols
@@ -17,3 +17,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassMethod2.ts, 0, 0))
 >method : Symbol(C.method, Decl(decoratorOnClassMethod2.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod2.ts, 6, 5))
+
+    @dec public method() {}
+>dec : Symbol(dec, Decl(decoratorOnClassMethod2.ts, 0, 0))
+>method : Symbol(C1.method, Decl(decoratorOnClassMethod2.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.types b/tests/baselines/reference/decoratorOnClassMethod2.types
index a9c0a77768e5f..2f7c7976811c0 100644
--- a/tests/baselines/reference/decoratorOnClassMethod2.types
+++ b/tests/baselines/reference/decoratorOnClassMethod2.types
@@ -12,3 +12,13 @@ class C {
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
 >method : () => void
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec public method() {}} : typeof C1
+
+    @dec public method() {}
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>method : () => void
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.errors.txt b/tests/baselines/reference/decoratorOnClassMethod3.errors.txt
index 4881502a02eed..59015d1a86c8e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod3.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(4,12): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts(8,12): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts (2 errors) ====
     declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
     class C {
         public @dec method() {}
                ~
 !!! error TS1005: ';' expected.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        public @dec method() {}
+               ~
+!!! error TS1005: ';' expected.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.js b/tests/baselines/reference/decoratorOnClassMethod3.js
index fbb753e929e2d..2de305bb51aca 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.js
+++ b/tests/baselines/reference/decoratorOnClassMethod3.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     public @dec method() {}
-}
+}
+
+const C1 = class {
+    public @dec method() {}
+}
+
 
 //// [decoratorOnClassMethod3.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -21,3 +27,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function () { };
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.symbols b/tests/baselines/reference/decoratorOnClassMethod3.symbols
index 9979e69f04ff8..ccb9787353e7d 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod3.symbols
@@ -18,3 +18,13 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassMethod3.ts, 0, 0))
 >method : Symbol(C.method, Decl(decoratorOnClassMethod3.ts, 3, 10))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod3.ts, 6, 5))
+
+    public @dec method() {}
+>public : Symbol(C1.public, Decl(decoratorOnClassMethod3.ts, 6, 18))
+>dec : Symbol(dec, Decl(decoratorOnClassMethod3.ts, 0, 0))
+>method : Symbol(C1.method, Decl(decoratorOnClassMethod3.ts, 7, 10))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod3.types b/tests/baselines/reference/decoratorOnClassMethod3.types
index 2050bbbcecd3c..8a25ff5f7345f 100644
--- a/tests/baselines/reference/decoratorOnClassMethod3.types
+++ b/tests/baselines/reference/decoratorOnClassMethod3.types
@@ -13,3 +13,14 @@ class C {
 >dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
 >method : () => void
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    public @dec method() {}} : typeof C1
+
+    public @dec method() {}
+>public : any
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>method : () => void
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.js b/tests/baselines/reference/decoratorOnClassMethod4.js
index c68cca5d3a04f..c4aa5b5581f7b 100644
--- a/tests/baselines/reference/decoratorOnClassMethod4.js
+++ b/tests/baselines/reference/decoratorOnClassMethod4.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec ["method"]() {}
-}
+}
+
+const C1 = class {
+    @dec ["method"]() {}
+}
+
 
 //// [decoratorOnClassMethod4.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,9 +17,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 class C {
     ["method"]() { }
 }
 __decorate([
     dec
 ], C.prototype, "method", null);
+const C1 = (_a = class {
+    ["method"]() { }
+}, __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.symbols b/tests/baselines/reference/decoratorOnClassMethod4.symbols
index f945a3e6972c4..f36dfddd2d509 100644
--- a/tests/baselines/reference/decoratorOnClassMethod4.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod4.symbols
@@ -18,3 +18,13 @@ class C {
 >["method"] : Symbol(C["method"], Decl(decoratorOnClassMethod4.ts, 2, 9))
 >"method" : Symbol(C["method"], Decl(decoratorOnClassMethod4.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod4.ts, 6, 5))
+
+    @dec ["method"]() {}
+>dec : Symbol(dec, Decl(decoratorOnClassMethod4.ts, 0, 0))
+>["method"] : Symbol(C1["method"], Decl(decoratorOnClassMethod4.ts, 6, 18))
+>"method" : Symbol(C1["method"], Decl(decoratorOnClassMethod4.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.types b/tests/baselines/reference/decoratorOnClassMethod4.types
index 5c751ca7fb533..0e75a5024b626 100644
--- a/tests/baselines/reference/decoratorOnClassMethod4.types
+++ b/tests/baselines/reference/decoratorOnClassMethod4.types
@@ -13,3 +13,14 @@ class C {
 >["method"] : () => void
 >"method" : "method"
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec ["method"]() {}} : typeof C1
+
+    @dec ["method"]() {}
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>["method"] : () => void
+>"method" : "method"
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.js b/tests/baselines/reference/decoratorOnClassMethod5.js
index c89ebc6bb38e3..cfbd2dd610b1e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod5.js
+++ b/tests/baselines/reference/decoratorOnClassMethod5.js
@@ -3,7 +3,12 @@ declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedP
 
 class C {
     @dec() ["method"]() {}
-}
+}
+
+const C1 = class {
+    @dec() ["method"]() {}
+}
+
 
 //// [decoratorOnClassMethod5.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,9 +17,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 class C {
     ["method"]() { }
 }
 __decorate([
     dec()
 ], C.prototype, "method", null);
+const C1 = (_a = class {
+    ["method"]() { }
+}, __decorate([
+    dec()
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.symbols b/tests/baselines/reference/decoratorOnClassMethod5.symbols
index 0617619f798d5..2dfa44c9116a7 100644
--- a/tests/baselines/reference/decoratorOnClassMethod5.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod5.symbols
@@ -18,3 +18,13 @@ class C {
 >["method"] : Symbol(C["method"], Decl(decoratorOnClassMethod5.ts, 2, 9))
 >"method" : Symbol(C["method"], Decl(decoratorOnClassMethod5.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod5.ts, 6, 5))
+
+    @dec() ["method"]() {}
+>dec : Symbol(dec, Decl(decoratorOnClassMethod5.ts, 0, 0))
+>["method"] : Symbol(C1["method"], Decl(decoratorOnClassMethod5.ts, 6, 18))
+>"method" : Symbol(C1["method"], Decl(decoratorOnClassMethod5.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.types b/tests/baselines/reference/decoratorOnClassMethod5.types
index aa452b82b0c32..bfc8e204c3e5f 100644
--- a/tests/baselines/reference/decoratorOnClassMethod5.types
+++ b/tests/baselines/reference/decoratorOnClassMethod5.types
@@ -14,3 +14,15 @@ class C {
 >["method"] : () => void
 >"method" : "method"
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec() ["method"]() {}} : typeof C1
+
+    @dec() ["method"]() {}
+>dec() : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>dec : () => <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>["method"] : () => void
+>"method" : "method"
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.errors.txt b/tests/baselines/reference/decoratorOnClassMethod6.errors.txt
index b863a9db72c9c..02c1bf442283f 100644
--- a/tests/baselines/reference/decoratorOnClassMethod6.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod6.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts(4,5): error TS1329: 'dec' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@dec()'?
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts(8,5): error TS1329: 'dec' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@dec()'?
 
 
-==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts (2 errors) ====
     declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
     
     class C {
         @dec ["method"]() {}
         ~~~~
 !!! error TS1329: 'dec' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@dec()'?
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        @dec ["method"]() {}
+        ~~~~
+!!! error TS1329: 'dec' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@dec()'?
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.js b/tests/baselines/reference/decoratorOnClassMethod6.js
index 45f5eeddb8129..3a6e18f51c471 100644
--- a/tests/baselines/reference/decoratorOnClassMethod6.js
+++ b/tests/baselines/reference/decoratorOnClassMethod6.js
@@ -3,7 +3,12 @@ declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedP
 
 class C {
     @dec ["method"]() {}
-}
+}
+
+const C1 = class {
+    @dec ["method"]() {}
+}
+
 
 //// [decoratorOnClassMethod6.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,9 +17,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 class C {
     ["method"]() { }
 }
 __decorate([
     dec
 ], C.prototype, "method", null);
+const C1 = (_a = class {
+    ["method"]() { }
+}, __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.symbols b/tests/baselines/reference/decoratorOnClassMethod6.symbols
index c5172bd9085c9..a151e6f58d03e 100644
--- a/tests/baselines/reference/decoratorOnClassMethod6.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod6.symbols
@@ -18,3 +18,13 @@ class C {
 >["method"] : Symbol(C["method"], Decl(decoratorOnClassMethod6.ts, 2, 9))
 >"method" : Symbol(C["method"], Decl(decoratorOnClassMethod6.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod6.ts, 6, 5))
+
+    @dec ["method"]() {}
+>dec : Symbol(dec, Decl(decoratorOnClassMethod6.ts, 0, 0))
+>["method"] : Symbol(C1["method"], Decl(decoratorOnClassMethod6.ts, 6, 18))
+>"method" : Symbol(C1["method"], Decl(decoratorOnClassMethod6.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.types b/tests/baselines/reference/decoratorOnClassMethod6.types
index e12fce2c9b09f..bd7b4d828fa55 100644
--- a/tests/baselines/reference/decoratorOnClassMethod6.types
+++ b/tests/baselines/reference/decoratorOnClassMethod6.types
@@ -13,3 +13,14 @@ class C {
 >["method"] : () => void
 >"method" : "method"
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec ["method"]() {}} : typeof C1
+
+    @dec ["method"]() {}
+>dec : () => <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>["method"] : () => void
+>"method" : "method"
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.js b/tests/baselines/reference/decoratorOnClassMethod7.js
index dc92364cd89eb..aa7120b1da923 100644
--- a/tests/baselines/reference/decoratorOnClassMethod7.js
+++ b/tests/baselines/reference/decoratorOnClassMethod7.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec public ["method"]() {}
-}
+}
+
+const C1 = class {
+    @dec public ["method"]() {}
+}
+
 
 //// [decoratorOnClassMethod7.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,9 +17,15 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 class C {
     ["method"]() { }
 }
 __decorate([
     dec
 ], C.prototype, "method", null);
+const C1 = (_a = class {
+    ["method"]() { }
+}, __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.symbols b/tests/baselines/reference/decoratorOnClassMethod7.symbols
index bef1eadbe6ecb..29e88ada3f4e8 100644
--- a/tests/baselines/reference/decoratorOnClassMethod7.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod7.symbols
@@ -18,3 +18,13 @@ class C {
 >["method"] : Symbol(C["method"], Decl(decoratorOnClassMethod7.ts, 2, 9))
 >"method" : Symbol(C["method"], Decl(decoratorOnClassMethod7.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod7.ts, 6, 5))
+
+    @dec public ["method"]() {}
+>dec : Symbol(dec, Decl(decoratorOnClassMethod7.ts, 0, 0))
+>["method"] : Symbol(C1["method"], Decl(decoratorOnClassMethod7.ts, 6, 18))
+>"method" : Symbol(C1["method"], Decl(decoratorOnClassMethod7.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.types b/tests/baselines/reference/decoratorOnClassMethod7.types
index db4cd4d23dbd6..3307adb1f0907 100644
--- a/tests/baselines/reference/decoratorOnClassMethod7.types
+++ b/tests/baselines/reference/decoratorOnClassMethod7.types
@@ -13,3 +13,14 @@ class C {
 >["method"] : () => void
 >"method" : "method"
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec public ["method"]() {}} : typeof C1
+
+    @dec public ["method"]() {}
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+>["method"] : () => void
+>"method" : "method"
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.errors.txt b/tests/baselines/reference/decoratorOnClassMethod8.errors.txt
index adfd69b9dff99..2eb5d2ca56828 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethod8.errors.txt
@@ -1,9 +1,12 @@
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(4,5): error TS1241: Unable to resolve signature of method decorator when called as an expression.
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(4,5): error TS1241: Unable to resolve signature of method decorator when called as an expression.
   Type 'C' has no properties in common with type 'TypedPropertyDescriptor<() => void>'.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(8,5): error TS1241: Unable to resolve signature of method decorator when called as an expression.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(8,5): error TS1241: Unable to resolve signature of method decorator when called as an expression.
+  Type 'C1' has no properties in common with type 'TypedPropertyDescriptor<() => void>'.
 
 
-==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts (2 errors) ====
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts (4 errors) ====
     declare function dec<T>(target: T): T;
     
     class C {
@@ -13,4 +16,14 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts(4,5):
         ~~~~
 !!! error TS1241: Unable to resolve signature of method decorator when called as an expression.
 !!! error TS1241:   Type 'C' has no properties in common with type 'TypedPropertyDescriptor<() => void>'.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        @dec method() {}
+        ~~~~
+!!! error TS1241: Unable to resolve signature of method decorator when called as an expression.
+        ~~~~
+!!! error TS1241: Unable to resolve signature of method decorator when called as an expression.
+!!! error TS1241:   Type 'C1' has no properties in common with type 'TypedPropertyDescriptor<() => void>'.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.js b/tests/baselines/reference/decoratorOnClassMethod8.js
index 15dba00c56476..76ea8e9e408f5 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.js
+++ b/tests/baselines/reference/decoratorOnClassMethod8.js
@@ -3,7 +3,12 @@ declare function dec<T>(target: T): T;
 
 class C {
     @dec method() {}
-}
+}
+
+const C1 = class {
+    @dec method() {}
+}
+
 
 //// [decoratorOnClassMethod8.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -21,3 +27,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function () { };
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.symbols b/tests/baselines/reference/decoratorOnClassMethod8.symbols
index 9f3118063ca0d..5f7565f8bf8f8 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethod8.symbols
@@ -13,3 +13,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassMethod8.ts, 0, 0))
 >method : Symbol(C.method, Decl(decoratorOnClassMethod8.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethod8.ts, 6, 5))
+
+    @dec method() {}
+>dec : Symbol(dec, Decl(decoratorOnClassMethod8.ts, 0, 0))
+>method : Symbol(C1.method, Decl(decoratorOnClassMethod8.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.types b/tests/baselines/reference/decoratorOnClassMethod8.types
index 949ad818f7344..630674a69260a 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.types
+++ b/tests/baselines/reference/decoratorOnClassMethod8.types
@@ -10,3 +10,13 @@ class C {
 >dec : <T>(target: T) => T
 >method : () => void
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec method() {}} : typeof C1
+
+    @dec method() {}
+>dec : <T>(target: T) => T
+>method : () => void
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload1.errors.txt b/tests/baselines/reference/decoratorOnClassMethodOverload1.errors.txt
index d1670bd6bb9bb..ac867c32e3ef6 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload1.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload1.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts(4,5): error TS1249: A decorator can only decorate a method implementation, not an overload.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts(10,5): error TS1249: A decorator can only decorate a method implementation, not an overload.
 
 
-==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts (2 errors) ====
     declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
     
     class C {
@@ -10,4 +11,13 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.
 !!! error TS1249: A decorator can only decorate a method implementation, not an overload.
         method()
         method() { }
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        @dec
+        ~
+!!! error TS1249: A decorator can only decorate a method implementation, not an overload.
+        method()
+        method() { }
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload1.js b/tests/baselines/reference/decoratorOnClassMethodOverload1.js
index 65016c2517717..fb8e99a7a774a 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload1.js
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload1.js
@@ -5,7 +5,14 @@ class C {
     @dec
     method()
     method() { }
-}
+}
+
+const C1 = class {
+    @dec
+    method()
+    method() { }
+}
+
 
 //// [decoratorOnClassMethodOverload1.js]
 var C = /** @class */ (function () {
@@ -14,3 +21,9 @@ var C = /** @class */ (function () {
     C.prototype.method = function () { };
     return C;
 }());
+var C1 = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function () { };
+    return class_1;
+}());
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload1.symbols b/tests/baselines/reference/decoratorOnClassMethodOverload1.symbols
index bf61f0a3d2168..ba2462b2ee9f1 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload1.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload1.symbols
@@ -22,3 +22,17 @@ class C {
     method() { }
 >method : Symbol(C.method, Decl(decoratorOnClassMethodOverload1.ts, 2, 9), Decl(decoratorOnClassMethodOverload1.ts, 4, 12))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethodOverload1.ts, 8, 5))
+
+    @dec
+>dec : Symbol(dec, Decl(decoratorOnClassMethodOverload1.ts, 0, 0))
+
+    method()
+>method : Symbol(C1.method, Decl(decoratorOnClassMethodOverload1.ts, 8, 18), Decl(decoratorOnClassMethodOverload1.ts, 10, 12))
+
+    method() { }
+>method : Symbol(C1.method, Decl(decoratorOnClassMethodOverload1.ts, 8, 18), Decl(decoratorOnClassMethodOverload1.ts, 10, 12))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload1.types b/tests/baselines/reference/decoratorOnClassMethodOverload1.types
index ff1395316234c..5d5539610e2f0 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload1.types
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload1.types
@@ -17,3 +17,18 @@ class C {
     method() { }
 >method : () => any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec    method()    method() { }} : typeof C1
+
+    @dec
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+
+    method()
+>method : () => any
+
+    method() { }
+>method : () => any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.js b/tests/baselines/reference/decoratorOnClassMethodOverload2.js
index 1a37ddb7003f6..77f4867045fb1 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload2.js
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.js
@@ -5,7 +5,14 @@ class C {
     method()
     @dec
     method() { }
-}
+}
+
+const C1 = class {
+    method()
+    @dec
+    method() { }
+}
+
 
 //// [decoratorOnClassMethodOverload2.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -14,6 +21,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -23,3 +31,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function () { };
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols b/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols
index 64e2bdd81f1c1..4181fafcfbf8c 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.symbols
@@ -22,3 +22,17 @@ class C {
     method() { }
 >method : Symbol(C.method, Decl(decoratorOnClassMethodOverload2.ts, 2, 9), Decl(decoratorOnClassMethodOverload2.ts, 3, 12))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethodOverload2.ts, 8, 5))
+
+    method()
+>method : Symbol(C1.method, Decl(decoratorOnClassMethodOverload2.ts, 8, 18), Decl(decoratorOnClassMethodOverload2.ts, 9, 12))
+
+    @dec
+>dec : Symbol(dec, Decl(decoratorOnClassMethodOverload2.ts, 0, 0))
+
+    method() { }
+>method : Symbol(C1.method, Decl(decoratorOnClassMethodOverload2.ts, 8, 18), Decl(decoratorOnClassMethodOverload2.ts, 9, 12))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodOverload2.types b/tests/baselines/reference/decoratorOnClassMethodOverload2.types
index 3bc3eabb3a814..e9d8c7f2d3207 100644
--- a/tests/baselines/reference/decoratorOnClassMethodOverload2.types
+++ b/tests/baselines/reference/decoratorOnClassMethodOverload2.types
@@ -17,3 +17,18 @@ class C {
     method() { }
 >method : () => any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    method()    @dec    method() { }} : typeof C1
+
+    method()
+>method : () => any
+
+    @dec
+>dec : <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>
+
+    method() { }
+>method : () => any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
index 00f6e8ed23b34..834984be4bb39 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.js
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
@@ -3,7 +3,12 @@ declare function dec(target: Object, propertyKey: string | symbol, parameterInde
 
 class C {
     method(@dec p: number) {}
-}
+}
+
+const C1 = class {
+    method(@dec p: number) {}
+}
+
 
 //// [decoratorOnClassMethodParameter1.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -15,6 +20,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -24,3 +30,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function (p) { };
+    return class_1;
+}()), __decorate([
+    __param(0, dec)
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.symbols b/tests/baselines/reference/decoratorOnClassMethodParameter1.symbols
index 83db4ae89bb9c..10196dcef6458 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.symbols
@@ -14,3 +14,13 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassMethodParameter1.ts, 0, 0))
 >p : Symbol(p, Decl(decoratorOnClassMethodParameter1.ts, 3, 11))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethodParameter1.ts, 6, 5))
+
+    method(@dec p: number) {}
+>method : Symbol(C1.method, Decl(decoratorOnClassMethodParameter1.ts, 6, 18))
+>dec : Symbol(dec, Decl(decoratorOnClassMethodParameter1.ts, 0, 0))
+>p : Symbol(p, Decl(decoratorOnClassMethodParameter1.ts, 7, 11))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.types b/tests/baselines/reference/decoratorOnClassMethodParameter1.types
index e8f2176e8faaa..7e64250fd60cd 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.types
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.types
@@ -13,3 +13,14 @@ class C {
 >dec : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 >p : number
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    method(@dec p: number) {}} : typeof C1
+
+    method(@dec p: number) {}
+>method : (p: number) => void
+>dec : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+>p : number
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter2.js b/tests/baselines/reference/decoratorOnClassMethodParameter2.js
index 1b52268117bfb..3ee36f89a6259 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter2.js
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter2.js
@@ -3,7 +3,12 @@ declare function dec(target: Object, propertyKey: string | symbol, parameterInde
 
 class C {
     method(this: C, @dec p: number) {}
-}
+}
+
+const C1 = class {
+    method(this: {}, @dec p: number) {}
+}
+
 
 //// [decoratorOnClassMethodParameter2.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -15,6 +20,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -24,3 +30,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function (p) { };
+    return class_1;
+}()), __decorate([
+    __param(0, dec)
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter2.symbols b/tests/baselines/reference/decoratorOnClassMethodParameter2.symbols
index efb8abc14335a..8954662035770 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter2.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter2.symbols
@@ -16,3 +16,14 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassMethodParameter2.ts, 0, 0))
 >p : Symbol(p, Decl(decoratorOnClassMethodParameter2.ts, 3, 19))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassMethodParameter2.ts, 6, 5))
+
+    method(this: {}, @dec p: number) {}
+>method : Symbol(C1.method, Decl(decoratorOnClassMethodParameter2.ts, 6, 18))
+>this : Symbol(this, Decl(decoratorOnClassMethodParameter2.ts, 7, 11))
+>dec : Symbol(dec, Decl(decoratorOnClassMethodParameter2.ts, 0, 0))
+>p : Symbol(p, Decl(decoratorOnClassMethodParameter2.ts, 7, 20))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter2.types b/tests/baselines/reference/decoratorOnClassMethodParameter2.types
index 12d9e2a022c12..4f83661c47ebd 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter2.types
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter2.types
@@ -14,3 +14,15 @@ class C {
 >dec : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 >p : number
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    method(this: {}, @dec p: number) {}} : typeof C1
+
+    method(this: {}, @dec p: number) {}
+>method : (this: {}, p: number) => void
+>this : {}
+>dec : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
+>p : number
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodThisParameter.errors.txt b/tests/baselines/reference/decoratorOnClassMethodThisParameter.errors.txt
index 02fb67534e881..9bc2936a01c67 100644
--- a/tests/baselines/reference/decoratorOnClassMethodThisParameter.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassMethodThisParameter.errors.txt
@@ -18,4 +18,5 @@ tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethod
 !!! error TS1433: Decorators may not be applied to 'this' parameters.
                                  ~~~~~~~~~~~~~
 !!! error TS2680: A 'this' parameter must be the first parameter.
-    }
\ No newline at end of file
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassMethodThisParameter.js b/tests/baselines/reference/decoratorOnClassMethodThisParameter.js
index 5feeb0ef90e36..0b259124536ba 100644
--- a/tests/baselines/reference/decoratorOnClassMethodThisParameter.js
+++ b/tests/baselines/reference/decoratorOnClassMethodThisParameter.js
@@ -7,7 +7,8 @@ class C {
 
 class C2 {
     method(@dec allowed: C2, @dec this: C2) {}
-}
+}
+
 
 //// [decoratorOnClassMethodThisParameter.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
diff --git a/tests/baselines/reference/decoratorOnClassMethodThisParameter.symbols b/tests/baselines/reference/decoratorOnClassMethodThisParameter.symbols
index b3ba9acadc797..c58fe994482ed 100644
--- a/tests/baselines/reference/decoratorOnClassMethodThisParameter.symbols
+++ b/tests/baselines/reference/decoratorOnClassMethodThisParameter.symbols
@@ -28,3 +28,4 @@ class C2 {
 >this : Symbol(this, Decl(decoratorOnClassMethodThisParameter.ts, 7, 28))
 >C2 : Symbol(C2, Decl(decoratorOnClassMethodThisParameter.ts, 4, 1))
 }
+
diff --git a/tests/baselines/reference/decoratorOnClassMethodThisParameter.types b/tests/baselines/reference/decoratorOnClassMethodThisParameter.types
index 44bd95b4b0ab8..f7e5575188520 100644
--- a/tests/baselines/reference/decoratorOnClassMethodThisParameter.types
+++ b/tests/baselines/reference/decoratorOnClassMethodThisParameter.types
@@ -24,3 +24,4 @@ class C2 {
 >dec : (target: Object, propertyKey: string | symbol, parameterIndex: number) => void
 >this : C2
 }
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.js b/tests/baselines/reference/decoratorOnClassProperty1.js
index dc7f39e6624c6..2fbbf10ef4c6c 100644
--- a/tests/baselines/reference/decoratorOnClassProperty1.js
+++ b/tests/baselines/reference/decoratorOnClassProperty1.js
@@ -3,7 +3,12 @@ declare function dec(target: any, propertyKey: string): void;
 
 class C {
     @dec prop;
-}
+}
+
+const C1 = class {
+    @dec prop;
+}
+
 
 //// [decoratorOnClassProperty1.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -20,3 +26,10 @@ var C = /** @class */ (function () {
     ], C.prototype, "prop", void 0);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "prop", void 0), _a);
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.symbols b/tests/baselines/reference/decoratorOnClassProperty1.symbols
index 3cf25a6fbf1a8..ac44cafe1018f 100644
--- a/tests/baselines/reference/decoratorOnClassProperty1.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty1.symbols
@@ -11,3 +11,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassProperty1.ts, 0, 0))
 >prop : Symbol(C.prop, Decl(decoratorOnClassProperty1.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassProperty1.ts, 6, 5))
+
+    @dec prop;
+>dec : Symbol(dec, Decl(decoratorOnClassProperty1.ts, 0, 0))
+>prop : Symbol(C1.prop, Decl(decoratorOnClassProperty1.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.types b/tests/baselines/reference/decoratorOnClassProperty1.types
index e974397e5322c..dcf0c3a312b50 100644
--- a/tests/baselines/reference/decoratorOnClassProperty1.types
+++ b/tests/baselines/reference/decoratorOnClassProperty1.types
@@ -11,3 +11,13 @@ class C {
 >dec : (target: any, propertyKey: string) => void
 >prop : any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec prop;} : typeof C1
+
+    @dec prop;
+>dec : (target: any, propertyKey: string) => void
+>prop : any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.js b/tests/baselines/reference/decoratorOnClassProperty10.js
index a9556de825270..ff03f97ba58ee 100644
--- a/tests/baselines/reference/decoratorOnClassProperty10.js
+++ b/tests/baselines/reference/decoratorOnClassProperty10.js
@@ -3,7 +3,12 @@ declare function dec(): <T>(target: any, propertyKey: string) => void;
 
 class C {
     @dec() prop;
-}
+}
+
+const C1 = class {
+    @dec() prop;
+}
+
 
 //// [decoratorOnClassProperty10.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -20,3 +26,10 @@ var C = /** @class */ (function () {
     ], C.prototype, "prop", void 0);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}()), __decorate([
+    dec()
+], _a.prototype, "prop", void 0), _a);
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.symbols b/tests/baselines/reference/decoratorOnClassProperty10.symbols
index ef207c95b844a..84d2d3c73e010 100644
--- a/tests/baselines/reference/decoratorOnClassProperty10.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty10.symbols
@@ -12,3 +12,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassProperty10.ts, 0, 0))
 >prop : Symbol(C.prop, Decl(decoratorOnClassProperty10.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassProperty10.ts, 6, 5))
+
+    @dec() prop;
+>dec : Symbol(dec, Decl(decoratorOnClassProperty10.ts, 0, 0))
+>prop : Symbol(C1.prop, Decl(decoratorOnClassProperty10.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.types b/tests/baselines/reference/decoratorOnClassProperty10.types
index 0115e392678bc..00d85c161c4ff 100644
--- a/tests/baselines/reference/decoratorOnClassProperty10.types
+++ b/tests/baselines/reference/decoratorOnClassProperty10.types
@@ -12,3 +12,14 @@ class C {
 >dec : () => <T>(target: any, propertyKey: string) => void
 >prop : any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec() prop;} : typeof C1
+
+    @dec() prop;
+>dec() : <T>(target: any, propertyKey: string) => void
+>dec : () => <T>(target: any, propertyKey: string) => void
+>prop : any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.errors.txt b/tests/baselines/reference/decoratorOnClassProperty11.errors.txt
index 537daaf44ea6a..8ddcf40f1ba13 100644
--- a/tests/baselines/reference/decoratorOnClassProperty11.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassProperty11.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts(4,5): error TS1329: 'dec' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@dec()'?
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts(8,5): error TS1329: 'dec' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@dec()'?
 
 
-==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts (2 errors) ====
     declare function dec(): <T>(target: any, propertyKey: string) => void;
     
     class C {
         @dec prop;
         ~~~~
 !!! error TS1329: 'dec' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@dec()'?
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        @dec prop;
+        ~~~~
+!!! error TS1329: 'dec' accepts too few arguments to be used as a decorator here. Did you mean to call it first and write '@dec()'?
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.js b/tests/baselines/reference/decoratorOnClassProperty11.js
index f6f4e4fc95981..c75ac9f281244 100644
--- a/tests/baselines/reference/decoratorOnClassProperty11.js
+++ b/tests/baselines/reference/decoratorOnClassProperty11.js
@@ -3,7 +3,12 @@ declare function dec(): <T>(target: any, propertyKey: string) => void;
 
 class C {
     @dec prop;
-}
+}
+
+const C1 = class {
+    @dec prop;
+}
+
 
 //// [decoratorOnClassProperty11.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -20,3 +26,10 @@ var C = /** @class */ (function () {
     ], C.prototype, "prop", void 0);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "prop", void 0), _a);
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.symbols b/tests/baselines/reference/decoratorOnClassProperty11.symbols
index a21b4692731ff..387af70e0b879 100644
--- a/tests/baselines/reference/decoratorOnClassProperty11.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty11.symbols
@@ -12,3 +12,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassProperty11.ts, 0, 0))
 >prop : Symbol(C.prop, Decl(decoratorOnClassProperty11.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassProperty11.ts, 6, 5))
+
+    @dec prop;
+>dec : Symbol(dec, Decl(decoratorOnClassProperty11.ts, 0, 0))
+>prop : Symbol(C1.prop, Decl(decoratorOnClassProperty11.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.types b/tests/baselines/reference/decoratorOnClassProperty11.types
index 1f409c858cb75..162c748bed833 100644
--- a/tests/baselines/reference/decoratorOnClassProperty11.types
+++ b/tests/baselines/reference/decoratorOnClassProperty11.types
@@ -11,3 +11,13 @@ class C {
 >dec : () => <T>(target: any, propertyKey: string) => void
 >prop : any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec prop;} : typeof C1
+
+    @dec prop;
+>dec : () => <T>(target: any, propertyKey: string) => void
+>prop : any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.js b/tests/baselines/reference/decoratorOnClassProperty2.js
index 6e8869bc27269..e8cc4efd43107 100644
--- a/tests/baselines/reference/decoratorOnClassProperty2.js
+++ b/tests/baselines/reference/decoratorOnClassProperty2.js
@@ -3,7 +3,12 @@ declare function dec(target: any, propertyKey: string): void;
 
 class C {
     @dec public prop;
-}
+}
+
+const C1 = class {
+    @dec public prop;
+}
+
 
 //// [decoratorOnClassProperty2.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -20,3 +26,10 @@ var C = /** @class */ (function () {
     ], C.prototype, "prop", void 0);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "prop", void 0), _a);
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.symbols b/tests/baselines/reference/decoratorOnClassProperty2.symbols
index dc86a33116685..a47c248f7b42b 100644
--- a/tests/baselines/reference/decoratorOnClassProperty2.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty2.symbols
@@ -11,3 +11,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassProperty2.ts, 0, 0))
 >prop : Symbol(C.prop, Decl(decoratorOnClassProperty2.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassProperty2.ts, 6, 5))
+
+    @dec public prop;
+>dec : Symbol(dec, Decl(decoratorOnClassProperty2.ts, 0, 0))
+>prop : Symbol(C1.prop, Decl(decoratorOnClassProperty2.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.types b/tests/baselines/reference/decoratorOnClassProperty2.types
index 78d35004f8f21..1f632b5fc0c8e 100644
--- a/tests/baselines/reference/decoratorOnClassProperty2.types
+++ b/tests/baselines/reference/decoratorOnClassProperty2.types
@@ -11,3 +11,13 @@ class C {
 >dec : (target: any, propertyKey: string) => void
 >prop : any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec public prop;} : typeof C1
+
+    @dec public prop;
+>dec : (target: any, propertyKey: string) => void
+>prop : any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.errors.txt b/tests/baselines/reference/decoratorOnClassProperty3.errors.txt
index 12d0efb78d78c..7887969ac23c0 100644
--- a/tests/baselines/reference/decoratorOnClassProperty3.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassProperty3.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(4,12): error TS1005: ';' expected.
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts(8,12): error TS1005: ';' expected.
 
 
-==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts (2 errors) ====
     declare function dec(target: any, propertyKey: string): void;
     
     class C {
         public @dec prop;
                ~
 !!! error TS1005: ';' expected.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        public @dec prop;
+               ~
+!!! error TS1005: ';' expected.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.js b/tests/baselines/reference/decoratorOnClassProperty3.js
index ed519fa8af7a6..514119e6d8a72 100644
--- a/tests/baselines/reference/decoratorOnClassProperty3.js
+++ b/tests/baselines/reference/decoratorOnClassProperty3.js
@@ -3,7 +3,12 @@ declare function dec(target: any, propertyKey: string): void;
 
 class C {
     public @dec prop;
-}
+}
+
+const C1 = class {
+    public @dec prop;
+}
+
 
 //// [decoratorOnClassProperty3.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -20,3 +26,10 @@ var C = /** @class */ (function () {
     ], C.prototype, "prop", void 0);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "prop", void 0), _a);
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.symbols b/tests/baselines/reference/decoratorOnClassProperty3.symbols
index 22afbe4815e84..3c17410748f7e 100644
--- a/tests/baselines/reference/decoratorOnClassProperty3.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty3.symbols
@@ -12,3 +12,13 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassProperty3.ts, 0, 0))
 >prop : Symbol(C.prop, Decl(decoratorOnClassProperty3.ts, 3, 10))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassProperty3.ts, 6, 5))
+
+    public @dec prop;
+>public : Symbol(C1.public, Decl(decoratorOnClassProperty3.ts, 6, 18))
+>dec : Symbol(dec, Decl(decoratorOnClassProperty3.ts, 0, 0))
+>prop : Symbol(C1.prop, Decl(decoratorOnClassProperty3.ts, 7, 10))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty3.types b/tests/baselines/reference/decoratorOnClassProperty3.types
index 7600cb98d64ed..261bde6ee0601 100644
--- a/tests/baselines/reference/decoratorOnClassProperty3.types
+++ b/tests/baselines/reference/decoratorOnClassProperty3.types
@@ -12,3 +12,14 @@ class C {
 >dec : (target: any, propertyKey: string) => void
 >prop : any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    public @dec prop;} : typeof C1
+
+    public @dec prop;
+>public : any
+>dec : (target: any, propertyKey: string) => void
+>prop : any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.errors.txt b/tests/baselines/reference/decoratorOnClassProperty6.errors.txt
index b40a81fe1c948..628667d70e15a 100644
--- a/tests/baselines/reference/decoratorOnClassProperty6.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassProperty6.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts(4,5): error TS1240: Unable to resolve signature of property decorator when called as an expression.
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts(8,5): error TS1240: Unable to resolve signature of property decorator when called as an expression.
 
 
-==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts (2 errors) ====
     declare function dec(target: Function): void;
     
     class C {
         @dec prop;
         ~~~~
 !!! error TS1240: Unable to resolve signature of property decorator when called as an expression.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        @dec prop;
+        ~~~~
+!!! error TS1240: Unable to resolve signature of property decorator when called as an expression.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.js b/tests/baselines/reference/decoratorOnClassProperty6.js
index 095e64e7190ba..7d6fdbb90097a 100644
--- a/tests/baselines/reference/decoratorOnClassProperty6.js
+++ b/tests/baselines/reference/decoratorOnClassProperty6.js
@@ -3,7 +3,12 @@ declare function dec(target: Function): void;
 
 class C {
     @dec prop;
-}
+}
+
+const C1 = class {
+    @dec prop;
+}
+
 
 //// [decoratorOnClassProperty6.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -20,3 +26,10 @@ var C = /** @class */ (function () {
     ], C.prototype, "prop", void 0);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "prop", void 0), _a);
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.symbols b/tests/baselines/reference/decoratorOnClassProperty6.symbols
index fdabe2fe5286c..e82dd53c02711 100644
--- a/tests/baselines/reference/decoratorOnClassProperty6.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty6.symbols
@@ -11,3 +11,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassProperty6.ts, 0, 0))
 >prop : Symbol(C.prop, Decl(decoratorOnClassProperty6.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassProperty6.ts, 6, 5))
+
+    @dec prop;
+>dec : Symbol(dec, Decl(decoratorOnClassProperty6.ts, 0, 0))
+>prop : Symbol(C1.prop, Decl(decoratorOnClassProperty6.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.types b/tests/baselines/reference/decoratorOnClassProperty6.types
index f98859249cabc..73a27678937a4 100644
--- a/tests/baselines/reference/decoratorOnClassProperty6.types
+++ b/tests/baselines/reference/decoratorOnClassProperty6.types
@@ -10,3 +10,13 @@ class C {
 >dec : (target: Function) => void
 >prop : any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec prop;} : typeof C1
+
+    @dec prop;
+>dec : (target: Function) => void
+>prop : any
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.errors.txt b/tests/baselines/reference/decoratorOnClassProperty7.errors.txt
index 47f8ad5ae8c18..6495ecf740ae9 100644
--- a/tests/baselines/reference/decoratorOnClassProperty7.errors.txt
+++ b/tests/baselines/reference/decoratorOnClassProperty7.errors.txt
@@ -1,11 +1,19 @@
 tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts(4,5): error TS1240: Unable to resolve signature of property decorator when called as an expression.
+tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts(8,5): error TS1240: Unable to resolve signature of property decorator when called as an expression.
 
 
-==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts (1 errors) ====
+==== tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts (2 errors) ====
     declare function dec(target: Function, propertyKey: string | symbol, paramIndex: number): void;
     
     class C {
         @dec prop;
         ~~~~
 !!! error TS1240: Unable to resolve signature of property decorator when called as an expression.
-    }
\ No newline at end of file
+    }
+    
+    const C1 = class {
+        @dec prop;
+        ~~~~
+!!! error TS1240: Unable to resolve signature of property decorator when called as an expression.
+    }
+    
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.js b/tests/baselines/reference/decoratorOnClassProperty7.js
index 5c8d4aedc6a09..625811b6fd2fb 100644
--- a/tests/baselines/reference/decoratorOnClassProperty7.js
+++ b/tests/baselines/reference/decoratorOnClassProperty7.js
@@ -3,7 +3,12 @@ declare function dec(target: Function, propertyKey: string | symbol, paramIndex:
 
 class C {
     @dec prop;
-}
+}
+
+const C1 = class {
+    @dec prop;
+}
+
 
 //// [decoratorOnClassProperty7.js]
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -12,6 +17,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -20,3 +26,10 @@ var C = /** @class */ (function () {
     ], C.prototype, "prop", void 0);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "prop", void 0), _a);
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.symbols b/tests/baselines/reference/decoratorOnClassProperty7.symbols
index f58fd0363f4eb..a587a3b73a7a5 100644
--- a/tests/baselines/reference/decoratorOnClassProperty7.symbols
+++ b/tests/baselines/reference/decoratorOnClassProperty7.symbols
@@ -13,3 +13,12 @@ class C {
 >dec : Symbol(dec, Decl(decoratorOnClassProperty7.ts, 0, 0))
 >prop : Symbol(C.prop, Decl(decoratorOnClassProperty7.ts, 2, 9))
 }
+
+const C1 = class {
+>C1 : Symbol(C1, Decl(decoratorOnClassProperty7.ts, 6, 5))
+
+    @dec prop;
+>dec : Symbol(dec, Decl(decoratorOnClassProperty7.ts, 0, 0))
+>prop : Symbol(C1.prop, Decl(decoratorOnClassProperty7.ts, 6, 18))
+}
+
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.types b/tests/baselines/reference/decoratorOnClassProperty7.types
index 44f104fd81e9b..939af19fef792 100644
--- a/tests/baselines/reference/decoratorOnClassProperty7.types
+++ b/tests/baselines/reference/decoratorOnClassProperty7.types
@@ -12,3 +12,13 @@ class C {
 >dec : (target: Function, propertyKey: string | symbol, paramIndex: number) => void
 >prop : any
 }
+
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec prop;} : typeof C1
+
+    @dec prop;
+>dec : (target: Function, propertyKey: string | symbol, paramIndex: number) => void
+>prop : any
+}
+
diff --git a/tests/baselines/reference/decoratorsOnComputedProperties.errors.txt b/tests/baselines/reference/decoratorsOnComputedProperties.errors.txt
index bcb3a0aac53d4..6e3cf2667fb6d 100644
--- a/tests/baselines/reference/decoratorsOnComputedProperties.errors.txt
+++ b/tests/baselines/reference/decoratorsOnComputedProperties.errors.txt
@@ -4,84 +4,63 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(20,8): error TS1166: A co
 tests/cases/compiler/decoratorsOnComputedProperties.ts(21,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(22,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(23,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(27,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(28,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(29,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(30,5): error TS1206: Decorators are not valid here.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(35,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(36,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(37,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(36,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(37,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(38,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(39,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(40,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(39,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(40,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(52,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(53,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(54,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(55,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(56,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(57,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(62,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(63,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(64,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(65,5): error TS1206: Decorators are not valid here.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(70,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(71,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(72,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(71,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(72,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(73,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(74,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(75,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(74,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(75,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(88,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(89,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(90,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(92,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(93,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(94,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(98,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(99,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(100,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(101,5): error TS1206: Decorators are not valid here.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(106,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(107,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(108,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(107,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(108,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(110,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(111,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(112,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(111,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(112,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(124,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(125,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(126,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(128,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(129,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(131,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(135,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(136,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(137,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(138,5): error TS1206: Decorators are not valid here.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(143,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(144,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(145,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(144,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(145,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(147,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(148,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(150,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(148,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(150,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(162,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(163,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(164,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(166,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(167,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(169,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(173,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(174,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(175,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(176,5): error TS1206: Decorators are not valid here.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(181,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(182,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(183,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(184,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(182,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(183,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 tests/cases/compiler/decoratorsOnComputedProperties.ts(185,5): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(186,5): error TS1206: Decorators are not valid here.
-tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Decorators are not valid here.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(186,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
+tests/cases/compiler/decoratorsOnComputedProperties.ts(188,8): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
 
 
-==== tests/cases/compiler/decoratorsOnComputedProperties.ts (81 errors) ====
+==== tests/cases/compiler/decoratorsOnComputedProperties.ts (60 errors) ====
     function x(o: object, k: PropertyKey) { }
     let i = 0;
     function foo(): string { return ++i + ""; }
@@ -121,17 +100,9 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
     
     void class B {
         @x ["property"]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.toStringTag]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x ["property2"]: any = 2;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.iterator]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
         ["property3"]: any;
         [Symbol.isConcatSpreadable]: any;
         ["property4"]: any = 2;
@@ -140,20 +111,20 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
         ~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         [fieldNameA]: any;
         ~~~~~~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [fieldNameB]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [fieldNameC]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
     };
     
     class C {
@@ -188,17 +159,9 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
     
     void class D {
         @x ["property"]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.toStringTag]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x ["property2"]: any = 2;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.iterator]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
         ["property3"]: any;
         [Symbol.isConcatSpreadable]: any;
         ["property4"]: any = 2;
@@ -207,20 +170,20 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
         ~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         [fieldNameA]: any;
         ~~~~~~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [fieldNameB]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [fieldNameC]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         ["some" + "method"]() {}
     };
     
@@ -256,17 +219,9 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
     
     void class F {
         @x ["property"]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.toStringTag]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x ["property2"]: any = 2;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.iterator]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
         ["property3"]: any;
         [Symbol.isConcatSpreadable]: any;
         ["property4"]: any = 2;
@@ -275,21 +230,21 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
         ~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         ["some" + "method"]() {}
         [fieldNameA]: any;
         ~~~~~~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [fieldNameB]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [fieldNameC]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
     };
     
     class G {
@@ -325,17 +280,9 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
     
     void class H {
         @x ["property"]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.toStringTag]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x ["property2"]: any = 2;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.iterator]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
         ["property3"]: any;
         [Symbol.isConcatSpreadable]: any;
         ["property4"]: any = 2;
@@ -344,22 +291,22 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
         ~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         ["some" + "method"]() {}
         [fieldNameA]: any;
         ~~~~~~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [fieldNameB]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         ["some" + "method2"]() {}
         @x [fieldNameC]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
     };
     
     class I {
@@ -395,17 +342,9 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
     
     void class J {
         @x ["property"]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.toStringTag]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x ["property2"]: any = 2;
-        ~
-!!! error TS1206: Decorators are not valid here.
         @x [Symbol.iterator]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
         ["property3"]: any;
         [Symbol.isConcatSpreadable]: any;
         ["property4"]: any = 2;
@@ -414,22 +353,20 @@ tests/cases/compiler/decoratorsOnComputedProperties.ts(188,5): error TS1206: Dec
         ~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [foo()]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x ["some" + "method"]() {}
-        ~
-!!! error TS1206: Decorators are not valid here.
         [fieldNameA]: any;
         ~~~~~~~~~~~~
 !!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         @x [fieldNameB]: any;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
         ["some" + "method2"]() {}
         @x [fieldNameC]: any = null;
-        ~
-!!! error TS1206: Decorators are not valid here.
+           ~~~~~~~~~~~~
+!!! error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
     };
\ No newline at end of file
diff --git a/tests/baselines/reference/decoratorsOnComputedProperties.js b/tests/baselines/reference/decoratorsOnComputedProperties.js
index ab9b31ac3d564..470fdb14c3553 100644
--- a/tests/baselines/reference/decoratorsOnComputedProperties.js
+++ b/tests/baselines/reference/decoratorsOnComputedProperties.js
@@ -197,7 +197,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-var _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51;
+var _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56;
 function x(o, k) { }
 let i = 0;
 function foo() { return ++i + ""; }
@@ -239,7 +239,7 @@ __decorate([
 __decorate([
     x
 ], A.prototype, _v, void 0);
-void (_c = class B {
+void (_2 = (_c = class B {
         constructor() {
             this["property2"] = 2;
             this[_x] = null;
@@ -258,30 +258,43 @@ void (_c = class B {
     _z = foo(),
     _0 = fieldNameB,
     _1 = fieldNameC,
-    _c);
+    _c), __decorate([
+    x
+], _2.prototype, "property", void 0), __decorate([
+    x
+], _2.prototype, _w, void 0), __decorate([
+    x
+], _2.prototype, "property2", void 0), __decorate([
+    x
+], _2.prototype, _x, void 0), __decorate([
+    x
+], _2.prototype, _y, void 0), __decorate([
+    x
+], _2.prototype, _z, void 0), __decorate([
+    x
+], _2.prototype, _0, void 0), __decorate([
+    x
+], _2.prototype, _1, void 0), _2);
 class C {
     constructor() {
         this["property2"] = 2;
-        this[_3] = null;
+        this[_4] = null;
         this["property4"] = 2;
         this[_d] = null;
-        this[_5] = null;
-        this[_7] = null;
+        this[_6] = null;
+        this[_8] = null;
     }
-    [(_2 = Symbol.toStringTag, _3 = Symbol.iterator, Symbol.isConcatSpreadable, _d = Symbol.match, foo(), _4 = foo(), _5 = foo(), _6 = fieldNameB, _7 = fieldNameC, "some" + "method")]() { }
+    [(_3 = Symbol.toStringTag, _4 = Symbol.iterator, Symbol.isConcatSpreadable, _d = Symbol.match, foo(), _5 = foo(), _6 = foo(), _7 = fieldNameB, _8 = fieldNameC, "some" + "method")]() { }
 }
 __decorate([
     x
 ], C.prototype, "property", void 0);
 __decorate([
     x
-], C.prototype, _2, void 0);
+], C.prototype, _3, void 0);
 __decorate([
     x
 ], C.prototype, "property2", void 0);
-__decorate([
-    x
-], C.prototype, _3, void 0);
 __decorate([
     x
 ], C.prototype, _4, void 0);
@@ -294,169 +307,238 @@ __decorate([
 __decorate([
     x
 ], C.prototype, _7, void 0);
-void class D {
+__decorate([
+    x
+], C.prototype, _8, void 0);
+void (_15 = class D {
     constructor() {
         this["property2"] = 2;
-        this[_9] = null;
+        this[_10] = null;
         this["property4"] = 2;
         this[_e] = null;
-        this[_11] = null;
-        this[_13] = null;
+        this[_12] = null;
+        this[_14] = null;
     }
-    [(_8 = Symbol.toStringTag, _9 = Symbol.iterator, Symbol.isConcatSpreadable, _e = Symbol.match, foo(), _10 = foo(), _11 = foo(), _12 = fieldNameB, _13 = fieldNameC, "some" + "method")]() { }
-};
+    [(_9 = Symbol.toStringTag, _10 = Symbol.iterator, Symbol.isConcatSpreadable, _e = Symbol.match, foo(), _11 = foo(), _12 = foo(), _13 = fieldNameB, _14 = fieldNameC, "some" + "method")]() { }
+}, __decorate([
+    x
+], _15.prototype, "property", void 0), __decorate([
+    x
+], _15.prototype, _9, void 0), __decorate([
+    x
+], _15.prototype, "property2", void 0), __decorate([
+    x
+], _15.prototype, _10, void 0), __decorate([
+    x
+], _15.prototype, _11, void 0), __decorate([
+    x
+], _15.prototype, _12, void 0), __decorate([
+    x
+], _15.prototype, _13, void 0), __decorate([
+    x
+], _15.prototype, _14, void 0), _15);
 class E {
     constructor() {
         this["property2"] = 2;
-        this[_15] = null;
+        this[_17] = null;
         this["property4"] = 2;
         this[_f] = null;
-        this[_17] = null;
         this[_19] = null;
+        this[_21] = null;
     }
-    [(_14 = Symbol.toStringTag, _15 = Symbol.iterator, Symbol.isConcatSpreadable, _f = Symbol.match, foo(), _16 = foo(), _17 = foo(), "some" + "method")]() { }
+    [(_16 = Symbol.toStringTag, _17 = Symbol.iterator, Symbol.isConcatSpreadable, _f = Symbol.match, foo(), _18 = foo(), _19 = foo(), "some" + "method")]() { }
 }
-_18 = fieldNameB, _19 = fieldNameC;
+_20 = fieldNameB, _21 = fieldNameC;
 __decorate([
     x
 ], E.prototype, "property", void 0);
 __decorate([
     x
-], E.prototype, _14, void 0);
+], E.prototype, _16, void 0);
 __decorate([
     x
 ], E.prototype, "property2", void 0);
 __decorate([
     x
-], E.prototype, _15, void 0);
+], E.prototype, _17, void 0);
 __decorate([
     x
-], E.prototype, _16, void 0);
+], E.prototype, _18, void 0);
 __decorate([
     x
-], E.prototype, _17, void 0);
+], E.prototype, _19, void 0);
 __decorate([
     x
-], E.prototype, _18, void 0);
+], E.prototype, _20, void 0);
 __decorate([
     x
-], E.prototype, _19, void 0);
-void (_h = class F {
+], E.prototype, _21, void 0);
+void (_28 = (_h = class F {
         constructor() {
             this["property2"] = 2;
-            this[_21] = null;
+            this[_23] = null;
             this["property4"] = 2;
             this[_g] = null;
-            this[_23] = null;
             this[_25] = null;
+            this[_27] = null;
         }
-        [(_20 = Symbol.toStringTag, _21 = Symbol.iterator, Symbol.isConcatSpreadable, _g = Symbol.match, foo(), _22 = foo(), _23 = foo(), "some" + "method")]() { }
+        [(_22 = Symbol.toStringTag, _23 = Symbol.iterator, Symbol.isConcatSpreadable, _g = Symbol.match, foo(), _24 = foo(), _25 = foo(), "some" + "method")]() { }
     },
-    _24 = fieldNameB,
-    _25 = fieldNameC,
-    _h);
+    _26 = fieldNameB,
+    _27 = fieldNameC,
+    _h), __decorate([
+    x
+], _28.prototype, "property", void 0), __decorate([
+    x
+], _28.prototype, _22, void 0), __decorate([
+    x
+], _28.prototype, "property2", void 0), __decorate([
+    x
+], _28.prototype, _23, void 0), __decorate([
+    x
+], _28.prototype, _24, void 0), __decorate([
+    x
+], _28.prototype, _25, void 0), __decorate([
+    x
+], _28.prototype, _26, void 0), __decorate([
+    x
+], _28.prototype, _27, void 0), _28);
 class G {
     constructor() {
         this["property2"] = 2;
-        this[_27] = null;
+        this[_30] = null;
         this["property4"] = 2;
         this[_j] = null;
-        this[_29] = null;
-        this[_31] = null;
+        this[_32] = null;
+        this[_34] = null;
     }
-    [(_26 = Symbol.toStringTag, _27 = Symbol.iterator, Symbol.isConcatSpreadable, _j = Symbol.match, foo(), _28 = foo(), _29 = foo(), "some" + "method")]() { }
-    [(_30 = fieldNameB, "some" + "method2")]() { }
+    [(_29 = Symbol.toStringTag, _30 = Symbol.iterator, Symbol.isConcatSpreadable, _j = Symbol.match, foo(), _31 = foo(), _32 = foo(), "some" + "method")]() { }
+    [(_33 = fieldNameB, "some" + "method2")]() { }
 }
-_31 = fieldNameC;
+_34 = fieldNameC;
 __decorate([
     x
 ], G.prototype, "property", void 0);
 __decorate([
     x
-], G.prototype, _26, void 0);
+], G.prototype, _29, void 0);
 __decorate([
     x
 ], G.prototype, "property2", void 0);
 __decorate([
     x
-], G.prototype, _27, void 0);
+], G.prototype, _30, void 0);
 __decorate([
     x
-], G.prototype, _28, void 0);
+], G.prototype, _31, void 0);
 __decorate([
     x
-], G.prototype, _29, void 0);
+], G.prototype, _32, void 0);
 __decorate([
     x
-], G.prototype, _30, void 0);
+], G.prototype, _33, void 0);
 __decorate([
     x
-], G.prototype, _31, void 0);
-void (_l = class H {
+], G.prototype, _34, void 0);
+void (_41 = (_l = class H {
         constructor() {
             this["property2"] = 2;
-            this[_33] = null;
+            this[_36] = null;
             this["property4"] = 2;
             this[_k] = null;
-            this[_35] = null;
-            this[_37] = null;
+            this[_38] = null;
+            this[_40] = null;
         }
-        [(_32 = Symbol.toStringTag, _33 = Symbol.iterator, Symbol.isConcatSpreadable, _k = Symbol.match, foo(), _34 = foo(), _35 = foo(), "some" + "method")]() { }
-        [(_36 = fieldNameB, "some" + "method2")]() { }
+        [(_35 = Symbol.toStringTag, _36 = Symbol.iterator, Symbol.isConcatSpreadable, _k = Symbol.match, foo(), _37 = foo(), _38 = foo(), "some" + "method")]() { }
+        [(_39 = fieldNameB, "some" + "method2")]() { }
     },
-    _37 = fieldNameC,
-    _l);
+    _40 = fieldNameC,
+    _l), __decorate([
+    x
+], _41.prototype, "property", void 0), __decorate([
+    x
+], _41.prototype, _35, void 0), __decorate([
+    x
+], _41.prototype, "property2", void 0), __decorate([
+    x
+], _41.prototype, _36, void 0), __decorate([
+    x
+], _41.prototype, _37, void 0), __decorate([
+    x
+], _41.prototype, _38, void 0), __decorate([
+    x
+], _41.prototype, _39, void 0), __decorate([
+    x
+], _41.prototype, _40, void 0), _41);
 class I {
     constructor() {
         this["property2"] = 2;
-        this[_39] = null;
+        this[_43] = null;
         this["property4"] = 2;
         this[_m] = null;
-        this[_41] = null;
-        this[_44] = null;
+        this[_45] = null;
+        this[_48] = null;
     }
-    [(_38 = Symbol.toStringTag, _39 = Symbol.iterator, Symbol.isConcatSpreadable, _m = Symbol.match, foo(), _40 = foo(), _41 = foo(), _42 = "some" + "method")]() { }
-    [(_43 = fieldNameB, "some" + "method2")]() { }
+    [(_42 = Symbol.toStringTag, _43 = Symbol.iterator, Symbol.isConcatSpreadable, _m = Symbol.match, foo(), _44 = foo(), _45 = foo(), _46 = "some" + "method")]() { }
+    [(_47 = fieldNameB, "some" + "method2")]() { }
 }
-_44 = fieldNameC;
+_48 = fieldNameC;
 __decorate([
     x
 ], I.prototype, "property", void 0);
 __decorate([
     x
-], I.prototype, _38, void 0);
+], I.prototype, _42, void 0);
 __decorate([
     x
 ], I.prototype, "property2", void 0);
 __decorate([
     x
-], I.prototype, _39, void 0);
+], I.prototype, _43, void 0);
 __decorate([
     x
-], I.prototype, _40, void 0);
+], I.prototype, _44, void 0);
 __decorate([
     x
-], I.prototype, _41, void 0);
+], I.prototype, _45, void 0);
 __decorate([
     x
-], I.prototype, _42, null);
+], I.prototype, _46, null);
 __decorate([
     x
-], I.prototype, _43, void 0);
+], I.prototype, _47, void 0);
 __decorate([
     x
-], I.prototype, _44, void 0);
-void (_p = class J {
+], I.prototype, _48, void 0);
+void (_56 = (_p = class J {
         constructor() {
             this["property2"] = 2;
-            this[_46] = null;
+            this[_50] = null;
             this["property4"] = 2;
             this[_o] = null;
-            this[_48] = null;
-            this[_51] = null;
+            this[_52] = null;
+            this[_55] = null;
         }
-        [(_45 = Symbol.toStringTag, _46 = Symbol.iterator, Symbol.isConcatSpreadable, _o = Symbol.match, foo(), _47 = foo(), _48 = foo(), _49 = "some" + "method")]() { }
-        [(_50 = fieldNameB, "some" + "method2")]() { }
+        [(_49 = Symbol.toStringTag, _50 = Symbol.iterator, Symbol.isConcatSpreadable, _o = Symbol.match, foo(), _51 = foo(), _52 = foo(), _53 = "some" + "method")]() { }
+        [(_54 = fieldNameB, "some" + "method2")]() { }
     },
-    _51 = fieldNameC,
-    _p);
+    _55 = fieldNameC,
+    _p), __decorate([
+    x
+], _56.prototype, "property", void 0), __decorate([
+    x
+], _56.prototype, _49, void 0), __decorate([
+    x
+], _56.prototype, "property2", void 0), __decorate([
+    x
+], _56.prototype, _50, void 0), __decorate([
+    x
+], _56.prototype, _51, void 0), __decorate([
+    x
+], _56.prototype, _52, void 0), __decorate([
+    x
+], _56.prototype, _53, null), __decorate([
+    x
+], _56.prototype, _54, void 0), __decorate([
+    x
+], _56.prototype, _55, void 0), _56);
diff --git a/tests/baselines/reference/missingDecoratorType.errors.txt b/tests/baselines/reference/missingDecoratorType.errors.txt
index b944335630654..750518c60303b 100644
--- a/tests/baselines/reference/missingDecoratorType.errors.txt
+++ b/tests/baselines/reference/missingDecoratorType.errors.txt
@@ -20,4 +20,8 @@ error TS2318: Cannot find global type 'TypedPropertyDescriptor'.
         method() {}
     }
     
+    const C1 = class {
+        @dec
+        method() {}
+    }
     
\ No newline at end of file
diff --git a/tests/baselines/reference/missingDecoratorType.js b/tests/baselines/reference/missingDecoratorType.js
index cfcc301d8a67f..2e6fbe1d26e52 100644
--- a/tests/baselines/reference/missingDecoratorType.js
+++ b/tests/baselines/reference/missingDecoratorType.js
@@ -18,6 +18,10 @@ class C {
     method() {}
 }
 
+const C1 = class {
+    @dec
+    method() {}
+}
 
 
 //// [a.js]
@@ -28,6 +32,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var _a;
 var C = /** @class */ (function () {
     function C() {
     }
@@ -37,3 +42,11 @@ var C = /** @class */ (function () {
     ], C.prototype, "method", null);
     return C;
 }());
+var C1 = (_a = /** @class */ (function () {
+    function class_1() {
+    }
+    class_1.prototype.method = function () { };
+    return class_1;
+}()), __decorate([
+    dec
+], _a.prototype, "method", null), _a);
diff --git a/tests/baselines/reference/missingDecoratorType.symbols b/tests/baselines/reference/missingDecoratorType.symbols
index ed01689ca2cea..7000f0e68c892 100644
--- a/tests/baselines/reference/missingDecoratorType.symbols
+++ b/tests/baselines/reference/missingDecoratorType.symbols
@@ -41,4 +41,13 @@ class C {
 >method : Symbol(C.method, Decl(b.ts, 2, 9))
 }
 
+const C1 = class {
+>C1 : Symbol(C1, Decl(b.ts, 7, 5))
+
+    @dec
+>dec : Symbol(dec, Decl(b.ts, 0, 0))
+
+    method() {}
+>method : Symbol(C1.method, Decl(b.ts, 7, 18))
+}
 
diff --git a/tests/baselines/reference/missingDecoratorType.types b/tests/baselines/reference/missingDecoratorType.types
index fc73bd142ea43..9edb9b5c07a87 100644
--- a/tests/baselines/reference/missingDecoratorType.types
+++ b/tests/baselines/reference/missingDecoratorType.types
@@ -25,4 +25,14 @@ class C {
 >method : () => void
 }
 
+const C1 = class {
+>C1 : typeof C1
+>class {    @dec    method() {}} : typeof C1
+
+    @dec
+>dec : (t: any, k: any, d: any) => any
+
+    method() {}
+>method : () => void
+}
 
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts
index 19abd8231d695..d601faa81291d 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor1.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 
 class C {
     @dec get accessor() { return 1; }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec get accessor() { return 1; }
+}
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts
index 5250b42929caa..32b5018189ac7 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor2.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 
 class C {
     @dec public get accessor() { return 1; }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec public get accessor() { return 1; }
+}
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts
index 4d7ccc6a82536..689ffc4d723d0 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor3.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 
 class C {
     public @dec get accessor() { return 1; }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    public @dec get accessor() { return 1; }
+}
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts
index 35c15ae7a6f31..d85a22a96b39a 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor4.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 
 class C {
     @dec set accessor(value: number) { }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec set accessor(value: number) { }
+}
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts
index b32dd98ed2a1d..4b6739d757387 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor5.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 
 class C {
     @dec public set accessor(value: number) { }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec public set accessor(value: number) { }
+}
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts
index ffbd27136219f..63e3bfe4b4684 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor6.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 
 class C {
     public @dec set accessor(value: number) { }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    public @dec set accessor(value: number) { }
+}
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts
index b20a5a85dfbf8..d6e8dac899338 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor7.ts
@@ -1,4 +1,4 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec1<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 declare function dec2<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
@@ -31,4 +31,34 @@ class E {
 class F {
     @dec1 set x(value: number) { }
     @dec2 get x() { return 0; }
-}
\ No newline at end of file
+}
+
+const A1 = class {
+    @dec1 get x() { return 0; }
+    set x(value: number) { }
+}
+
+const B1 = class {
+    get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+const C1 = class {
+    @dec1 set x(value: number) { }
+    get x() { return 0; }
+}
+
+const D1 = class {
+    set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
+
+const E1 = class {
+    @dec1 get x() { return 0; }
+    @dec2 set x(value: number) { }
+}
+
+const F1 = class {
+    @dec1 set x(value: number) { }
+    @dec2 get x() { return 0; }
+}
diff --git a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor8.ts b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor8.ts
index 3caf4b406d24b..07493442bdfcb 100644
--- a/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor8.ts
+++ b/tests/cases/conformance/decorators/class/accessor/decoratorOnClassAccessor8.ts
@@ -1,4 +1,4 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 // @emitdecoratormetadata: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
@@ -29,4 +29,32 @@ class E {
 
 class F {
     @dec set x(value: number) { }
-}
\ No newline at end of file
+}
+
+const A1 = class {
+    @dec get x() { return 0; }
+    set x(value: number) { }
+}
+
+const B1 = class {
+    get x() { return 0; }
+    @dec set x(value: number) { }
+}
+
+const C1 = class {
+    @dec set x(value: number) { }
+    get x() { return 0; }
+}
+
+const D1 = class {
+    set x(value: number) { }
+    @dec get x() { return 0; }
+}
+
+const E1 = class {
+    @dec get x() { return 0; }
+}
+
+const F1 = class {
+    @dec set x(value: number) { }
+}
diff --git a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts
index b9ee9295744d1..c5cbfa14681fa 100644
--- a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts
+++ b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor1.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 
 class C {
     @dec constructor() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec constructor() {}
+}
diff --git a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts
index dece1cc992cd4..ab43a0efc1940 100644
--- a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts
+++ b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor2.ts
@@ -9,8 +9,15 @@ export function foo(target: Object, propertyKey: string | symbol, parameterIndex
 // @Filename: 2.ts
 import {base} from "./0.ts"
 import {foo} from "./0.ts"
-export class C  extends base{
+
+export class C  extends base {
+    constructor(@foo prop: any) {
+        super();
+    }
+}
+
+export const C1 = class extends base {
     constructor(@foo prop: any) {
         super();
     }
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor3.ts b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor3.ts
index ca89b65a7ac02..a505080e0bf4c 100644
--- a/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor3.ts
+++ b/tests/cases/conformance/decorators/class/constructor/decoratorOnClassConstructor3.ts
@@ -11,8 +11,14 @@ import {base} from "./0"
 import {foo} from "./0"
 
 /* Comment on the Class Declaration */
-export class C  extends base{
+export class C  extends base {
     constructor(@foo prop: any) {
         super();
     }
-}
\ No newline at end of file
+}
+
+export const C1 = class extends base {
+    constructor(@foo prop: any) {
+        super();
+    }
+}
diff --git a/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter1.ts b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter1.ts
index dbfd38c7896d6..84981136b6412 100644
--- a/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter1.ts
+++ b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter1.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
 
 class C {
     constructor(@dec p: number) {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    constructor(@dec p: number) {}
+}
diff --git a/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts
index 4e0373ff5d13c..547ef1f2bf9a3 100644
--- a/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts
+++ b/tests/cases/conformance/decorators/class/constructor/parameter/decoratorOnClassConstructorParameter4.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
 
 class C {
     constructor(public @dec p: number) {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    constructor(public @dec p: number) {}
+}
diff --git a/tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts b/tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts
index 36237f3cb58ed..0fc4c42d40435 100644
--- a/tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts
+++ b/tests/cases/conformance/decorators/class/decoratorChecksFunctionBodies.ts
@@ -1,4 +1,4 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 
 // from #2971
@@ -14,4 +14,15 @@ class A {
     m() {
 
     }
-}
\ No newline at end of file
+}
+
+const A1 = class {
+    @((x, p) => {
+        var a = 3;
+        func(a);
+        return x; 
+    })
+    m() {
+
+    }
+}
diff --git a/tests/cases/conformance/decorators/class/decoratorInstantiateModulesInFunctionBodies.ts b/tests/cases/conformance/decorators/class/decoratorInstantiateModulesInFunctionBodies.ts
index 7ba5a6839b936..28f18f487f12c 100644
--- a/tests/cases/conformance/decorators/class/decoratorInstantiateModulesInFunctionBodies.ts
+++ b/tests/cases/conformance/decorators/class/decoratorInstantiateModulesInFunctionBodies.ts
@@ -1,4 +1,4 @@
-// @target:es5
+// @target: es5
 // @module:commonjs
 // @experimentaldecorators: true
 // @filename: a.ts
@@ -15,9 +15,16 @@ function filter(handler: any) {
     };
 }
 
-class Wat {
+class A {
     @filter(() => test == 'abc')
     static whatever() {
         // ...
     }
-}
\ No newline at end of file
+}
+
+const A1 = class {
+    @filter(() => test == 'abc')
+    static whatever() {
+        // ...
+    }
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts
index 418ace9a0dc1a..449d0e13a15ea 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod1.ts
@@ -4,4 +4,8 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec method() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec method() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts
index c4658cc6405bf..2fcc313d457dd 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts
@@ -4,4 +4,8 @@ declare function dec(target: Function, paramIndex: number): void;
 
 class C {
     @dec method() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec method() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts
index 058f8134880d4..38e68c0cff29b 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod11.ts
@@ -7,4 +7,11 @@ module M {
         @this.decorator
         method() { }
     }
-}
\ No newline at end of file
+
+    const C1 = class {
+        decorator(target: Object, key: string): void { }
+
+        @this.decorator
+        method() { }
+    }
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts
index 9af80e32c46b3..ba4605d7c4f19 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod12.ts
@@ -4,8 +4,14 @@ module M {
     class S {
         decorator(target: Object, key: string): void { }
     }
+
     class C extends S {
         @super.decorator
         method() { }
     }
-}
\ No newline at end of file
+
+    const C1 = class extends S {
+        @super.decorator
+        method() { }
+    }
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod13.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod13.ts
index 5ab3b39d7abea..35377e9c6ffde 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod13.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod13.ts
@@ -5,4 +5,9 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 class C {
     @dec ["1"]() { }
     @dec ["b"]() { }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec ["1"]() { }
+    @dec ["b"]() { }
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts
index 8305ed1a4481f..2877e44dd54b1 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod2.ts
@@ -4,4 +4,8 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec public method() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec public method() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts
index b951bd5c8c90a..c1fac7931a33c 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod3.ts
@@ -4,4 +4,8 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     public @dec method() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    public @dec method() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts
index 3d3ff2c878568..6aabfbca2816f 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod4.ts
@@ -4,4 +4,8 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec ["method"]() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec ["method"]() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts
index d91d4331ce05a..7a03f67343ef9 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod5.ts
@@ -4,4 +4,8 @@ declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedP
 
 class C {
     @dec() ["method"]() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec() ["method"]() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts
index b3cd6ee75d4d1..a9995f5ec41e4 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod6.ts
@@ -4,4 +4,8 @@ declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedP
 
 class C {
     @dec ["method"]() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec ["method"]() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts
index 16915e9aaaba2..7e7239617e9ca 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod7.ts
@@ -4,4 +4,8 @@ declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPrope
 
 class C {
     @dec public ["method"]() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec public ["method"]() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts
index 73f5880942039..74a32a1a25585 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethod8.ts
@@ -4,4 +4,8 @@ declare function dec<T>(target: T): T;
 
 class C {
     @dec method() {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec method() {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts
index 722463b33dab2..afefb5136ec28 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload1.ts
@@ -6,4 +6,10 @@ class C {
     @dec
     method()
     method() { }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec
+    method()
+    method() { }
+}
diff --git a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts
index ee5a3f33bf10e..712401cebfdfc 100644
--- a/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts
+++ b/tests/cases/conformance/decorators/class/method/decoratorOnClassMethodOverload2.ts
@@ -6,4 +6,10 @@ class C {
     method()
     @dec
     method() { }
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    method()
+    @dec
+    method() { }
+}
diff --git a/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter1.ts b/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter1.ts
index 64de61bb8a908..6acfa4308b640 100644
--- a/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter1.ts
+++ b/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter1.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec(target: Object, propertyKey: string | symbol, parameterIndex: number): void;
 
 class C {
     method(@dec p: number) {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    method(@dec p: number) {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter2.ts b/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter2.ts
index 1a8c6faf84b10..cdb2bda0491b0 100644
--- a/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter2.ts
+++ b/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodParameter2.ts
@@ -1,7 +1,11 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec(target: Object, propertyKey: string | symbol, parameterIndex: number): void;
 
 class C {
     method(this: C, @dec p: number) {}
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    method(this: {}, @dec p: number) {}
+}
diff --git a/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodThisParameter.ts b/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodThisParameter.ts
index 7bc6570a8bb92..d71aef1a0d75c 100644
--- a/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodThisParameter.ts
+++ b/tests/cases/conformance/decorators/class/method/parameter/decoratorOnClassMethodThisParameter.ts
@@ -1,4 +1,4 @@
-// @target:es5
+// @target: es5
 // @experimentaldecorators: true
 declare function dec(target: Object, propertyKey: string | symbol, parameterIndex: number): void;
 
@@ -8,4 +8,4 @@ class C {
 
 class C2 {
     method(@dec allowed: C2, @dec this: C2) {}
-}
\ No newline at end of file
+}
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts
index 026949fb5b8ec..7714acf64446e 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty1.ts
@@ -4,4 +4,8 @@ declare function dec(target: any, propertyKey: string): void;
 
 class C {
     @dec prop;
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec prop;
+}
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts
index 2b10c0aec0872..c15c81339f561 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty10.ts
@@ -4,4 +4,8 @@ declare function dec(): <T>(target: any, propertyKey: string) => void;
 
 class C {
     @dec() prop;
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec() prop;
+}
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts
index eb720b20dff85..b1432d469a8ee 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty11.ts
@@ -4,4 +4,8 @@ declare function dec(): <T>(target: any, propertyKey: string) => void;
 
 class C {
     @dec prop;
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec prop;
+}
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts
index 01af3e6ee810e..d3b02f39b6495 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty2.ts
@@ -4,4 +4,8 @@ declare function dec(target: any, propertyKey: string): void;
 
 class C {
     @dec public prop;
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec public prop;
+}
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts
index 55fd6fe93e1e8..833b129b44509 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty3.ts
@@ -4,4 +4,8 @@ declare function dec(target: any, propertyKey: string): void;
 
 class C {
     public @dec prop;
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    public @dec prop;
+}
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts
index 412a592ece1a6..685a66ba47896 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty6.ts
@@ -4,4 +4,8 @@ declare function dec(target: Function): void;
 
 class C {
     @dec prop;
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec prop;
+}
diff --git a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts
index 0e11e103ce746..040f5298edc4d 100644
--- a/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts
+++ b/tests/cases/conformance/decorators/class/property/decoratorOnClassProperty7.ts
@@ -4,4 +4,8 @@ declare function dec(target: Function, propertyKey: string | symbol, paramIndex:
 
 class C {
     @dec prop;
-}
\ No newline at end of file
+}
+
+const C1 = class {
+    @dec prop;
+}
diff --git a/tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts b/tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts
index 822269366bc29..c5f46315b731e 100644
--- a/tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts
+++ b/tests/cases/conformance/decorators/decoratorMetadata-jsdoc.ts
@@ -11,4 +11,13 @@ class X {
     b?: string!;
     @decorator()
     c?: *;
-}
\ No newline at end of file
+}
+
+const X1 = class {
+    @decorator()
+    a?: string?;
+    @decorator()
+    b?: string!;
+    @decorator()
+    c?: *;
+}
diff --git a/tests/cases/conformance/decorators/missingDecoratorType.ts b/tests/cases/conformance/decorators/missingDecoratorType.ts
index 9b8cdd276f22e..525622caa4284 100644
--- a/tests/cases/conformance/decorators/missingDecoratorType.ts
+++ b/tests/cases/conformance/decorators/missingDecoratorType.ts
@@ -20,3 +20,7 @@ class C {
     method() {}
 }
 
+const C1 = class {
+    @dec
+    method() {}
+}