Avoid using this in object literals where possible

sandersn · sandersn · commit a138e6307fa6 · 2016-07-11T11:30:22.000-07:00
diff --git 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
@@ -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;
                     }
                 }
             };

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ namespace ts {`
`182`	`182`	`return matchFiles(path, extensions, excludes, includes, /useCaseSensitiveFileNames/ false, shell.CurrentDirectory, getAccessibleFileSystemEntries);`
`183`	`183`	`}`
`184`	`184`
`185`		`- return {`
	`185`	`+ const wscriptSystem: System = {`
`186`	`186`	`args,`
`187`	`187`	`newLine: "\r\n",`
`188`	`188`	`useCaseSensitiveFileNames: false,`
`@@ -200,8 +200,8 @@ namespace ts {`
`200`	`200`	`directoryExists(path: string) {`
`201`	`201`	`return fso.FolderExists(path);`
`202`	`202`	`},`
`203`		`- createDirectory(this: System, directoryName: string) {`
`204`		`- if (!this.directoryExists(directoryName)) {`
	`203`	`+ createDirectory(directoryName: string) {`
	`204`	`+ if (!wscriptSystem.directoryExists(directoryName)) {`
`205`	`205`	`fso.CreateFolder(directoryName);`
`206`	`206`	`}`
`207`	`207`	`},`
`@@ -221,6 +221,7 @@ namespace ts {`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`	`};`
	`224`	`+ return wscriptSystem;`
`224`	`225`	`}`
`225`	`226`
`226`	`227`	`function getNodeSystem(): System {`
`@@ -439,7 +440,7 @@ namespace ts {`
`439`	`440`	`return filter<string>(_fs.readdirSync(path), p => fileSystemEntryExists(combinePaths(path, p), FileSystemEntryKind.Directory));`
`440`	`441`	`}`
`441`	`442`
`442`		`- return {`
	`443`	`+ const nodeSystem: System = {`
`443`	`444`	`args: process.argv.slice(2),`
`444`	`445`	`newLine: _os.EOL,`
`445`	`446`	`useCaseSensitiveFileNames: useCaseSensitiveFileNames,`
`@@ -500,8 +501,8 @@ namespace ts {`
`500`	`501`	`},`
`501`	`502`	`fileExists,`
`502`	`503`	`directoryExists,`
`503`		`- createDirectory(this: System, directoryName: string) {`
`504`		`- if (!this.directoryExists(directoryName)) {`
	`504`	`+ createDirectory(directoryName: string) {`
	`505`	`+ if (!nodeSystem.directoryExists(directoryName)) {`
`505`	`506`	`_fs.mkdirSync(directoryName);`
`506`	`507`	`}`
`507`	`508`	`},`
`@@ -549,6 +550,7 @@ namespace ts {`
`549`	`550`	`return _fs.realpathSync(path);`
`550`	`551`	`}`
`551`	`552`	`};`
	`553`	`+ return nodeSystem;`
`552`	`554`	`}`
`553`	`555`
`554`	`556`	`function getChakraSystem(): System {`
Original file line number	Diff line number	Diff line change
`@@ -2081,9 +2081,9 @@ namespace ts.server {`
`2081`	`2081`	`const walkFns = {`
`2082`	`2082`	`goSubtree: true,`
`2083`	`2083`	`done: false,`
`2084`		`- leaf: function (this: ILineIndexWalker, relativeStart: number, relativeLength: number, ll: LineLeaf) {`
	`2084`	`+ leaf: function (relativeStart: number, relativeLength: number, ll: LineLeaf) {`
`2085`	`2085`	`if (!f(ll, relativeStart, relativeLength)) {`
`2086`		`- this.done = true;`
	`2086`	`+ walkFns.done = true;`
`2087`	`2087`	`}`
`2088`	`2088`	`}`
`2089`	`2089`	`};`