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

Revert "Make permittedJumps a parameter to eliminate save-restore pattern"

Browse Source 
This reverts commit 57906fe90e8efd2fb285fcb67f018c0438ba06dd.
This commit is contained in:
Andrew Casey 2017-09-07 15:36:32 -07:00
parent 73bc0c9796
commit baefdd2ccb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/services/refactors/extractMethod.ts
View File

@ -293,13 +293,14 @@ namespace ts.refactor.extractMethod {
}
let errors: Diagnostic[];
let permittedJumps = PermittedJumps.Return;
let seenLabels: Array<__String>;
visit(nodeToCheck, PermittedJumps.Return);
visit(nodeToCheck);
return errors;
function visit(node: Node, permittedJumps: PermittedJumps) {
function visit(node: Node) {
if (errors) {
// already found an error - can stop now
return true;
@ -350,6 +351,7 @@ namespace ts.refactor.extractMethod {
// do not dive into functions or classes
return false;
}
const savedPermittedJumps = permittedJumps;
switch (node.kind) {
case SyntaxKind.IfStatement:
@ -386,7 +388,7 @@ namespace ts.refactor.extractMethod {
{
const label = (<LabeledStatement>node).label;
(seenLabels || (seenLabels = [])).push(label.escapedText);
forEachChild(node, child => visit(child, permittedJumps));
forEachChild(node, visit);
seenLabels.pop();
break;
}
@ -423,10 +425,11 @@ namespace ts.refactor.extractMethod {
}
break;
default:
forEachChild(node, child => visit(child, permittedJumps));
forEachChild(node, visit);
break;
}
permittedJumps = savedPermittedJumps;
}
}
}