brighterscript 1.0.0-alpha.13 → 1.0.0-alpha.16

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

@@ -51,7 +51,6 @@ describe('BrsFile BrighterScript classes', () => {
         //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' }, `
             class Person
                 sub new()
@@ -63,10 +62,11 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, 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('access modifier is option for override', () => {
-        var _a;
         let file = program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
             class Animal
                 sub move()
@@ -79,13 +79,12 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, chai_1.expect)((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
+        (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;
     });
     it('supports various namespace configurations', () => {
-        var _a;
         program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.bs' }, `
             class Animal
                 sub new()
@@ -106,11 +105,10 @@ describe('BrsFile BrighterScript classes', () => {
             end namespace
         `);
         program.validate();
-        (0, 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
@@ -120,10 +118,11 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            (0, 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()
@@ -135,10 +134,11 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            (0, 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)
@@ -154,7 +154,7 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            (0, 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', `
@@ -170,13 +170,7 @@ describe('BrsFile BrighterScript classes', () => {
                 end class
             `);
             program.validate();
-            (0, 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()), { 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) })]);
         });
     });
     describe('transpile', () => {
@@ -666,8 +660,7 @@ describe('BrsFile BrighterScript classes', () => {
         });
     });
     it('detects using `new` keyword on non-classes', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.brs' }, `
             sub quack()
             end sub
             sub main()
@@ -675,37 +668,41 @@ describe('BrsFile BrighterScript classes', () => {
             end sub
         `);
         program.validate();
-        (0, chai_1.expect)((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.expressionIsNotConstructable('sub').message);
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.expressionIsNotConstructable('sub')
+        ]);
     });
     it('detects missing call to super', () => {
-        var _a;
-        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        program.setFile({ src: `${rootDir}/source/main.bs`, dest: 'source/main.brs' }, `
             class Animal
-                sub new()
+                sub new ()
                 end sub
             end class
             class Duck extends Animal
-                sub new()
+                sub new ()
                 end sub
             end class
         `);
         program.validate();
-        (0, 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' }, `
+        program.setFile('source/main.brs', `
             class Animal
-                sub new()
+                sub new ()
                     m.methodThatDoesNotExist()
                 end sub
             end class
         `);
         program.validate();
-        (0, chai_1.expect)((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.methodDoesNotExistOnType('methodThatDoesNotExist', 'Animal'));
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.methodDoesNotExistOnType('methodThatDoesNotExist', 'Animal')
+        ]);
     });
     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
@@ -719,32 +716,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
-            };
-        });
-        (0, 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')), { 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) })]);
     });
     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();
-        (0, 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.classChildMemberDifferentMemberTypeThanAncestor('method', 'field', 'Animal')
+        ]);
     });
     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
@@ -781,15 +772,15 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, 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.cannotFindType('Person'),
+            DiagnosticMessages_1.DiagnosticMessages.childFieldTypeNotAssignableToBaseProperty('Duck', 'Bird', 'age', 'float', 'integer'),
+            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
@@ -800,10 +791,12 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, 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
@@ -822,12 +815,14 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, chai_1.expect)(program.getDiagnostics()[0]).to.exist.and.to.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchedOverriddenMemberVisibility('Duck', 'speakInPublic', 'private', 'public', 'Animal')));
-        (0, chai_1.expect)(program.getDiagnostics()[1]).to.exist.and.to.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchedOverriddenMemberVisibility('Duck', 'speakWithFriends', 'public', 'protected', 'Animal')));
-        (0, 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
@@ -846,50 +841,123 @@ describe('BrsFile BrighterScript classes', () => {
             end class
         `);
         program.validate();
-        (0, 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();
-        (0, 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.classCouldNotBeFound('Animal', 'source')), { 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.classCouldNotBeFound('Animal', 'source')
+            ]);
+        });
+        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.classCouldNotBeFound('Animal', 'source')
+            ]);
+        });
+        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();
+            //TODO replace this with `expectDiagnostics` once we fix the duplicate diagnostic one-per-file for missing base classes issue
+            (0, chai_1.expect)(program.getDiagnostics()[0].message).to.eql(DiagnosticMessages_1.DiagnosticMessages.classCouldNotBeFound('Vertibrates.GroundedBird', 'source').message);
+        });
+        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();
+            //TODO replace this with `expectDiagnostics` once we fix the duplicate diagnostic one-per-file for missing base classes issue
+            (0, chai_1.expect)(program.getDiagnostics()[0].message).to.eql(DiagnosticMessages_1.DiagnosticMessages.classCouldNotBeFound('Vertibrates.GroundedBird', 'source').message);
+        });
     });
     it('catches newable class without namespace name', () => {
-        var _a;
         program.setFile('source/main.bs', `
             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, 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.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.classCouldNotBeFound('Duck', 'source')
+        ]);
     });
     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
