Adds minimal support for 'this' types in decorator metadata, emitting 'Object' for now.

rbuckton · rbuckton · commit 5915fbd292c3 · 2015-11-19T09:53:32.000-08:00
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
@@ -6006,6 +6006,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, Promi
                         case SyntaxKind.UnionType:
                         case SyntaxKind.IntersectionType:
                         case SyntaxKind.AnyKeyword:
+                        case SyntaxKind.ThisType:
                             break;
 
                         default:
diff --git a/tests/baselines/reference/decoratorMetadata.js b/tests/baselines/reference/decoratorMetadata.js
@@ -12,6 +12,10 @@ declare var decorator: any;
 class MyComponent {
     constructor(public Service: Service) {
     }
+
+    @decorator
+    method(x: this) {
+    }
 }
 
 //// [service.js]
@@ -37,6 +41,14 @@ var MyComponent = (function () {
     function MyComponent(Service) {
         this.Service = Service;
     }
+    MyComponent.prototype.method = function (x) {
+    };
+    __decorate([
+        decorator, 
+        __metadata('design:type', Function), 
+        __metadata('design:paramtypes', [Object]), 
+        __metadata('design:returntype', void 0)
+    ], MyComponent.prototype, "method", null);
     MyComponent = __decorate([
         decorator, 
         __metadata('design:paramtypes', [service_1.default])
diff --git a/tests/baselines/reference/decoratorMetadata.symbols b/tests/baselines/reference/decoratorMetadata.symbols
@@ -19,4 +19,12 @@ class MyComponent {
 >Service : Symbol(Service, Decl(component.ts, 6, 16))
 >Service : Symbol(Service, Decl(component.ts, 0, 6))
     }
+
+    @decorator
+>decorator : Symbol(decorator, Decl(component.ts, 2, 11))
+
+    method(x: this) {
+>method : Symbol(method, Decl(component.ts, 7, 5))
+>x : Symbol(x, Decl(component.ts, 10, 11))
+    }
 }
diff --git a/tests/baselines/reference/decoratorMetadata.types b/tests/baselines/reference/decoratorMetadata.types
@@ -19,4 +19,12 @@ class MyComponent {
 >Service : Service
 >Service : Service
     }
+
+    @decorator
+>decorator : any
+
+    method(x: this) {
+>method : (x: this) => void
+>x : this
+    }
 }
diff --git a/tests/cases/conformance/decorators/decoratorMetadata.ts b/tests/cases/conformance/decorators/decoratorMetadata.ts
@@ -14,4 +14,8 @@ declare var decorator: any;
 class MyComponent {
     constructor(public Service: Service) {
     }
+
+    @decorator
+    method(x: this) {
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,12 @@ class MyComponent {`
`19`	`19`	`>Service : Symbol(Service, Decl(component.ts, 6, 16))`
`20`	`20`	`>Service : Symbol(Service, Decl(component.ts, 0, 6))`
`21`	`21`	`}`
	`22`	`+`
	`23`	`+ @decorator`
	`24`	`+>decorator : Symbol(decorator, Decl(component.ts, 2, 11))`
	`25`	`+`
	`26`	`+ method(x: this) {`
	`27`	`+>method : Symbol(method, Decl(component.ts, 7, 5))`
	`28`	`+>x : Symbol(x, Decl(component.ts, 10, 11))`
	`29`	`+ }`
`22`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,4 +14,8 @@ declare var decorator: any;`
`14`	`14`	`class MyComponent {`
`15`	`15`	`constructor(public Service: Service) {`
`16`	`16`	`}`
	`17`	`+`
	`18`	`+ @decorator`
	`19`	`+ method(x: this) {`
	`20`	`+ }`
`17`	`21`	`}`