Updated check and emit, updated baselines

rbuckton · rbuckton · commit 8dd9b9f2cb5a · 2015-03-23T14:47:07.000-07:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -102,11 +102,9 @@ module ts {
         let anyArrayType: Type;
         let globalTypedPropertyDescriptorType: ObjectType;
         let globalClassDecoratorType: ObjectType;
-        let globalClassDecoratorErasedType: ObjectType;
         let globalParameterDecoratorType: ObjectType;
         let globalPropertyDecoratorType: ObjectType;
-        let globalPropertyDecoratorErasedType: ObjectType;
-
+        
         let tupleTypes: Map<TupleType> = {};
         let unionTypes: Map<UnionType> = {};
         let stringLiteralTypes: Map<StringLiteralType> = {};
@@ -11344,9 +11342,7 @@ module ts {
             globalRegExpType = getGlobalType("RegExp");
             globalTypedPropertyDescriptorType = getTypeOfGlobalSymbol(getGlobalTypeSymbol("TypedPropertyDescriptor"), 1);
             globalClassDecoratorType = getGlobalType("ClassDecorator");
-            globalClassDecoratorErasedType = instantiateSingleCallFunctionType(globalClassDecoratorType, [globalFunctionType]);
             globalPropertyDecoratorType = getGlobalType("PropertyDecorator");
-            globalPropertyDecoratorErasedType = instantiateSingleCallFunctionType(globalPropertyDecoratorType, [anyType]);
             globalParameterDecoratorType = getGlobalType("ParameterDecorator");
 
             // If we're in ES6 mode, load the TemplateStringsArray.
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -6053,7 +6053,6 @@ module ts {
 var __decorate = this.__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));
-    if (kind == 2 && !result) kind = 1;
     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;
diff --git a/tests/baselines/reference/APISample_compile.js b/tests/baselines/reference/APISample_compile.js
@@ -960,7 +960,6 @@ declare module "typescript" {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         isUnknownIdentifier(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
-        getClassDeclarationVariableId(node: Identifier): number;
     }
     const enum SymbolFlags {
         FunctionScopedVariable = 1,
@@ -1455,7 +1454,6 @@ declare module "typescript" {
         character: number;
     };
     function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
-    function lineBreakBetween(sourceFile: SourceFile, firstPos: number, secondPos: number): boolean;
     function isWhiteSpace(ch: number): boolean;
     function isLineBreak(ch: number): boolean;
     function isOctalDigit(ch: number): boolean;
diff --git a/tests/baselines/reference/APISample_compile.types b/tests/baselines/reference/APISample_compile.types
@@ -3121,11 +3121,6 @@ declare module "typescript" {
         getBlockScopedVariableId(node: Identifier): number;
 >getBlockScopedVariableId : (node: Identifier) => number
 >node : Identifier
->Identifier : Identifier
-
-        getClassDeclarationVariableId(node: Identifier): number;
->getClassDeclarationVariableId : (node: Identifier) => number
->node : Identifier
 >Identifier : Identifier
     }
     const enum SymbolFlags {
@@ -4614,13 +4609,6 @@ declare module "typescript" {
 >position : number
 >LineAndCharacter : LineAndCharacter
 
-    function lineBreakBetween(sourceFile: SourceFile, firstPos: number, secondPos: number): boolean;
->lineBreakBetween : (sourceFile: SourceFile, firstPos: number, secondPos: number) => boolean
->sourceFile : SourceFile
->SourceFile : SourceFile
->firstPos : number
->secondPos : number
-
     function isWhiteSpace(ch: number): boolean;
 >isWhiteSpace : (ch: number) => boolean
 >ch : number
diff --git a/tests/baselines/reference/APISample_linter.js b/tests/baselines/reference/APISample_linter.js
@@ -991,7 +991,6 @@ declare module "typescript" {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         isUnknownIdentifier(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
-        getClassDeclarationVariableId(node: Identifier): number;
     }
     const enum SymbolFlags {
         FunctionScopedVariable = 1,
@@ -1486,7 +1485,6 @@ declare module "typescript" {
         character: number;
     };
     function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
-    function lineBreakBetween(sourceFile: SourceFile, firstPos: number, secondPos: number): boolean;
     function isWhiteSpace(ch: number): boolean;
     function isLineBreak(ch: number): boolean;
     function isOctalDigit(ch: number): boolean;
diff --git a/tests/baselines/reference/APISample_linter.types b/tests/baselines/reference/APISample_linter.types
@@ -3267,11 +3267,6 @@ declare module "typescript" {
         getBlockScopedVariableId(node: Identifier): number;
 >getBlockScopedVariableId : (node: Identifier) => number
 >node : Identifier
->Identifier : Identifier
-
-        getClassDeclarationVariableId(node: Identifier): number;
->getClassDeclarationVariableId : (node: Identifier) => number
->node : Identifier
 >Identifier : Identifier
     }
     const enum SymbolFlags {
@@ -4760,13 +4755,6 @@ declare module "typescript" {
 >position : number
 >LineAndCharacter : LineAndCharacter
 
-    function lineBreakBetween(sourceFile: SourceFile, firstPos: number, secondPos: number): boolean;
->lineBreakBetween : (sourceFile: SourceFile, firstPos: number, secondPos: number) => boolean
->sourceFile : SourceFile
->SourceFile : SourceFile
->firstPos : number
->secondPos : number
-
     function isWhiteSpace(ch: number): boolean;
 >isWhiteSpace : (ch: number) => boolean
 >ch : number
diff --git a/tests/baselines/reference/APISample_transform.js b/tests/baselines/reference/APISample_transform.js
@@ -992,7 +992,6 @@ declare module "typescript" {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         isUnknownIdentifier(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
-        getClassDeclarationVariableId(node: Identifier): number;
     }
     const enum SymbolFlags {
         FunctionScopedVariable = 1,
@@ -1487,7 +1486,6 @@ declare module "typescript" {
         character: number;
     };
     function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
-    function lineBreakBetween(sourceFile: SourceFile, firstPos: number, secondPos: number): boolean;
     function isWhiteSpace(ch: number): boolean;
     function isLineBreak(ch: number): boolean;
     function isOctalDigit(ch: number): boolean;
diff --git a/tests/baselines/reference/APISample_transform.types b/tests/baselines/reference/APISample_transform.types
@@ -3217,11 +3217,6 @@ declare module "typescript" {
         getBlockScopedVariableId(node: Identifier): number;
 >getBlockScopedVariableId : (node: Identifier) => number
 >node : Identifier
->Identifier : Identifier
-
-        getClassDeclarationVariableId(node: Identifier): number;
->getClassDeclarationVariableId : (node: Identifier) => number
->node : Identifier
 >Identifier : Identifier
     }
     const enum SymbolFlags {
@@ -4710,13 +4705,6 @@ declare module "typescript" {
 >position : number
 >LineAndCharacter : LineAndCharacter
 
-    function lineBreakBetween(sourceFile: SourceFile, firstPos: number, secondPos: number): boolean;
->lineBreakBetween : (sourceFile: SourceFile, firstPos: number, secondPos: number) => boolean
->sourceFile : SourceFile
->SourceFile : SourceFile
->firstPos : number
->secondPos : number
-
     function isWhiteSpace(ch: number): boolean;
 >isWhiteSpace : (ch: number) => boolean
 >ch : number
diff --git a/tests/baselines/reference/APISample_watcher.js b/tests/baselines/reference/APISample_watcher.js
@@ -1029,7 +1029,6 @@ declare module "typescript" {
         getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
         isUnknownIdentifier(location: Node, name: string): boolean;
         getBlockScopedVariableId(node: Identifier): number;
-        getClassDeclarationVariableId(node: Identifier): number;
     }
     const enum SymbolFlags {
         FunctionScopedVariable = 1,
@@ -1524,7 +1523,6 @@ declare module "typescript" {
         character: number;
     };
     function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
-    function lineBreakBetween(sourceFile: SourceFile, firstPos: number, secondPos: number): boolean;
     function isWhiteSpace(ch: number): boolean;
     function isLineBreak(ch: number): boolean;
     function isOctalDigit(ch: number): boolean;
diff --git a/tests/baselines/reference/APISample_watcher.types b/tests/baselines/reference/APISample_watcher.types
@@ -3390,11 +3390,6 @@ declare module "typescript" {
         getBlockScopedVariableId(node: Identifier): number;
 >getBlockScopedVariableId : (node: Identifier) => number
 >node : Identifier
->Identifier : Identifier
-
-        getClassDeclarationVariableId(node: Identifier): number;
->getClassDeclarationVariableId : (node: Identifier) => number
->node : Identifier
 >Identifier : Identifier
     }
     const enum SymbolFlags {
@@ -4883,13 +4878,6 @@ declare module "typescript" {
 >position : number
 >LineAndCharacter : LineAndCharacter
 
-    function lineBreakBetween(sourceFile: SourceFile, firstPos: number, secondPos: number): boolean;
->lineBreakBetween : (sourceFile: SourceFile, firstPos: number, secondPos: number) => boolean
->sourceFile : SourceFile
->SourceFile : SourceFile
->firstPos : number
->secondPos : number
-
     function isWhiteSpace(ch: number): boolean;
 >isWhiteSpace : (ch: number) => boolean
 >ch : number
diff --git a/tests/baselines/reference/decoratorOnClass8.errors.txt b/tests/baselines/reference/decoratorOnClass8.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/decorators/class/decoratorOnClass8.ts(3,1): error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: Function) => void | Function'.
+tests/cases/conformance/decorators/class/decoratorOnClass8.ts(3,1): error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: typeof C) => void | typeof C'.
 
 
 ==== tests/cases/conformance/decorators/class/decoratorOnClass8.ts (1 errors) ====
     declare function dec(): (target: Function, paramIndex: number) => void;
     
     @dec()
     ~~~~~~
-!!! error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: Function) => void | Function'.
+!!! error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: typeof C) => void | typeof C'.
     class C {
     }
diff --git a/tests/baselines/reference/decoratorOnClassMethod10.errors.txt b/tests/baselines/reference/decoratorOnClassMethod10.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,5): error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<any>) => void | TypedPropertyDescriptor<any>'.
+tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,5): error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<() => void>) => void | TypedPropertyDescriptor<() => void>'.
   Types of parameters 'paramIndex' and 'propertyKey' are incompatible.
     Type 'number' is not assignable to type 'string | symbol'.
       Type 'number' is not assignable to type 'symbol'.
@@ -10,7 +10,7 @@ tests/cases/conformance/decorators/class/method/decoratorOnClassMethod10.ts(4,5)
     class C {
         @dec method() {}
         ~~~~
-!!! error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<any>) => void | TypedPropertyDescriptor<any>'.
+!!! error TS2322: Type '(target: Function, paramIndex: number) => void' is not assignable to type '(target: Object, propertyKey: string | symbol, descriptor: TypedPropertyDescriptor<() => void>) => void | TypedPropertyDescriptor<() => void>'.
 !!! error TS2322:   Types of parameters 'paramIndex' and 'propertyKey' are incompatible.
 !!! error TS2322:     Type 'number' is not assignable to type 'string | symbol'.
 !!! error TS2322:       Type 'number' is not assignable to type 'symbol'.
diff --git a/tests/baselines/reference/decoratorOnClassMethod4.js b/tests/baselines/reference/decoratorOnClassMethod4.js
@@ -1,27 +1,27 @@
-//// [decoratorOnClassMethod4.ts]
+//// [decoratorOnClassMethod4.ts]
 declare function dec<T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>): TypedPropertyDescriptor<T>;
 
 class C {
     @dec ["method"]() {}
-}
-
-//// [decoratorOnClassMethod4.js]
-var __decorate = this.__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 C = (function() {
-    class C {
-        [_a = "method"]() {
-        }
-    }
-    __decorate([dec], C.prototype, _a);
-    return C;
-    var _a;
-})();
+}
+
+//// [decoratorOnClassMethod4.js]
+var __decorate = this.__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;
+};
+let C = () => {
+    class C {
+        [_a = "method"]() {
+        }
+    }
+    __decorate([dec], C.prototype, _a);
+    return C;
+    var _a;
+}();
diff --git a/tests/baselines/reference/decoratorOnClassMethod5.js b/tests/baselines/reference/decoratorOnClassMethod5.js
@@ -1,27 +1,27 @@
-//// [decoratorOnClassMethod5.ts]
+//// [decoratorOnClassMethod5.ts]
 declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
 
 class C {
     @dec() ["method"]() {}
-}
-
-//// [decoratorOnClassMethod5.js]
-var __decorate = this.__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 C = (function() {
-    class C {
-        [_a = "method"]() {
-        }
-    }
-    __decorate([dec()], C.prototype, _a);
-    return C;
-    var _a;
-})();
+}
+
+//// [decoratorOnClassMethod5.js]
+var __decorate = this.__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;
+};
+let C = () => {
+    class C {
+        [_a = "method"]() {
+        }
+    }
+    __decorate([dec()], C.prototype, _a);
+    return C;
+    var _a;
+}();
diff --git a/tests/baselines/reference/decoratorOnClassMethod6.js b/tests/baselines/reference/decoratorOnClassMethod6.js
@@ -1,27 +1,27 @@
-//// [decoratorOnClassMethod6.ts]
+//// [decoratorOnClassMethod6.ts]
 declare function dec(): <T>(target: any, propertyKey: string, descriptor: TypedPropertyDescriptor<T>) => TypedPropertyDescriptor<T>;
 
 class C {
     @dec ["method"]() {}
-}
-
-//// [decoratorOnClassMethod6.js]
-var __decorate = this.__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 C = (function() {
-    class C {
-        [_a = "method"]() {
-        }
-    }
-    __decorate([dec], C.prototype, _a);
-    return C;
-    var _a;
-})();
+}
+
+//// [decoratorOnClassMethod6.js]
+var __decorate = this.__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;
+};
+let C = () => {
+    class C {
+        [_a = "method"]() {
+        }
+    }
+    __decorate([dec], C.prototype, _a);
+    return C;
+    var _a;
+}();
diff --git a/tests/baselines/reference/decoratorOnClassMethod7.js b/tests/baselines/reference/decoratorOnClassMethod7.js
diff --git a/tests/baselines/reference/decoratorOnClassProperty13.errors.txt b/tests/baselines/reference/decoratorOnClassProperty13.errors.txt
diff --git a/tests/baselines/reference/es6ExportDefaultClassDeclaration2.js b/tests/baselines/reference/es6ExportDefaultClassDeclaration2.js
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js b/tests/baselines/reference/sourceMapValidationDecorators.js
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.js.map b/tests/baselines/reference/sourceMapValidationDecorators.js.map
diff --git a/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt b/tests/baselines/reference/sourceMapValidationDecorators.sourcemap.txt
