Update type checking for lexical binding due to merge with master

Yui T · Yui T · commit de9547cc9e61 · 2015-01-23T17:08:08.000-08:00
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -4832,9 +4832,12 @@ module ts {
                 container = getThisContainer(container, /* includeArrowFunctions */ false);
 
                 // When targeting es6, arrow function lexically bind "this" so we do not need to do the work of binding "this" in emitted code
-                if (compilerOptions.target < ScriptTarget.ES6) {
-                    needToCaptureLexicalThis = true;
+                if (compilerOptions.target >= ScriptTarget.ES6) {
+                    needToCaptureLexicalThis = false;
                 }
+				else {
+					needToCaptureLexicalThis = true;
+				}
             }
 
             switch (container.kind) {

Original file line number	Diff line number	Diff line change
`@@ -4832,9 +4832,12 @@ module ts {`
`4832`	`4832`	`container = getThisContainer(container, /* includeArrowFunctions */ false);`
`4833`	`4833`
`4834`	`4834`	`// When targeting es6, arrow function lexically bind "this" so we do not need to do the work of binding "this" in emitted code`
`4835`		`- if (compilerOptions.target < ScriptTarget.ES6) {`
`4836`		`- needToCaptureLexicalThis = true;`
	`4835`	`+ if (compilerOptions.target >= ScriptTarget.ES6) {`
	`4836`	`+ needToCaptureLexicalThis = false;`
`4837`	`4837`	`}`
	`4838`	`+ else {`
	`4839`	`+ needToCaptureLexicalThis = true;`
	`4840`	`+ }`
`4838`	`4841`	`}`
`4839`	`4842`
`4840`	`4843`	`switch (container.kind) {`