From a1d445ebc90876cb61c456309c3dc239ad0f9c85 Mon Sep 17 00:00:00 2001
From: Ron Buckton <rbuckton@microsoft.com>
Date: Tue, 17 Mar 2015 17:09:39 -0700
Subject: [PATCH] Updated baselines

---
 src/compiler/checker.ts                       | 83 ++++++++++++++--
 src/compiler/emitter.ts                       | 95 ++++++++++++++++++-
 src/compiler/types.ts                         |  3 +
 src/lib/es6.d.ts                              | 36 +++----
 .../baselines/reference/APISample_compile.js  |  7 ++
 .../reference/APISample_compile.types         | 23 +++++
 tests/baselines/reference/APISample_linter.js |  7 ++
 .../reference/APISample_linter.types          | 23 +++++
 .../reference/APISample_transform.js          |  7 ++
 .../reference/APISample_transform.types       | 23 +++++
 .../baselines/reference/APISample_watcher.js  |  7 ++
 .../reference/APISample_watcher.types         | 23 +++++
 .../baselines/reference/decoratorOnClass1.js  | 18 ++++
 .../baselines/reference/decoratorOnClass2.js  | 18 ++++
 .../baselines/reference/decoratorOnClass3.js  | 18 ++++
 .../baselines/reference/decoratorOnClass4.js  | 18 ++++
 .../baselines/reference/decoratorOnClass5.js  | 18 ++++
 .../baselines/reference/decoratorOnClass8.js  | 18 ++++
 .../reference/decoratorOnClassAccessor1.js    | 18 ++++
 .../reference/decoratorOnClassAccessor2.js    | 18 ++++
 .../reference/decoratorOnClassAccessor4.js    | 18 ++++
 .../reference/decoratorOnClassAccessor5.js    | 18 ++++
 .../decoratorOnClassConstructorParameter1.js  | 22 +++++
 .../decoratorOnClassConstructorParameter4.js  | 22 +++++
 .../reference/decoratorOnClassMethod1.js      | 18 ++++
 .../reference/decoratorOnClassMethod10.js     | 18 ++++
 .../reference/decoratorOnClassMethod2.js      | 18 ++++
 .../reference/decoratorOnClassMethod4.js      | 23 +++++
 .../reference/decoratorOnClassMethod5.js      | 23 +++++
 .../reference/decoratorOnClassMethod6.js      | 23 +++++
 .../reference/decoratorOnClassMethod7.js      | 23 +++++
 .../reference/decoratorOnClassMethod8.js      | 18 ++++
 .../decoratorOnClassMethodParameter1.js       | 22 +++++
 .../reference/decoratorOnClassProperty1.js    | 22 +++++
 .../reference/decoratorOnClassProperty10.js   | 22 +++++
 .../reference/decoratorOnClassProperty11.js   | 22 +++++
 .../reference/decoratorOnClassProperty2.js    | 22 +++++
 .../reference/decoratorOnClassProperty6.js    | 18 ++++
 .../reference/decoratorOnClassProperty7.js    | 22 +++++
 39 files changed, 843 insertions(+), 32 deletions(-)

diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index 58607e449d8..a5a27df4124 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -8702,6 +8702,41 @@ module ts {
             }
         }
 
