microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-06 11:54:44 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Check for CR, LF, space, and tab before doing the lookup.

Browse Source
This commit is contained in:
Daniel Rosenwasser 2024-07-02 08:36:09 +00:00
parent 811526d993
commit 9830671eef
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/compiler/scanner.ts
View File

@ -1991,28 +1991,41 @@ export function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean
const ch = codePointUnchecked(pos);
if (ch === CharacterCodes.tab || ch === CharacterCodes.space) {
if (skipTrivia) {
pos++;
continue;
}
else {
while (pos < end && isWhiteSpaceSingleLine(charCodeUnchecked(pos))) {
pos++;
}
return token = SyntaxKind.WhitespaceTrivia;
}
}
if (ch === CharacterCodes.lineFeed || ch === CharacterCodes.carriageReturn) {
tokenFlags |= TokenFlags.PrecedingLineBreak;
if (skipTrivia) {
pos++;
continue;
}
else {
if (ch === CharacterCodes.carriageReturn && pos + 1 < end && charCodeUnchecked(pos + 1) === CharacterCodes.lineFeed) {
// consume both CR and LF
pos += 2;
}
else {
pos++;
}
return token = SyntaxKind.NewLineTrivia;
}
}
const tokenInfo = ch < charcodeToTokenInfoCommon.length ?
charcodeToTokenInfoCommon[ch] :
charcodeToTokenInfoUncommon.get(ch) ?? TokenInfo.None;
if (tokenInfo !== TokenInfo.None) {
if (tokenInfo & TokenInfo.LineBreak) {
tokenFlags |= TokenFlags.PrecedingLineBreak;
if (skipTrivia) {
pos++;
continue;
}
else {
if (ch === CharacterCodes.carriageReturn && pos + 1 < end && charCodeUnchecked(pos + 1) === CharacterCodes.lineFeed) {
// consume both CR and LF
pos += 2;
}
else {
pos++;
}
return token = SyntaxKind.NewLineTrivia;
}
}
if (tokenInfo & TokenInfo.Whitespace) {
if (skipTrivia) {
pos++;