From 20679979fce602b5aca90ece870075f15d43594a Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Tue, 12 Sep 2017 16:28:52 -0700
Subject: [PATCH] Remove the unused 'scope' param from 'traverse.hasType'.

---
 .../src/index.js                                 |  2 --
 packages/babel-traverse/src/index.js             |  4 ++--
 packages/babel-traverse/test/traverse.js         | 16 +++++++---------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/packages/babel-plugin-transform-es2015-block-scoping/src/index.js b/packages/babel-plugin-transform-es2015-block-scoping/src/index.js
index 5422eaf828..1d69de1f12 100644
--- a/packages/babel-plugin-transform-es2015-block-scoping/src/index.js
+++ b/packages/babel-plugin-transform-es2015-block-scoping/src/index.js
@@ -480,7 +480,6 @@ class BlockScoping {
     // handle generators
     const hasYield = traverse.hasType(
       fn.body,
-      this.scope,
       "YieldExpression",
       t.FUNCTION_TYPES,
     );
@@ -493,7 +492,6 @@ class BlockScoping {
     // handlers async functions
     const hasAsync = traverse.hasType(
       fn.body,
-      this.scope,
       "AwaitExpression",
       t.FUNCTION_TYPES,
     );
diff --git a/packages/babel-traverse/src/index.js b/packages/babel-traverse/src/index.js
index fa0b913f5f..58cb925821 100644
--- a/packages/babel-traverse/src/index.js
+++ b/packages/babel-traverse/src/index.js
@@ -81,7 +81,6 @@ function hasBlacklistedType(path, state) {
 
 traverse.hasType = function(
   tree: Object,
-  scope: Object,
   type: Object,
   blacklistTypes: Array<string>,
 ): boolean {
@@ -99,10 +98,11 @@ traverse.hasType = function(
   traverse(
     tree,
     {
+      noScope: true,
       blacklist: blacklistTypes,
       enter: hasBlacklistedType,
     },
-    scope,
+    null,
     state,
   );
 
diff --git a/packages/babel-traverse/test/traverse.js b/packages/babel-traverse/test/traverse.js
index d2eb4638c6..b326f02179 100644
--- a/packages/babel-traverse/test/traverse.js
+++ b/packages/babel-traverse/test/traverse.js
@@ -85,20 +85,18 @@ describe("traverse", function() {
   });
 
   it("hasType", function() {
-    assert.ok(traverse.hasType(ast, null, "ThisExpression"));
+    assert.ok(traverse.hasType(ast, "ThisExpression"));
     assert.ok(
-      !traverse.hasType(ast, null, "ThisExpression", ["AssignmentExpression"]),
+      !traverse.hasType(ast, "ThisExpression", ["AssignmentExpression"]),
     );
 
-    assert.ok(traverse.hasType(ast, null, "ThisExpression"));
-    assert.ok(traverse.hasType(ast, null, "Program"));
+    assert.ok(traverse.hasType(ast, "ThisExpression"));
+    assert.ok(traverse.hasType(ast, "Program"));
 
-    assert.ok(
-      !traverse.hasType(ast, null, "ThisExpression", ["MemberExpression"]),
-    );
-    assert.ok(!traverse.hasType(ast, null, "ThisExpression", ["Program"]));
+    assert.ok(!traverse.hasType(ast, "ThisExpression", ["MemberExpression"]));
+    assert.ok(!traverse.hasType(ast, "ThisExpression", ["Program"]));
 
-    assert.ok(!traverse.hasType(ast, null, "ArrowFunctionExpression"));
+    assert.ok(!traverse.hasType(ast, "ArrowFunctionExpression"));
   });
 
   it("clearCache", function() {