handle references to class from inner scope correctly

Create only a single variable to ClassDeclarations instead
of two for inner and outer scope.

Author: sokra

src/referencer.js

@@ -250,7 +250,7 @@ export default class Referencer extends esrecurse.Visitor {
 
         this.scopeManager.__nestClassScope(node);
 
-        if (node.id) {
+        if (node.id && node.type !== Syntax.ClassDeclaration) {
             this.currentScope().__define(node.id,
                     new Definition(
                         Variable.ClassName,

test/es6-class.js

@@ -52,8 +52,7 @@ describe('ES6 class', function() {
         expect(scope.type).to.be.equal('class');
         expect(scope.block.type).to.be.equal('ClassDeclaration');
         expect(scope.isStrict).to.be.true;
-        expect(scope.variables).to.have.length(1);
-        expect(scope.variables[0].name).to.be.equal('Derived');
+        expect(scope.variables).to.have.length(0);
         expect(scope.references).to.have.length(0);
 
         scope = scopeManager.scopes[2];
@@ -191,6 +190,45 @@ describe('ES6 class', function() {
         expect(scope.references[0].identifier.name).to.be.equal('shoe');
         expect(scope.references[1].identifier.name).to.be.equal('Shoe');
     });
+
+    it('reference in class', function() {
+        const ast = parse(`
+            class Foo {
+                constructor() {
+                    Foo;
+                }
+            }
+        `);
+
+
+        const scopeManager = analyze(ast, {ecmaVersion: 6});
+        expect(scopeManager.scopes).to.have.length(3);
+
+        let scope = scopeManager.scopes[0];
+        expect(scope.type).to.be.equal('global');
+        expect(scope.block.type).to.be.equal('Program');
+        expect(scope.isStrict).to.be.false;
+        expect(scope.variables).to.have.length(1);
+        expect(scope.variables[0].name).to.be.equal('Foo');
+        expect(scope.variables[0].references).to.have.length(1);
+        expect(scope.variables[0].references[0].identifier.name).to.be.equal('Foo');
+
+        scope = scopeManager.scopes[1];
+        expect(scope.type).to.be.equal('class');
+        expect(scope.block.type).to.be.equal('ClassDeclaration');
+        expect(scope.isStrict).to.be.true;
+        expect(scope.variables).to.have.length(0);
+        expect(scope.references).to.have.length(0);
+
+        scope = scopeManager.scopes[2];
+        expect(scope.type).to.be.equal('function');
+        expect(scope.block.type).to.be.equal('FunctionExpression');
+        expect(scope.isStrict).to.be.true;
+        expect(scope.variables).to.have.length(1);
+        expect(scope.variables[0].name).to.be.equal('arguments');
+        expect(scope.references).to.have.length(1);
+        expect(scope.references[0].identifier.name).to.be.equal('Foo');
+    });
 });
 
 // vim: set sw=4 ts=4 et tw=80 :

test/es6-super.js

@@ -50,8 +50,7 @@ describe('ES6 super', function() {
 
         scope = scopeManager.scopes[1];
         expect(scope.type).to.be.equal('class');
-        expect(scope.variables).to.have.length(1);
-        expect(scope.variables[0].name).to.be.equal('Hello');
+        expect(scope.variables).to.have.length(0);
         expect(scope.references).to.have.length(0);
 
         scope = scopeManager.scopes[2];

test/get-declared-variables.js

@@ -165,8 +165,8 @@ describe('ScopeManager.prototype.getDeclaredVariables', function() {
         `);
 
         verify(ast, 'ClassDeclaration', [
-            ['A', 'A'], // outer scope's and inner scope's.
-            ['B', 'B']
+            ['A'],
+            ['B']
         ]);
     });