Merge branch 'master-jsxChildren' of https://github.com/Microsoft/TypeScript into master-jsxChildren

Kanchalai Tanglertsampan · Kanchalai Tanglertsampan · commit e5b95fcfbbaa · 2017-04-12T12:18:18.000-07:00
# Conflicts:
#	src/compiler/scanner.ts
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -1,4 +1,4 @@
-/// <reference path="core.ts"/>
+﻿/// <reference path="core.ts"/>
 /// <reference path="diagnosticInformationMap.generated.ts"/>
 
 namespace ts {
@@ -1750,7 +1750,7 @@ namespace ts {
                 if (isLineBreak(char) && firstNonWhitespace === 0) {
                     firstNonWhitespace = -1;
                 }
-                else if (!isWhiteSpaceLike(char)) {
+                else if (!isWhiteSpaceLike(char)) {
                     firstNonWhitespace = pos;
                 }
                 pos++;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/// <reference path="core.ts"/>`
	`1`	`+/// <reference path="core.ts"/>`
`2`	`2`	`/// <reference path="diagnosticInformationMap.generated.ts"/>`
`3`	`3`
`4`	`4`	`namespace ts {`
`@@ -1750,7 +1750,7 @@ namespace ts {`
`1750`	`1750`	`if (isLineBreak(char) && firstNonWhitespace === 0) {`
`1751`	`1751`	`firstNonWhitespace = -1;`
`1752`	`1752`	`}`
`1753`		`- else if (!isWhiteSpaceLike(char)) {`
	`1753`	`+ else if (!isWhiteSpaceLike(char)) {`
`1754`	`1754`	`firstNonWhitespace = pos;`
`1755`	`1755`	`}`
`1756`	`1756`	`pos++;`