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

Guard against no parent nodes.

Browse source
This commit is contained in:
Daniel Rosenwasser 2020-10-02 16:34:33 -07:00
parent bac73a33fe
commit f0a6fd3a72
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/compiler/utilities.ts
View file

@ -1218,19 +1218,21 @@ namespace ts {
// Warning: This has the same semantics as the forEach family of functions,
// in that traversal terminates in the event that 'visitor' supplies a truthy value.
export function forEachReturnStatement<T>(body: Block, visitor: (stmt: ReturnStatement) => T): T | undefined {
const sourceText = getSourceFileOfNode(body).text;
let currentPosition = sourceText.indexOf("return", body.pos);
const sourceText = getSourceFileOfNode(body)?.text as string | undefined;
let currentPosition = sourceText?.indexOf("return", body.pos) ?? body.pos;
return traverse(body);
function traverse(node: Node): T | undefined {
// Catch up to the current node.
while (0 <= currentPosition && currentPosition < node.pos) {
currentPosition = sourceText.indexOf("return", currentPosition + 1);
}
if (currentPosition < 0 || node.end <= currentPosition) {
// Nope, no candidates here.
return undefined;
if (sourceText !== undefined) {
// Catch up to the current node.
while (0 <= currentPosition && currentPosition < node.pos) {
currentPosition = sourceText.indexOf("return", currentPosition + 1);
}
if (currentPosition < 0 || node.end <= currentPosition) {
// Nope, no candidates here.
return undefined;
}
}
switch (node.kind) {
case SyntaxKind.ReturnStatement: