From 3987545b4f9bba35b85c55ccba2394916b5835cf Mon Sep 17 00:00:00 2001
From: dignifiedquire <dignifiedquire@gmail.com>
Date: Tue, 7 Apr 2015 14:15:26 +0200
Subject: [PATCH] Ensure correct scope for decorated classes.

---
 .../transformers/es6/classes.js               | 26 ++++++++------
 .../es7.decorators/class/expected.js          | 35 +++++++++++--------
 2 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/babel/transformation/transformers/es6/classes.js b/src/babel/transformation/transformers/es6/classes.js
index f15233451b..9b33376ebf 100644
--- a/src/babel/transformation/transformers/es6/classes.js
+++ b/src/babel/transformation/transformers/es6/classes.js
@@ -140,7 +140,7 @@ class ClassTransformer {
     var constructorBody = this.constructorBody = t.blockStatement([]);
     var constructor;
 
-    if (this.className && !this.node.decorators) {
+    if (this.className) {
       constructor = t.functionDeclaration(this.className, [], constructorBody);
       body.push(constructor);
     } else {
@@ -170,15 +170,27 @@ class ClassTransformer {
 
     this.buildBody();
 
+    var decorators = this.node.decorators;
+    var classCheckRef = classRef;
+
+    if (decorators) {
+      classCheckRef = this.scope.generateUidIdentifier(classRef);
+    }
+
     constructorBody.body.unshift(t.expressionStatement(t.callExpression(file.addHelper("class-call-check"), [
       t.thisExpression(),
-      classRef
+      classCheckRef
     ])));
 
     //
 
-    var decorators = this.node.decorators;
     if (decorators) {
+      if (this.className) {
+        body.push(t.variableDeclaration("var", [
+          t.variableDeclarator(classCheckRef, classRef)
+        ]));
+      }
+
       for (var i = 0; i < decorators.length; i++) {
         var decorator = decorators[i];
         body.push(util.template("class-decorator", {
@@ -189,14 +201,6 @@ class ClassTransformer {
     }
 
     if (this.className) {
-      if (decorators) {
-        constructor = t.functionExpression(this.className, constructor.params, constructorBody);
-
-        body.unshift(t.variableDeclaration("var", [
-          t.variableDeclarator(classRef, constructor)
-        ]));
-      }
-
       // named class with only a constructor
       if (body.length === 1) return t.toExpression(body[0]);
     } else {
diff --git a/test/core/fixtures/transformation/es7.decorators/class/expected.js b/test/core/fixtures/transformation/es7.decorators/class/expected.js
index d0388c5577..e60d87aba8 100644
--- a/test/core/fixtures/transformation/es7.decorators/class/expected.js
+++ b/test/core/fixtures/transformation/es7.decorators/class/expected.js
@@ -1,50 +1,55 @@
 "use strict";
 
 var Foo = (function () {
-  var Foo = function Foo() {
-    babelHelpers.classCallCheck(this, Foo);
-  };
+  function Foo() {
+    babelHelpers.classCallCheck(this, _Foo);
+  }
 
+  var _Foo = Foo;
   Foo = foo(Foo) || Foo;
   return Foo;
 })();
 
 var Bar = (function () {
-  var Bar = function Bar() {
-    babelHelpers.classCallCheck(this, Bar);
-  };
+  function Bar() {
+    babelHelpers.classCallCheck(this, _Bar);
+  }
 
+  var _Bar = Bar;
   Bar = foo(Bar) || Bar;
   Bar = bar(Bar) || Bar;
   return Bar;
 })();
 
 var Foo2 = (function () {
-  var Foo = function Foo() {
-    babelHelpers.classCallCheck(this, Foo);
-  };
+  function Foo() {
+    babelHelpers.classCallCheck(this, _Foo2);
+  }
 
+  var _Foo2 = Foo;
   Foo = bar(Foo) || Foo;
   return Foo;
 })();
 
 var Bar2 = (function () {
-  var Bar = function Bar() {
-    babelHelpers.classCallCheck(this, Bar);
-  };
+  function Bar() {
+    babelHelpers.classCallCheck(this, _Bar2);
+  }
 
+  var _Bar2 = Bar;
   Bar = foo(Bar) || Bar;
   Bar = bar(Bar) || Bar;
   return Bar;
 })();
 
 var Baz = (function () {
-  var Baz = function Baz(baz) {
-    babelHelpers.classCallCheck(this, Baz);
+  function Baz(baz) {
+    babelHelpers.classCallCheck(this, _Baz);
 
     this.baz = baz;
-  };
+  }
 
+  var _Baz = Baz;
   Baz = foo(Baz) || Baz;
   return Baz;
 })();