+        /** Checks a type reference node as an expression. */
+        function checkTypeNodeAsExpression(node: TypeNode | LiteralExpression) {
+            if (node && node.kind === SyntaxKind.TypeReference) {
+                var type = getTypeFromTypeNode(node);
+                if (!type || type.flags & (TypeFlags.Intrinsic | TypeFlags.NumberLike | TypeFlags.StringLike)) {
+                    return;
+                }
+                if (type.symbol.valueDeclaration) {
+                    checkExpressionOrQualifiedName((<TypeReferenceNode>node).typeName);
+                }
+            }
+        }
+
+        /**
+          * Checks the type annotation of an accessor declaration or property declaration as 
+          * an expression if it is a type reference to a type with a value declaration.
+          */
+        function checkTypeAnnotationAsExpression(node: AccessorDeclaration | PropertyDeclaration | ParameterDeclaration | MethodDeclaration) {
+            switch (node.kind) {
+                case SyntaxKind.PropertyDeclaration:    return checkTypeNodeAsExpression((<PropertyDeclaration>node).type);
+                case SyntaxKind.Parameter:              return checkTypeNodeAsExpression((<ParameterDeclaration>node).type);
+                case SyntaxKind.MethodDeclaration:      return checkTypeNodeAsExpression((<MethodDeclaration>node).type);
+                case SyntaxKind.GetAccessor:            return checkTypeNodeAsExpression((<AccessorDeclaration>node).type);
+                case SyntaxKind.SetAccessor:            return checkTypeNodeAsExpression(getSetAccessorTypeAnnotationNode(<AccessorDeclaration>node));
+            }
+        }
+        
+        /** Checks the type annotation of the parameters of a function/method or the constructor of a class as expressions */
+        function checkParameterTypeAnnotationsAsExpressions(node: FunctionLikeDeclaration) {
+            // ensure all type annotations with a value declaration are checked as an expression
+            if (node) {
+                forEach(node.parameters, checkTypeAnnotationAsExpression);
+            }
+        }
+
         /** Check the decorators of a node */
         function checkDecorators(node: Node): void {
             if (!node.decorators) {
@@ -8710,18 +8745,28 @@ module ts {
 
             switch (node.kind) {
                 case SyntaxKind.ClassDeclaration:
+                    var constructor = getFirstConstructorWithBody(<ClassDeclaration>node);
+                    if (constructor) {
+                        checkParameterTypeAnnotationsAsExpressions(constructor);
+                    }
+                    break;
+
                 case SyntaxKind.MethodDeclaration:
-                case SyntaxKind.GetAccessor:
+                    checkParameterTypeAnnotationsAsExpressions(<FunctionLikeDeclaration>node);
+                    // fall-through
+
                 case SyntaxKind.SetAccessor:
+                case SyntaxKind.GetAccessor:
                 case SyntaxKind.PropertyDeclaration:
                 case SyntaxKind.Parameter:
-                    emitDecorate = true;
+                    checkTypeAnnotationAsExpression(<PropertyDeclaration | ParameterDeclaration>node);
                     break;
 
                 default:
                     return;
             }
 
+            emitDecorate = true;
             forEach(node.decorators, checkDecorator);
         }
 
@@ -11400,17 +11445,17 @@ module ts {
             else if (type.flags & TypeFlags.ESSymbol) {
                 return "Symbol";
             }
-            else if (type.symbol.valueDeclaration) {
-                return serializeEntityName(node.typeName, getGeneratedNameForNode);
-            }
-            else if (typeHasCallOrConstructSignatures(type)) {
-                return "Function";
-            }
             else if (type === unknownType) {
                 var fallbackPath: string[] = [];
                 serializeEntityName(node.typeName, getGeneratedNameForNode, fallbackPath);
                 return fallbackPath;
             }
+            else if (type.symbol && type.symbol.valueDeclaration) {
+                return serializeEntityName(node.typeName, getGeneratedNameForNode);
+            }
+            else if (typeHasCallOrConstructSignatures(type)) {
+                return "Function";
+            }
 
             return "Object";
         }
@@ -11473,7 +11518,7 @@ module ts {
             // 
             // For rules on serializing type annotations, see `serializeTypeNode`.
             switch (node.kind) {
-                case SyntaxKind.ClassDeclaration:       return serializeEntityName((<ClassDeclaration>node).name, getGeneratedNameForNode);
+                case SyntaxKind.ClassDeclaration:       return "Function";
                 case SyntaxKind.PropertyDeclaration:    return serializeTypeNode((<PropertyDeclaration>node).type, getGeneratedNameForNode);
                 case SyntaxKind.Parameter:              return serializeTypeNode((<ParameterDeclaration>node).type, getGeneratedNameForNode);
                 case SyntaxKind.GetAccessor:            return serializeTypeNode((<AccessorDeclaration>node).type, getGeneratedNameForNode);
@@ -11508,7 +11553,22 @@ module ts {
                     if (parameterCount > 0) {
                         result = new Array<string>(parameterCount);
                         for (var i = 0; i < parameterCount; i++) {
-                            result[i] = serializeTypeOfNode(parameters[i], getGeneratedNameForNode);
+                            if (parameters[i].dotDotDotToken) {
+                                var parameterType = parameters[i].type;
+                                if (parameterType.kind === SyntaxKind.ArrayType) {
+                                    parameterType = (<ArrayTypeNode>parameterType).elementType;
+                                }
+                                else if (parameterType.kind === SyntaxKind.TypeReference && (<TypeReferenceNode>parameterType).typeArguments && (<TypeReferenceNode>parameterType).typeArguments.length === 1) {
+                                    parameterType = (<TypeReferenceNode>parameterType).typeArguments[0];
+                                }
+                                else {
+                                    parameterType = undefined;
+                                }
+                                result[i] = serializeTypeNode(parameterType, getGeneratedNameForNode);
+                            }
+                            else {
+                                result[i] = serializeTypeOfNode(parameters[i], getGeneratedNameForNode);
+                            }
                         }
                         return result;
                     }
@@ -11612,6 +11672,9 @@ module ts {
                 resolvesToSomeValue,
                 collectLinkedAliases,
                 getBlockScopedVariableId,
+                serializeTypeOfNode,
+                serializeParameterTypesOfNode,
+                serializeReturnTypeOfNode,
             };
         }
 
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index c772262e893..1e959eeb7dd 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -3791,7 +3791,7 @@ module ts {
                 emitStart(node);
                 emitDeclarationName(node);
                 write(" = ");
-                emitDecorateStart(node.decorators);
+                emitDecorateStart(node);
                 emitDeclarationName(node);
                 write(");");
                 emitEnd(node);
@@ -3879,7 +3879,7 @@ module ts {
                         write(", ");
                     }
 
-                    emitDecorateStart(decorators);
+                    emitDecorateStart(member);
                     emitStart(member.name);
                     emitClassMemberPrefix(node, member);
                     write(", ");
@@ -3931,7 +3931,7 @@ module ts {
 
                     writeLine();
                     emitStart(parameter);
-                    emitDecorateStart(parameter.decorators);
+                    emitDecorateStart(parameter);
                     emitStart(parameter.name);
 
                     if (member.kind === SyntaxKind.Constructor) {
@@ -3953,8 +3953,9 @@ module ts {
                 });
             }
 
-            function emitDecorateStart(decorators: Decorator[]): void {
+            function emitDecorateStart(node: Declaration): void {
                 write("__decorate([");
+                let decorators = node.decorators;
                 let decoratorCount = decorators.length;
                 for (let i = 0; i < decoratorCount; i++) {
                     if (i > 0) {
@@ -3965,9 +3966,95 @@ module ts {
                     emit(decorator.expression);
                     emitEnd(decorator);
                 }
+                emitSerializedTypeMetadata(node);
                 write("], ");
             }
 
+            function formatPathSegment(location: Node, path: string[], index: number): string {
+                switch (index) {
+                    case 0:
+                        return `typeof ${path[index]} !== 'undefined' && ${path[index]}`;
+                    case 1:
+                        return `${formatPathSegment(location, path, index - 1) }.${path[index]}`;
+                    default:
+                        let temp = createTempVariable(location);
+                        recordTempDeclaration(temp);
+                        return `(${temp.text} = ${formatPathSegment(location, path, index - 1) }) && ${temp.text}.${path[index]}`;
+                }
+            }
+
+            function shouldEmitTypeMetadata(node: Declaration): boolean {
+                switch (node.kind) {
+                    case SyntaxKind.MethodDeclaration:
+                    case SyntaxKind.GetAccessor:
+                    case SyntaxKind.SetAccessor:
+                    case SyntaxKind.PropertyDeclaration:
+                    case SyntaxKind.Parameter:
+                        return true;
+                }
+                return false;
+            }
+
+            function shouldEmitReturnTypeMetadata(node: Declaration): boolean {
+                switch (node.kind) {
+                    case SyntaxKind.MethodDeclaration:
+                        return true;
+                }
+                return false;
+            }
+
+            function shouldEmitParamTypesMetadata(node: Declaration): boolean {
+                switch (node.kind) {
+                    case SyntaxKind.ClassDeclaration:
+                    case SyntaxKind.MethodDeclaration:
+                    case SyntaxKind.SetAccessor:
+                        return true;
+                }
+                return false;
+            }
+
+            function emitSerializedTypeMetadata(node: Declaration): void {
+                if (shouldEmitTypeMetadata(node)) {
+                    var serializedType = resolver.serializeTypeOfNode(node, getGeneratedNameForNode);
+                    if (serializedType) {
+                        write(", __metadata('design:type', ");
+                        emitSerializedType(node, serializedType);
+                        write(")");
+                    }
+                }
+                if (shouldEmitParamTypesMetadata(node)) {
+                    var serializedTypes = resolver.serializeParameterTypesOfNode(node, getGeneratedNameForNode);
+                    if (serializedTypes) {
+                        write(", __metadata('design:paramtypes', [");
+                        for (var i = 0; i < serializedTypes.length; ++i) {
+                            if (i > 0) {
+                                write(", ");
+                            }
+                            emitSerializedType(node, serializedTypes[i]);
+                        }
+                        write("])");
+                    }
+                }
+                if (shouldEmitReturnTypeMetadata(node)) {
+                    var serializedType = resolver.serializeReturnTypeOfNode(node, getGeneratedNameForNode);
+                    if (serializedType) {
+                        write(", __metadata('design:returntype', ");
+                        emitSerializedType(node, serializedType);
+                        write(")");
+                    }
+                }
+            }
+
+            function emitSerializedType(location: Node, name: string | string[]): void {
+                if (typeof name === "string") {
+                    write(name);
+                    return;
+                }
+                else {
+                    Debug.assert(name.length > 0, "Invalid type name path for serialization");
+                    write(`(${formatPathSegment(location, name, name.length - 1) }) || Object`);
+                }
+            }
             function emitInterfaceDeclaration(node: InterfaceDeclaration) {
                 emitOnlyPinnedOrTripleSlashComments(node);
             }
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index e5697f9f372..06f21836a6e 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -1236,6 +1236,9 @@ module ts {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
+        serializeTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[];
+        serializeParameterTypesOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): (string | string[])[];
+        serializeReturnTypeOfNode(node: Node, getGeneratedNameForNode: (Node: Node) => string): string | string[];
     }
 
     export const enum SymbolFlags {
diff --git a/src/lib/es6.d.ts b/src/lib/es6.d.ts
index 3e6ac3f756c..8590e2273e0 100644
--- a/src/lib/es6.d.ts
+++ b/src/lib/es6.d.ts
@@ -3513,27 +3513,27 @@ interface ProxyHandler<T> {
 
 interface ProxyConstructor {
     revocable<T>(target: T, handler: ProxyHandler<T>): { proxy: T; revoke: () => void; };
-    new <T>(target: T, handeler: ProxyHandler<T>): T
+    new <T>(target: T, handler: ProxyHandler<T>): T
 }
 declare var Proxy: ProxyConstructor;
 
-declare var Reflect: {
-    apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
-    construct(target: Function, argumentsList: ArrayLike<any>): any;
-    defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
-    deleteProperty(target: any, propertyKey: PropertyKey): boolean;
-    enumerate(target: any): IterableIterator<any>;
-    get(target: any, propertyKey: PropertyKey, receiver?: any): any;
-    getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
-    getPrototypeOf(target: any): any;
-    has(target: any, propertyKey: string): boolean;
-    has(target: any, propertyKey: symbol): boolean;
-    isExtensible(target: any): boolean;
-    ownKeys(target: any): Array<PropertyKey>;
-    preventExtensions(target: any): boolean;
-    set(target: any, propertyKey: PropertyKey, value: any, receiver? :any): boolean;
-    setPrototypeOf(target: any, proto: any): boolean;
-};
+declare module Reflect {
+    function apply(target: Function, thisArgument: any, argumentsList: ArrayLike<any>): any;
+    function construct(target: Function, argumentsList: ArrayLike<any>): any;
+    function defineProperty(target: any, propertyKey: PropertyKey, attributes: PropertyDescriptor): boolean;
+    function deleteProperty(target: any, propertyKey: PropertyKey): boolean;
+    function enumerate(target: any): IterableIterator<any>;
+    function get(target: any, propertyKey: PropertyKey, receiver?: any): any;
+    function getOwnPropertyDescriptor(target: any, propertyKey: PropertyKey): PropertyDescriptor;
+    function getPrototypeOf(target: any): any;
+    function has(target: any, propertyKey: string): boolean;
+    function has(target: any, propertyKey: symbol): boolean;
+    function isExtensible(target: any): boolean;
+    function ownKeys(target: any): Array<PropertyKey>;
+    function preventExtensions(target: any): boolean;
+    function set(target: any, propertyKey: PropertyKey, value: any, receiver? :any): boolean;
+    function setPrototypeOf(target: any, proto: any): boolean;
+}
 
 /**
  * Represents the completion of an asynchronous operation
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
index 07d5e4337a6..cb9cd765b21 100644
--- a/tests/baselines/reference/APISample_compile.js
+++ b/tests/baselines/reference/APISample_compile.js
@@ -964,6 +964,13 @@ declare module "typescript" {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
+<<<<<<< HEAD
+=======
+        getClassDeclarationVariableId(node: Identifier): number;
+        serializeTypeOfNode(node: Node): string | string[];
+        serializeParameterTypesOfNode(node: Node): (string | string[])[];
+        serializeReturnTypeOfNode(node: Node): string | string[];
+>>>>>>> Updated baselines
     }
     const enum SymbolFlags {
         FunctionScopedVariable = 1,
diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types
index eff47a4cb7b..71c0db3d19c 100644
--- a/tests/baselines/reference/APISample_compile.types
+++ b/tests/baselines/reference/APISample_compile.types
@@ -3150,6 +3150,29 @@ declare module "typescript" {
 >getBlockScopedVariableId : (node: Identifier) => number
 >node : Identifier
 >Identifier : Identifier
+<<<<<<< HEAD
+=======
+
+        getClassDeclarationVariableId(node: Identifier): number;

+>getClassDeclarationVariableId : (node: Identifier) => number
+>node : Identifier
+>Identifier : Identifier
+
+        serializeTypeOfNode(node: Node): string | string[];

+>serializeTypeOfNode : (node: Node) => string | string[]
+>node : Node
+>Node : Node
+
+        serializeParameterTypesOfNode(node: Node): (string | string[])[];

+>serializeParameterTypesOfNode : (node: Node) => (string | string[])[]
+>node : Node
+>Node : Node
+
+        serializeReturnTypeOfNode(node: Node): string | string[];

+>serializeReturnTypeOfNode : (node: Node) => string | string[]
+>node : Node
+>Node : Node
+>>>>>>> Updated baselines
     }

     const enum SymbolFlags {

 >SymbolFlags : SymbolFlags
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
index b57acaf0e9c..1459cf0f777 100644
--- a/tests/baselines/reference/APISample_linter.js
+++ b/tests/baselines/reference/APISample_linter.js
@@ -995,6 +995,13 @@ declare module "typescript" {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
+<<<<<<< HEAD
+=======
+        getClassDeclarationVariableId(node: Identifier): number;
+        serializeTypeOfNode(node: Node): string | string[];
+        serializeParameterTypesOfNode(node: Node): (string | string[])[];
+        serializeReturnTypeOfNode(node: Node): string | string[];
+>>>>>>> Updated baselines
     }
     const enum SymbolFlags {
         FunctionScopedVariable = 1,
diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types
index 600bf5c6adc..f979f60b576 100644
--- a/tests/baselines/reference/APISample_linter.types
+++ b/tests/baselines/reference/APISample_linter.types
@@ -3296,6 +3296,29 @@ declare module "typescript" {
 >getBlockScopedVariableId : (node: Identifier) => number
 >node : Identifier
 >Identifier : Identifier
+<<<<<<< HEAD
+=======
+
+        getClassDeclarationVariableId(node: Identifier): number;

+>getClassDeclarationVariableId : (node: Identifier) => number
+>node : Identifier
+>Identifier : Identifier
+
+        serializeTypeOfNode(node: Node): string | string[];

+>serializeTypeOfNode : (node: Node) => string | string[]
+>node : Node
+>Node : Node
+
+        serializeParameterTypesOfNode(node: Node): (string | string[])[];

+>serializeParameterTypesOfNode : (node: Node) => (string | string[])[]
+>node : Node
+>Node : Node
+
+        serializeReturnTypeOfNode(node: Node): string | string[];

+>serializeReturnTypeOfNode : (node: Node) => string | string[]
+>node : Node
+>Node : Node
+>>>>>>> Updated baselines
     }

     const enum SymbolFlags {

 >SymbolFlags : SymbolFlags
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
index 4004007508a..7c59f94ca44 100644
--- a/tests/baselines/reference/APISample_transform.js
+++ b/tests/baselines/reference/APISample_transform.js
@@ -996,6 +996,13 @@ declare module "typescript" {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
+<<<<<<< HEAD
+=======
+        getClassDeclarationVariableId(node: Identifier): number;
+        serializeTypeOfNode(node: Node): string | string[];
+        serializeParameterTypesOfNode(node: Node): (string | string[])[];
+        serializeReturnTypeOfNode(node: Node): string | string[];
+>>>>>>> Updated baselines
     }
     const enum SymbolFlags {
         FunctionScopedVariable = 1,
diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types
index 4ea9c49d758..004f179f286 100644
--- a/tests/baselines/reference/APISample_transform.types
+++ b/tests/baselines/reference/APISample_transform.types
@@ -3246,6 +3246,29 @@ declare module "typescript" {
 >getBlockScopedVariableId : (node: Identifier) => number
 >node : Identifier
 >Identifier : Identifier
+<<<<<<< HEAD
+=======
+
+        getClassDeclarationVariableId(node: Identifier): number;

+>getClassDeclarationVariableId : (node: Identifier) => number
+>node : Identifier
+>Identifier : Identifier
+
+        serializeTypeOfNode(node: Node): string | string[];

+>serializeTypeOfNode : (node: Node) => string | string[]
+>node : Node
+>Node : Node
+
+        serializeParameterTypesOfNode(node: Node): (string | string[])[];

+>serializeParameterTypesOfNode : (node: Node) => (string | string[])[]
+>node : Node
+>Node : Node
+
+        serializeReturnTypeOfNode(node: Node): string | string[];

+>serializeReturnTypeOfNode : (node: Node) => string | string[]
+>node : Node
+>Node : Node
+>>>>>>> Updated baselines
     }

     const enum SymbolFlags {

 >SymbolFlags : SymbolFlags
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
index 34503a0d81a..606bffdf770 100644
--- a/tests/baselines/reference/APISample_watcher.js
+++ b/tests/baselines/reference/APISample_watcher.js
@@ -1033,6 +1033,13 @@ declare module "typescript" {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         resolvesToSomeValue(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
+<<<<<<< HEAD
+=======
+        getClassDeclarationVariableId(node: Identifier): number;
+        serializeTypeOfNode(node: Node): string | string[];
+        serializeParameterTypesOfNode(node: Node): (string | string[])[];
+        serializeReturnTypeOfNode(node: Node): string | string[];
+>>>>>>> Updated baselines
     }
     const enum SymbolFlags {
         FunctionScopedVariable = 1,
diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types
index 3903e169b4e..5170a0bd2bf 100644
--- a/tests/baselines/reference/APISample_watcher.types
+++ b/tests/baselines/reference/APISample_watcher.types
@@ -3419,6 +3419,29 @@ declare module "typescript" {
 >getBlockScopedVariableId : (node: Identifier) => number
 >node : Identifier
 >Identifier : Identifier
+<<<<<<< HEAD
+=======
+
+        getClassDeclarationVariableId(node: Identifier): number;

+>getClassDeclarationVariableId : (node: Identifier) => number
+>node : Identifier
+>Identifier : Identifier
+
+        serializeTypeOfNode(node: Node): string | string[];

+>serializeTypeOfNode : (node: Node) => string | string[]
+>node : Node
+>Node : Node
+
+        serializeParameterTypesOfNode(node: Node): (string | string[])[];

+>serializeParameterTypesOfNode : (node: Node) => (string | string[])[]
+>node : Node
+>Node : Node
+
+        serializeReturnTypeOfNode(node: Node): string | string[];

+>serializeReturnTypeOfNode : (node: Node) => string | string[]
+>node : Node
+>Node : Node
+>>>>>>> Updated baselines
     }

     const enum SymbolFlags {

 >SymbolFlags : SymbolFlags
diff --git a/tests/baselines/reference/decoratorOnClass1.js b/tests/baselines/reference/decoratorOnClass1.js
index 24be2517469..c5b0233bfb7 100644
--- a/tests/baselines/reference/decoratorOnClass1.js
+++ b/tests/baselines/reference/decoratorOnClass1.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClass1.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
     function C() {
     }
     C = __decorate([dec], C);
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec, __metadata('design:paramtypes', [])], C);
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 92741819e94..ee0fd6010b3 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -6,6 +6,7 @@ export class C {
 }
 
 //// [decoratorOnClass2.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,6 +24,23 @@ var C = (function () {
     function C() {
     }
     C = __decorate([dec], C);
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec, __metadata('design:paramtypes', [])], C);
+>>>>>>> Updated baselines
     return C;
 })();
 exports.C = C;
diff --git a/tests/baselines/reference/decoratorOnClass3.js b/tests/baselines/reference/decoratorOnClass3.js
index 766acc42072..17f0c395b86 100644
--- a/tests/baselines/reference/decoratorOnClass3.js
+++ b/tests/baselines/reference/decoratorOnClass3.js
@@ -7,6 +7,7 @@ class C {
 }
 
 //// [decoratorOnClass3.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -24,5 +25,22 @@ var C = (function () {
     function C() {
     }
     C = __decorate([dec], C);
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec, __metadata('design:paramtypes', [])], C);
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClass4.js b/tests/baselines/reference/decoratorOnClass4.js
index 95bde549379..b530b477c15 100644
--- a/tests/baselines/reference/decoratorOnClass4.js
+++ b/tests/baselines/reference/decoratorOnClass4.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClass4.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
     function C() {
     }
     C = __decorate([dec()], C);
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec(), __metadata('design:paramtypes', [])], C);
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClass5.js b/tests/baselines/reference/decoratorOnClass5.js
index a93d625f491..c01463ace08 100644
--- a/tests/baselines/reference/decoratorOnClass5.js
+++ b/tests/baselines/reference/decoratorOnClass5.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClass5.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
     function C() {
     }
     C = __decorate([dec()], C);
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec(), __metadata('design:paramtypes', [])], C);
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClass8.js b/tests/baselines/reference/decoratorOnClass8.js
index 0e782d45e11..99ce993e952 100644
--- a/tests/baselines/reference/decoratorOnClass8.js
+++ b/tests/baselines/reference/decoratorOnClass8.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClass8.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
     function C() {
     }
     C = __decorate([dec()], C);
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    C = __decorate([dec(), __metadata('design:paramtypes', [])], C);
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor1.js b/tests/baselines/reference/decoratorOnClassAccessor1.js
index d78e776cb96..6065bad5dca 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor1.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor1.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassAccessor1.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,6 +20,19 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
@@ -29,6 +43,10 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
+<<<<<<< HEAD
     Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+=======
+    __decorate([dec, __metadata('design:type', Object)], C.prototype, "accessor");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor2.js b/tests/baselines/reference/decoratorOnClassAccessor2.js
index f1bfce9ea6d..6ba38de1b1c 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor2.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor2.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassAccessor2.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,6 +20,19 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
@@ -29,6 +43,10 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
+<<<<<<< HEAD
     Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+=======
+    __decorate([dec, __metadata('design:type', Object)], C.prototype, "accessor");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor4.js b/tests/baselines/reference/decoratorOnClassAccessor4.js
index 77dbc569e5a..5495d4d8f4f 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor4.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor4.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassAccessor4.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,6 +20,19 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
@@ -28,6 +42,10 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
+<<<<<<< HEAD
     Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+=======
+    __decorate([dec, __metadata('design:type', Number), __metadata('design:paramtypes', [Number])], C.prototype, "accessor");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassAccessor5.js b/tests/baselines/reference/decoratorOnClassAccessor5.js
index bfd6518c59b..6b4542b6377 100644
--- a/tests/baselines/reference/decoratorOnClassAccessor5.js
+++ b/tests/baselines/reference/decoratorOnClassAccessor5.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassAccessor5.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,6 +20,19 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
@@ -28,6 +42,10 @@ var C = (function () {
         enumerable: true,
         configurable: true
     });
+<<<<<<< HEAD
     Object.defineProperty(C.prototype, "accessor", __decorate([dec], C.prototype, "accessor", Object.getOwnPropertyDescriptor(C.prototype, "accessor")));
+=======
+    __decorate([dec, __metadata('design:type', Number), __metadata('design:paramtypes', [Number])], C.prototype, "accessor");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
index 0c86a1ccf7a..232d6873221 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter1.js
@@ -1,11 +1,16 @@
 //// [decoratorOnClassConstructorParameter1.ts]
+<<<<<<< HEAD
 declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+=======
+declare function dec(target: Function, parameterIndex: number): void;
+>>>>>>> Updated baselines
 
 class C {
     constructor(@dec p: number) {}
 }
 
 //// [decoratorOnClassConstructorParameter1.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
     function C(p) {
     }
     __decorate([dec], C, void 0, 0);
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C(p) {
+    }
+    __decorate([dec, __metadata('design:type', Number)], C, 0);
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
index 07dc7cae075..afb8775f58e 100644
--- a/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
+++ b/tests/baselines/reference/decoratorOnClassConstructorParameter4.js
@@ -1,11 +1,16 @@
 //// [decoratorOnClassConstructorParameter4.ts]
+<<<<<<< HEAD
 declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+=======
+declare function dec(target: Function, parameterIndex: number): void;
+>>>>>>> Updated baselines
 
 class C {
     constructor(public @dec p: number) {}
 }
 
 //// [decoratorOnClassConstructorParameter4.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
     function C(public, p) {
     }
     __decorate([dec], C, void 0, 1);
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C(public, p) {
+    }
+    __decorate([dec, __metadata('design:type', Number)], C, 1);
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassMethod1.js b/tests/baselines/reference/decoratorOnClassMethod1.js
index be9c00290fb..ece5d6320e5 100644
--- a/tests/baselines/reference/decoratorOnClassMethod1.js
+++ b/tests/baselines/reference/decoratorOnClassMethod1.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassMethod1.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +20,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
     C.prototype.method = function () {
     };
+<<<<<<< HEAD
     Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+=======
+    __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.js b/tests/baselines/reference/decoratorOnClassMethod10.js
index 3dd38f806bd..b8b60aa9445 100644
--- a/tests/baselines/reference/decoratorOnClassMethod10.js
+++ b/tests/baselines/reference/decoratorOnClassMethod10.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassMethod10.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +20,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
     C.prototype.method = function () {
     };
+<<<<<<< HEAD
     Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+=======
+    __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassMethod2.js b/tests/baselines/reference/decoratorOnClassMethod2.js
index b7df7b9ba9c..01f41e185f7 100644
--- a/tests/baselines/reference/decoratorOnClassMethod2.js
+++ b/tests/baselines/reference/decoratorOnClassMethod2.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassMethod2.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +20,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
     C.prototype.method = function () {
     };
+<<<<<<< HEAD
     Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+=======
+    __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.js b/tests/baselines/reference/decoratorOnClassMethod4.js
index 7021e5af328..4f4227a23f3 100644
--- a/tests/baselines/reference/decoratorOnClassMethod4.js
+++ b/tests/baselines/reference/decoratorOnClassMethod4.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassMethod4.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -25,3 +26,25 @@ class C {
 }
 Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
 var _a;
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function() {
+    class C {
+        [_a = "method"]() {
+        }
+    }
+    __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, _a);
+    return C;
+    var _a;
+})();
+>>>>>>> Updated baselines
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.js b/tests/baselines/reference/decoratorOnClassMethod5.js
index 3bde0968eab..a74536cc167 100644
--- a/tests/baselines/reference/decoratorOnClassMethod5.js
+++ b/tests/baselines/reference/decoratorOnClassMethod5.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassMethod5.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -25,3 +26,25 @@ class C {
 }
 Object.defineProperty(C.prototype, _a, __decorate([dec()], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
 var _a;
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function() {
+    class C {
+        [_a = "method"]() {
+        }
+    }
+    __decorate([dec(), __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, _a);
+    return C;
+    var _a;
+})();
+>>>>>>> Updated baselines
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.js b/tests/baselines/reference/decoratorOnClassMethod6.js
index 126dc47ad2f..6f9c42a7203 100644
--- a/tests/baselines/reference/decoratorOnClassMethod6.js
+++ b/tests/baselines/reference/decoratorOnClassMethod6.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassMethod6.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -25,3 +26,25 @@ class C {
 }
 Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
 var _a;
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function() {
+    class C {
+        [_a = "method"]() {
+        }
+    }
+    __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, _a);
+    return C;
+    var _a;
+})();
+>>>>>>> Updated baselines
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.js b/tests/baselines/reference/decoratorOnClassMethod7.js
index 34fbdb53ca5..2ad1e43998b 100644
--- a/tests/baselines/reference/decoratorOnClassMethod7.js
+++ b/tests/baselines/reference/decoratorOnClassMethod7.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassMethod7.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -25,3 +26,25 @@ class C {
 }
 Object.defineProperty(C.prototype, _a, __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a)));
 var _a;
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function() {
+    class C {
+        [_a = "method"]() {
+        }
+    }
+    __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, _a);
+    return C;
+    var _a;
+})();
+>>>>>>> Updated baselines
diff --git a/tests/baselines/reference/decoratorOnClassMethod8.js b/tests/baselines/reference/decoratorOnClassMethod8.js
index 629ff4e253b..2fd17798b25 100644
--- a/tests/baselines/reference/decoratorOnClassMethod8.js
+++ b/tests/baselines/reference/decoratorOnClassMethod8.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassMethod8.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +20,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
     C.prototype.method = function () {
     };
+<<<<<<< HEAD
     Object.defineProperty(C.prototype, "method", __decorate([dec], C.prototype, "method", Object.getOwnPropertyDescriptor(C.prototype, "method")));
+=======
+    __decorate([dec, __metadata('design:type', Function), __metadata('design:paramtypes', []), __metadata('design:returntype', Object)], C.prototype, "method");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassMethodParameter1.js b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
index 1dcb057e530..171872ee28f 100644
--- a/tests/baselines/reference/decoratorOnClassMethodParameter1.js
+++ b/tests/baselines/reference/decoratorOnClassMethodParameter1.js
@@ -1,11 +1,16 @@
 //// [decoratorOnClassMethodParameter1.ts]
+<<<<<<< HEAD
 declare function dec(target: Function, propertyKey: string | symbol, parameterIndex: number): void;
+=======
+declare function dec(target: Function, parameterIndex: number): void;
+>>>>>>> Updated baselines
 
 class C {
     method(@dec p: number) {}
 }
 
 //// [decoratorOnClassMethodParameter1.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -19,11 +24,28 @@ var __decorate = this.__decorate || function (decorators, target, key, value) {
     }
     return value;
 };
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+>>>>>>> Updated baselines
 var C = (function () {
     function C() {
     }
     C.prototype.method = function (p) {
     };
+<<<<<<< HEAD
     __decorate([dec], C.prototype, "method", 0);
+=======
+    __decorate([dec, __metadata('design:type', Number)], C.prototype.method, 0);
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassProperty1.js b/tests/baselines/reference/decoratorOnClassProperty1.js
index efc6a2c04db..f9cfab7d658 100644
--- a/tests/baselines/reference/decoratorOnClassProperty1.js
+++ b/tests/baselines/reference/decoratorOnClassProperty1.js
@@ -1,11 +1,16 @@
 //// [decoratorOnClassProperty1.ts]
+<<<<<<< HEAD
 declare function dec(target: any, propertyKey: string): void;
+=======
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>>>>>>> Updated baselines
 
 class C {
     @dec prop;
 }
 
 //// [decoratorOnClassProperty1.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
     function C() {
     }
     __decorate([dec], C.prototype, "prop");
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassProperty10.js b/tests/baselines/reference/decoratorOnClassProperty10.js
index d55eb71e3c6..c7b3a564641 100644
--- a/tests/baselines/reference/decoratorOnClassProperty10.js
+++ b/tests/baselines/reference/decoratorOnClassProperty10.js
@@ -1,11 +1,16 @@
 //// [decoratorOnClassProperty10.ts]
+<<<<<<< HEAD
 declare function dec(): <T>(target: any, propertyKey: string) => void;
+=======
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+>>>>>>> Updated baselines
 
 class C {
     @dec() prop;
 }
 
 //// [decoratorOnClassProperty10.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
     function C() {
     }
     __decorate([dec()], C.prototype, "prop");
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec(), __metadata('design:type', Object)], C.prototype, "prop");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassProperty11.js b/tests/baselines/reference/decoratorOnClassProperty11.js
index 63e5f8d02e9..d784eb56a80 100644
--- a/tests/baselines/reference/decoratorOnClassProperty11.js
+++ b/tests/baselines/reference/decoratorOnClassProperty11.js
@@ -1,11 +1,16 @@
 //// [decoratorOnClassProperty11.ts]
+<<<<<<< HEAD
 declare function dec(): <T>(target: any, propertyKey: string) => void;
+=======
+declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
+>>>>>>> Updated baselines
 
 class C {
     @dec prop;
 }
 
 //// [decoratorOnClassProperty11.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
     function C() {
     }
     __decorate([dec], C.prototype, "prop");
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassProperty2.js b/tests/baselines/reference/decoratorOnClassProperty2.js
index d52baa79202..4968fce0889 100644
--- a/tests/baselines/reference/decoratorOnClassProperty2.js
+++ b/tests/baselines/reference/decoratorOnClassProperty2.js
@@ -1,11 +1,16 @@
 //// [decoratorOnClassProperty2.ts]
+<<<<<<< HEAD
 declare function dec(target: any, propertyKey: string): void;
+=======
+declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
+>>>>>>> Updated baselines
 
 class C {
     @dec public prop;
 }
 
 //// [decoratorOnClassProperty2.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
     function C() {
     }
     __decorate([dec], C.prototype, "prop");
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassProperty6.js b/tests/baselines/reference/decoratorOnClassProperty6.js
index 7f087156bc7..2eaf977c7ee 100644
--- a/tests/baselines/reference/decoratorOnClassProperty6.js
+++ b/tests/baselines/reference/decoratorOnClassProperty6.js
@@ -6,6 +6,7 @@ class C {
 }
 
 //// [decoratorOnClassProperty6.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +24,22 @@ var C = (function () {
     function C() {
     }
     __decorate([dec], C.prototype, "prop");
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
+>>>>>>> Updated baselines
     return C;
 })();
diff --git a/tests/baselines/reference/decoratorOnClassProperty7.js b/tests/baselines/reference/decoratorOnClassProperty7.js
index ba2c8383a2c..72f08c988f1 100644
--- a/tests/baselines/reference/decoratorOnClassProperty7.js
+++ b/tests/baselines/reference/decoratorOnClassProperty7.js
@@ -1,11 +1,16 @@
 //// [decoratorOnClassProperty7.ts]
+<<<<<<< HEAD
 declare function dec(target: Function, propertyKey: string | symbol, paramIndex: number): void;
+=======
+declare function dec(target: Function, paramIndex: number): void;
+>>>>>>> Updated baselines
 
 class C {
     @dec prop;
 }
 
 //// [decoratorOnClassProperty7.js]
+<<<<<<< HEAD
 var __decorate = this.__decorate || function (decorators, target, key, value) {
     var kind = typeof (arguments.length == 2 ? value = target : value);
     for (var i = decorators.length - 1; i >= 0; --i) {
@@ -23,5 +28,22 @@ var C = (function () {
     function C() {
     }
     __decorate([dec], C.prototype, "prop");
+=======
+var __decorate = this.__decorate || (typeof Reflect === "object" && Reflect.decorate) || function (decorators, target, key) {
+    var kind = key == null ? 0 : typeof key == "number" ? 1 : 2, result = target;
+    if (kind == 2) result = Object.getOwnPropertyDescriptor(target, typeof key == "symbol" ? key : key = String(key));
+    for (var i = decorators.length - 1; i >= 0; --i) {
+        var decorator = decorators[i];
+        result = (kind == 0 ? decorator(result) : kind == 1 ? decorator(target, key) : decorator(target, key, result)) || result;
+    }
+    if (kind == 2 && result) Object.defineProperty(target, key, result);
+    if (kind == 0) return result;
+};
+var __metadata = this.__metadata || (typeof Reflect === "object" && Reflect.metadata) || function (metadataKey, metadataValue) { return function() { } };
+var C = (function () {
+    function C() {
+    }
+    __decorate([dec, __metadata('design:type', Object)], C.prototype, "prop");
+>>>>>>> Updated baselines
     return C;
 })();