refactor: stop using scope.upper to avoid potential unmatch on leavin…

…g node refs #36
power-assert-js · May 20, 2017 · ce58d1f · ce58d1f
1 parent a10876d
commit ce58d1f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/lib/assertion-visitor.js b/lib/assertion-visitor.js
@@ -198,8 +198,7 @@ AssertionVisitor.prototype.verifyNotInstrumented = function (currentNode) {
 };
 
 AssertionVisitor.prototype.createNewRecorder = function (controller) {
-    var currentScope = this.options.currentScope;
-    var currentBlock = findBlockedScope(currentScope).block;
+    var currentBlock = findBlockedScope(this.options.scopeStack).block;
     var scopeBlockEspath = findEspathOfAncestorNode(currentBlock, controller);
     var recorderConstructorName = this.getRecorderConstructorName(controller);
     var recorderVariableName = this.options.transformation.generateUniqueName('rec');
@@ -345,9 +344,11 @@ function newNodeWithLocationCopyOf (original) {
     };
 }
 
-function findBlockedScope (scope) {
-    if (isArrowFunctionWithConciseBody(scope.block)) {
-        return findBlockedScope(scope.upper);
+function findBlockedScope (scopeStack) {
+    var lastIndex = scopeStack.length - 1;
+    var scope = scopeStack[lastIndex];
+    if (!scope.block || isArrowFunctionWithConciseBody(scope.block)) {
+        return findBlockedScope(scopeStack.slice(0, lastIndex));
     }
     return scope;
 }

diff --git a/lib/instrumentor.js b/lib/instrumentor.js
@@ -64,8 +64,7 @@ Instrumentor.prototype.createVisitor = function (ast) {
                         storage: storage,
                         transformation: transformation,
                         globalScope: globalScope,
-                        scopeManager: scopeManager,
-                        currentScope: scopeStack[scopeStack.length - 1]
+                        scopeStack: scopeStack
                     }, that.options));
                     assertionVisitor.enter(controller);
                     return undefined;