From 8cea575e2e9886f4cd2e385be26c1c68e1f8a007 Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Mon, 8 Jun 2015 00:29:46 +0100
Subject: [PATCH] change NodePath#findParent to only call callback with path
 instead of node

---
 .../transformation/transformers/internal/shadow-functions.js    | 2 +-
 .../transformers/minification/dead-code-elimination.js          | 2 +-
 src/babel/transformation/transformers/other/strict.js           | 2 +-
 src/babel/traversal/path/ancestry.js                            | 2 +-
 src/babel/traversal/path/replacement.js                         | 2 +-
 src/babel/traversal/path/resolution.js                          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/babel/transformation/transformers/internal/shadow-functions.js b/src/babel/transformation/transformers/internal/shadow-functions.js
index 493c2c3f1d..c01469eb84 100644
--- a/src/babel/transformation/transformers/internal/shadow-functions.js
+++ b/src/babel/transformation/transformers/internal/shadow-functions.js
@@ -8,7 +8,7 @@ function remap(path, key, create) {
   // ensure that we're shadowed
   if (!path.inShadow()) return;
 
-  var fnPath = path.findParent((node, path) => !node.shadow && (path.isFunction() || path.isProgram()));
+  var fnPath = path.findParent((path) => !path.is("shadow") && (path.isFunction() || path.isProgram()));
 
   var cached = fnPath.getData(key);
   if (cached) return cached;
diff --git a/src/babel/transformation/transformers/minification/dead-code-elimination.js b/src/babel/transformation/transformers/minification/dead-code-elimination.js
index 9d659dafeb..f09166c03b 100644
--- a/src/babel/transformation/transformers/minification/dead-code-elimination.js
+++ b/src/babel/transformation/transformers/minification/dead-code-elimination.js
@@ -44,7 +44,7 @@ export function ReferencedIdentifier(node, parent, scope) {
     if (binding.path.scope.parent !== scope) return;
   }
 
-  if (this.findParent((node) => node === replacement)) {
+  if (this.findParent((path) => path.node === replacement)) {
     return;
   }
 
diff --git a/src/babel/transformation/transformers/other/strict.js b/src/babel/transformation/transformers/other/strict.js
index dfab4a1ff6..fb3a12685f 100644
--- a/src/babel/transformation/transformers/other/strict.js
+++ b/src/babel/transformation/transformers/other/strict.js
@@ -26,7 +26,7 @@ export var Program = {
 };
 
 export function ThisExpression() {
-  if (!this.findParent((node) => !node.shadow && THIS_BREAK_KEYS.indexOf(node.type) >= 0)) {
+  if (!this.findParent((path) => !path.is("shadow") && THIS_BREAK_KEYS.indexOf(path.type) >= 0)) {
     return t.identifier("undefined");
   }
 }
diff --git a/src/babel/traversal/path/ancestry.js b/src/babel/traversal/path/ancestry.js
index 2e3d12a2b6..9bb56e4d49 100644
--- a/src/babel/traversal/path/ancestry.js
+++ b/src/babel/traversal/path/ancestry.js
@@ -5,7 +5,7 @@
 export function findParent(callback) {
   var path = this;
   while (path) {
-    if (callback(path.node, path)) return path;
+    if (callback(path)) return path;
     path = path.parentPath;
   }
   return null;
diff --git a/src/babel/traversal/path/replacement.js b/src/babel/traversal/path/replacement.js
index 5aa9da0258..d8ec9dc01c 100644
--- a/src/babel/traversal/path/replacement.js
+++ b/src/babel/traversal/path/replacement.js
@@ -158,7 +158,7 @@ export function replaceExpressionWithStatements(nodes: Array) {
     for (var i = 0; i < last.length; i++) {
       var lastNode = last[i];
       if (lastNode.isExpressionStatement()) {
-        var loop = lastNode.findParent((node, path) => path.isLoop());
+        var loop = lastNode.findParent((path) => path.isLoop());
         if (loop) {
           var uid = this.get("callee").scope.generateDeclaredUidIdentifier("ret");
           this.get("callee.body").pushContainer("body", t.returnStatement(uid));
diff --git a/src/babel/traversal/path/resolution.js b/src/babel/traversal/path/resolution.js
index b831fb786e..5a74d1bd8f 100644
--- a/src/babel/traversal/path/resolution.js
+++ b/src/babel/traversal/path/resolution.js
@@ -160,7 +160,7 @@ export function _getTypeAnnotation(force?: boolean): ?Object {
   }
 
   if (this.isReturnStatement()) {
-    var funcPath = this.findParent((node, path) => path.isFunction());
+    var funcPath = this.findParent((path) => path.isFunction());
     if (!funcPath) return;
 
     var returnType = funcPath.node.returnType;