From a138e6307fa6e9d60e7179f4aa5e49617fd5fd9c Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 11 Jul 2016 11:30:22 -0700
Subject: [PATCH] Avoid using `this` in object literals where possible

---
 src/compiler/sys.ts          | 14 ++++++++------
 src/server/editorServices.ts |  4 ++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/compiler/sys.ts b/src/compiler/sys.ts
index 5000be8a0c..29ae2c60af 100644
--- a/src/compiler/sys.ts
+++ b/src/compiler/sys.ts
@@ -182,7 +182,7 @@ namespace ts {
                 return matchFiles(path, extensions, excludes, includes, /*useCaseSensitiveFileNames*/ false, shell.CurrentDirectory, getAccessibleFileSystemEntries);
             }
 
-            return {
+            const wscriptSystem: System = {
                 args,
                 newLine: "\r\n",
                 useCaseSensitiveFileNames: false,
@@ -200,8 +200,8 @@ namespace ts {
                 directoryExists(path: string) {
                     return fso.FolderExists(path);
                 },
-                createDirectory(this: System, directoryName: string) {
-                    if (!this.directoryExists(directoryName)) {
+                createDirectory(directoryName: string) {
+                    if (!wscriptSystem.directoryExists(directoryName)) {
                         fso.CreateFolder(directoryName);
                     }
                 },
@@ -221,6 +221,7 @@ namespace ts {
                     }
                 }
             };
+            return wscriptSystem;
         }
 
         function getNodeSystem(): System {
@@ -439,7 +440,7 @@ namespace ts {
                 return filter<string>(_fs.readdirSync(path), p => fileSystemEntryExists(combinePaths(path, p), FileSystemEntryKind.Directory));
             }
 
-            return {
+            const nodeSystem: System = {
                 args: process.argv.slice(2),
                 newLine: _os.EOL,
                 useCaseSensitiveFileNames: useCaseSensitiveFileNames,
@@ -500,8 +501,8 @@ namespace ts {
                 },
                 fileExists,
                 directoryExists,
-                createDirectory(this: System, directoryName: string) {
-                    if (!this.directoryExists(directoryName)) {
+                createDirectory(directoryName: string) {
+                    if (!nodeSystem.directoryExists(directoryName)) {
                         _fs.mkdirSync(directoryName);
                     }
                 },
@@ -549,6 +550,7 @@ namespace ts {
                     return _fs.realpathSync(path);
                 }
             };
+            return nodeSystem;
         }
 
         function getChakraSystem(): System {
diff --git a/src/server/editorServices.ts b/src/server/editorServices.ts
index fc2131d092..8854ea9f43 100644
--- a/src/server/editorServices.ts
+++ b/src/server/editorServices.ts
@@ -2081,9 +2081,9 @@ namespace ts.server {
             const walkFns = {
                 goSubtree: true,
                 done: false,
-                leaf: function (this: ILineIndexWalker, relativeStart: number, relativeLength: number, ll: LineLeaf) {
+                leaf: function (relativeStart: number, relativeLength: number, ll: LineLeaf) {
                     if (!f(ll, relativeStart, relativeLength)) {
-                        this.done = true;
+                        walkFns.done = true;
                     }
                 }
             };