-                sub main()
+                                        sub main()
                     d = new Duck()
                 end sub
             end namespace
-        `);
+                                        `);
         program.validate();
-        (0, 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
@@ -898,89 +966,98 @@ describe('BrsFile BrighterScript classes', () => {
             end namespace
         `);
         program.validate();
-        (0, 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.classCouldNotBeFound('NameA.NameB.Animal1', 'source')
+        ]);
     });
     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
                 class Duck extends Animal
                 end class
-            end namespace
-        `);
+                                        end namespace
+                                            `);
         program.validate();
-        (0, 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();
-        (0, 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.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.duplicateClassDeclaration('source', '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();
-        (0, 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.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.duplicateClassDeclaration('source', 'NameA.NameB.Animal')
+        ]);
     });
     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' }, `
+        program.setFile('source/main.bs', `
             namespace NameA.NameB
                 class Animal
                 end class
-            end namespace
+                            end namespace
             class Animal
             end class
         `);
         program.validate();
-        (0, 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.expectDiagnostics)(program, [
+            DiagnosticMessages_1.DiagnosticMessages.namespacedClassCannotShareNamewithNonNamespacedClass('Animal').message
+        ]);
     });
     it('catches class with same name as function', () => {
-        var _a;
         program.setFile('source/main.bs', `
             class Animal
             end class
-            sub Animal()
+                            sub Animal()
             end sub
-        `);
+                            `);
         program.validate();
-        (0, 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.functionCannotHaveSameNameAsClass('Animal').message
+        ]);
     });
     it('catches class with same name (but different case) as function', () => {
-        var _a;
         program.setFile('source/main.bs', `
             class ANIMAL
             end class
-            sub animal()
+                            sub animal()
             end sub
-        `);
+                            `);
         program.validate();
-        (0, 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.functionCannotHaveSameNameAsClass('animal').message
+        ]);
     });
     it('catches variable with same name as class', () => {
-        var _a;
         program.setFile('source/main.bs', `
             class Animal
             end class
-            sub main()
+                            sub main()
                 animal = new Animal()
             end sub
-        `);
+                            `);
         program.validate();
-        (0, 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.localVarSameNameAsClass('Animal').message
+        ]);
     });
     it('allows extending classes with more than one dot in the filename', () => {
         program.setFile('source/testclass.bs', `
@@ -988,21 +1065,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
@@ -1027,7 +1104,7 @@ describe('BrsFile BrighterScript classes', () => {
         testTranspile(`
             namespace App
                 class ClassC extends ClassB
-                    sub new()
+                    sub new ()
                         super()
                     end sub
                 end class
@@ -1058,7 +1135,7 @@ describe('BrsFile BrighterScript classes', () => {
                 class ClassB extends ClassA
                 end class
             end namespace
-        `, `
+                `, `
             function __App_ClassB_builder()
                 instance = __ClassA_builder()
                 instance.super0_new = instance.new
@@ -1085,112 +1162,142 @@ describe('BrsFile BrighterScript classes', () => {
     });
     describe('getHover', () => {
         const animalClassCode = `
-        class Animal
-            kind as string
-            isHungry as boolean
+            class Animal
+                kind as string
+                isHungry as boolean
 
-            sub new(kind as string)
-                m.kind = kind
-                m.isHungry = true ' born hungry
-            end sub
+                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 eat(foodAmount as integer)
+                    if foodAmount > 100
+                    m.isHungry = false
+                    end if
+                end sub
 
-            sub sleep()
-              m.isHungry = false
-            end sub
+                sub sleep()
+                    m.isHungry = false
+                end sub
 
-        end class
+            end class
 
-        class Dog extends Animal
-            breed as string
-            sub new(breed as string)
-                super("Dog")
-                m.breed = breed
-            end sub
+            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
+                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
+            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 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
+            sub feedAnimal(beast as Animal)
+                beast.eat(100)
+            end sub
         `;
         it('correctly parses the file', () => {
             program.setFile('source/animal.bs', animalClassCode);
             program.validate();
-            (0, chai_1.expect)(program.getDiagnostics().length).to.equal(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
         it('gets the correct text for m', () => {
             let animalCode = program.setFile('source/animal.bs', animalClassCode);
             program.validate();
-            let hover = animalCode.getHover(vscode_languageserver_1.Position.create(6, 17));
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('m as Animal');
-            hover = animalCode.getHover(vscode_languageserver_1.Position.create(26, 17));
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('m as Dog');
+            let hover = animalCode.getHover(vscode_languageserver_1.Position.create(6, 21));
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'm as Animal',
+                '```'
+            ].join('\n'));
+            hover = animalCode.getHover(vscode_languageserver_1.Position.create(26, 20));
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'm as Dog',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for m.field', () => {
             let animalCode = program.setFile('source/animal.bs', animalClassCode);
             program.validate();
-            let hover = animalCode.getHover(vscode_languageserver_1.Position.create(6, 19));
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('Animal.kind as string');
-            hover = animalCode.getHover(vscode_languageserver_1.Position.create(26, 19));
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('Dog.breed as string');
+            let hover = animalCode.getHover(vscode_languageserver_1.Position.create(6, 26));
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'Animal.kind as string',
+                '```'
+            ].join('\n'));
+            hover = animalCode.getHover(vscode_languageserver_1.Position.create(26, 25));
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'Dog.breed as string',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for m.method', () => {
             let animalCode = program.setFile('source/animal.bs', animalClassCode);
             program.validate();
-            let hover = animalCode.getHover(vscode_languageserver_1.Position.create(30, 21));
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('sub Animal.sleep() as void');
+            let hover = animalCode.getHover(vscode_languageserver_1.Position.create(30, 25));
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'sub Animal.sleep() as void',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for obj.field', () => {
             let animalCode = program.setFile('source/animal.brs', animalClassCode);
             program.validate();
-            let hover = animalCode.getHover(vscode_languageserver_1.Position.create(46, 29));
+            let hover = animalCode.getHover(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)(hover.contents).to.equal('Dog.isHungry as boolean');
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'Dog.isHungry as boolean',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for obj.method', () => {
-            let animalCode = program.setFile('source/animal.bs', animalClassCode);
+            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 = animalCode.getHover(vscode_languageserver_1.Position.create(52, 21));
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('sub Animal.eat(foodAmount as integer) as void');
+            let hover = animalCode.getHover(vscode_languageserver_1.Position.create(2, 29));
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.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)
+                sub new (name as string)
                 end sub
             end class
 
