Error on all uses of this that are implicitly any

sandersn · sandersn · commit 0113ad525069 · 2016-03-30T13:31:10.000-07:00
Previously it was only an error inside an function.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -8110,7 +8110,7 @@ namespace ts {
                 }
             }
 
-            if (compilerOptions.noImplicitThis && isFunctionLike(container)) {
+            if (compilerOptions.noImplicitThis) {
                 // With noImplicitThis, functions may not reference 'this' if it has type 'any'
                 error(node, Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
             }
diff --git a/tests/baselines/reference/noImplicitThisFunctions.errors.txt b/tests/baselines/reference/noImplicitThisFunctions.errors.txt
@@ -1,7 +1,8 @@
 tests/cases/compiler/noImplicitThisFunctions.ts(14,12): error TS2681: 'this' implicitly has type 'any' because it does not have a type annotation.
+tests/cases/compiler/noImplicitThisFunctions.ts(18,38): error TS2681: 'this' implicitly has type 'any' because it does not have a type annotation.
 
 
-==== tests/cases/compiler/noImplicitThisFunctions.ts (1 errors) ====
+==== tests/cases/compiler/noImplicitThisFunctions.ts (2 errors) ====
     
     function f1(x) {
         // implicit any is still allowed
@@ -20,6 +21,8 @@ tests/cases/compiler/noImplicitThisFunctions.ts(14,12): error TS2681: 'this' imp
 !!! error TS2681: 'this' implicitly has type 'any' because it does not have a type annotation.
     }
     
-    // ok, arrow functions don't even bind `this`, so `this` is just `window`
+    // error: `this` is `window`, but is still of type `any`
     let f4: (b: number) => number = b => this.c + b;
+                                         ~~~~
+!!! error TS2681: 'this' implicitly has type 'any' because it does not have a type annotation.
     
diff --git a/tests/baselines/reference/noImplicitThisFunctions.js b/tests/baselines/reference/noImplicitThisFunctions.js
@@ -15,7 +15,7 @@ function f3(z: number): number {
     return this.a + z;
 }
 
-// ok, arrow functions don't even bind `this`, so `this` is just `window`
+// error: `this` is `window`, but is still of type `any`
 let f4: (b: number) => number = b => this.c + b;
 
 
@@ -33,5 +33,5 @@ function f3(z) {
     // error: this is implicitly any
     return this.a + z;
 }
-// ok, arrow functions don't even bind `this`, so `this` is just `window`
+// error: `this` is `window`, but is still of type `any`
 var f4 = function (b) { return _this.c + b; };
diff --git a/tests/cases/compiler/noImplicitThisFunctions.ts b/tests/cases/compiler/noImplicitThisFunctions.ts
@@ -15,5 +15,5 @@ function f3(z: number): number {
     return this.a + z;
 }
 
-// ok, arrow functions don't even bind `this`, so `this` is just `window`
+// error: `this` is `window`, but is still of type `any`
 let f4: (b: number) => number = b => this.c + b;

Original file line number	Diff line number	Diff line change
`@@ -8110,7 +8110,7 @@ namespace ts {`
`8110`	`8110`	`}`
`8111`	`8111`	`}`
`8112`	`8112`
`8113`		`- if (compilerOptions.noImplicitThis && isFunctionLike(container)) {`
	`8113`	`+ if (compilerOptions.noImplicitThis) {`
`8114`	`8114`	`// With noImplicitThis, functions may not reference 'this' if it has type 'any'`
`8115`	`8115`	`error(node, Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);`
`8116`	`8116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ function f3(z: number): number {`
`15`	`15`	`return this.a + z;`
`16`	`16`	`}`
`17`	`17`
`18`		-// ok, arrow functions don't even bind `this`, so `this` is just `window`
	`18`	+// error: `this` is `window`, but is still of type `any`
`19`	`19`	`let f4: (b: number) => number = b => this.c + b;`
`20`	`20`
`21`	`21`
`@@ -33,5 +33,5 @@ function f3(z) {`
`33`	`33`	`// error: this is implicitly any`
`34`	`34`	`return this.a + z;`
`35`	`35`	`}`
`36`		-// ok, arrow functions don't even bind `this`, so `this` is just `window`
	`36`	+// error: `this` is `window`, but is still of type `any`
`37`	`37`	`var f4 = function (b) { return _this.c + b; };`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ function f3(z: number): number {`
`15`	`15`	`return this.a + z;`
`16`	`16`	`}`
`17`	`17`
`18`		-// ok, arrow functions don't even bind `this`, so `this` is just `window`
	`18`	+// error: `this` is `window`, but is still of type `any`
`19`	`19`	`let f4: (b: number) => number = b => this.c + b;`