Compile with --noImplicitThis

sandersn · sandersn · commit b543074861f7 · 2016-07-08T15:13:32.000-07:00
1. Add to various tsconfig.json
2. Add to Jakefile
3. Add annotations where needed.
4. Add workaround to shims.ts, which uses toplevel `this`.
diff --git a/Jakefile.js b/Jakefile.js
@@ -284,7 +284,7 @@ var builtLocalCompiler = path.join(builtLocalDirectory, compilerFilename);
 function compileFile(outFile, sources, prereqs, prefixes, useBuiltCompiler, opts, callback) {
     file(outFile, prereqs, function() {
         var compilerPath = useBuiltCompiler ? builtLocalCompiler : LKGCompiler;
-        var options = "--noImplicitAny --noEmitOnError --types --pretty";
+        var options = "--noImplicitAny --noImplicitThis --noEmitOnError --types --pretty";
         opts = opts || {};
         // Keep comments when specifically requested
         // or when in debug mode.
diff --git a/src/compiler/core.ts b/src/compiler/core.ts
@@ -1237,20 +1237,20 @@ namespace ts {
         getSignatureConstructor(): new (checker: TypeChecker) => Signature;
     }
 
-    function Symbol(flags: SymbolFlags, name: string) {
+    function Symbol(this: Symbol, flags: SymbolFlags, name: string) {
         this.flags = flags;
         this.name = name;
         this.declarations = undefined;
     }
 
-    function Type(checker: TypeChecker, flags: TypeFlags) {
+    function Type(this: Type, checker: TypeChecker, flags: TypeFlags) {
         this.flags = flags;
     }
 
     function Signature(checker: TypeChecker) {
     }
 
-    function Node(kind: SyntaxKind, pos: number, end: number) {
+    function Node(this: Node, kind: SyntaxKind, pos: number, end: number) {
         this.kind = kind;
         this.pos = pos;
         this.end = end;
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1398,7 +1398,7 @@ namespace ts {
             return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = createTypeChecker(program, /*produceDiagnostics:*/ false));
         }
 
-        function emit(sourceFile?: SourceFile, writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken): EmitResult {
+        function emit(this: Program, sourceFile?: SourceFile, writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken): EmitResult {
             return runWithCancellationToken(() => emitWorker(this, sourceFile, writeFileCallback, cancellationToken));
         }
 
diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
@@ -200,7 +200,7 @@ namespace ts {
                 directoryExists(path: string) {
                     return fso.FolderExists(path);
                 },
-                createDirectory(directoryName: string) {
+                createDirectory(this: System, directoryName: string) {
                     if (!this.directoryExists(directoryName)) {
                         fso.CreateFolder(directoryName);
                     }
@@ -500,7 +500,7 @@ namespace ts {
                 },
                 fileExists,
                 directoryExists,
-                createDirectory(directoryName: string) {
+                createDirectory(this: System, directoryName: string) {
                     if (!this.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
                     }
diff --git a/src/compiler/tsconfig.json b/src/compiler/tsconfig.json
@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "noImplicitAny": true,
+        "noImplicitThis": true,
         "removeComments": true,
         "preserveConstEnums": true,
         "outFile": "../../built/local/tsc.js",
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
@@ -2081,7 +2081,7 @@ namespace ts.server {
             const walkFns = {
                 goSubtree: true,
                 done: false,
-                leaf: function (relativeStart: number, relativeLength: number, ll: LineLeaf) {
+                leaf: function (this: ILineIndexWalker, relativeStart: number, relativeLength: number, ll: LineLeaf) {
                     if (!f(ll, relativeStart, relativeLength)) {
                         this.done = true;
                     }
diff --git a/src/server/tsconfig.json b/src/server/tsconfig.json
@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "noImplicitAny": true,
+        "noImplicitThis": true,
         "removeComments": true,
         "preserveConstEnums": true,
         "out": "../../built/local/tsserver.js",
diff --git a/src/services/shims.ts b/src/services/shims.ts
@@ -16,7 +16,7 @@
 /// <reference path='services.ts' />
 
 /* @internal */
-let debugObjectHost = (<any>this);
+let debugObjectHost = new Function("return this")();
 
 // We need to use 'null' to interface with the managed side.
 /* tslint:disable:no-null-keyword */
diff --git a/src/services/tsconfig.json b/src/services/tsconfig.json
@@ -1,6 +1,7 @@
 {
     "compilerOptions": {
         "noImplicitAny": true,
+        "noImplicitThis": true,
         "removeComments": false,
         "preserveConstEnums": true,
         "outFile": "../../built/local/typescriptServices.js",

Original file line number	Diff line number	Diff line change
`@@ -1237,20 +1237,20 @@ namespace ts {`
`1237`	`1237`	`getSignatureConstructor(): new (checker: TypeChecker) => Signature;`
`1238`	`1238`	`}`
`1239`	`1239`
`1240`		`- function Symbol(flags: SymbolFlags, name: string) {`
	`1240`	`+ function Symbol(this: Symbol, flags: SymbolFlags, name: string) {`
`1241`	`1241`	`this.flags = flags;`
`1242`	`1242`	`this.name = name;`
`1243`	`1243`	`this.declarations = undefined;`
`1244`	`1244`	`}`
`1245`	`1245`
`1246`		`- function Type(checker: TypeChecker, flags: TypeFlags) {`
	`1246`	`+ function Type(this: Type, checker: TypeChecker, flags: TypeFlags) {`
`1247`	`1247`	`this.flags = flags;`
`1248`	`1248`	`}`
`1249`	`1249`
`1250`	`1250`	`function Signature(checker: TypeChecker) {`
`1251`	`1251`	`}`
`1252`	`1252`
`1253`		`- function Node(kind: SyntaxKind, pos: number, end: number) {`
	`1253`	`+ function Node(this: Node, kind: SyntaxKind, pos: number, end: number) {`
`1254`	`1254`	`this.kind = kind;`
`1255`	`1255`	`this.pos = pos;`
`1256`	`1256`	`this.end = end;`
Original file line number	Diff line number	Diff line change
`@@ -1398,7 +1398,7 @@ namespace ts {`
`1398`	`1398`	`return noDiagnosticsTypeChecker \|\| (noDiagnosticsTypeChecker = createTypeChecker(program, /produceDiagnostics:/ false));`
`1399`	`1399`	`}`
`1400`	`1400`
`1401`		`- function emit(sourceFile?: SourceFile, writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken): EmitResult {`
	`1401`	`+ function emit(this: Program, sourceFile?: SourceFile, writeFileCallback?: WriteFileCallback, cancellationToken?: CancellationToken): EmitResult {`
`1402`	`1402`	`return runWithCancellationToken(() => emitWorker(this, sourceFile, writeFileCallback, cancellationToken));`
`1403`	`1403`	`}`
`1404`	`1404`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"compilerOptions": {`
`3`	`3`	`"noImplicitAny": true,`
	`4`	`+ "noImplicitThis": true,`
`4`	`5`	`"removeComments": true,`
`5`	`6`	`"preserveConstEnums": true,`
`6`	`7`	`"outFile": "../../built/local/tsc.js",`
Original file line number	Diff line number	Diff line change
`@@ -2081,7 +2081,7 @@ namespace ts.server {`
`2081`	`2081`	`const walkFns = {`
`2082`	`2082`	`goSubtree: true,`
`2083`	`2083`	`done: false,`
`2084`		`- leaf: function (relativeStart: number, relativeLength: number, ll: LineLeaf) {`
	`2084`	`+ leaf: function (this: ILineIndexWalker, relativeStart: number, relativeLength: number, ll: LineLeaf) {`
`2085`	`2085`	`if (!f(ll, relativeStart, relativeLength)) {`
`2086`	`2086`	`this.done = true;`
`2087`	`2087`	`}`