microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-05-15 12:51:30 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

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

Browse Source 
# Conflicts:
#	src/compiler/scanner.ts
This commit is contained in:
Kanchalai Tanglertsampan
2017-04-12 12:18:18 -07:00
parent eb0ad7f3f9 c1ea3034d5
commit e5b95fcfbb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/compiler/scanner.ts
View File

@@ -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++;