From c3ccddaaaf5c1d752c31ec652b174f6661c9a47e Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Fri, 8 Apr 2016 09:09:48 -0700
Subject: [PATCH] Revert "Merge pull request #3433 from
 loganfsmyth/bail-out-rename"

This reverts commit 2d0a007d14e519fe60a849dd17068a0f3df79a28, reversing
changes made to e4d6d420415a0c290a321fb6c18ba5f19675b5c1.
---
 .../fixtures/transformation/misc/T7215/actual.js    |  5 -----
 .../fixtures/transformation/misc/T7215/expected.js  | 13 -------------
 .../fixtures/transformation/misc/T7215/options.json |  4 ----
 packages/babel-traverse/src/scope/lib/renamer.js    |  2 +-
 4 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 packages/babel-core/test/fixtures/transformation/misc/T7215/actual.js
 delete mode 100644 packages/babel-core/test/fixtures/transformation/misc/T7215/expected.js
 delete mode 100644 packages/babel-core/test/fixtures/transformation/misc/T7215/options.json

diff --git a/packages/babel-core/test/fixtures/transformation/misc/T7215/actual.js b/packages/babel-core/test/fixtures/transformation/misc/T7215/actual.js
deleted file mode 100644
index 9003788157..0000000000
--- a/packages/babel-core/test/fixtures/transformation/misc/T7215/actual.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export default (onClick) => ({
-    onClick: function(){
-        onClick(text);
-    },
-});
diff --git a/packages/babel-core/test/fixtures/transformation/misc/T7215/expected.js b/packages/babel-core/test/fixtures/transformation/misc/T7215/expected.js
deleted file mode 100644
index cdb25f2b92..0000000000
--- a/packages/babel-core/test/fixtures/transformation/misc/T7215/expected.js
+++ /dev/null
@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-
-exports.default = function (_onClick) {
-    return {
-        onClick: function onClick() {
-            _onClick(text);
-        }
-    };
-};
diff --git a/packages/babel-core/test/fixtures/transformation/misc/T7215/options.json b/packages/babel-core/test/fixtures/transformation/misc/T7215/options.json
deleted file mode 100644
index c6017628c1..0000000000
--- a/packages/babel-core/test/fixtures/transformation/misc/T7215/options.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "presets": ["es2015"],
-  "plugins": ["external-helpers"]
-}
diff --git a/packages/babel-traverse/src/scope/lib/renamer.js b/packages/babel-traverse/src/scope/lib/renamer.js
index e5a45773e6..bf89b3f10f 100644
--- a/packages/babel-traverse/src/scope/lib/renamer.js
+++ b/packages/babel-traverse/src/scope/lib/renamer.js
@@ -105,7 +105,7 @@ export default class Renamer {
     let { binding, oldName, newName } = this;
     let { scope, path } = binding;
 
-    let parentDeclar = path.find((path) => path.isDeclaration());
+    let parentDeclar = path.find((path) => path.isDeclaration() || path.isFunctionExpression());
     if (parentDeclar) {
       this.maybeConvertFromExportDeclaration(parentDeclar);
     }