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

amcasey · amcasey · commit baefdd2ccb21 · 2017-09-07T16:22:12.000-07:00
This reverts commit 57906fe.
diff --git a/src/services/refactors/extractMethod.ts b/src/services/refactors/extractMethod.ts
@@ -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;
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -293,13 +293,14 @@ namespace ts.refactor.extractMethod {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`let errors: Diagnostic[];`
	`296`	`+ let permittedJumps = PermittedJumps.Return;`
`296`	`297`	`let seenLabels: Array<__String>;`
`297`	`298`
`298`		`- visit(nodeToCheck, PermittedJumps.Return);`
	`299`	`+ visit(nodeToCheck);`
`299`	`300`
`300`	`301`	`return errors;`
`301`	`302`
`302`		`- function visit(node: Node, permittedJumps: PermittedJumps) {`
	`303`	`+ function visit(node: Node) {`
`303`	`304`	`if (errors) {`
`304`	`305`	`// already found an error - can stop now`
`305`	`306`	`return true;`
`@@ -350,6 +351,7 @@ namespace ts.refactor.extractMethod {`
`350`	`351`	`// do not dive into functions or classes`
`351`	`352`	`return false;`
`352`	`353`	`}`
	`354`	`+ const savedPermittedJumps = permittedJumps;`
`353`	`355`
`354`	`356`	`switch (node.kind) {`
`355`	`357`	`case SyntaxKind.IfStatement:`
`@@ -386,7 +388,7 @@ namespace ts.refactor.extractMethod {`
`386`	`388`	`{`
`387`	`389`	`const label = (<LabeledStatement>node).label;`
`388`	`390`	`(seenLabels \|\| (seenLabels = [])).push(label.escapedText);`
`389`		`- forEachChild(node, child => visit(child, permittedJumps));`
	`391`	`+ forEachChild(node, visit);`
`390`	`392`	`seenLabels.pop();`
`391`	`393`	`break;`
`392`	`394`	`}`
`@@ -423,10 +425,11 @@ namespace ts.refactor.extractMethod {`
`423`	`425`	`}`
`424`	`426`	`break;`
`425`	`427`	`default:`
`426`		`- forEachChild(node, child => visit(child, permittedJumps));`
	`428`	`+ forEachChild(node, visit);`
`427`	`429`	`break;`
`428`	`430`	`}`
`429`	`431`
	`432`	`+ permittedJumps = savedPermittedJumps;`
`430`	`433`	`}`
`431`	`434`	`}`
`432`	`435`	`}`