brighterscript 1.0.0-alpha.24 → 1.0.0-alpha.26

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,30 +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 = (0, util_1.standardizePath) `${process.cwd()}/.tmp`;
-    let rootDir = (0, util_1.standardizePath) `${tmpPath}/rootDir`;
-    const stagingDir = (0, util_1.standardizePath) `${tmpPath}/staging`;
     let program;
-    let testTranspile = (0, 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, stagingFolderPath: stagingDir });
+        fsExtra.ensureDirSync(testHelpers_spec_2.rootDir);
+        fsExtra.emptyDirSync(testHelpers_spec_2.tempDir);
+        program = new Program_1.Program({ rootDir: testHelpers_spec_2.rootDir, stagingDir: testHelpers_spec_2.stagingDir });
     });
     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
@@ -42,17 +41,18 @@ describe('BrsFile BrighterScript classes', () => {
 
             end class
         `);
-        (0, 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', () => {
-        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
@@ -67,8 +67,29 @@ describe('BrsFile BrighterScript classes', () => {
             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', () => {
-        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
@@ -81,12 +102,12 @@ describe('BrsFile BrighterScript classes', () => {
         `);
         program.validate();
         (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
-        let duckClass = file.parser.references.classStatements.find(x => x.name.text.toLowerCase() === 'duck');
-        (0, chai_1.expect)(duckClass).to.exist;
-        (0, chai_1.expect)(duckClass.memberMap['move']).to.exist;
+        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', () => {
-        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()
@@ -146,7 +167,7 @@ describe('BrsFile BrighterScript classes', () => {
                     end sub
                 end class
                 class Duck extends Bird
-                    sub new()
+                    sub new(name)
                         thing = { m: "m"}
                         print thing.m
                         name = "Donald" + "Duck"
@@ -160,18 +181,20 @@ describe('BrsFile BrighterScript classes', () => {
         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(m.name)
+                        super("Flappy")
                     end sub
                 end class
             `);
             program.validate();
-            (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall()), { range: vscode_languageserver_1.Range.create(7, 24, 7, 25) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall()), { range: vscode_languageserver_1.Range.create(7, 33, 7, 34) })]);
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall()), { range: vscode_languageserver_1.Range.create(9, 24, 9, 25) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.classConstructorIllegalUseOfMBeforeSuperCall()), { range: vscode_languageserver_1.Range.create(9, 33, 9, 34) })]);
         });
     });
     describe('transpile', () => {
@@ -186,23 +209,23 @@ describe('BrsFile BrighterScript classes', () => {
                     end sub
                 end class
             `);
-            (0, chai_1.expect)(file.ast.statements[1].body[0].func.body.statements[0].expression.callee.name.text).to.eql('super');
-            await program.transpile([], stagingDir);
-            (0, chai_1.expect)(file.ast.statements[1].body[0].func.body.statements[0].expression.callee.name.text).to.eql('super');
+            (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', () => {
-            testTranspile(`
+        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
             `, `
@@ -210,7 +233,7 @@ describe('BrsFile BrighterScript classes', () => {
                     instance = {}
                     instance.new = sub()
                         m.species1 = "Animal"
-                        print "From Animal: " + m.species
+                        print "From Animal: " + m.species1
                     end sub
                     return instance
                 end function
@@ -225,7 +248,7 @@ describe('BrsFile BrighterScript classes', () => {
                     instance.new = sub()
                         m.super0_new()
                         m.species2 = "Duck"
-                        print "From Duck: " + m.species
+                        print "From Duck: " + m.species2
                     end sub
                     return instance
                 end function
@@ -236,8 +259,84 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, 'trim', 'source/main.bs');
         });
-        it('handles class inheritance inferred constructor calls', () => {
-            testTranspile(`
+        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
+            `, `
+                function __Animal_builder()
+                    instance = {}
+                    instance.new = sub()
+                    end sub
+                    return instance
+                end function
+                function Animal()
+                    instance = __Animal_builder()
+                    instance.new()
+                    return instance
+                end function
+                function __Duck_builder()
+                    instance = __Animal_builder()
+                    instance.super0_new = instance.new
+                    instance.new = sub()
+                        'comment should not cause double super call
+                        m.super0_new()
+                    end sub
+                    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
+            `, `
+                function __Animal_builder()
+                    instance = {}
+                    instance.new = sub()
+                    end sub
+                    return instance
+                end function
+                function Animal()
+                    instance = __Animal_builder()
+                    instance.new()
+                    return instance
+                end function
+                function __Duck_builder()
+                    instance = __Animal_builder()
+                    instance.super0_new = instance.new
+                    instance.new = sub()
+                        print "I am a statement which does not use m"
+                        m.super0_new()
+                    end sub
+                    return instance
+                end function
+                function Duck()
+                    instance = __Duck_builder()
+                    instance.new()
+                    return instance
+                end function
+            `);
+        });
+        it('handles class inheritance inferred constructor calls', async () => {
+            await testTranspile(`
                 class Animal
                     className1 = "Animal"
                 end class
@@ -290,8 +389,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
@@ -325,8 +424,8 @@ 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
             `, `
@@ -343,8 +442,8 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, undefined, 'source/main.bs');
         });
-        it('registers the constructor and properly handles its parameters', () => {
-            testTranspile(`
+        it('registers the constructor and properly handles its parameters', async () => {
+            await testTranspile(`
                 class Duck
                     sub new(name as string, age as integer)
                     end sub
@@ -363,8 +462,8 @@ 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
@@ -409,8 +508,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
@@ -464,7 +563,7 @@ describe('BrsFile BrighterScript classes', () => {
                 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
@@ -473,7 +572,7 @@ describe('BrsFile BrighterScript classes', () => {
                 class Bird
                 end class
             `);
-            testTranspile(`
+            await testTranspile(`
                 namespace Animals
                     sub init()
                         donaldDuck = new Duck()
@@ -489,8 +588,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
@@ -500,14 +599,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
@@ -517,8 +616,8 @@ describe('BrsFile BrighterScript classes', () => {
                 end sub
             `, undefined, 'source/main.bs');
         });
-        it('calls super ', () => {
-            const { file } = testTranspile(`
+        it('calls super ', async () => {
+            const { file } = await testTranspile(`
                 class Parent
                     sub new()
                     end sub
@@ -555,10 +654,10 @@ describe('BrsFile BrighterScript classes', () => {
             `, undefined, undefined, false);
             //the AST should not be permanently modified
             const constructor = file.ast.statements[0].body[0];
-            (0, chai_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
+            (0, chai_config_spec_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
         });
-        it('adds field initializers', () => {
-            const { file } = testTranspile(`
+        it('adds field initializers', async () => {
+            const { file } = await testTranspile(`
                 class Person
                     sub new()
                     end sub
@@ -580,10 +679,10 @@ describe('BrsFile BrighterScript classes', () => {
             `);
             //the AST should not be permanently modified
             const constructor = file.ast.statements[0].body[0];
-            (0, chai_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
+            (0, chai_config_spec_1.expect)(constructor.func.body.statements).to.be.lengthOf(0);
         });
-        it('does not screw up local variable references', () => {
-            testTranspile(`
+        it('does not screw up local variable references', async () => {
+            await testTranspile(`
                 class Animal
                     sub new(name as string)
                         m.name = name
@@ -690,8 +789,8 @@ describe('BrsFile BrighterScript classes', () => {
                 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"
@@ -739,9 +838,308 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             `, 'trim', 'source/main.bs');
         });
+        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
+            `, `
+                function __MyNS_KlassOne_builder()
+                    instance = {}
+                    instance.new = sub()
+                        m.other = MyNS_KlassTwo()
+                    end sub
+                    return instance
+                end function
+                function MyNS_KlassOne()
+                    instance = __MyNS_KlassOne_builder()
+                    instance.new()
+                    return instance
+                end function
+                function __MyNS_KlassTwo_builder()
+                    instance = {}
+                    instance.new = sub()
+                    end sub
+                    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
+            `, `
+                function __MyNS_HasEnumKlass_builder()
+                    instance = {}
+                    instance.new = sub()
+                        m.enumValue = "A"
+                    end sub
+                    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
+            `, `
+                function __MyNS_SubKlass_builder()
+                    instance = __MyNS_SuperKlass_builder()
+                    instance.super0_new = instance.new
+                    instance.new = sub()
+                        m.super0_new("B")
+                    end sub
+                    return instance
+                end function
+                function MyNS_SubKlass()
+                    instance = __MyNS_SubKlass_builder()
+                    instance.new()
+                    return instance
+                end function
+                function __MyNS_SuperKlass_builder()
+                    instance = {}
+                    instance.new = sub(enumVal as dynamic)
+                        print enumVal
+                    end sub
+                    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
+            `, `
+                function __MyNS_HasEnumKlass_builder()
+                    instance = {}
+                    instance.new = sub()
+                        m.myArray = [
+                            true
+                            true
+                        ]
+                        m.myArray[0] = true
+                        m.myArray[1] = false
+                    end sub
+                    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
+            `, `
+                function __MyNS_HasEnumKlass_builder()
+                    instance = {}
+                    instance.new = sub()
+                        m.myArray = [
+                            true
+                            true
+                        ]
+                        m.myArray[0] = true
+                        m.myArray[1] = false
+                    end sub
+                    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
+            `, `
+                function __Alpha_Button_builder()
+                    instance = {}
+                    instance.new = sub()
+                    end sub
+                    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
+            `, `
+                function __Alpha_Button_builder()
+                    instance = {}
+                    instance.new = sub()
+                    end sub
+                    return instance
+                end function
+                function Alpha_Button()
+                    instance = __Alpha_Button_builder()
+                    instance.new()
+                    return instance
+                end function
+                function __Alpha_ButtonContainer_builder()
+                    instance = {}
+                    instance.new = sub()
+                        m.button = Alpha_Button()
+                        m.init()
+                    end sub
+                    instance.init = sub()
+                        button = Alpha_Button()
+                        items = [
+                            m.button
+                            Alpha_button
+                            Alpha_Button
+                        ]
+                    end sub
+                    return instance
+                end function
+                function Alpha_ButtonContainer()
+                    instance = __Alpha_ButtonContainer_builder()
+                    instance.new()
+                    return instance
+                end function
+            `, 'trim', 'source/main.bs');
+        });
     });
     it('detects using `new` keyword on non-classes', () => {
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.brs' }, `
+        program.setFile('source/main.bs', `
             sub quack()
             end sub
             sub main()
@@ -754,13 +1152,13 @@ describe('BrsFile BrighterScript classes', () => {
         ]);
     });
     it('detects missing call to super', () => {
-        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.brs' }, `
+        program.setFile('source/main.bs', `
             class Animal
-                sub new ()
+                sub new()
                 end sub
             end class
             class Duck extends Animal
-                sub new ()
+                sub new()
                 end sub
             end class
         `);
@@ -770,9 +1168,9 @@ describe('BrsFile BrighterScript classes', () => {
         ]);
     });
     it.skip('detects calls to unknown m methods', () => {
-        program.setFile('source/main.brs', `
+        program.setFile('source/main.bs', `
             class Animal
-                sub new ()
+                sub new()
                     m.methodThatDoesNotExist()
                 end sub
             end class
@@ -792,7 +1190,7 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, chai_1.expect)(program.getDiagnostics().map(x => x.message).sort()).to.eql([
+        (0, chai_config_spec_1.expect)(program.getDiagnostics().map(x => x.message).sort()).to.eql([
             DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Child', 'Parent', 'Child'], 'source').message,
             DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Parent', 'Child', 'Parent'], 'source').message
         ]);
@@ -810,7 +1208,7 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, chai_1.expect)(program.getDiagnostics().map(x => x.message).sort()).to.eql([
+        (0, chai_config_spec_1.expect)(program.getDiagnostics().map(x => x.message).sort()).to.eql([
             DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Child', 'Parent', 'Grandchild', 'Child'], 'source').message,
             DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Grandchild', 'Child', 'Parent', 'Grandchild'], 'source').message,
             DiagnosticMessages_1.DiagnosticMessages.circularReferenceDetected(['Parent', 'Grandchild', 'Child', 'Parent'], 'source').message
@@ -830,10 +1228,10 @@ describe('BrsFile BrighterScript classes', () => {
                 end function
             end class
         `);
-        await program.transpile([], stagingDir);
-        fsExtra.emptyDirSync(stagingDir);
-        await program.transpile([], stagingDir);
-        (0, chai_1.expect)(fsExtra.readFileSync((0, util_1.standardizePath) `${stagingDir}/source/lib.brs`).toString().trimEnd()).to.eql((0, testHelpers_spec_1.trim) `
+        await program.build({ stagingDir: testHelpers_spec_2.stagingDir });
+        fsExtra.emptyDirSync(testHelpers_spec_2.stagingDir);
+        await program.build({ stagingDir: testHelpers_spec_2.stagingDir });
+        (0, chai_config_spec_1.expect)(fsExtra.readFileSync((0, util_1.standardizePath) `${testHelpers_spec_2.stagingDir}/source/lib.brs`).toString().trimEnd()).to.eql((0, testHelpers_spec_1.trim) `
             function __Being_builder()
                 instance = {}
                 instance.new = sub()
@@ -931,15 +1329,14 @@ 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();
         (0, testHelpers_spec_1.expectDiagnostics)(program, [
-            DiagnosticMessages_1.DiagnosticMessages.cannotFindType('Person'),
-            DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'age', 'float', 'integer'),
+            DiagnosticMessages_1.DiagnosticMessages.cannotFindName('Person'),
             DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'name', 'integer', 'string'),
             DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'owner', 'string', 'Person')
         ]);
@@ -1016,11 +1413,11 @@ describe('BrsFile BrighterScript classes', () => {
                     end sub
                 end class
 
-                            namespace Vertibrates
+                namespace Vertibrates
                     class Animal
                     end class
-                            end namespace
-                                `);
+                end namespace
+            `);
             program.validate();
             (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.cannotFindName('Animal')), { range: vscode_languageserver_1.Range.create(1, 35, 1, 41) })]);
         });
@@ -1031,8 +1428,8 @@ describe('BrsFile BrighterScript classes', () => {
                         sub speak()
                         end sub
                     end class
-                                end namespace
-                                    `);
+                end namespace
+            `);
             program.validate();
             (0, testHelpers_spec_1.expectDiagnostics)(program, [
                 DiagnosticMessages_1.DiagnosticMessages.cannotFindName('Animal')
@@ -1043,7 +1440,7 @@ describe('BrsFile BrighterScript classes', () => {
                 namespace Vertibrates
                     class Animal
                     end class
-                                end namespace
+                end namespace
 
                 class Duck extends Animal
                     sub speak()
@@ -1069,9 +1466,9 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            (0, testHelpers_spec_1.expectDiagnostics)(program, [
-                DiagnosticMessages_1.DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird')
-            ]);
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird')), { relatedInformation: [{
+                            message: `In scope 'source'`
+                        }] })]);
         });
         it('namespaced parent class from inside namespace', () => {
             program.setFile('source/vertibrates.bs', `
@@ -1089,9 +1486,9 @@ describe('BrsFile BrighterScript classes', () => {
                 end namespace
             `);
             program.validate();
-            (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird')), { relatedInformation: [{
-                            message: `Not defined in scope 'source'`
-                        }] })]);
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.cannotFindName('GroundedBird', 'Vertibrates.GroundedBird').message
+            ]);
         });
     });
     it('catches newable class without namespace name', () => {
@@ -1099,12 +1496,12 @@ describe('BrsFile BrighterScript classes', () => {
             namespace NameA.NameB
                 class Duck
                 end class
-                                            end namespace
+            end namespace
             sub main()
                 ' this should be an error because the proper name is NameA.NameB.Duck"
                 d = new Duck()
             end sub
-                                            `);
+        `);
         program.validate();
         (0, testHelpers_spec_1.expectDiagnostics)(program, [
             DiagnosticMessages_1.DiagnosticMessages.cannotFindName('Duck')
@@ -1115,11 +1512,11 @@ describe('BrsFile BrighterScript classes', () => {
             namespace NameA.NameB
                 class Duck
                 end class
-                                        sub main()
+                sub main()
                     d = new Duck()
                 end sub
             end namespace
-                                        `);
+        `);
         program.validate();
         (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
@@ -1144,8 +1541,8 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
                 class Duck extends Animal
                 end class
-                                        end namespace
-                                            `);
+            end namespace
+        `);
         program.validate();
         (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
@@ -1157,8 +1554,8 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, testHelpers_spec_1.expectDiagnostics)(program, [
-            DiagnosticMessages_1.DiagnosticMessages.duplicateClassDeclaration('source', 'Animal')
+        (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Class', 'Class', 'Animal')
         ]);
     });
     it('catches duplicate namespace-level class declarations', () => {
@@ -1171,8 +1568,8 @@ describe('BrsFile BrighterScript classes', () => {
             end namespace
         `);
         program.validate();
-        (0, testHelpers_spec_1.expectDiagnostics)(program, [
-            DiagnosticMessages_1.DiagnosticMessages.duplicateClassDeclaration('source', 'NameA.NameB.Animal')
+        (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Class', 'Class', 'Animal').message
         ]);
     });
     it('catches namespaced class name which is the same as a global class', () => {
@@ -1180,24 +1577,24 @@ describe('BrsFile BrighterScript classes', () => {
             namespace NameA.NameB
                 class Animal
                 end class
-                            end namespace
+            end namespace
             class Animal
             end class
         `);
         program.validate();
         (0, testHelpers_spec_1.expectDiagnostics)(program, [
-            DiagnosticMessages_1.DiagnosticMessages.namespacedClassCannotShareNamewithNonNamespacedClass('Animal').message
+            DiagnosticMessages_1.DiagnosticMessages.nameCollision('Class', 'Class', 'Animal').message
         ]);
     });
     it('catches class with same name as function', () => {
         program.setFile('source/main.bs', `
             class Animal
             end class
-                            sub Animal()
+            sub Animal()
             end sub
-                            `);
+        `);
         program.validate();
-        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+        (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [
             DiagnosticMessages_1.DiagnosticMessages.functionCannotHaveSameNameAsClass('Animal').message
         ]);
     });
@@ -1205,11 +1602,11 @@ describe('BrsFile BrighterScript classes', () => {
         program.setFile('source/main.bs', `
             class ANIMAL
             end class
-                            sub animal()
+            sub animal()
             end sub
-                            `);
+        `);
         program.validate();
-        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+        (0, testHelpers_spec_1.expectDiagnosticsIncludes)(program, [
             DiagnosticMessages_1.DiagnosticMessages.functionCannotHaveSameNameAsClass('animal').message
         ]);
     });
@@ -1217,10 +1614,10 @@ describe('BrsFile BrighterScript classes', () => {
         program.setFile('source/main.bs', `
             class Animal
             end class
-                            sub main()
+            sub main()
                 animal = new Animal()
             end sub
-                            `);
+        `);
         program.validate();
         (0, testHelpers_spec_1.expectDiagnostics)(program, [
             DiagnosticMessages_1.DiagnosticMessages.localVarSameNameAsClass('Animal').message
@@ -1232,21 +1629,21 @@ describe('BrsFile BrighterScript classes', () => {
             end class
 
             class Bar extends Foo
-                sub new ()
+                sub new()
                     super()
                 end sub
             end class
         `);
         program.setFile('source/testclass_no_testdot.bs', `
             class BarNoDot extends Foo
-                sub new ()
+                sub new()
                     super()
                 end sub
             end class
         `);
         program.setFile('source/testclass.dot.bs', `
             class BarDot extends Foo
-                sub new ()
+                sub new()
                 super()
                 end sub
             end class
@@ -1254,7 +1651,7 @@ describe('BrsFile BrighterScript classes', () => {
         program.validate();
         (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()
@@ -1268,10 +1665,10 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             end namespace
         `);
-        testTranspile(`
+        await testTranspile(`
             namespace App
                 class ClassC extends ClassB
-                    sub new ()
+                    sub new()
                         super()
                     end sub
                 end class
@@ -1292,17 +1689,17 @@ 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
-                `, `
+        `, `
             function __App_ClassB_builder()
                 instance = __ClassA_builder()
                 instance.super0_new = instance.new
@@ -1324,375 +1721,8 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         (0, assert_1.doesNotThrow)(() => {
-            file.parser.references.classStatements[0]['getParentClassIndex'](new BrsTranspileState_1.BrsTranspileState(file));
-        });
-    });
-    describe('getHover', () => {
-        const animalClassCode = `
-            class Animal
-                kind as string
-                isHungry as boolean
-
-                sub new (kind as string)
-                    m.kind = kind
-                    m.isHungry = true ' born hungry
-                end sub
-
-                sub eat(foodAmount as integer)
-                    if foodAmount > 100
-                    m.isHungry = false
-                    end if
-                end sub
-
-                sub sleep()
-                    m.isHungry = false
-                end sub
-
-            end class
-
-            class Dog extends Animal
-                breed as string
-                sub new (breed as string)
-                    super("Dog")
-                    m.breed = breed
-                end sub
-
-                sub snooze()
-                    m.sleep()
-                end sub
-            end class
-
-            class DogHouse
-                puppy as Dog
-                sub new (pup as Dog)
-                    m.puppy = pup
-                end sub
-            end class
-
-            sub main()
-                snoopy = new Dog("Beagle")
-                biplane = new DogHouse(snoopy)
-                print snoopy.kind ' Dog
-                print snoopy.breed ' Beagle
-                print snoopy.isHungry ' true
-                feedAnimal(biplane.puppy)
-                print snoopy.isHungry ' false
-            end sub
-
-            sub feedAnimal(beast as Animal)
-                beast.eat(100)
-            end sub
-        `;
-        it('correctly parses the file', () => {
-            program.setFile('source/animal.bs', animalClassCode);
-            program.validate();
-            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
-        });
-        it('gets the correct text for m', () => {
-            var _a, _b;
-            let animalCode = program.setFile('source/animal.bs', animalClassCode);
-            program.validate();
-            let hover = program.getHover(animalCode.srcPath, vscode_languageserver_1.Position.create(6, 21));
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'm as Animal',
-                '```'
-            ].join('\n'));
-            hover = program.getHover(animalCode.srcPath, vscode_languageserver_1.Position.create(26, 20));
-            (0, chai_1.expect)((_b = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _b === void 0 ? void 0 : _b.contents).to.equal([
-                '```brightscript',
-                'm as Dog',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for m.field', () => {
-            var _a, _b;
-            let animalCode = program.setFile('source/animal.bs', animalClassCode);
-            program.validate();
-            let hover = program.getHover(animalCode.srcPath, vscode_languageserver_1.Position.create(6, 26));
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'Animal.kind as string',
-                '```'
-            ].join('\n'));
-            hover = program.getHover(animalCode.srcPath, vscode_languageserver_1.Position.create(26, 25));
-            (0, chai_1.expect)((_b = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _b === void 0 ? void 0 : _b.contents).to.equal([
-                '```brightscript',
-                'Dog.breed as string',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for m.method', () => {
-            var _a;
-            let animalCode = program.setFile('source/animal.bs', animalClassCode);
-            program.validate();
-            let hover = program.getHover(animalCode.srcPath, vscode_languageserver_1.Position.create(30, 25));
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'sub Animal.sleep() as void',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for obj.field', () => {
-            var _a;
-            let animalCode = program.setFile('source/animal.brs', animalClassCode);
-            program.validate();
-            let hover = program.getHover(animalCode.srcPath, vscode_languageserver_1.Position.create(46, 33));
-            (0, chai_1.expect)(hover).to.exist;
-            //TODO TYPES: This should probably say 'Animal.isHungry ...' because that field is defined in Animal
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'Dog.isHungry as boolean',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for obj.method', () => {
-            var _a;
-            let animalCode = program.setFile('source/animal.bs', `
-                sub feedAnimal(beast as Animal)
-                    beast.eat(100)
-                end sub
-                class Animal
-                    sub eat(foodAmount as integer)
-                    end sub
-                end class
-            `);
-            program.validate();
-            let hover = program.getHover(animalCode.srcPath, vscode_languageserver_1.Position.create(2, 29));
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'sub Animal.eat(foodAmount as integer) as void',
-                '```'
-            ].join('\n'));
-        });
-    });
-    describe('getHover class members', () => {
-        const testCode = `
-            class Foo
-                sub new (name as string)
-                end sub
-            end class
-
-            class Bar
-                sub doSomething()
-                    myFoo = new Foo()
-                end sub
-
-                function getInt() as integer
-                    return 1
-                end function
-        end class
-
-            class Buz
-                myInt as integer
-                sub new (i as integer)
-    myInt = i
-                end sub
-            end class
-
-            class Bee extends Buz
-                sub new (i as integer)
-                    super(i)
-                end sub
-
-                sub varSameNameAsMember()
-                   myInt = 4567
-                   print myInt ' should not print m.myInt
-                end sub
-            end class`;
-        it('correctly parses the file', () => {
-            program.setFile('source/fooBar.bs', testCode);
-            program.validate();
-            (0, chai_1.expect)(program.getDiagnostics().length).to.equal(0);
-        });
-        it('gets the correct text for new Class()', () => {
-            var _a;
-            let file = program.setFile('source/fooBar.bs', testCode);
-            program.validate();
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(8, 34)); // new Foo("hello")
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'new Foo(name as string)',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for created object', () => {
-            var _a;
-            let file = program.setFile('source/fooBar.bs', testCode);
-            program.validate();
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(8, 23)); // myFoo
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'myFoo as Foo',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for class declaration', () => {
-            var _a;
-            let file = program.setFile('source/fooBar.bs', testCode);
-            program.validate();
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(6, 21)); // class Bar
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'class Bar',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for class method declaration', () => {
-            var _a;
-            let file = program.setFile('source/fooBar.bs', testCode);
-            program.validate();
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(11, 29)); // getInt
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'function Bar.getInt() as integer',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for class field declaration', () => {
-            var _a;
-            let file = program.setFile('source/fooBar.bs', testCode);
-            program.validate();
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(17, 20)); // myInt
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'Buz.myInt as integer',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for super() call', () => {
-            var _a;
-            let file = program.setFile('source/fooBar.bs', testCode);
-            program.validate();
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(25, 23)); // super() in Bee.new
-            (0, chai_1.expect)((_a = hover === null || hover === void 0 ? void 0 : hover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'new Buz(i as integer)',
-                '```'
-            ].join('\n'));
-        });
-        it('gets the correct text for variable with same name as a member', () => {
-            let file = program.setFile('source/fooBar.bs', testCode);
-            program.validate();
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(29, 23)); // myInt in Bee.varSameNameAsMember
-            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover[0].contents).to.equal([
-                '```brightscript',
-                'myInt as integer',
-                '```'
-            ].join('\n'));
-        });
-    });
-    describe('getSymbolTypeFromToken', () => {
-        const testClassCode = `
-            sub main()
-                c = new KlassC()
-                a = c.b.getA()
-                num = c.b.getA().getInt()
-                c.b.getA().printInt(num)
-            end sub
-            class KlassA
-                function getInt() as integer
-                    return 1
-                end function
-
-                sub printInt(i as integer)
-                    print i
-                end sub
-            end class
-
-            class KlassB
-
-                function getA() as KlassA
-                    return new KlassA()
-                end function
-            end class
-
-            class KlassC
-                public b as KlassB
-
-                sub new ()
-                    m.b = new KlassB()
-                end sub
-            end class
-        `;
-        it('correctly parses the file', () => {
-            program.setFile('source/klassTest.bs', testClassCode);
-            program.validate();
-            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
-        });
-        describe('finding tokens', () => {
-            let klassCode;
-            let mainScope;
-            beforeEach(() => {
-                klassCode = program.setFile('source/klassTest.bs', testClassCode);
-                const scopes = program.getScopesForFile(klassCode);
-                (0, chai_1.expect)(scopes.length).to.eql(1);
-                mainScope = scopes[0];
-                mainScope.linkSymbolTable();
-            });
-            afterEach(() => {
-                mainScope.unlinkSymbolTable();
-            });
-            it('gets correct class for m', () => {
-                var _a;
-                const position = vscode_languageserver_1.Position.create(28, 20); // 'm' from m.b = new KlassB()
-                const token = klassCode.parser.getTokenAt(position);
-                (0, chai_1.expect)(token.text).to.equal('m');
-                const func = klassCode.getFunctionExpressionAtPosition(position);
-                let klass = (_a = klassCode.getClassFromToken(token, func, mainScope)) === null || _a === void 0 ? void 0 : _a.item;
-                (0, chai_1.expect)(klass).to.exist;
-                (0, chai_1.expect)(klass.getName(Parser_1.ParseMode.BrighterScript)).to.equal('KlassC');
-            });
-            it('gets correct class for fieldMember', () => {
-                var _a;
-                const position = vscode_languageserver_1.Position.create(28, 23); // 'b' from m.b = new KlassB()
-                const token = klassCode.parser.getTokenAt(position);
-                (0, chai_1.expect)(token.text).to.equal('b');
-                const func = klassCode.getFunctionExpressionAtPosition(position);
-                let klass = (_a = klassCode.getClassFromToken(token, func, mainScope)) === null || _a === void 0 ? void 0 : _a.item;
-                (0, chai_1.expect)(klass).to.exist;
-                (0, chai_1.expect)(klass.getName(Parser_1.ParseMode.BrighterScript)).to.equal('KlassB');
-            });
-            it('gets correct class for variable', () => {
-                var _a;
-                const position = vscode_languageserver_1.Position.create(4, 22); // 'c' from c.b.getA().getInt()
-                const token = klassCode.parser.getTokenAt(position);
-                (0, chai_1.expect)(token.text).to.equal('c');
-                const func = klassCode.getFunctionExpressionAtPosition(position);
-                let klass = (_a = klassCode.getClassFromToken(token, func, mainScope)) === null || _a === void 0 ? void 0 : _a.item;
-                (0, chai_1.expect)(klass).to.exist;
-                (0, chai_1.expect)(klass.getName(Parser_1.ParseMode.BrighterScript)).to.equal('KlassC');
-            });
-            it('gets correct class for variable field', () => {
-                var _a;
-                const position = vscode_languageserver_1.Position.create(3, 23); // 'b' from c.b.getA()
-                const token = klassCode.parser.getTokenAt(position);
-                (0, chai_1.expect)(token.text).to.equal('b');
-                const func = klassCode.getFunctionExpressionAtPosition(position);
-                let klass = (_a = klassCode.getClassFromToken(token, func, mainScope)) === null || _a === void 0 ? void 0 : _a.item;
-                (0, chai_1.expect)(klass).to.exist;
-                (0, chai_1.expect)(klass.getName(Parser_1.ParseMode.BrighterScript)).to.equal('KlassB');
-            });
-            it('gets type and return class for variable function field', () => {
-                const position = vscode_languageserver_1.Position.create(3, 28); // 'getA' from c.b.getA()
-                const token = klassCode.parser.getTokenAt(position);
-                (0, chai_1.expect)(token.text).to.equal('getA');
-                const func = klassCode.getFunctionExpressionAtPosition(position);
-                let { type, symbolContainer } = klassCode.getSymbolTypeFromToken(token, func, mainScope);
-                (0, chai_1.expect)((0, reflection_1.isTypedFunctionType)(type)).to.be.true;
-                (0, chai_1.expect)((0, reflection_1.isCustomType)(symbolContainer)).to.be.true;
-                (0, chai_1.expect)(symbolContainer.name).to.equal('KlassA');
-            });
-            it('gets type and class for field from return value of function', () => {
-                const position = vscode_languageserver_1.Position.create(4, 37); // 'getInt' from c.b.getA().getInt()
-                const token = klassCode.parser.getTokenAt(position);
-                (0, chai_1.expect)(token.text).to.equal('getInt');
-                const func = klassCode.getFunctionExpressionAtPosition(position);
-                let { type, symbolContainer } = klassCode.getSymbolTypeFromToken(token, func, mainScope);
-                (0, chai_1.expect)(type).to.exist;
-                (0, chai_1.expect)((0, reflection_1.isTypedFunctionType)(type)).to.be.true;
-                (0, chai_1.expect)(symbolContainer).to.be.undefined; // getInt() returns integer - no class reference at this point
-            });
+            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', () => {
@@ -1700,7 +1730,7 @@ describe('BrsFile BrighterScript classes', () => {
             class Parent
                 public function helloWorld()
                 end function
-    end class
+            end class
             class Child extends Parent
                 public helloWorld as string
             end class
@@ -1715,28 +1745,28 @@ describe('BrsFile BrighterScript classes', () => {
             class Child extends Parent
                 public function helloWorld()
                 end function
-                end class
+            end class
         `);
         program.validate();
     });
-    it.skip('detects calling class constructors with too many parameters', () => {
+    it('detects calling class constructors with too many parameters', () => {
         program.setFile('source/main.bs', `
             class Parameterless
-                sub new ()
+                sub new()
                 end sub
             end class
 
             class OneParam
-                sub new (param1)
+                sub new(param1)
                 end sub
             end class
 
-                sub main()
+            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),