maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle other linebreak characters and add boundary checks

Browse source
This commit is contained in:
Andrew Casey 2017-11-07 10:33:35 -08:00
parent d1fa006a1e
commit 3e339d88a1
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/services/utilities.ts
View file

@ -1330,6 +1330,7 @@ namespace ts {
export function getSourceFileImportLocation(node: SourceFile) { export function getSourceFileImportLocation(node: SourceFile) {
// For a source file, it is possible there are detached comments we should not skip // For a source file, it is possible there are detached comments we should not skip
const text = node.text; const text = node.text;
const textLength = text.length;
let ranges = getLeadingCommentRanges(text, 0); let ranges = getLeadingCommentRanges(text, 0);
if (!ranges) return 0; if (!ranges) return 0;
let position = 0; let position = 0;
@ -1351,12 +1352,15 @@ namespace ts {
return position; return position;
function AdvancePastLineBreak() { function AdvancePastLineBreak() {
if (text.charCodeAt(position) === CharacterCodes.carriageReturn) { if (position < textLength) {
position++; const charCode = text.charCodeAt(position);
} if (isLineBreak(charCode)) {
position++;
if (text.charCodeAt(position) === CharacterCodes.lineFeed) { if (position < textLength && charCode === CharacterCodes.carriageReturn && text.charCodeAt(position) === CharacterCodes.lineFeed) {
position++; position++;
}
}
} }
} }
} }