@@ -1202,17 +1309,17 @@ describe('BrsFile BrighterScript classes', () => {
                 function getInt() as integer
                     return 1
                 end function
-            end class
+        end class
 
             class Buz
                 myInt as integer
-                sub new(i as integer)
-                    myInt = i
+                sub new (i as integer)
+    myInt = i
                 end sub
             end class
 
             class Bee extends Buz
-                sub new(i as integer)
+                sub new (i as integer)
                     super(i)
                 end sub
 
@@ -1230,90 +1337,110 @@ describe('BrsFile BrighterScript classes', () => {
             let file = program.setFile('source/fooBar.bs', testCode);
             program.validate();
             let hover = file.getHover(vscode_languageserver_1.Position.create(8, 34)); // new Foo("hello")
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('new Foo(name as string)');
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'new Foo(name as string)',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for created object', () => {
             let file = program.setFile('source/fooBar.bs', testCode);
             program.validate();
             let hover = file.getHover(vscode_languageserver_1.Position.create(8, 23)); // myFoo
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('myFoo as Foo');
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'myFoo as Foo',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for class declaration', () => {
             let file = program.setFile('source/fooBar.bs', testCode);
             program.validate();
             let hover = file.getHover(vscode_languageserver_1.Position.create(6, 21)); // class Bar
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('class Bar');
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'class Bar',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for class method declaration', () => {
             let file = program.setFile('source/fooBar.bs', testCode);
             program.validate();
             let hover = file.getHover(vscode_languageserver_1.Position.create(11, 29)); // getInt
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('function Bar.getInt() as integer');
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'function Bar.getInt() as integer',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for class field declaration', () => {
             let file = program.setFile('source/fooBar.bs', testCode);
             program.validate();
             let hover = file.getHover(vscode_languageserver_1.Position.create(17, 20)); // myInt
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('Buz.myInt as integer');
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'Buz.myInt as integer',
+                '```'
+            ].join('\n'));
         });
         it('gets the correct text for super() call', () => {
             let file = program.setFile('source/fooBar.bs', testCode);
             program.validate();
             let hover = file.getHover(vscode_languageserver_1.Position.create(25, 23)); // super() in Bee.new
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('new Buz(i as integer)');
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.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 = file.getHover(vscode_languageserver_1.Position.create(29, 23)); // myInt in Bee.varSameNameAsMember
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.contents).to.equal('myInt as integer');
+            (0, chai_1.expect)(hover === null || hover === void 0 ? void 0 : hover.contents).to.equal([
+                '```brightscript',
+                'myInt as integer',
+                '```'
+            ].join('\n'));
         });
     });
     describe('getSymbolTypeFromToken', () => {
         const testClassCode = `
-        class KlassA
-            function getInt() as integer
-                return 1
-            end function
-
-            sub printInt(i as integer)
-                print i
+            sub main()
+                c = new KlassC()
+                a = c.b.getA()
+                num = c.b.getA().getInt()
+                c.b.getA().printInt(num)
             end sub
-        end class
+            class KlassA
+                function getInt() as integer
+                    return 1
+                end function
 
-        class KlassB
+                sub printInt(i as integer)
+                    print i
+                end sub
+            end class
 
-            function getA() as KlassA
-                return new KlassA()
-            end function
-        end class
+            class KlassB
 
-        class KlassC
-            public b as KlassB
+                function getA() as KlassA
+                    return new KlassA()
+                end function
+            end class
 
-            sub new()
-                m.b = new KlassB()
-            end sub
-        end class
+            class KlassC
+                public b as KlassB
 
-        sub main()
-            c = new KlassC()
-            a = c.b.getA()
-            num = c.b.getA().getInt()
-            c.b.getA().printInt(num)
-        end sub
+                sub new ()
+                    m.b = new KlassB()
+                end sub
+            end class
         `;
         it('correctly parses the file', () => {
             program.setFile('source/klassTest.bs', testClassCode);
             program.validate();
-            (0, chai_1.expect)(program.getDiagnostics().length).to.equal(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
         describe('finding tokens', () => {
             let klassCode;
@@ -1330,7 +1457,7 @@ describe('BrsFile BrighterScript classes', () => {
             });
             it('gets correct class for m', () => {
                 var _a;
-                const position = vscode_languageserver_1.Position.create(22, 17); // 'm' from m.b = new KlassB()
+                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);
@@ -1340,7 +1467,7 @@ describe('BrsFile BrighterScript classes', () => {
             });
             it('gets correct class for fieldMember', () => {
                 var _a;
-                const position = vscode_languageserver_1.Position.create(22, 19); // 'b' from m.b = new KlassB()
+                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);
@@ -1350,7 +1477,7 @@ describe('BrsFile BrighterScript classes', () => {
             });
             it('gets correct class for variable', () => {
                 var _a;
-                const position = vscode_languageserver_1.Position.create(28, 17); // 'c' from c.b.getA().getInt()
+                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);
@@ -1360,7 +1487,7 @@ describe('BrsFile BrighterScript classes', () => {
             });
             it('gets correct class for variable field', () => {
                 var _a;
-                const position = vscode_languageserver_1.Position.create(28, 19); // 'b' from c.b.getA()
+                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);
@@ -1369,19 +1496,17 @@ describe('BrsFile BrighterScript classes', () => {
                 (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(28, 23); // 'getA' from c.b.getA()
+                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)(type).to.exist;
                 (0, chai_1.expect)((0, reflection_1.isFunctionType)(type)).to.be.true;
-                (0, chai_1.expect)(symbolContainer).to.exist;
                 (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(29, 30); // 'getInt' from c.b.getA().getInt()
+                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);
@@ -1397,7 +1522,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
@@ -1412,9 +1537,34 @@ 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', () => {
+        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