Skip to content

Commit db10cae

Browse files
Add missing nextLine entry to whitespace, remove unnecessary branches.
1 parent 9e5e29f commit db10cae

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/compiler/scanner.ts

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -333,11 +333,12 @@ for (
333333
[CharacterCodes.paragraphSeparator, TokenCategory.LineBreak],
334334

335335
// Single Line Whitespace
336+
[CharacterCodes.space, TokenCategory.Whitespace],
336337
[CharacterCodes.tab, TokenCategory.Whitespace],
337338
[CharacterCodes.verticalTab, TokenCategory.Whitespace],
338339
[CharacterCodes.formFeed, TokenCategory.Whitespace],
339-
[CharacterCodes.space, TokenCategory.Whitespace],
340340
[CharacterCodes.nonBreakingSpace, TokenCategory.Whitespace],
341+
[CharacterCodes.nextLine, TokenCategory.Whitespace],
341342
[CharacterCodes.ogham, TokenCategory.Whitespace],
342343
[CharacterCodes.enQuad, TokenCategory.Whitespace],
343344
[CharacterCodes.emQuad, TokenCategory.Whitespace],
@@ -2033,15 +2034,6 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
20332034
if (identifierKind) {
20342035
return token = identifierKind;
20352036
}
2036-
else if (isWhiteSpaceSingleLine(ch)) {
2037-
pos += charSize(ch);
2038-
continue;
2039-
}
2040-
else if (isLineBreak(ch)) {
2041-
tokenFlags |= TokenFlags.PrecedingLineBreak;
2042-
pos += charSize(ch);
2043-
continue;
2044-
}
20452037
const size = charSize(ch);
20462038
error(Diagnostics.Invalid_character, pos, size);
20472039
pos += size;
@@ -2061,6 +2053,12 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
20612053
}
20622054
}
20632055

2056+
if (tokenCategory & TokenCategory.LineBreak) {
2057+
tokenFlags |= TokenFlags.PrecedingLineBreak;
2058+
pos += charSize(ch);
2059+
continue;
2060+
}
2061+
20642062
if (tokenCategory & TokenCategory.SimpleToken) {
20652063
pos++;
20662064
return token = tokenCategory & TokenCategory.SimpleTokenMask;

0 commit comments

Comments
 (0)