brighterscript 1.0.0-alpha.5 → 1.0.0-alpha.50

package/dist/files/BrsFile.Class.spec.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const sinonImport = require("sinon");
 const Program_1 = require("../Program");
-const chai_1 = require("chai");
+const chai_config_spec_1 = require("../chai-config.spec");
 const DiagnosticMessages_1 = require("../DiagnosticMessages");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const Parser_1 = require("../parser/Parser");
@@ -11,28 +11,29 @@ const util_1 = require("../util");
 const fsExtra = require("fs-extra");
 const BrsTranspileState_1 = require("../parser/BrsTranspileState");
 const assert_1 = require("assert");
+const testHelpers_spec_2 = require("../testHelpers.spec");
+const reflection_1 = require("../astUtils/reflection");
+const visitors_1 = require("../astUtils/visitors");
 let sinon = sinonImport.createSandbox();
 describe('BrsFile BrighterScript classes', () => {
-    let tmpPath = util_1.standardizePath `${process.cwd()}/.tmp`;
-    let rootDir = util_1.standardizePath `${tmpPath}/rootDir`;
     let program;
-    let testTranspile = testHelpers_spec_1.getTestTranspile(() => [program, rootDir]);
+    let testTranspile = (0, testHelpers_spec_1.getTestTranspile)(() => [program, testHelpers_spec_2.rootDir]);
     beforeEach(() => {
-        fsExtra.ensureDirSync(rootDir);
-        fsExtra.emptyDirSync(tmpPath);
-        program = new Program_1.Program({ rootDir: rootDir });
+        fsExtra.ensureDirSync(testHelpers_spec_2.rootDir);
+        fsExtra.emptyDirSync(testHelpers_spec_2.tempDir);
+        program = new Program_1.Program({ rootDir: testHelpers_spec_2.rootDir, outDir: testHelpers_spec_2.outDir });
     });
     afterEach(() => {
         sinon.restore();
         program.dispose();
-        fsExtra.ensureDirSync(tmpPath);
-        fsExtra.emptyDirSync(tmpPath);
+        fsExtra.ensureDirSync(testHelpers_spec_2.tempDir);
+        fsExtra.emptyDirSync(testHelpers_spec_2.tempDir);
     });
     function addFile(relativePath, text) {
-        return program.setFile({ src: `${rootDir}/${relativePath}`, dest: relativePath }, text);
+        return program.setFile({ src: `${testHelpers_spec_2.rootDir}/${relativePath}`, dest: relativePath }, text);
     }
     it('detects all classes after parse', () => {
-        let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        let file = program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
             class Animal
             end class
             class Duck
@@ -40,18 +41,18 @@ describe('BrsFile BrighterScript classes', () => {
 
             end class
         `);
-        chai_1.expect(file.parser.references.classStatements.map(x => x.getName(Parser_1.ParseMode.BrighterScript)).sort()).to.eql(['Animal', 'Duck']);
+        const classStatements = file.ast.findChildren(reflection_1.isClassStatement);
+        (0, chai_config_spec_1.expect)(classStatements.map(x => x.getName(Parser_1.ParseMode.BrighterScript)).sort()).to.eql(['Animal', 'Duck']);
     });
     it('does not cause errors with incomplete class statement', () => {
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
             class
         `);
         program.validate();
         //if no exception was thrown, this test passes
     });
     it('catches child class missing super call in constructor', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
             class Person
                 sub new()
                 end sub
@@ -62,11 +63,33 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.classConstructorMissingSuperCall().message);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.classConstructorMissingSuperCall()
+        ]);
+    });
+    it('allows class named `optional`', () => {
+        program.setFile('source/main.bs', `
+            class optional
+                thing = 1
+            end class
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+    });
+    it('supports optional fields', () => {
+        program.setFile('source/main.bs', `
+            class Movie
+                name as string
+                optional subtitles as string
+                public optional isRepeatEnabled as boolean
+                private optional wasPlayed
+            end class
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
     it('access modifier is option for override', () => {
-        var _a;
-        let file = program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        let file = program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
             class Animal
                 sub move()
                 end sub
@@ -78,14 +101,13 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
-        let duckClass = file.parser.references.classStatements.find(x => x.name.text.toLowerCase() === 'duck');
-        chai_1.expect(duckClass).to.exist;
-        chai_1.expect(duckClass.memberMap['move']).to.exist;
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        let duckClass = file.ast.findChildren(reflection_1.isClassStatement, { walkMode: visitors_1.WalkMode.visitStatements }).find(x => x.tokens.name.text.toLowerCase() === 'duck');
+        (0, chai_config_spec_1.expect)(duckClass).to.exist;
+        (0, chai_config_spec_1.expect)(duckClass.memberMap['move']).to.exist;
     });
     it('supports various namespace configurations', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
             class Animal
                 sub new()
                     bigBird = new Birds.Bird()
@@ -105,11 +127,10 @@ describe('BrsFile BrighterScript classes', () => {
             end namespace
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
     describe('super', () => {
         it('always requires super call in child constructor', () => {
-            var _a;
             program.setFile('source/main.bs', `
                 class Bird
                 end class
@@ -119,10 +140,11 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.eql(DiagnosticMessages_1.DiagnosticMessages.classConstructorMissingSuperCall().message);
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.classConstructorMissingSuperCall()
+            ]);
         });
         it('requires super call in child when parent has own `new` method', () => {
-            var _a;
             program.setFile('source/main.bs', `
                 class Bird
                     sub new()
@@ -134,17 +156,18 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.eql(DiagnosticMessages_1.DiagnosticMessages.classConstructorMissingSuperCall().message);
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.classConstructorMissingSuperCall()
+            ]);
         });
         it('allows non-`m` expressions and statements before the super call', () => {
-            var _a;
             program.setFile('source/main.bs', `
                 class Bird
                     sub new(name)
                     end sub
                 end class
                 class Duck extends Bird
-                    sub new()
+                    sub new(name)
                         thing = { m: "m"}
                         print thing.m
                         name = "Donald" + "Duck"
@@ -153,54 +176,107 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.be.undefined;
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
         it('allows non-`m` expressions and statements before the super call', () => {
             program.setFile('source/main.bs', `
                 class Bird
-                    sub new(name)
+                    name as string
+                    sub new(name as string)
+                        m.name = name
                     end sub
                 end class
                 class Duck extends Bird
                     sub new()
                         m.name = m.name + "Duck"
-                        super()
+                        super("Flappy")
                     end sub
                 end class
             `);
             program.validate();
-            chai_1.expect(program.getDiagnostics().map(x => ({ message: x.message, range: x.range }))).to.eql([{
-                    message: DiagnosticMessages_1.DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall().message,
-                    range: vscode_languageserver_1.Range.create(7, 24, 7, 25)
-                }, {
-                    message: DiagnosticMessages_1.DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall().message,
-                    range: vscode_languageserver_1.Range.create(7, 33, 7, 34)
-                }]);
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall()), { location: { range: vscode_languageserver_1.Range.create(9, 24, 9, 25) } }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall()), { location: { range: vscode_languageserver_1.Range.create(9, 33, 9, 34) } })]);
         });
     });
     describe('transpile', () => {
-        it('follows correct sequence for property initializers', () => {
-            testTranspile(`
+        it('does not mess with AST when injecting `super()` call', async () => {
+            const file = program.setFile('source/classes.bs', `
+                class Parent
+                end class
+
+                class Child extends parent
+                    sub new()
+                        super()
+                    end sub
+                end class
+            `);
+            (0, chai_config_spec_1.expect)(file.ast.statements[1].body[0].func.body.statements[0].expression.callee.tokens.name.text).to.eql('super');
+            await program.getTranspiledFileContents(file.srcPath);
+            (0, chai_config_spec_1.expect)(file.ast.statements[1].body[0].func.body.statements[0].expression.callee.tokens.name.text).to.eql('super');
+        });
+        it('follows correct sequence for property initializers', async () => {
+            await testTranspile(`
                 class Animal
                     species1 = "Animal"
                     sub new()
-                        print "From Animal: " + m.species
+                        print "From Animal: " + m.species1
                     end sub
                 end class
                 class Duck extends Animal
                     species2 = "Duck"
                     sub new()
                         super()
-                        print "From Duck: " + m.species
+                        print "From Duck: " + m.species2
                     end sub
                 end class
             `, `
+                sub __Animal_method_new()
+                    m.species1 = "Animal"
+                    print "From Animal: " + m.species1
+                end sub
                 function __Animal_builder()
                     instance = {}
-                    instance.new = sub()
-                        m.species1 = "Animal"
-                        print "From Animal: " + m.species
+                    instance.new = __Animal_method_new
+                    return instance
+                end function
+                function Animal()
+                    instance = __Animal_builder()
+                    instance.new()
+                    return instance
+                end function
+                sub __Duck_method_new()
+                    m.super0_new()
+                    m.species2 = "Duck"
+                    print "From Duck: " + m.species2
+                end sub
+                function __Duck_builder()
+                    instance = __Animal_builder()
+                    instance.super0_new = instance.new
+                    instance.new = __Duck_method_new
+                    return instance
+                end function
+                function Duck()
+                    instance = __Duck_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+        it('allows comments as first line of constructor', async () => {
+            await testTranspile(`
+                class Animal
+                end class
+                class Duck extends Animal
+                    sub new()
+                        'comment should not cause double super call
+                        super()
                     end sub
+                end class
+            `, `
+                sub __Animal_method_new()
+                end sub
+                function __Animal_builder()
+                    instance = {}
+                    instance.new = __Animal_method_new
                     return instance
                 end function
                 function Animal()
@@ -208,14 +284,54 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new()
                     return instance
                 end function
+                sub __Duck_method_new()
+                    'comment should not cause double super call
+                    m.super0_new()
+                end sub
                 function __Duck_builder()
                     instance = __Animal_builder()
                     instance.super0_new = instance.new
-                    instance.new = sub()
-                        m.super0_new()
-                        m.species2 = "Duck"
-                        print "From Duck: " + m.species
+                    instance.new = __Duck_method_new
+                    return instance
+                end function
+                function Duck()
+                    instance = __Duck_builder()
+                    instance.new()
+                    return instance
+                end function
+            `);
+        });
+        it('does not inject a call to super if one exists', async () => {
+            await testTranspile(`
+                class Animal
+                end class
+                class Duck extends Animal
+                    sub new()
+                        print "I am a statement which does not use m"
+                        super()
                     end sub
+                end class
+            `, `
+                sub __Animal_method_new()
+                end sub
+                function __Animal_builder()
+                    instance = {}
+                    instance.new = __Animal_method_new
+                    return instance
+                end function
+                function Animal()
+                    instance = __Animal_builder()
+                    instance.new()
+                    return instance
+                end function
+                sub __Duck_method_new()
+                    print "I am a statement which does not use m"
+                    m.super0_new()
+                end sub
+                function __Duck_builder()
+                    instance = __Animal_builder()
+                    instance.super0_new = instance.new
+                    instance.new = __Duck_method_new
                     return instance
                 end function
                 function Duck()
@@ -223,10 +339,10 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new()
                     return instance
                 end function
-            `, 'trim', 'source/main.bs');
+            `);
         });
-        it('handles class inheritance inferred constructor calls', () => {
-            testTranspile(`
+        it('handles class inheritance inferred constructor calls', async () => {
+            await testTranspile(`
                 class Animal
                     className1 = "Animal"
                 end class
@@ -237,11 +353,12 @@ describe('BrsFile BrighterScript classes', () => {
                     className3 = "BabyDuck"
                 end class
             `, `
+                sub __Animal_method_new()
+                    m.className1 = "Animal"
+                end sub
                 function __Animal_builder()
                     instance = {}
-                    instance.new = sub()
-                        m.className1 = "Animal"
-                    end sub
+                    instance.new = __Animal_method_new
                     return instance
                 end function
                 function Animal()
@@ -249,13 +366,14 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new()
                     return instance
                 end function
+                sub __Duck_method_new()
+                    m.super0_new()
+                    m.className2 = "Duck"
+                end sub
                 function __Duck_builder()
                     instance = __Animal_builder()
                     instance.super0_new = instance.new
-                    instance.new = sub()
-                        m.super0_new()
-                        m.className2 = "Duck"
-                    end sub
+                    instance.new = __Duck_method_new
                     return instance
                 end function
                 function Duck()
@@ -263,13 +381,14 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new()
                     return instance
                 end function
+                sub __BabyDuck_method_new()
+                    m.super1_new()
+                    m.className3 = "BabyDuck"
+                end sub
                 function __BabyDuck_builder()
                     instance = __Duck_builder()
                     instance.super1_new = instance.new
-                    instance.new = sub()
-                        m.super1_new()
-                        m.className3 = "BabyDuck"
-                    end sub
+                    instance.new = __BabyDuck_method_new
                     return instance
                 end function
                 function BabyDuck()
@@ -279,8 +398,8 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, undefined, 'source/main.bs');
         });
-        it('works with namespaces', () => {
-            testTranspile(`
+        it('works with namespaces', async () => {
+            await testTranspile(`
                 namespace Birds.WaterFowl
                     class Duck
                     end class
@@ -288,10 +407,11 @@ describe('BrsFile BrighterScript classes', () => {
                     end class
                 end namespace
             `, `
+                sub __Birds_WaterFowl_Duck_method_new()
+                end sub
                 function __Birds_WaterFowl_Duck_builder()
                     instance = {}
-                    instance.new = sub()
-                    end sub
+                    instance.new = __Birds_WaterFowl_Duck_method_new
                     return instance
                 end function
                 function Birds_WaterFowl_Duck()
@@ -299,12 +419,13 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new()
                     return instance
                 end function
+                sub __Birds_WaterFowl_BabyDuck_method_new()
+                    m.super0_new()
+                end sub
                 function __Birds_WaterFowl_BabyDuck_builder()
                     instance = __Birds_WaterFowl_Duck_builder()
                     instance.super0_new = instance.new
-                    instance.new = sub()
-                        m.super0_new()
-                    end sub
+                    instance.new = __Birds_WaterFowl_BabyDuck_method_new
                     return instance
                 end function
                 function Birds_WaterFowl_BabyDuck()
@@ -314,15 +435,16 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, undefined, 'source/main.bs');
         });
-        it('works for simple  class', () => {
-            testTranspile(`
+        it('works for simple class', async () => {
+            await testTranspile(`
                 class Duck
                 end class
             `, `
+                sub __Duck_method_new()
+                end sub
                 function __Duck_builder()
                     instance = {}
-                    instance.new = sub()
-                    end sub
+                    instance.new = __Duck_method_new
                     return instance
                 end function
                 function Duck()
@@ -332,17 +454,94 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, undefined, 'source/main.bs');
         });
-        it('registers the constructor and properly handles its parameters', () => {
-            testTranspile(`
+        it('inherits the parameters of the last known constructor', async () => {
+            await testTranspile(`
+                class Animal
+                    sub new(p1)
+                    end sub
+                end class
+                class Bird extends Animal
+                end class
+                class Duck extends Bird
+                    sub new(p1, p2)
+                        super(p1)
+                        m.p2 = p2
+                    end sub
+                    private p2 as dynamic
+                end class
+                class BabyDuck extends Duck
+                end class
+            `, `
+                sub __Animal_method_new(p1)
+                end sub
+                function __Animal_builder()
+                    instance = {}
+                    instance.new = __Animal_method_new
+                    return instance
+                end function
+                function Animal(p1)
+                    instance = __Animal_builder()
+                    instance.new(p1)
+                    return instance
+                end function
+                sub __Bird_method_new(p1)
+                    m.super0_new(p1)
+                end sub
+                function __Bird_builder()
+                    instance = __Animal_builder()
+                    instance.super0_new = instance.new
+                    instance.new = __Bird_method_new
+                    return instance
+                end function
+                function Bird(p1)
+                    instance = __Bird_builder()
+                    instance.new(p1)
+                    return instance
+                end function
+                sub __Duck_method_new(p1, p2)
+                    m.super1_new(p1)
+                    m.p2 = invalid
+                    m.p2 = p2
+                end sub
+                function __Duck_builder()
+                    instance = __Bird_builder()
+                    instance.super1_new = instance.new
+                    instance.new = __Duck_method_new
+                    return instance
+                end function
+                function Duck(p1, p2)
+                    instance = __Duck_builder()
+                    instance.new(p1, p2)
+                    return instance
+                end function
+                sub __BabyDuck_method_new(p1, p2)
+                    m.super2_new(p1, p2)
+                end sub
+                function __BabyDuck_builder()
+                    instance = __Duck_builder()
+                    instance.super2_new = instance.new
+                    instance.new = __BabyDuck_method_new
+                    return instance
+                end function
+                function BabyDuck(p1, p2)
+                    instance = __BabyDuck_builder()
+                    instance.new(p1, p2)
+                    return instance
+                end function
+            `);
+        });
+        it('registers the constructor and properly handles its parameters', async () => {
+            await testTranspile(`
                 class Duck
                     sub new(name as string, age as integer)
                     end sub
                 end class
             `, `
+                sub __Duck_method_new(name as string, age as integer)
+                end sub
                 function __Duck_builder()
                     instance = {}
-                    instance.new = sub(name as string, age as integer)
-                    end sub
+                    instance.new = __Duck_method_new
                     return instance
                 end function
                 function Duck(name as string, age as integer)
@@ -352,11 +551,14 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, undefined, 'source/main.bs');
         });
-        it('properly handles child class constructor override and super calls', () => {
-            testTranspile(`
+        it('properly handles child class constructor override and super calls', async () => {
+            await testTranspile(`
                 class Animal
                     sub new(name as string)
                     end sub
+
+                    sub DoSomething()
+                    end sub
                 end class
 
                 class Duck extends Animal
@@ -366,10 +568,14 @@ describe('BrsFile BrighterScript classes', () => {
                     end sub
                 end class
             `, `
+                sub __Animal_method_new(name as string)
+                end sub
+                sub __Animal_method_DoSomething()
+                end sub
                 function __Animal_builder()
                     instance = {}
-                    instance.new = sub(name as string)
-                    end sub
+                    instance.new = __Animal_method_new
+                    instance.DoSomething = __Animal_method_DoSomething
                     return instance
                 end function
                 function Animal(name as string)
@@ -377,13 +583,14 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new(name)
                     return instance
                 end function
+                sub __Duck_method_new(name as string, age as integer)
+                    m.super0_new(name)
+                    m.super0_DoSomething()
+                end sub
                 function __Duck_builder()
                     instance = __Animal_builder()
                     instance.super0_new = instance.new
-                    instance.new = sub(name as string, age as integer)
-                        m.super0_new(name)
-                        m.super0_DoSomething()
-                    end sub
+                    instance.new = __Duck_method_new
                     return instance
                 end function
                 function Duck(name as string, age as integer)
@@ -393,8 +600,8 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, undefined, 'source/main.bs');
         });
-        it('transpiles super in nested blocks', () => {
-            testTranspile(`
+        it('transpiles super in nested blocks', async () => {
+            await testTranspile(`
                 class Creature
                     sub new(name as string)
                     end sub
@@ -412,13 +619,15 @@ describe('BrsFile BrighterScript classes', () => {
                     end function
                 end class
             `, `
+                sub __Creature_method_new(name as string)
+                end sub
+                function __Creature_method_sayHello(text)
+                    ? text
+                end function
                 function __Creature_builder()
                     instance = {}
-                    instance.new = sub(name as string)
-                    end sub
-                    instance.sayHello = function(text)
-                        ? text
-                    end function
+                    instance.new = __Creature_method_new
+                    instance.sayHello = __Creature_method_sayHello
                     return instance
                 end function
                 function Creature(name as string)
@@ -426,29 +635,31 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new(name)
                     return instance
                 end function
+                sub __Duck_method_new(name as string)
+                    m.super0_new(name)
+                end sub
+                function __Duck_method_sayHello(text)
+                    text = "The duck says " + text
+                    if text <> invalid
+                        m.super0_sayHello(text)
+                    end if
+                end function
                 function __Duck_builder()
                     instance = __Creature_builder()
                     instance.super0_new = instance.new
-                    instance.new = sub()
-                        m.super0_new()
-                    end sub
+                    instance.new = __Duck_method_new
                     instance.super0_sayHello = instance.sayHello
-                    instance.sayHello = function(text)
-                        text = "The duck says " + text
-                        if text <> invalid then
-                            m.super0_sayHello(text)
-                        end if
-                    end function
+                    instance.sayHello = __Duck_method_sayHello
                     return instance
                 end function
-                function Duck()
+                function Duck(name as string)
                     instance = __Duck_builder()
-                    instance.new()
+                    instance.new(name)
                     return instance
                 end function
             `, 'trim', 'source/main.bs');
         });
-        it('properly transpiles classes from outside current namespace', () => {
+        it('properly transpiles classes from outside current namespace', async () => {
             addFile('source/Animals.bs', `
                 namespace Animals
                     class Duck
@@ -457,7 +668,7 @@ describe('BrsFile BrighterScript classes', () => {
                 class Bird
                 end class
             `);
-            testTranspile(`
+            await testTranspile(`
                 namespace Animals
                     sub init()
                         donaldDuck = new Duck()
@@ -473,8 +684,8 @@ describe('BrsFile BrighterScript classes', () => {
                 end sub
             `, undefined, 'source/main.bs');
         });
-        it('properly transpiles new statement for missing class ', () => {
-            testTranspile(`
+        it('properly transpiles new statement for missing class ', async () => {
+            await testTranspile(`
                 sub main()
                     bob = new Human()
                 end sub
@@ -484,14 +695,14 @@ describe('BrsFile BrighterScript classes', () => {
                 end sub
             `, undefined, 'source/main.bs', false);
         });
-        it('new keyword transpiles correctly', () => {
+        it('new keyword transpiles correctly', async () => {
             addFile('source/Animal.bs', `
                 class Animal
                     sub new(name as string)
                     end sub
                 end class
             `);
-            testTranspile(`
+            await testTranspile(`
                 sub main()
                     a = new Animal("donald")
                 end sub
@@ -501,8 +712,76 @@ describe('BrsFile BrighterScript classes', () => {
                 end sub
             `, undefined, 'source/main.bs');
         });
-        it('does not screw up local variable references', () => {
-            testTranspile(`
+        it('calls super ', async () => {
+            const { file } = await testTranspile(`
+                class Parent
+                    sub new()
+                    end sub
+                end class
+                class Child extends Parent
+                    sub new()
+                    end sub
+                end class
+            `, `
+                sub __Parent_method_new()
+                end sub
+                function __Parent_builder()
+                    instance = {}
+                    instance.new = __Parent_method_new
+                    return instance
+                end function
+                function Parent()
+                    instance = __Parent_builder()
+                    instance.new()
+                    return instance
+                end function
+                sub __Child_method_new()
+                    m.super0_new()
+                end sub
+                function __Child_builder()
+                    instance = __Parent_builder()
+                    instance.super0_new = instance.new
+                    instance.new = __Child_method_new
+                    return instance
+                end function
+                function Child()
+                    instance = __Child_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, undefined, undefined, false);
+            //the AST should not be permanently modified
+            const constructor = file.ast.statements[0].body[0];
+            (0, chai_config_spec_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
+        });
+        it('adds field initializers', async () => {
+            const { file } = await testTranspile(`
+                class Person
+                    sub new()
+                    end sub
+                    name = "Bob"
+                end class
+            `, `
+                sub __Person_method_new()
+                    m.name = "Bob"
+                end sub
+                function __Person_builder()
+                    instance = {}
+                    instance.new = __Person_method_new
+                    return instance
+                end function
+                function Person()
+                    instance = __Person_builder()
+                    instance.new()
+                    return instance
+                end function
+            `);
+            //the AST should not be permanently modified
+            const constructor = file.ast.statements[0].body[0];
+            (0, chai_config_spec_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
+        });
+        it('does not screw up local variable references', async () => {
+            await testTranspile(`
                 class Animal
                     sub new(name as string)
                         m.name = name
@@ -543,15 +822,17 @@ describe('BrsFile BrighterScript classes', () => {
                     '> Waddling...\\nDewey moved 2 meters\\nFell over...I'm new at this
                 end sub
             `, `
+                sub __Animal_method_new(name as string)
+                    m.name = invalid
+                    m.name = name
+                end sub
+                sub __Animal_method_move(distanceInMeters as integer)
+                    print m.name + " moved " + distanceInMeters.ToStr() + " meters"
+                end sub
                 function __Animal_builder()
                     instance = {}
-                    instance.new = sub(name as string)
-                        m.name = invalid
-                        m.name = name
-                    end sub
-                    instance.move = sub(distanceInMeters as integer)
-                        print m.name + " moved " + distanceInMeters.ToStr() + " meters"
-                    end sub
+                    instance.new = __Animal_method_new
+                    instance.move = __Animal_method_move
                     return instance
                 end function
                 function Animal(name as string)
@@ -559,40 +840,44 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new(name)
                     return instance
                 end function
+                sub __Duck_method_new(name as string)
+                    m.super0_new(name)
+                end sub
+                sub __Duck_method_move(distanceInMeters as integer)
+                    print "Waddling..."
+                    m.super0_move(distanceInMeters)
+                end sub
                 function __Duck_builder()
                     instance = __Animal_builder()
                     instance.super0_new = instance.new
-                    instance.new = sub()
-                        m.super0_new()
-                    end sub
+                    instance.new = __Duck_method_new
                     instance.super0_move = instance.move
-                    instance.move = sub(distanceInMeters as integer)
-                        print "Waddling..."
-                        m.super0_move(distanceInMeters)
-                    end sub
+                    instance.move = __Duck_method_move
                     return instance
                 end function
-                function Duck()
+                function Duck(name as string)
                     instance = __Duck_builder()
-                    instance.new()
+                    instance.new(name)
                     return instance
                 end function
+                sub __BabyDuck_method_new(name as string)
+                    m.super1_new(name)
+                end sub
+                sub __BabyDuck_method_move(distanceInMeters as integer)
+                    m.super1_move(distanceInMeters)
+                    print "Fell over...I'm new at this"
+                end sub
                 function __BabyDuck_builder()
                     instance = __Duck_builder()
                     instance.super1_new = instance.new
-                    instance.new = sub()
-                        m.super1_new()
-                    end sub
+                    instance.new = __BabyDuck_method_new
                     instance.super1_move = instance.move
-                    instance.move = sub(distanceInMeters as integer)
-                        m.super1_move(distanceInMeters)
-                        print "Fell over...I'm new at this"
-                    end sub
+                    instance.move = __BabyDuck_method_move
                     return instance
                 end function
-                function BabyDuck()
+                function BabyDuck(name as string)
                     instance = __BabyDuck_builder()
-                    instance.new()
+                    instance.new(name)
                     return instance
                 end function
 
@@ -600,17 +885,19 @@ describe('BrsFile BrighterScript classes', () => {
                     smokey = Animal("Smokey")
                     smokey.move(1)
                     '> Bear moved 1 meters
+
                     donald = Duck("Donald")
                     donald.move(2)
                     '> Waddling...\\nDonald moved 2 meters
+
                     dewey = BabyDuck("Dewey")
                     dewey.move(3)
                     '> Waddling...\\nDewey moved 2 meters\\nFell over...I'm new at this
                 end sub
             `, 'trim', 'source/main.bs');
         });
-        it('calculates the proper super index', () => {
-            testTranspile(`
+        it('calculates the proper super index', async () => {
+            await testTranspile(`
                 class Duck
                     public sub walk(meters as integer)
                         print "Walked " + meters.ToStr() + " meters"
@@ -624,13 +911,15 @@ describe('BrsFile BrighterScript classes', () => {
                     end sub
                 end class
             `, `
+                sub __Duck_method_new()
+                end sub
+                sub __Duck_method_walk(meters as integer)
+                    print "Walked " + meters.ToStr() + " meters"
+                end sub
                 function __Duck_builder()
                     instance = {}
-                    instance.new = sub()
-                    end sub
-                    instance.walk = sub(meters as integer)
-                        print "Walked " + meters.ToStr() + " meters"
-                    end sub
+                    instance.new = __Duck_method_new
+                    instance.walk = __Duck_method_walk
                     return instance
                 end function
                 function Duck()
@@ -638,17 +927,19 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new()
                     return instance
                 end function
+                sub __BabyDuck_method_new()
+                    m.super0_new()
+                end sub
+                sub __BabyDuck_method_walk(meters as integer)
+                    print "Tripped"
+                    m.super0_walk(meters)
+                end sub
                 function __BabyDuck_builder()
                     instance = __Duck_builder()
                     instance.super0_new = instance.new
-                    instance.new = sub()
-                        m.super0_new()
-                    end sub
+                    instance.new = __BabyDuck_method_new
                     instance.super0_walk = instance.walk
-                    instance.walk = sub(meters as integer)
-                        print "Tripped"
-                        m.super0_walk(meters)
-                    end sub
+                    instance.walk = __BabyDuck_method_walk
                     return instance
                 end function
                 function BabyDuck()
@@ -658,22 +949,391 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, 'trim', 'source/main.bs');
         });
-    });
-    it('detects using `new` keyword on non-classes', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-            sub quack()
-            end sub
-            sub main()
-                duck = new quack()
-            end sub
-        `);
-        program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.expressionIsNotConstructable('sub').message);
-    });
-    it('detects missing call to super', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        it('adds namespacing to constructors on field definitions', async () => {
+            await testTranspile(`
+                namespace MyNS
+                    class KlassOne
+                        other = new KlassTwo()
+                    end class
+
+                    class KlassTwo
+                    end class
+                end namespace
+            `, `
+                sub __MyNS_KlassOne_method_new()
+                    m.other = MyNS_KlassTwo()
+                end sub
+                function __MyNS_KlassOne_builder()
+                    instance = {}
+                    instance.new = __MyNS_KlassOne_method_new
+                    return instance
+                end function
+                function MyNS_KlassOne()
+                    instance = __MyNS_KlassOne_builder()
+                    instance.new()
+                    return instance
+                end function
+                sub __MyNS_KlassTwo_method_new()
+                end sub
+                function __MyNS_KlassTwo_builder()
+                    instance = {}
+                    instance.new = __MyNS_KlassTwo_method_new
+                    return instance
+                end function
+                function MyNS_KlassTwo()
+                    instance = __MyNS_KlassTwo_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+        it('works with enums as field initial values inside a namespace', async () => {
+            await testTranspile(`
+                namespace MyNS
+                    class HasEnumKlass
+                        enumValue = MyEnum.A
+                    end class
+                    enum MyEnum
+                        A = "A"
+                        B = "B"
+                    end enum
+                end namespace
+            `, `
+                sub __MyNS_HasEnumKlass_method_new()
+                    m.enumValue = "A"
+                end sub
+                function __MyNS_HasEnumKlass_builder()
+                    instance = {}
+                    instance.new = __MyNS_HasEnumKlass_method_new
+                    return instance
+                end function
+                function MyNS_HasEnumKlass()
+                    instance = __MyNS_HasEnumKlass_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+        it('allows enums as super args inside a namespace', async () => {
+            await testTranspile(`
+                namespace MyNS
+                    class SubKlass extends SuperKlass
+                        sub new()
+                            super(MyEnum.B)
+                        end sub
+                    end class
+
+                    class SuperKlass
+                        sub new(enumVal as MyEnum)
+                            print enumVal
+                        end sub
+                    end class
+
+                    enum MyEnum
+                        A = "A"
+                        B = "B"
+                    end enum
+                end namespace
+            `, `
+                sub __MyNS_SubKlass_method_new()
+                    m.super0_new("B")
+                end sub
+                function __MyNS_SubKlass_builder()
+                    instance = __MyNS_SuperKlass_builder()
+                    instance.super0_new = instance.new
+                    instance.new = __MyNS_SubKlass_method_new
+                    return instance
+                end function
+                function MyNS_SubKlass()
+                    instance = __MyNS_SubKlass_builder()
+                    instance.new()
+                    return instance
+                end function
+                sub __MyNS_SuperKlass_method_new(enumVal as dynamic)
+                    print enumVal
+                end sub
+                function __MyNS_SuperKlass_builder()
+                    instance = {}
+                    instance.new = __MyNS_SuperKlass_method_new
+                    return instance
+                end function
+                function MyNS_SuperKlass(enumVal as dynamic)
+                    instance = __MyNS_SuperKlass_builder()
+                    instance.new(enumVal)
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+        it('works with enums as values referenced in a namespace directly', async () => {
+            await testTranspile(`
+                namespace MyNS
+                    class HasEnumKlass
+                        myArray = [true, true] as boolean[]
+                        sub new()
+                            m.myArray[MyEnum.A] = true
+                            m.myArray[MyEnum.B] = false
+                        end sub
+                    end class
+                    enum MyEnum
+                        A = 0
+                        B = 1
+                    end enum
+                end namespace
+            `, `
+                sub __MyNS_HasEnumKlass_method_new()
+                    m.myArray = [
+                        true
+                        true
+                    ]
+                    m.myArray[0] = true
+                    m.myArray[1] = false
+                end sub
+                function __MyNS_HasEnumKlass_builder()
+                    instance = {}
+                    instance.new = __MyNS_HasEnumKlass_method_new
+                    return instance
+                end function
+                function MyNS_HasEnumKlass()
+                    instance = __MyNS_HasEnumKlass_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+        it('works with enums as values referenced in a namespace with namespace', async () => {
+            await testTranspile(`
+                namespace MyNS
+                    class HasEnumKlass
+                        myArray = [true, true] as boolean[]
+                        sub new()
+                            m.myArray[MyNS.MyEnum.A] = true
+                            m.myArray[MyNS.MyEnum.B] = false
+                        end sub
+                    end class
+                    enum MyEnum
+                        A = 0
+                        B = 1
+                    end enum
+                end namespace
+            `, `
+                sub __MyNS_HasEnumKlass_method_new()
+                    m.myArray = [
+                        true
+                        true
+                    ]
+                    m.myArray[0] = true
+                    m.myArray[1] = false
+                end sub
+                function __MyNS_HasEnumKlass_builder()
+                    instance = {}
+                    instance.new = __MyNS_HasEnumKlass_method_new
+                    return instance
+                end function
+                function MyNS_HasEnumKlass()
+                    instance = __MyNS_HasEnumKlass_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+        it('allows namespaced class function as function parameters', async () => {
+            await testTranspile(`
+                namespace Alpha
+                    function foo()
+                        return 1
+                    end function
+
+                    function callSomeFunc(f as function)
+                        return f()
+                    end function
+
+                    sub callFoo()
+                        callSomeFunc(foo)
+                    end sub
+                end namespace
+            `, `
+                function Alpha_foo()
+                    return 1
+                end function
+
+                function Alpha_callSomeFunc(f as function)
+                    return f()
+                end function
+
+                sub Alpha_callFoo()
+                    Alpha_callSomeFunc(Alpha_foo)
+                end sub
+            `, 'trim', 'source/main.bs');
+        });
+        it('allows namespaced class constructors as function parameters', async () => {
+            await testTranspile(`
+                namespace Alpha
+                    class Button
+                    end class
+
+                    function callSomeFunc(f as function)
+                        return f()
+                    end function
+
+                    sub makeButton()
+                        callSomeFunc(Button)
+                    end sub
+                end namespace
+            `, `
+                sub __Alpha_Button_method_new()
+                end sub
+                function __Alpha_Button_builder()
+                    instance = {}
+                    instance.new = __Alpha_Button_method_new
+                    return instance
+                end function
+                function Alpha_Button()
+                    instance = __Alpha_Button_builder()
+                    instance.new()
+                    return instance
+                end function
+
+                function Alpha_callSomeFunc(f as function)
+                    return f()
+                end function
+
+                sub Alpha_makeButton()
+                    Alpha_callSomeFunc(Alpha_Button)
+                end sub
+            `, 'trim', 'source/main.bs');
+        });
+        it('allows class constructors as functions in array', async () => {
+            await testTranspile(`
+                namespace Alpha
+                    class Button
+                    end class
+
+                    class ButtonContainer
+                        private button = new Alpha.Button()
+
+                        sub new()
+                            m.init()
+                        end sub
+
+                        sub init()
+                            button = new Alpha.Button()
+                            items = [m.button, button, Alpha.Button]
+                        end sub
+                    end class
+                end namespace
+            `, `
+                sub __Alpha_Button_method_new()
+                end sub
+                function __Alpha_Button_builder()
+                    instance = {}
+                    instance.new = __Alpha_Button_method_new
+                    return instance
+                end function
+                function Alpha_Button()
+                    instance = __Alpha_Button_builder()
+                    instance.new()
+                    return instance
+                end function
+                sub __Alpha_ButtonContainer_method_new()
+                    m.button = Alpha_Button()
+                    m.init()
+                end sub
+                sub __Alpha_ButtonContainer_method_init()
+                    button = Alpha_Button()
+                    items = [
+                        m.button
+                        button
+                        Alpha_Button
+                    ]
+                end sub
+                function __Alpha_ButtonContainer_builder()
+                    instance = {}
+                    instance.new = __Alpha_ButtonContainer_method_new
+                    instance.init = __Alpha_ButtonContainer_method_init
+                    return instance
+                end function
+                function Alpha_ButtonContainer()
+                    instance = __Alpha_ButtonContainer_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
+        it('puts leading comments from methods in correct place', async () => {
+            await testTranspile(`
+                    class Duck
+                        ' hatch from egg
+                        sub new()
+                        end sub
+                        ' it must be a duck
+                        sub quack()
+                            ' what does a duck say?
+                            print "quack"
+                        end sub
+                    end class
+                `, `
+                    ' hatch from egg
+                    sub __Duck_method_new()
+                    end sub
+                    ' it must be a duck
+                    sub __Duck_method_quack()
+                        ' what does a duck say?
+                        print "quack"
+                    end sub
+                    function __Duck_builder()
+                        instance = {}
+                        ' hatch from egg
+                        instance.new = __Duck_method_new
+                        ' it must be a duck
+                        instance.quack = __Duck_method_quack
+                        return instance
+                    end function
+                    function Duck()
+                        instance = __Duck_builder()
+                        instance.new()
+                        return instance
+                    end function
+                `, undefined, 'source/main.bs');
+        });
+        it('puts leading comments from fields in correct place', async () => {
+            await testTranspile(`
+                    class Duck
+                        ' what kind of duck?
+                        type as string = "mallard"
+                    end class
+                `, `
+                    sub __Duck_method_new()
+                        ' what kind of duck?
+                        m.type = "mallard"
+                    end sub
+                    function __Duck_builder()
+                        instance = {}
+                        instance.new = __Duck_method_new
+                        return instance
+                    end function
+                    function Duck()
+                        instance = __Duck_builder()
+                        instance.new()
+                        return instance
+                    end function
+                `, undefined, 'source/main.bs');
+        });
+    });
+    it('detects using `new` keyword on non-classes', () => {
+        program.setFile('source/main.bs', `
+            sub quack()
+            end sub
+            sub main()
+                duck = new quack()
+            end sub
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.expressionIsNotConstructable('quack')
+        ]);
+    });
+    it('detects missing call to super', () => {
+        program.setFile('source/main.bs', `
             class Animal
                 sub new()
                 end sub
@@ -684,22 +1344,100 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.classConstructorMissingSuperCall().message);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.classConstructorMissingSuperCall()
+        ]);
     });
-    it.skip('detects calls to unknown m methods', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-            class Animal
-                sub new()
-                    m.methodThatDoesNotExist()
-                end sub
+    it('detects direct circular extends', () => {
+        //direct
+        program.setFile('source/Direct.bs', `
+            class Parent extends Child
+            end class
+
+            class Child extends Parent
+            end class
+        `);
+        program.validate();
+        (0, chai_config_spec_1.expect)(program.getDiagnostics().map(x => x.message).sort()).to.eql([
+            DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Child', 'Parent', 'Child']).message,
+            DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Parent', 'Child', 'Parent']).message
+        ]);
+    });
+    it('detects indirect circular extends', () => {
+        //direct
+        program.setFile('source/Indirect.bs', `
+            class Parent extends Grandchild
+            end class
+
+            class Child extends Parent
+            end class
+
+            class Grandchild extends Child
             end class
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.methodDoesNotExistOnType('methodThatDoesNotExist', 'Animal'));
+        (0, chai_config_spec_1.expect)(program.getDiagnostics().map(x => x.message).sort()).to.eql([
+            DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Child', 'Parent', 'Grandchild', 'Child']).message,
+            DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Grandchild', 'Child', 'Parent', 'Grandchild']).message,
+            DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Parent', 'Grandchild', 'Child', 'Parent']).message
+        ]);
+    });
+    it('transpiles super method calls twice', async () => {
+        program.setFile('source/lib.bs', `
+            class Being
+                function think()
+                    print "thinking..."
+                end function
+            end class
+
+            class Human extends Being
+                function think()
+                    super.think()
+                end function
+            end class
+        `);
+        await program.build({ outDir: testHelpers_spec_2.outDir });
+        fsExtra.emptyDirSync(testHelpers_spec_2.outDir);
+        await program.build({ outDir: testHelpers_spec_2.outDir });
+        (0, chai_config_spec_1.expect)(fsExtra.readFileSync((0, util_1.standardizePath) `${testHelpers_spec_2.outDir}/source/lib.brs`).toString().trimEnd()).to.eql((0, testHelpers_spec_1.trim) `
+            sub __Being_method_new()
+            end sub
+            function __Being_method_think()
+                print "thinking..."
+            end function
+            function __Being_builder()
+                instance = {}
+                instance.new = __Being_method_new
+                instance.think = __Being_method_think
+                return instance
+            end function
+            function Being()
+                instance = __Being_builder()
+                instance.new()
+                return instance
+            end function
+            sub __Human_method_new()
+                m.super0_new()
+            end sub
+            function __Human_method_think()
+                m.super0_think()
+            end function
+            function __Human_builder()
+                instance = __Being_builder()
+                instance.super0_new = instance.new
+                instance.new = __Human_method_new
+                instance.think = __Human_method_think
+                return instance
+            end function
+            function Human()
+                instance = __Human_builder()
+                instance.new()
+                return instance
+            end function
+        `);
     });
     it('detects duplicate member names', () => {
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             class Animal
                 public name
                 public name
@@ -713,32 +1451,26 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        let diagnostics = program.getDiagnostics().map(x => {
-            return {
-                code: x.code,
-                message: x.message,
-                range: x.range,
-                severity: vscode_languageserver_1.DiagnosticSeverity.Error
-            };
-        });
-        chai_1.expect(diagnostics).to.eql([Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier('name')), { range: vscode_languageserver_1.Range.create(3, 23, 3, 27) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier('name')), { range: vscode_languageserver_1.Range.create(4, 27, 4, 31) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier('age')), { range: vscode_languageserver_1.Range.create(8, 27, 8, 30) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier('age')), { range: vscode_languageserver_1.Range.create(10, 23, 10, 26) })]);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier('name')), { location: { range: vscode_languageserver_1.Range.create(3, 23, 3, 27) } }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier('name')), { location: { range: vscode_languageserver_1.Range.create(4, 27, 4, 31) } }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier('age')), { location: { range: vscode_languageserver_1.Range.create(8, 27, 8, 30) } }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.duplicateIdentifier('age')), { location: { range: vscode_languageserver_1.Range.create(10, 23, 10, 26) } })]);
     });
     it('detects mismatched member type in child class', () => {
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             class Animal
                 public name
             end class
             class Duck extends Animal
-                public function name()
+                public override function name()
                     return "Donald"
                 end function
             end class
         `);
         program.validate();
-        chai_1.expect(program.getDiagnostics().map(x => x.message).sort()[0]).to.eql(DiagnosticMessages_1.DiagnosticMessages.classChildMemberDifferentMemberTypeThanAncestor('method', 'field', 'Animal').message);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Animal', 'name', 'function name() as dynamic', 'dynamic')
+        ]);
     });
     it('allows untyped overridden field in child class', () => {
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             class Animal
                 public name
             end class
@@ -747,7 +1479,7 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        testHelpers_spec_1.expectZeroDiagnostics(program);
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
     it('allows overridden property name in child class', () => {
         program.setFile('source/main.bs', `
@@ -759,7 +1491,7 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        testHelpers_spec_1.expectZeroDiagnostics(program);
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
     it('flags incompatible child field type changes', () => {
         program.setFile('source/main.bs', `
@@ -769,21 +1501,20 @@ describe('BrsFile BrighterScript classes', () => {
                 public owner as Person
             end class
             class Duck extends Bird
-                public age = 12.2 'should be integer but is float
+                public age = 12.2 'should be integer, but a float can be assigned to an int
                 public name = 12 'should be string but is integer
                 public owner as string
             end class
         `);
         program.validate();
-        chai_1.expect(program.getDiagnostics().map(x => x.message).sort()).to.eql([
-            DiagnosticMessages_1.DiagnosticMessages.cannotFindType('Person').message,
-            DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'age', 'float', 'integer').message,
-            DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'name', 'integer', 'string').message,
-            DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'owner', 'string', 'Person').message
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.cannotFindName('Person'),
+            DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'name', 'integer', 'string'),
+            DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'owner', 'string', 'Person')
         ]);
     });
     it('detects overridden methods without override keyword', () => {
-        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        program.setFile('source/main.bs', `
             class Animal
                 sub speak()
                 end sub
@@ -794,10 +1525,12 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        chai_1.expect(program.getDiagnostics()[0]).to.exist.and.to.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.missingOverrideKeyword('Animal')));
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.missingOverrideKeyword('Animal')
+        ]);
     });
     it('detects overridden methods with different visibility', () => {
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             class Animal
                 sub speakInPublic()
                 end sub
@@ -816,12 +1549,14 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        chai_1.expect(program.getDiagnostics()[0]).to.exist.and.to.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchedOverriddenMemberVisibility('Duck', 'speakInPublic', 'private', 'public', 'Animal')));
-        chai_1.expect(program.getDiagnostics()[1]).to.exist.and.to.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchedOverriddenMemberVisibility('Duck', 'speakWithFriends', 'public', 'protected', 'Animal')));
-        chai_1.expect(program.getDiagnostics()[2]).to.exist.and.to.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchedOverriddenMemberVisibility('Duck', 'speakWithFamily', 'public', 'private', 'Animal')));
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.mismatchedOverriddenMemberVisibility('Duck', 'speakInPublic', 'private', 'public', 'Animal'),
+            DiagnosticMessages_1.DiagnosticMessages.mismatchedOverriddenMemberVisibility('Duck', 'speakWithFriends', 'public', 'protected', 'Animal'),
+            DiagnosticMessages_1.DiagnosticMessages.mismatchedOverriddenMemberVisibility('Duck', 'speakWithFamily', 'public', 'private', 'Animal')
+        ]);
     });
     it('allows overridden methods with matching visibility', () => {
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             class Animal
                 sub speakInPublic()
                 end sub
@@ -840,20 +1575,93 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        chai_1.expect(program.getDiagnostics()).to.be.empty;
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
-    it('detects extending unknown parent class', () => {
-        program.setFile('source/main.brs', `
-            class Duck extends Animal
-                sub speak()
-                end sub
-            end class
-        `);
-        program.validate();
-        chai_1.expect(program.getDiagnostics()[0]).to.exist.and.to.deep.include(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.classCouldNotBeFound('Animal', 'source')), { range: vscode_languageserver_1.Range.create(1, 31, 1, 37) }));
+    describe('detects unknown parent class', () => {
+        it('non-namespaced parent from outside namespace', () => {
+            program.setFile('source/main.bs', `
+                class Duck extends Animal
+                    sub speak()
+                    end sub
+                end class
+
+                namespace Vertibrates
+                    class Animal
+                    end class
+                end namespace
+            `);
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.cannotFindName('Animal')), { location: { range: vscode_languageserver_1.Range.create(1, 35, 1, 41) } })]);
+        });
+        it('non-namespaced parent from within namespace', () => {
+            program.setFile('source/main.bs', `
+                namespace Vertibrates
+                    class Duck extends Animal
+                        sub speak()
+                        end sub
+                    end class
+                end namespace
+            `);
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.cannotFindName('Animal')
+            ]);
+        });
+        it('non-namespaced name from outside namespace alongside existing namespace', () => {
+            program.setFile('source/main.bs', `
+                namespace Vertibrates
+                    class Animal
+                    end class
+                end namespace
+
+                class Duck extends Animal
+                    sub speak()
+                    end sub
+                end class
+            `);
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.cannotFindName('Animal')
+            ]);
+        });
+        it('namespaced parent class from outside namespace', () => {
+            program.setFile('source/vertibrates.bs', `
+                namespace Vertibrates
+                    class Bird
+                    end class
+                end namespace
+            `);
+            program.setFile('source/Duck.bs', `
+                class Duck extends Vertibrates.GroundedBird
+                    sub speak()
+                    end sub
+                end class
+            `);
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird', 'Vertibrates', 'namespace'))]);
+        });
+        it('namespaced parent class from inside namespace', () => {
+            program.setFile('source/vertibrates.bs', `
+                namespace Vertibrates
+                    class Bird
+                    end class
+                end namespace
+            `);
+            program.setFile('source/Duck.bs', `
+                namespace Birdies
+                    class Duck extends Vertibrates.GroundedBird
+                        sub speak()
+                        end sub
+                    end class
+                end namespace
+            `);
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird', 'Vertibrates', 'namespace').message
+            ]);
+        });
     });
     it('catches newable class without namespace name', () => {
-        var _a;
         program.setFile('source/main.bs', `
             namespace NameA.NameB
                 class Duck
@@ -865,11 +1673,13 @@ describe('BrsFile BrighterScript classes', () => {
             end sub
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.classCouldNotBeFound('Duck', 'source').message);
+        (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.cannotFindFunction('Duck').message,
+            DiagnosticMessages_1.DiagnosticMessages.expressionIsNotConstructable('Duck')
+        ]);
     });
     it('supports newable class namespace inference', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             namespace NameA.NameB
                 class Duck
                 end class
@@ -879,24 +1689,24 @@ describe('BrsFile BrighterScript classes', () => {
             end namespace
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
     it('catches extending unknown namespaced class', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             namespace NameA.NameB
                 class Animal
                 end class
-                class Duck extends NameA.NameB.Animal1
+                class Duck extends NameA.NameB.AnimalNotDefined
                 end class
             end namespace
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.classCouldNotBeFound('NameA.NameB.Animal1', 'source').message);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.cannotFindName('AnimalNotDefined', 'NameA.NameB.AnimalNotDefined', 'NameA.NameB', 'namespace')
+        ]);
     });
     it('supports omitting namespace prefix for items in same namespace', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             namespace NameA.NameB
                 class Animal
                 end class
@@ -905,45 +1715,54 @@ describe('BrsFile BrighterScript classes', () => {
             end namespace
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
     it('catches duplicate root-level class declarations', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             class Animal
             end class
             class Animal
+            end class
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.duplicateClassDeclaration('source', 'Animal').message);
+        (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Class', 'Class', 'Animal')
+        ]);
     });
     it('catches duplicate namespace-level class declarations', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+        program.setFile('source/main.bs', `
             namespace NameA.NameB
                 class Animal
                 end class
                 class Animal
+                end class
             end namespace
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.duplicateClassDeclaration('source', 'NameA.NameB.Animal').message);
+        (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Class', 'Class', 'NameA.NameB.Animal').message
+        ]);
     });
-    it('catches namespaced class name which is the same as a global class', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
+    it('allows namespaced class name which is the same as a global class', () => {
+        program.setFile('source/main.bs', `
             namespace NameA.NameB
                 class Animal
+                    name as string
                 end class
+
+                sub printThisAnimalName(ani as Animal) ' this refers to NameA.NameB.Animal
+                    print ani.name
+                end sub
             end namespace
+
             class Animal
+                doesNotHaveName as string
             end class
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.namespacedClassCannotShareNamewithNonNamespacedClass('Animal').message);
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
     it('catches class with same name as function', () => {
-        var _a;
         program.setFile('source/main.bs', `
             class Animal
             end class
@@ -951,10 +1770,12 @@ describe('BrsFile BrighterScript classes', () => {
             end sub
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.functionCannotHaveSameNameAsClass('Animal').message);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Class', 'Function', 'Animal').message,
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Function', 'Class', 'Animal').message
+        ]);
     });
     it('catches class with same name (but different case) as function', () => {
-        var _a;
         program.setFile('source/main.bs', `
             class ANIMAL
             end class
@@ -962,10 +1783,12 @@ describe('BrsFile BrighterScript classes', () => {
             end sub
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.functionCannotHaveSameNameAsClass('animal').message);
+        (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Class', 'Function', 'animal').message,
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Function', 'Class', 'ANIMAL').message
+        ]);
     });
     it('catches variable with same name as class', () => {
-        var _a;
         program.setFile('source/main.bs', `
             class Animal
             end class
@@ -974,7 +1797,9 @@ describe('BrsFile BrighterScript classes', () => {
             end sub
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.localVarSameNameAsClass('Animal').message);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.localVarShadowedByScopedFunction().message
+        ]);
     });
     it('allows extending classes with more than one dot in the filename', () => {
         program.setFile('source/testclass.bs', `
@@ -1002,9 +1827,9 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        testHelpers_spec_1.expectZeroDiagnostics(program);
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
-    it('computes correct super index for grandchild class', () => {
+    it('computes correct super index for grandchild class', async () => {
         program.setFile('source/main.bs', `
             sub Main()
                 c = new App.ClassC()
@@ -1018,7 +1843,7 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             end namespace
         `);
-        testTranspile(`
+        await testTranspile(`
             namespace App
                 class ClassC extends ClassB
                     sub new()
@@ -1027,12 +1852,13 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             end namespace
         `, `
+            sub __App_ClassC_method_new()
+                m.super1_new()
+            end sub
             function __App_ClassC_builder()
                 instance = __App_ClassB_builder()
                 instance.super1_new = instance.new
-                instance.new = sub()
-                    m.super1_new()
-                end sub
+                instance.new = __App_ClassC_method_new
                 return instance
             end function
             function App_ClassC()
@@ -1042,23 +1868,24 @@ describe('BrsFile BrighterScript classes', () => {
             end function
         `, 'trim', 'source/App.ClassC.bs');
     });
-    it('computes correct super index for namespaced child class and global parent class', () => {
+    it('computes correct super index for namespaced child class and global parent class', async () => {
         program.setFile('source/ClassA.bs', `
             class ClassA
             end class
         `);
-        testTranspile(`
+        await testTranspile(`
             namespace App
                 class ClassB extends ClassA
                 end class
             end namespace
         `, `
+            sub __App_ClassB_method_new()
+                m.super0_new()
+            end sub
             function __App_ClassB_builder()
                 instance = __ClassA_builder()
                 instance.super0_new = instance.new
-                instance.new = sub()
-                    m.super0_new()
-                end sub
+                instance.new = __App_ClassB_method_new
                 return instance
             end function
             function App_ClassB()
@@ -1073,9 +1900,136 @@ describe('BrsFile BrighterScript classes', () => {
             class ClassB extends ClassA
             end class
         `);
-        assert_1.doesNotThrow(() => {
-            file.parser.references.classStatements[0].getParentClassIndex(new BrsTranspileState_1.BrsTranspileState(file));
+        (0, assert_1.doesNotThrow)(() => {
+            const classStatements = file.ast.findChildren(reflection_1.isClassStatement);
+            classStatements[0]['getParentClassIndex'](new BrsTranspileState_1.BrsTranspileState(file));
         });
     });
+    it('does not crash when child has field with same name as sub in parent', () => {
+        program.setFile('source/main.bs', `
+            class Parent
+                public function helloWorld()
+                end function
+            end class
+            class Child extends Parent
+                public helloWorld as string
+            end class
+        `);
+        program.validate();
+    });
+    it('does not crash when child has method with same name as field in parent', () => {
+        program.setFile('source/main.bs', `
+            class Parent
+                public helloWorld as string
+            end class
+            class Child extends Parent
+                public function helloWorld()
+                end function
+            end class
+        `);
+        program.validate();
+    });
+    it('extending namespaced class transpiles properly', async () => {
+        await testTranspile(`
+            namespace App
+                class CoreClass
+                    sub new()
+                        print "CoreClass.new()"
+                    end sub
+                end class
+            end namespace
+            namespace App.Logic
+                class FirstClass extends App.CoreClass
+                end class
+                class SecondClass extends FirstClass
+                end class
+            end namespace
+            namespace App.OtherLogic
+                class FinalClass extends App.Logic.SecondClass
+                end class
+            end namespace
+        `, `
+            sub __App_CoreClass_method_new()
+                print "CoreClass.new()"
+            end sub
+            function __App_CoreClass_builder()
+                instance = {}
+                instance.new = __App_CoreClass_method_new
+                return instance
+            end function
+            function App_CoreClass()
+                instance = __App_CoreClass_builder()
+                instance.new()
+                return instance
+            end function
+            sub __App_Logic_FirstClass_method_new()
+                m.super0_new()
+            end sub
+            function __App_Logic_FirstClass_builder()
+                instance = __App_CoreClass_builder()
+                instance.super0_new = instance.new
+                instance.new = __App_Logic_FirstClass_method_new
+                return instance
+            end function
+            function App_Logic_FirstClass()
+                instance = __App_Logic_FirstClass_builder()
+                instance.new()
+                return instance
+            end function
+            sub __App_Logic_SecondClass_method_new()
+                m.super1_new()
+            end sub
+            function __App_Logic_SecondClass_builder()
+                instance = __App_Logic_FirstClass_builder()
+                instance.super1_new = instance.new
+                instance.new = __App_Logic_SecondClass_method_new
+                return instance
+            end function
+            function App_Logic_SecondClass()
+                instance = __App_Logic_SecondClass_builder()
+                instance.new()
+                return instance
+            end function
+            sub __App_OtherLogic_FinalClass_method_new()
+                m.super2_new()
+            end sub
+            function __App_OtherLogic_FinalClass_builder()
+                instance = __App_Logic_SecondClass_builder()
+                instance.super2_new = instance.new
+                instance.new = __App_OtherLogic_FinalClass_method_new
+                return instance
+            end function
+            function App_OtherLogic_FinalClass()
+                instance = __App_OtherLogic_FinalClass_builder()
+                instance.new()
+                return instance
+            end function
+        `);
+    });
+    it('detects calling class constructors with too many parameters', () => {
+        program.setFile('source/main.bs', `
+            class Parameterless
+                sub new()
+                end sub
+            end class
+
+            class OneParam
+                sub new(param1)
+                end sub
+            end class
+
+            sub main()
+                c1 = new Parameterless(1)
+                c2 = new OneParam(1, 2)
+                c2 = new OneParam()
+            end sub
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.mismatchArgumentCount(0, 1),
+            DiagnosticMessages_1.DiagnosticMessages.mismatchArgumentCount(1, 2),
+            DiagnosticMessages_1.DiagnosticMessages.mismatchArgumentCount(1, 0)
+        ]);
+    });
 });
 //# sourceMappingURL=BrsFile.Class.spec.js.map