brighterscript 1.0.0-alpha.2 → 1.0.0-alpha.20

package/dist/files/BrsFile.spec.js

@@ -2,33 +2,41 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const chai_1 = require("chai");
 const sinonImport = require("sinon");
-const path = require("path");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const Program_1 = require("../Program");
 const BooleanType_1 = require("../types/BooleanType");
 const DynamicType_1 = require("../types/DynamicType");
-const FunctionType_1 = require("../types/FunctionType");
+const TypedFunctionType_1 = require("../types/TypedFunctionType");
 const IntegerType_1 = require("../types/IntegerType");
 const StringType_1 = require("../types/StringType");
 const BrsFile_1 = require("./BrsFile");
 const source_map_1 = require("source-map");
-const lexer_1 = require("../lexer");
+const Lexer_1 = require("../lexer/Lexer");
+const TokenKind_1 = require("../lexer/TokenKind");
 const DiagnosticMessages_1 = require("../DiagnosticMessages");
 const util_1 = require("../util");
 const PluginInterface_1 = require("../PluginInterface");
 const testHelpers_spec_1 = require("../testHelpers.spec");
 const Parser_1 = require("../parser/Parser");
 const Logger_1 = require("../Logger");
+const Statement_1 = require("../parser/Statement");
+const creators_1 = require("../astUtils/creators");
+const fsExtra = require("fs-extra");
+const ArrayType_1 = require("../types/ArrayType");
+const FloatType_1 = require("../types/FloatType");
+const ObjectType_1 = require("../types/ObjectType");
 const VoidType_1 = require("../types/VoidType");
 let sinon = sinonImport.createSandbox();
 describe('BrsFile', () => {
-    let rootDir = util_1.standardizePath `${process.cwd()}/.tmp/rootDir`;
+    let tempDir = (0, util_1.standardizePath) `${process.cwd()}/.tmp`;
+    let rootDir = (0, util_1.standardizePath) `${tempDir}/rootDir`;
     let program;
-    let srcPath = util_1.standardizePath `${rootDir}/source/main.brs`;
+    let srcPath = (0, util_1.standardizePath) `${rootDir}/source/main.brs`;
     let destPath = 'source/main.brs';
     let file;
-    let testTranspile = testHelpers_spec_1.getTestTranspile(() => [program, rootDir]);
+    let testTranspile = (0, testHelpers_spec_1.getTestTranspile)(() => [program, rootDir]);
     beforeEach(() => {
+        fsExtra.emptyDirSync(tempDir);
         program = new Program_1.Program({ rootDir: rootDir, sourceMap: true });
         file = new BrsFile_1.BrsFile(srcPath, destPath, program);
     });
@@ -37,20 +45,36 @@ describe('BrsFile', () => {
         program.dispose();
     });
     it('supports the third parameter in CreateObject', () => {
-        var _a;
-        program.addOrReplaceFile('source/main.brs', `
+        program.setFile('source/main.brs', `
             sub main()
                 regexp = CreateObject("roRegex", "[a-z]+", "i")
             end sub
         `);
         program.validate();
-        chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.not.exist;
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+    });
+    it('supports the 6 params in CreateObject for roRegion', () => {
+        program.setFile('source/main.brs', `
+            sub createRegion(bitmap as object)
+                region = CreateObject("roRegion", bitmap, 20, 40, 100, 200)
+            end sub
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
     });
     it('sets needsTranspiled to true for .bs files', () => {
         //BrightScript
-        chai_1.expect(new BrsFile_1.BrsFile(`${rootDir}/source/main.brs`, 'source/main.brs', program).needsTranspiled).to.be.false;
+        (0, chai_1.expect)(new BrsFile_1.BrsFile(`${rootDir}/source/main.brs`, 'source/main.brs', program).needsTranspiled).to.be.false;
         //BrighterScript
-        chai_1.expect(new BrsFile_1.BrsFile(`${rootDir}/source/main.bs`, 'source/main.bs', program).needsTranspiled).to.be.true;
+        (0, chai_1.expect)(new BrsFile_1.BrsFile(`${rootDir}/source/main.bs`, 'source/main.bs', program).needsTranspiled).to.be.true;
+    });
+    it('computes new import statements after clearing parser references', () => {
+        const file = program.setFile('source/main.bs', ``);
+        (0, chai_1.expect)(file.ownScriptImports).to.be.empty;
+        file.parser.ast.statements.push(new Statement_1.ImportStatement((0, creators_1.createToken)(TokenKind_1.TokenKind.Import), (0, creators_1.createToken)(TokenKind_1.TokenKind.StringLiteral, 'pkg:/source/lib.brs')));
+        (0, chai_1.expect)(file.ownScriptImports).to.be.empty;
+        file.parser.invalidateReferences();
+        (0, chai_1.expect)(file.ownScriptImports.map(x => x.text)).to.eql(['pkg:/source/lib.brs']);
     });
     it('allows adding diagnostics', () => {
         const expected = [{
@@ -59,8 +83,7 @@ describe('BrsFile', () => {
                 range: undefined
             }];
         file.addDiagnostics(expected);
-        const actual = file.getDiagnostics();
-        chai_1.expect(actual).deep.equal(expected);
+        (0, testHelpers_spec_1.expectDiagnostics)(file, expected);
     });
     describe('getPartialVariableName', () => {
         let entry = {
@@ -68,72 +91,72 @@ describe('BrsFile', () => {
             dest: `source/lib.brs`
         };
         it('creates proper tokens', () => {
-            file = program.addOrReplaceFile(entry, `call(ModuleA.ModuleB.ModuleC.`);
-            chai_1.expect(file['getPartialVariableName'](file.parser.tokens[7])).to.equal('ModuleA.ModuleB.ModuleC.');
-            chai_1.expect(file['getPartialVariableName'](file.parser.tokens[6])).to.equal('ModuleA.ModuleB.ModuleC');
-            chai_1.expect(file['getPartialVariableName'](file.parser.tokens[5])).to.equal('ModuleA.ModuleB.');
-            chai_1.expect(file['getPartialVariableName'](file.parser.tokens[4])).to.equal('ModuleA.ModuleB');
-            chai_1.expect(file['getPartialVariableName'](file.parser.tokens[3])).to.equal('ModuleA.');
-            chai_1.expect(file['getPartialVariableName'](file.parser.tokens[2])).to.equal('ModuleA');
+            file = program.setFile(entry, `call(ModuleA.ModuleB.ModuleC.`);
+            (0, chai_1.expect)(file['getPartialVariableName'](file.parser.tokens[7])).to.equal('ModuleA.ModuleB.ModuleC.');
+            (0, chai_1.expect)(file['getPartialVariableName'](file.parser.tokens[6])).to.equal('ModuleA.ModuleB.ModuleC');
+            (0, chai_1.expect)(file['getPartialVariableName'](file.parser.tokens[5])).to.equal('ModuleA.ModuleB.');
+            (0, chai_1.expect)(file['getPartialVariableName'](file.parser.tokens[4])).to.equal('ModuleA.ModuleB');
+            (0, chai_1.expect)(file['getPartialVariableName'](file.parser.tokens[3])).to.equal('ModuleA.');
+            (0, chai_1.expect)(file['getPartialVariableName'](file.parser.tokens[2])).to.equal('ModuleA');
         });
     });
     describe('getScopesForFile', () => {
         it('finds the scope for the file', () => {
             var _a;
-            let file = program.addOrReplaceFile('source/main.brs', ``);
-            chai_1.expect((_a = program.getScopesForFile(file)[0]) === null || _a === void 0 ? void 0 : _a.name).to.equal('source');
+            let file = program.setFile('source/main.brs', ``);
+            (0, chai_1.expect)((_a = program.getScopesForFile(file)[0]) === null || _a === void 0 ? void 0 : _a.name).to.equal('source');
         });
     });
     describe('getCompletions', () => {
         it('does not crash for callfunc on a function call', () => {
-            const file = program.addOrReplaceFile('source/main.brs', `
+            const file = program.setFile('source/main.brs', `
                 sub main()
                     getManager()@.
                 end sub
             `);
-            chai_1.expect(() => {
+            (0, chai_1.expect)(() => {
                 program.getCompletions(file.srcPath, util_1.default.createPosition(2, 34));
             }).not.to.throw;
         });
         it('suggests pkg paths in strings that match that criteria', () => {
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     print "pkg:"
                 end sub
             `);
             const result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 31));
             const names = result.map(x => x.label);
-            chai_1.expect(names.sort()).to.eql([
+            (0, chai_1.expect)(names.sort()).to.eql([
                 'pkg:/source/main.brs'
             ]);
         });
         it('suggests libpkg paths in strings that match that criteria', () => {
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     print "libpkg:"
                 end sub
             `);
             const result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 31));
             const names = result.map(x => x.label);
-            chai_1.expect(names.sort()).to.eql([
+            (0, chai_1.expect)(names.sort()).to.eql([
                 'libpkg:/source/main.brs'
             ]);
         });
         it('suggests pkg paths in template strings', () => {
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     print \`pkg:\`
                 end sub
             `);
             const result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 31));
             const names = result.map(x => x.label);
-            chai_1.expect(names.sort()).to.eql([
+            (0, chai_1.expect)(names.sort()).to.eql([
                 'pkg:/source/main.brs'
             ]);
         });
         it('waits for the file to be processed before collecting completions', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub Main()
                     print "hello"
                     Say
@@ -144,62 +167,132 @@ describe('BrsFile', () => {
             `);
             let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(3, 23));
             let names = result.map(x => x.label);
-            chai_1.expect(names).to.includes('Main');
-            chai_1.expect(names).to.includes('SayHello');
+            (0, chai_1.expect)(names).to.includes('Main');
+            (0, chai_1.expect)(names).to.includes('SayHello');
+        });
+        it('includes every type of item at base level', () => {
+            program.setFile('source/main.bs', `
+                sub main()
+                    print
+                end sub
+                sub speak()
+                end sub
+                namespace stuff
+                end namespace
+                class Person
+                end class
+                enum Direction
+                end enum
+            `);
+            (0, testHelpers_spec_1.expectCompletionsIncludes)(program.getCompletions('source/main.bs', util_1.default.createPosition(2, 26)), [{
+                    label: 'main',
+                    kind: vscode_languageserver_1.CompletionItemKind.Function
+                }, {
+                    label: 'speak',
+                    kind: vscode_languageserver_1.CompletionItemKind.Function
+                }, {
+                    label: 'stuff',
+                    kind: vscode_languageserver_1.CompletionItemKind.Module
+                }, {
+                    label: 'Person',
+                    kind: vscode_languageserver_1.CompletionItemKind.Class
+                }, {
+                    label: 'Direction',
+                    kind: vscode_languageserver_1.CompletionItemKind.Enum
+                }]);
+        });
+        describe('namespaces', () => {
+            it('gets full namespace completions at any point through the leading identifier', () => {
+                program.setFile('source/main.bs', `
+                    sub main()
+                        foo.bar
+                    end sub
+
+                    namespace foo.bar
+                    end namespace
+
+                    class Person
+                    end class
+                `);
+                const result = program.getCompletions(`${rootDir}/source/main.bs`, vscode_languageserver_1.Position.create(2, 24)).map(x => x.label);
+                (0, chai_1.expect)(result).includes('main');
+                (0, chai_1.expect)(result).includes('foo');
+                (0, chai_1.expect)(result).includes('Person');
+            });
+            it('gets namespace completions', () => {
+                program.setFile('source/main.bs', `
+                    namespace foo.bar
+                        function sayHello()
+                        end function
+                    end namespace
+
+                    sub Main()
+                        print "hello"
+                        foo.ba
+                        foo.bar.
+                    end sub
+                `);
+                let result = program.getCompletions(`${rootDir}/source/main.bs`, vscode_languageserver_1.Position.create(8, 30));
+                let names = result.map(x => x.label);
+                (0, chai_1.expect)(names).to.includes('bar');
+                result = program.getCompletions(`${rootDir}/source/main.bs`, vscode_languageserver_1.Position.create(9, 32));
+                names = result.map(x => x.label);
+                (0, chai_1.expect)(names).to.includes('sayHello');
+            });
         });
         it('always includes `m`', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
 
                 end sub
             `);
             let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 23));
             let names = result.map(x => x.label);
-            chai_1.expect(names).to.contain('m');
+            (0, chai_1.expect)(names).to.contain('m');
         });
         it('does not fail for missing previousToken', () => {
             //add a single character to the file, and get completions after it
-            program.addOrReplaceFile('source/main.brs', `i`);
-            chai_1.expect(() => {
+            program.setFile('source/main.brs', `i`);
+            (0, chai_1.expect)(() => {
                 program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(0, 1)).map(x => x.label);
             }).not.to.throw;
         });
         it('includes all keywords`', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
 
                 end sub
             `);
-            let keywords = Object.keys(lexer_1.Keywords).filter(x => !x.includes(' '));
+            let keywords = Object.keys(TokenKind_1.Keywords).filter(x => !x.includes(' '));
             //inside the function
             let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 23));
             let names = result.map(x => x.label);
             for (let keyword of keywords) {
-                chai_1.expect(names).to.include(keyword);
+                (0, chai_1.expect)(names).to.include(keyword);
             }
             //outside the function
             result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(4, 8));
             names = result.map(x => x.label);
             for (let keyword of keywords) {
-                chai_1.expect(names).to.include(keyword);
+                (0, chai_1.expect)(names).to.include(keyword);
             }
         });
         it('does not provide completions within a comment', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     'some comment
                 end sub
             `);
             //inside the function
             let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 33));
-            chai_1.expect(result).to.be.lengthOf(0);
+            (0, chai_1.expect)(result).to.be.lengthOf(0);
         });
         it('does not provide duplicate entries for variables', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     name = "bob"
                     age = 12
@@ -210,67 +303,91 @@ describe('BrsFile', () => {
             let count = result.reduce((total, x) => {
                 return x.label === 'name' ? total + 1 : total;
             }, 0);
-            chai_1.expect(count).to.equal(1);
+            (0, chai_1.expect)(count).to.equal(1);
         });
         it('does not include `as` and `string` text options when used in function params', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main(name as string)
 
                 end sub
             `);
             let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 23));
-            chai_1.expect(result.filter(x => x.kind === vscode_languageserver_1.CompletionItemKind.Text)).not.to.contain('as');
-            chai_1.expect(result.filter(x => x.kind === vscode_languageserver_1.CompletionItemKind.Text)).not.to.contain('string');
+            (0, chai_1.expect)(result.filter(x => x.kind === vscode_languageserver_1.CompletionItemKind.Text)).not.to.contain('as');
+            (0, chai_1.expect)(result.filter(x => x.kind === vscode_languageserver_1.CompletionItemKind.Text)).not.to.contain('string');
         });
         it('does not provide intellisense results when inside a comment', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main(name as string)
                     'this is a comment
                 end sub
             `);
             let results = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 30));
-            chai_1.expect(results).to.be.empty;
+            (0, chai_1.expect)(results).to.be.empty;
         });
         it('does provide intellisence for labels only after a goto keyword', () => {
             var _a;
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main(name as string)
                     something:
                     goto \nend sub
             `);
             let results = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(3, 25));
-            chai_1.expect(results.length).to.equal(1);
-            chai_1.expect((_a = results[0]) === null || _a === void 0 ? void 0 : _a.label).to.equal('something');
+            (0, chai_1.expect)(results.length).to.equal(1);
+            (0, chai_1.expect)((_a = results[0]) === null || _a === void 0 ? void 0 : _a.label).to.equal('something');
+        });
+        it('includes properties of objects', () => {
+            //eslint-disable-next-line @typescript-eslint/no-floating-promises
+            program.setFile('source/main.brs', `
+                sub Main()
+                    myObj = {name:"Bob", age: 34, height:6.0}
+                    myObj.
+                end sub
+            `);
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(3, 26));
+            let names = result.map(x => x.label);
+            (0, chai_1.expect)(names).to.contain('name');
+            (0, chai_1.expect)(names).to.contain('age');
+            (0, chai_1.expect)(names).to.contain('height');
+        });
+        it('includes properties of m', () => {
+            //eslint-disable-next-line @typescript-eslint/no-floating-promises
+            program.setFile('source/main.brs', `
+                sub Main()
+                    m.someField= "hello"
+                    m.
+                end sub
+            `);
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(3, 22));
+            let names = result.map(x => x.label);
+            (0, chai_1.expect)(names).to.contain('someField');
         });
     });
     describe('comment flags', () => {
         describe('bs:disable-next-line', () => {
             it('disables critical diagnostic issues', () => {
-                var _a, _b;
-                program.addOrReplaceFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         Dim requestData
                     end sub
                 `);
                 //should have an error
                 program.validate();
-                chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.exist;
-                program.addOrReplaceFile('source/main.brs', `
+                (0, testHelpers_spec_1.expectHasDiagnostics)(program);
+                program.setFile('source/main.brs', `
                     sub main()
                         'bs:disable-next-line
                         Dim requestData
                     end sub
                 `);
-                //should have an error
+                //should not have an error
                 program.validate();
-                chai_1.expect((_b = program.getDiagnostics()[0]) === null || _b === void 0 ? void 0 : _b.message).not.to.exist;
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('works with leading whitespace', () => {
-                var _a;
-                program.addOrReplaceFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         ' bs:disable-next-line
                         =asdf=sadf=
@@ -278,89 +395,96 @@ describe('BrsFile', () => {
                 `);
                 //should have an error
                 program.validate();
-                chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('works for all', () => {
-                var _a;
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         'bs:disable-next-line
                         name = "bob
                     end sub
                 `);
-                chai_1.expect(file.commentFlags[0]).to.exist;
-                chai_1.expect(file.commentFlags[0]).to.deep.include({
+                (0, chai_1.expect)(file.commentFlags[0]).to.exist;
+                (0, chai_1.expect)(file.commentFlags[0]).to.deep.include({
                     codes: null,
                     range: vscode_languageserver_1.Range.create(2, 24, 2, 45),
                     affectedRange: util_1.default.createRange(3, 0, 3, Number.MAX_SAFE_INTEGER)
                 });
                 program.validate();
                 //the "unterminated string" error should be filtered out
-                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('works for specific codes', () => {
-                var _a;
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         'bs:disable-next-line: 1083, 1001
                         name = "bob
                     end sub
                 `);
-                chai_1.expect(file.commentFlags[0]).to.exist;
-                chai_1.expect(file.commentFlags[0]).to.deep.include({
+                (0, chai_1.expect)(file.commentFlags[0]).to.exist;
+                (0, chai_1.expect)(file.commentFlags[0]).to.deep.include({
                     codes: [1083, 1001],
                     range: vscode_languageserver_1.Range.create(2, 24, 2, 57),
                     affectedRange: util_1.default.createRange(3, 0, 3, Number.MAX_SAFE_INTEGER)
                 });
                 //the "unterminated string" error should be filtered out
-                chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.not.exist;
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
-            it('ignores non-numeric codes', () => {
-                var _a;
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            it('recognizes non-numeric codes', () => {
+                let file = program.setFile('source/main.brs', `
                     sub Main()
                         'bs:disable-next-line: LINT9999
                         name = "bob
                     end sub
-                `);
-                chai_1.expect(file.commentFlags[0]).to.not.exist;
-                chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.exist;
+                    `);
+                (0, chai_1.expect)(file.commentFlags[0]).to.exist;
+                (0, testHelpers_spec_1.expectHasDiagnostics)(program);
+            });
+            it('supports disabling non-numeric error codes', () => {
+                const program = new Program_1.Program({});
+                const file = program.setFile('source/main.brs', `
+                    sub main()
+                        something = true 'bs:disable-line: LINT1005
+                    end sub
+                    `);
+                file.addDiagnostics([{
+                        code: 'LINT1005',
+                        file: file,
+                        message: 'Something is not right',
+                        range: util_1.default.createRange(2, 16, 2, 26)
+                    }]);
+                const scope = program.getScopesForFile(file)[0];
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(scope);
             });
             it('adds diagnostics for unknown numeric diagnostic codes', () => {
-                program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                program.setFile({ src: `${rootDir} / source / main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         print "hi" 'bs:disable-line: 123456 999999   aaaab
                     end sub
-                `);
+                    `);
                 program.validate();
-                chai_1.expect(program.getDiagnostics()).to.be.lengthOf(2);
-                chai_1.expect(program.getDiagnostics()[0]).to.deep.include({
-                    range: vscode_languageserver_1.Range.create(2, 53, 2, 59)
-                });
-                chai_1.expect(program.getDiagnostics()[1]).to.deep.include({
-                    range: vscode_languageserver_1.Range.create(2, 60, 2, 66)
-                });
+                (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.unknownDiagnosticCode(123456)), { range: vscode_languageserver_1.Range.create(2, 53, 2, 59) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.unknownDiagnosticCode(999999)), { range: vscode_languageserver_1.Range.create(2, 60, 2, 66) })]);
             });
         });
         describe('bs:disable-line', () => {
             it('works for all', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} / source / main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         z::;;%%%%%% 'bs:disable-line
                     end sub
                 `);
-                chai_1.expect(file.commentFlags[0]).to.exist;
-                chai_1.expect(file.commentFlags[0]).to.deep.include({
+                (0, chai_1.expect)(file.commentFlags[0]).to.exist;
+                (0, chai_1.expect)(file.commentFlags[0]).to.deep.include({
                     codes: null,
                     range: vscode_languageserver_1.Range.create(2, 36, 2, 52),
                     affectedRange: vscode_languageserver_1.Range.create(2, 0, 2, 36)
                 });
                 program.validate();
                 //the "unterminated string" error should be filtered out
-                chai_1.expect(program.getDiagnostics()).to.be.lengthOf(0);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('works for specific codes', () => {
-                program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         'should not have any errors
                         DoSomething(1) 'bs:disable-line:1002
@@ -371,42 +495,41 @@ describe('BrsFile', () => {
                     end sub
                 `);
                 program.validate();
-                chai_1.expect(program.getDiagnostics()).to.be.lengthOf(1);
-                chai_1.expect(program.getDiagnostics()[0]).to.deep.include({
-                    range: vscode_languageserver_1.Range.create(5, 24, 5, 35)
-                });
+                (0, testHelpers_spec_1.expectDiagnostics)(program, [{
+                        range: vscode_languageserver_1.Range.create(5, 24, 5, 35)
+                    }]);
             });
             it('handles the erraneous `stop` keyword', () => {
                 //the current version of BRS causes parse errors after the `parse` keyword, showing error in comments
                 //the program should ignore all diagnostics found in brs:* comment lines EXCEPT
                 //for the diagnostics about using unknown error codes
-                program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         stop 'bs:disable-line
                         print "need a valid line to fix stop error"
                     end sub
-                `);
+                    `);
                 program.validate();
-                chai_1.expect(program.getDiagnostics()).to.be.lengthOf(0);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
         });
     });
     describe('parse', () => {
         it('supports iife in assignment', () => {
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
-                    result = sub()
+                result = sub()
                     end sub()
-                    result = (sub()
+                result = (sub()
                     end sub)()
                 end sub
             `);
-            testHelpers_spec_1.expectZeroDiagnostics(program);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
         it('uses the proper parse mode based on file extension', () => {
             function testParseMode(destPath, expectedParseMode) {
-                const file = program.addOrReplaceFile(destPath, '');
-                chai_1.expect(file.parseMode).to.equal(expectedParseMode);
+                const file = program.setFile(destPath, '');
+                (0, chai_1.expect)(file.parseMode).to.equal(expectedParseMode);
             }
             testParseMode('source/main.brs', Parser_1.ParseMode.BrightScript);
             testParseMode('source/main.spec.brs', Parser_1.ParseMode.BrightScript);
@@ -416,26 +539,26 @@ describe('BrsFile', () => {
             testParseMode('source/main.spec.bs', Parser_1.ParseMode.BrighterScript);
         });
         it('supports labels and goto statements', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     'multiple goto statements on one line
-                    goto myLabel : goto myLabel
+                    goto myLabel: goto myLabel
                     myLabel:
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports empty print statements', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                 sub main()
-                   print
+                    print
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         describe('conditional compile', () => {
             it('works for upper case keywords', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #CONST someFlag = true
                         #IF someFlag
@@ -447,10 +570,10 @@ describe('BrsFile', () => {
                         #ENDIF
                     end sub
                 `);
-                chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
             });
             it('supports single-word #elseif and #endif', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #const someFlag = true
                         #if someFlag
@@ -460,10 +583,10 @@ describe('BrsFile', () => {
                         #endif
                     end sub
                 `);
-                chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
             });
             it('supports multi-word #else if and #end if', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #const someFlag = true
                         #if someFlag
@@ -473,84 +596,93 @@ describe('BrsFile', () => {
                         #end if
                     end sub
                 `);
-                chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
             });
             it('does not choke on invalid code inside a false conditional compile', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #if false
-                            non-commented code here should not cause parse errors
+                            non - commented code here should not cause parse errors
                         #end if
                     end sub
                 `);
-                chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
             });
             it('detects syntax error in #if', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #if true1
                             print "true"
                         #end if
                     end sub
                 `);
-                chai_1.expect(file.getDiagnostics()[0]).to.exist.and.deep.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.invalidHashConstValue));
+                (0, testHelpers_spec_1.expectDiagnostics)(file, [
+                    DiagnosticMessages_1.DiagnosticMessages.referencedConstDoesNotExist()
+                ]);
             });
             it('detects syntax error in #const', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #if %
                             print "true"
                         #end if
                     end sub
                 `);
-                chai_1.expect(file.getDiagnostics()[0]).to.exist.and.deep.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.unexpectedCharacter('%')));
+                (0, testHelpers_spec_1.expectDiagnostics)(file, [
+                    DiagnosticMessages_1.DiagnosticMessages.unexpectedCharacter('%'),
+                    DiagnosticMessages_1.DiagnosticMessages.invalidHashIfValue()
+                ]);
             });
             it('detects #const name using reserved word', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #const function = true
                     end sub
                 `);
-                chai_1.expect(file.getDiagnostics()[0]).to.exist.and.deep.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.constNameCannotBeReservedWord()));
+                (0, testHelpers_spec_1.expectDiagnostics)(file, [
+                    DiagnosticMessages_1.DiagnosticMessages.constNameCannotBeReservedWord(),
+                    DiagnosticMessages_1.DiagnosticMessages.unexpectedToken('#const')
+                ]);
             });
             it('detects syntax error in #const', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #const someConst = 123
                     end sub
                 `);
-                chai_1.expect(file.getDiagnostics()[0]).to.exist.and.deep.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.invalidHashConstValue()));
+                (0, testHelpers_spec_1.expectDiagnostics)(file, [
+                    DiagnosticMessages_1.DiagnosticMessages.invalidHashConstValue()
+                ]);
             });
         });
         it('supports stop statement', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                 sub main()
-                   stop
+                    stop
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports single-line if statements', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                 sub main()
                     if 1 < 2: return true: end if
                     if 1 < 2: return true
                     end if
                     if false : print "true" : end if
                     if true: print "8 worked": else if true: print "not run": else: print "not run": end if
-                    if true then : test = sub() : print "yes" : end sub : end if
+                    if true then: test = sub() : print "yes" : end sub: end if
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports line_num as global variable', () => {
-            var _a;
             file.parse(`
                 sub Main()
                     print LINE_NUM
                 end sub
             `);
-            chai_1.expect((_a = file.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports many keywords as object property names', () => {
             file.parse(`
@@ -616,7 +748,7 @@ describe('BrsFile', () => {
                     person.new = true
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('does not error on numeric literal type designators', () => {
             file.parse(`
@@ -624,13 +756,13 @@ describe('BrsFile', () => {
                     print &he2
                     print 1.2E+2
                     print 2!
-                    print 12D-12
+                    print 12D - 12
                     print 2.3#
                     print &hFEDCBA9876543210&
                     print 9876543210&
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('does not error when encountering sub with return type', () => {
             file.parse(`
@@ -638,7 +770,7 @@ describe('BrsFile', () => {
                     return
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('does not lose function statements when mismatched end sub', () => {
             file.parse(`
@@ -650,7 +782,7 @@ describe('BrsFile', () => {
                     print "hello world"
                 end sub
             `);
-            chai_1.expect(file.parser.references.functionStatements).to.be.lengthOf(2);
+            (0, chai_1.expect)(file.parser.references.functionStatements).to.be.lengthOf(2);
         });
         it('does not lose sub scope when mismatched end function', () => {
             file.parse(`
@@ -662,7 +794,7 @@ describe('BrsFile', () => {
                     print "hello world"
                 end sub
             `);
-            chai_1.expect(file.parser.references.functionStatements).to.be.lengthOf(2);
+            (0, chai_1.expect)(file.parser.references.functionStatements).to.be.lengthOf(2);
         });
         it('does not error with boolean in RHS of set statement', () => {
             file.parse(`
@@ -673,7 +805,7 @@ describe('BrsFile', () => {
                     foo.bar = true and false or 3 > 4
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('does not error with boolean in RHS of set statement', () => {
             file.parse(`
@@ -686,57 +818,57 @@ describe('BrsFile', () => {
                     m.isTrue = m.isTrue = m.isTrue
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports variable names ending with type designators', () => {
             file.parse(`
                 sub main()
-                  name$ = "bob"
-                  age% = 1
-                  height! = 5.5
-                  salary# = 9.87654321
-                  someHex& = 13
+                    name$ = "bob"
+                    age% = 1
+                    height! = 5.5
+                        salary# = 9.87654321
+                    someHex& = 13
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports multiple spaces between two-word keywords', () => {
             file.parse(`
                 sub main()
                     if true then
                         print "true"
-                    else    if true then
+                    else if true then
                         print "also true"
                     end if
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('does not error with `stop` as object key', () => {
             file.parse(`
                 function GetObject()
                     obj = {
-                        stop: function() as void
+                    stop: function () as void
 
-                        end function
+                            end function
                     }
                     return obj
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('does not error with `run` as object key', () => {
             file.parse(`
                 function GetObject()
                     obj = {
-                        run: function() as void
+                        run: function () as void
 
                         end function
-                    }
+                        }
                     return obj
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports assignment operators', () => {
             file.parse(`
@@ -753,28 +885,28 @@ describe('BrsFile', () => {
                     print x
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports `then` as object property', () => {
             file.parse(`
                 function Main()
                     promise = {
                         then: sub()
-                        end sub
+                                end sub
                     }
                     promise.then()
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports function as parameter type', () => {
             file.parse(`
                 sub Main()
-                    doWork = function(callback as function)
+                    doWork = function (callback as function)
                     end function
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports increment operator', () => {
             file.parse(`
@@ -783,8 +915,7 @@ describe('BrsFile', () => {
                     x++
                 end function
             `);
-            file.getDiagnostics();
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports decrement operator', () => {
             file.parse(`
@@ -793,8 +924,7 @@ describe('BrsFile', () => {
                     x--
                 end function
             `);
-            file.getDiagnostics();
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports writing numbers with decimal but no trailing digit', () => {
             file.parse(`
@@ -803,7 +933,7 @@ describe('BrsFile', () => {
                     print x
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports assignment operators against object properties', () => {
             file.parse(`
@@ -825,7 +955,7 @@ describe('BrsFile', () => {
                     print m.age
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         //skipped until `brs` supports this
         it('supports bitshift assignment operators', () => {
@@ -837,7 +967,7 @@ describe('BrsFile', () => {
                     print x
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         //skipped until `brs` supports this
         it('supports bitshift assignment operators on objects', () => {
@@ -849,7 +979,7 @@ describe('BrsFile', () => {
                         print m.x
                     end function
                 `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports leading and trailing periods for numeric literals', () => {
             file.parse(`
@@ -860,7 +990,7 @@ describe('BrsFile', () => {
                     print pointOne
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports bitshift assignment operators on object properties accessed by array syntax', () => {
             file.parse(`
@@ -871,7 +1001,7 @@ describe('BrsFile', () => {
                         print m.x
                     end function
                 `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports weird period AA accessor', () => {
             file.parse(`
@@ -880,67 +1010,71 @@ describe('BrsFile', () => {
                     print m.["_uuid"]
                 end function
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('adds error for library statements NOT at top of file', () => {
-            let file = program.addOrReplaceFile('source/main.bs', `
+            program.setFile('source/file.brs', ``);
+            program.setFile('source/main.bs', `
                 sub main()
                 end sub
                 import "file.brs"
-            `);
-            chai_1.expect(file.getDiagnostics().map(x => x.message)).to.eql([
-                DiagnosticMessages_1.DiagnosticMessages.importStatementMustBeDeclaredAtTopOfFile().message
+        `);
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.importStatementMustBeDeclaredAtTopOfFile()
             ]);
         });
         it('supports library imports', () => {
-            file.parse(`
+            program.setFile('source/main.brs', `
                 Library "v30/bslCore.brs"
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
         it('adds error for library statements NOT at top of file', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                 end sub
                 Library "v30/bslCore.brs"
             `);
-            chai_1.expect(file.getDiagnostics().map(x => x.message)).to.eql([
-                DiagnosticMessages_1.DiagnosticMessages.libraryStatementMustBeDeclaredAtTopOfFile().message
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.libraryStatementMustBeDeclaredAtTopOfFile()
             ]);
         });
         it('adds error for library statements inside of function body', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     Library "v30/bslCore.brs"
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics().map(x => x.message)).to.eql([
-                DiagnosticMessages_1.DiagnosticMessages.libraryStatementMustBeDeclaredAtTopOfFile().message
+            program.validate();
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.libraryStatementMustBeDeclaredAtTopOfFile()
             ]);
         });
         it('supports colons as separators in associative array properties', () => {
             file.parse(`
                 sub Main()
-                    obj = {x:0 : y: 1}
+                    obj = { x: 0 : y: 1 }
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('succeeds when finding variables with "sub" in them', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 function DoSomething()
                     return value.subType()
                 end function
             `);
-            chai_1.expect(file.callables[0]).to.deep.include({
+            (0, chai_1.expect)(file.callables[0]).to.deep.include({
                 file: file,
                 nameRange: vscode_languageserver_1.Range.create(1, 25, 1, 36)
             });
         });
         it('succeeds when finding variables with the word "function" in them', () => {
             file.parse(`
-                function Test()
-                    typeCheckFunction = RBS_CMN_GetFunction(invalid, methodName)
+        function Test()
+        typeCheckFunction = RBS_CMN_GetFunction(invalid, methodName)
                 end function
             `);
         });
@@ -951,14 +1085,14 @@ describe('BrsFile', () => {
                     print "A"
                 end function
 
-                 function DoB()
-                     print "B"
-                 end function
+                function DoB()
+                    print "B"
+                end function
             `);
-            chai_1.expect(file.callables[0].name).to.equal('DoA');
-            chai_1.expect(file.callables[0].nameRange).to.eql(vscode_languageserver_1.Range.create(1, 25, 1, 28));
-            chai_1.expect(file.callables[1].name).to.equal('DoB');
-            chai_1.expect(file.callables[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 26, 5, 29));
+            (0, chai_1.expect)(file.callables[0].name).to.equal('DoA');
+            (0, chai_1.expect)(file.callables[0].nameRange).to.eql(vscode_languageserver_1.Range.create(1, 25, 1, 28));
+            (0, chai_1.expect)(file.callables[1].name).to.equal('DoB');
+            (0, chai_1.expect)(file.callables[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 25, 5, 28));
         });
         it('throws an error if the file has already been parsed', () => {
             let file = new BrsFile_1.BrsFile('abspath', 'relpath', program);
@@ -982,11 +1116,11 @@ describe('BrsFile', () => {
                      print "A"
                  end function
             `);
-            chai_1.expect(file.callables.length).to.equal(2);
-            chai_1.expect(file.callables[0].name).to.equal('DoA');
-            chai_1.expect(file.callables[0].nameRange.start.line).to.equal(1);
-            chai_1.expect(file.callables[1].name).to.equal('DoA');
-            chai_1.expect(file.callables[1].nameRange.start.line).to.equal(5);
+            (0, chai_1.expect)(file.callables.length).to.equal(2);
+            (0, chai_1.expect)(file.callables[0].name).to.equal('DoA');
+            (0, chai_1.expect)(file.callables[0].nameRange.start.line).to.equal(1);
+            (0, chai_1.expect)(file.callables[1].name).to.equal('DoA');
+            (0, chai_1.expect)(file.callables[1].nameRange.start.line).to.equal(5);
         });
         it('finds function call line and column numbers', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -998,11 +1132,11 @@ describe('BrsFile', () => {
                     DoC()
                 end function
             `);
-            chai_1.expect(file.functionCalls.length).to.equal(2);
-            chai_1.expect(file.functionCalls[0].range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 28));
-            chai_1.expect(file.functionCalls[0].nameRange).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 23));
-            chai_1.expect(file.functionCalls[1].range).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 25));
-            chai_1.expect(file.functionCalls[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 23));
+            (0, chai_1.expect)(file.functionCalls.length).to.equal(2);
+            (0, chai_1.expect)(file.functionCalls[0].range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 28));
+            (0, chai_1.expect)(file.functionCalls[0].nameRange).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 23));
+            (0, chai_1.expect)(file.functionCalls[1].range).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 25));
+            (0, chai_1.expect)(file.functionCalls[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 23));
         });
         it('sanitizes brs errors', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -1010,11 +1144,9 @@ describe('BrsFile', () => {
                 function DoSomething
                 end function
             `);
-            chai_1.expect(file.getDiagnostics().length).to.be.greaterThan(0);
-            chai_1.expect(file.getDiagnostics()[0]).to.deep.include({
-                file: file
-            });
-            chai_1.expect(file.getDiagnostics()[0].range.start.line).to.equal(1);
+            (0, testHelpers_spec_1.expectHasDiagnostics)(file);
+            (0, chai_1.expect)(file.getDiagnostics()[0].file).to.equal(file);
+            (0, chai_1.expect)(file.getDiagnostics()[0].range.start.line).to.equal(1);
         });
         it('supports using the `next` keyword in a for loop', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -1025,7 +1157,7 @@ describe('BrsFile', () => {
                     next
                 end sub
             `);
-            chai_1.expect(file.getDiagnostics()).to.be.empty;
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         //test is not working yet, but will be enabled when brs supports this syntax
         it('supports assigning functions to objects', () => {
@@ -1038,7 +1170,7 @@ describe('BrsFile', () => {
                     end sub
                 end function
             `);
-            chai_1.expect(file.getDiagnostics().length).to.equal(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
     });
     describe('findCallables', () => {
@@ -1050,7 +1182,7 @@ describe('BrsFile', () => {
                 end sub
             `);
             let callable = file.callables[0];
-            chai_1.expect(callable.range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
+            (0, chai_1.expect)(callable.range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
         });
         it('finds correct body range even with inner function', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -1063,7 +1195,7 @@ describe('BrsFile', () => {
                 end sub
             `);
             let callable = file.callables[0];
-            chai_1.expect(callable.range).to.eql(vscode_languageserver_1.Range.create(1, 16, 6, 23));
+            (0, chai_1.expect)(callable.range).to.eql(vscode_languageserver_1.Range.create(1, 16, 6, 23));
         });
         it('finds callable parameters', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -1073,24 +1205,24 @@ describe('BrsFile', () => {
                 end function
             `);
             let callable = file.callables[0];
-            chai_1.expect(callable.params[0]).to.deep.include({
+            (0, chai_1.expect)(callable.params[0]).to.deep.include({
                 name: 'a',
                 isOptional: false,
                 isRestArgument: false
             });
-            chai_1.expect(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
-            chai_1.expect(callable.params[1]).to.deep.include({
+            (0, chai_1.expect)(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_1.expect)(callable.params[1]).to.deep.include({
                 name: 'b',
                 isOptional: false,
                 isRestArgument: false
             });
-            chai_1.expect(callable.params[1].type).instanceof(DynamicType_1.DynamicType);
-            chai_1.expect(callable.params[2]).to.deep.include({
+            (0, chai_1.expect)(callable.params[1].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_1.expect)(callable.params[2]).to.deep.include({
                 name: 'c',
                 isOptional: false,
                 isRestArgument: false
             });
-            chai_1.expect(callable.params[2].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_1.expect)(callable.params[2].type).instanceof(DynamicType_1.DynamicType);
         });
         it('finds optional parameters', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -1100,12 +1232,12 @@ describe('BrsFile', () => {
                 end function
             `);
             let callable = file.callables[0];
-            chai_1.expect(callable.params[0]).to.deep.include({
+            (0, chai_1.expect)(callable.params[0]).to.deep.include({
                 name: 'a',
                 isOptional: true,
                 isRestArgument: false
             });
-            chai_1.expect(callable.params[0].type).instanceof(IntegerType_1.IntegerType);
+            (0, chai_1.expect)(callable.params[0].type).instanceof(IntegerType_1.IntegerType);
         });
         it('finds parameter types', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -1115,24 +1247,24 @@ describe('BrsFile', () => {
                 end function
             `);
             let callable = file.callables[0];
-            chai_1.expect(callable.params[0]).to.deep.include({
+            (0, chai_1.expect)(callable.params[0]).to.deep.include({
                 name: 'a',
                 isOptional: false,
                 isRestArgument: false
             });
-            chai_1.expect(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
-            chai_1.expect(callable.params[1]).to.deep.include({
+            (0, chai_1.expect)(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_1.expect)(callable.params[1]).to.deep.include({
                 name: 'b',
                 isOptional: false,
                 isRestArgument: false
             });
-            chai_1.expect(callable.params[1].type).instanceof(IntegerType_1.IntegerType);
-            chai_1.expect(callable.params[2]).to.deep.include({
+            (0, chai_1.expect)(callable.params[1].type).instanceof(IntegerType_1.IntegerType);
+            (0, chai_1.expect)(callable.params[2]).to.deep.include({
                 name: 'c',
                 isOptional: false,
                 isRestArgument: false
             });
-            chai_1.expect(callable.params[2].type).instanceof(StringType_1.StringType);
+            (0, chai_1.expect)(callable.params[2].type).instanceof(StringType_1.StringType);
         });
     });
     describe('findCallableInvocations', () => {
@@ -1143,8 +1275,12 @@ describe('BrsFile', () => {
                     DoSomething("name", 12, true)
                 end function
             `);
-            chai_1.expect(file.functionCalls.length).to.equal(1);
-            chai_1.expect(file.functionCalls[0].args).to.eql([{
+            (0, chai_1.expect)(file.functionCalls.length).to.equal(1);
+            const argsMap = file.functionCalls[0].args.map(arg => {
+                // disregard arg.expression, etc.
+                return { type: arg.type, range: arg.range, text: arg.text };
+            });
+            (0, chai_1.expect)(argsMap).to.eql([{
                     type: new StringType_1.StringType(),
                     range: util_1.default.createRange(2, 32, 2, 38),
                     text: '"name"'
@@ -1159,8 +1295,7 @@ describe('BrsFile', () => {
                 }]);
         });
         it('finds function calls nested inside statements', () => {
-            var _a;
-            program.addOrReplaceFile(`source/main.brs`, `
+            program.setFile(`source/main.brs`, `
                 sub main()
                     if true then
                         DoesNotExist(1, 2)
@@ -1168,7 +1303,9 @@ describe('BrsFile', () => {
                 end sub
             `);
             program.validate();
-            chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.callToUnknownFunction('DoesNotExist', 'source').message);
+            (0, testHelpers_spec_1.expectDiagnostics)(program, [
+                DiagnosticMessages_1.DiagnosticMessages.callToUnknownFunction('DoesNotExist', 'source')
+            ]);
         });
         it('finds arguments with variable values', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -1180,17 +1317,17 @@ describe('BrsFile', () => {
                     DoSomething(count, name, isAlive)
                 end function
             `);
-            chai_1.expect(file.functionCalls.length).to.equal(1);
-            chai_1.expect(file.functionCalls[0].args[0]).deep.include({
-                type: new DynamicType_1.DynamicType(),
+            (0, chai_1.expect)(file.functionCalls.length).to.equal(1);
+            (0, chai_1.expect)(file.functionCalls[0].args[0]).deep.include({
+                type: new IntegerType_1.IntegerType(),
                 text: 'count'
             });
-            chai_1.expect(file.functionCalls[0].args[1]).deep.include({
-                type: new DynamicType_1.DynamicType(),
+            (0, chai_1.expect)(file.functionCalls[0].args[1]).deep.include({
+                type: new StringType_1.StringType(),
                 text: 'name'
             });
-            chai_1.expect(file.functionCalls[0].args[2]).deep.include({
-                type: new DynamicType_1.DynamicType(),
+            (0, chai_1.expect)(file.functionCalls[0].args[2]).deep.include({
+                type: new BooleanType_1.BooleanType(),
                 text: 'isAlive'
             });
         });
@@ -1200,20 +1337,20 @@ describe('BrsFile', () => {
         it('skips top-level statements', () => {
             let file = new BrsFile_1.BrsFile('absolute', 'relative', program);
             file.parse('name = "Bob"');
-            chai_1.expect(file.callables.length).to.equal(0);
+            (0, chai_1.expect)(file.callables.length).to.equal(0);
         });
         it('finds return type', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 function DoSomething() as string
                 end function
             `);
-            chai_1.expect(file.callables[0]).to.deep.include({
+            (0, chai_1.expect)(file.callables[0]).to.deep.include({
                 file: file,
                 nameRange: vscode_languageserver_1.Range.create(1, 25, 1, 36),
                 name: 'DoSomething',
                 params: []
             });
-            chai_1.expect(file.callables[0].type.returnType).instanceof(StringType_1.StringType);
+            (0, chai_1.expect)(file.callables[0].type.returnType).instanceof(StringType_1.StringType);
         });
     });
     describe('function local variable handling', () => {
@@ -1223,7 +1360,7 @@ describe('BrsFile', () => {
                     name = 'bob"
                 end sub
             `);
-            chai_1.expect(file.parser.references.functionStatements[0].range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
+            (0, chai_1.expect)(file.parser.references.functionStatements[0].range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
         });
         it('creates scopes for parent and child functions', () => {
             file.parse(`
@@ -1237,7 +1374,7 @@ describe('BrsFile', () => {
                     end sub)
                 end sub
             `);
-            chai_1.expect(file.parser.references.functionExpressions).to.be.length(3);
+            (0, chai_1.expect)(file.parser.references.functionExpressions).to.be.length(3);
         });
         it('finds variables declared in function expressions', () => {
             file.parse(`
@@ -1251,13 +1388,13 @@ describe('BrsFile', () => {
                     end sub)
                 end sub
             `);
-            testHelpers_spec_1.expectSymbolTableEquals(file.parser.references.functionExpressions[0].symbolTable, [
-                ['sayHi', new FunctionType_1.FunctionType(new VoidType_1.VoidType(), true), util_1.default.createRange(2, 20, 2, 25)]
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
+                ['sayHi', new TypedFunctionType_1.TypedFunctionType(new VoidType_1.VoidType(), true), util_1.default.createRange(2, 20, 2, 25)]
             ]);
-            testHelpers_spec_1.expectSymbolTableEquals(file.parser.references.functionExpressions[1].symbolTable, [
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[1].symbolTable, [
                 ['age', new IntegerType_1.IntegerType(), util_1.default.createRange(3, 24, 3, 27)]
             ]);
-            testHelpers_spec_1.expectSymbolTableEquals(file.parser.references.functionExpressions[2].symbolTable, [
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[2].symbolTable, [
                 ['name', new StringType_1.StringType(), util_1.default.createRange(7, 24, 7, 28)]
             ]);
         });
@@ -1269,12 +1406,12 @@ describe('BrsFile', () => {
                     end if
                 end sub
             `);
-            testHelpers_spec_1.expectSymbolTableEquals(file.parser.references.functionExpressions[0].symbolTable, [
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
                 ['theLength', new IntegerType_1.IntegerType(), util_1.default.createRange(3, 24, 3, 33)]
             ]);
         });
         it('finds value from global return', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 sub Main()
                    myName = GetName()
                 end sub
@@ -1283,20 +1420,20 @@ describe('BrsFile', () => {
                     return "bob"
                 end function
             `);
-            testHelpers_spec_1.expectSymbolTableEquals(file.parser.references.functionExpressions[0].symbolTable, [
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
                 ['myName', new StringType_1.StringType(), util_1.default.createRange(2, 19, 2, 25)]
             ]);
         });
         it('finds variable type from other variable', () => {
             file.parse(`
                 sub Main()
-                   name = "bob"
-                   nameCopy = name
+                    name = "bob"
+                    nameCopy = name
                 end sub
             `);
-            testHelpers_spec_1.expectSymbolTableEquals(file.parser.references.functionExpressions[0].symbolTable, [
-                ['name', new StringType_1.StringType(), util_1.default.createRange(2, 19, 2, 23)],
-                ['nameCopy', new StringType_1.StringType(), util_1.default.createRange(3, 19, 3, 27)]
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
+                ['name', new StringType_1.StringType(), util_1.default.createRange(2, 20, 2, 24)],
+                ['nameCopy', new StringType_1.StringType(), util_1.default.createRange(3, 20, 3, 28)]
             ]);
         });
         it('sets proper range for functions', () => {
@@ -1307,8 +1444,7 @@ describe('BrsFile', () => {
                     end function
                 end sub
             `);
-            chai_1.expect(file.parser.references.functionExpressions).to.be.length(2);
-            chai_1.expect(file.parser.references.functionExpressions.map(x => x.range)).to.eql([
+            (0, chai_1.expect)(file.parser.references.functionExpressions.map(x => x.range)).to.eql([
                 util_1.default.createRange(1, 16, 5, 23),
                 util_1.default.createRange(2, 30, 4, 32)
             ]);
@@ -1316,37 +1452,37 @@ describe('BrsFile', () => {
     });
     describe('getHover', () => {
         it('works for param types', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                 sub DoSomething(name as string)
                     name = 1
-                    sayMyName = function(name as string)
+                    sayMyName = function (name as string)
                     end function
                 end sub
             `);
             //hover over the `name = 1` line
             let hover = file.getHover(vscode_languageserver_1.Position.create(2, 24));
-            chai_1.expect(hover).to.exist;
-            chai_1.expect(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 24));
+            (0, chai_1.expect)(hover).to.exist;
+            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 24));
             //hover over the `name` parameter declaration
             hover = file.getHover(vscode_languageserver_1.Position.create(1, 34));
-            chai_1.expect(hover).to.exist;
-            chai_1.expect(hover.range).to.eql(vscode_languageserver_1.Range.create(1, 32, 1, 36));
+            (0, chai_1.expect)(hover).to.exist;
+            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(1, 32, 1, 36));
         });
         //ignore this for now...it's not a huge deal
         it('does not match on keywords or data types', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main(name as string)
                 end sub
-                sub as()
+                sub as ()
                 end sub
             `);
-            //hover over the `as`
-            chai_1.expect(file.getHover(vscode_languageserver_1.Position.create(1, 31))).not.to.exist;
+            //hover over the `as `
+            (0, chai_1.expect)(file.getHover(vscode_languageserver_1.Position.create(1, 31))).not.to.exist;
             //hover over the `string`
-            chai_1.expect(file.getHover(vscode_languageserver_1.Position.create(1, 36))).not.to.exist;
+            (0, chai_1.expect)(file.getHover(vscode_languageserver_1.Position.create(1, 36))).not.to.exist;
         });
         it('finds declared function', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
                 function Main(count = 1)
                     firstName = "bob"
                     age = 21
@@ -1354,12 +1490,16 @@ describe('BrsFile', () => {
                 end function
             `);
             let hover = file.getHover(vscode_languageserver_1.Position.create(1, 28));
-            chai_1.expect(hover).to.exist;
-            chai_1.expect(hover.range).to.eql(vscode_languageserver_1.Range.create(1, 25, 1, 29));
-            chai_1.expect(hover.contents).to.equal('function Main(count? as integer) as dynamic');
+            (0, chai_1.expect)(hover).to.exist;
+            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(1, 25, 1, 29));
+            (0, chai_1.expect)(hover.contents).to.equal([
+                '```brightscript',
+                'function Main(count? as integer) as dynamic',
+                '```'
+            ].join('\n'));
         });
         it('finds variable function hover in same scope', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     sayMyName = sub(name as string)
                     end sub
@@ -1368,11 +1508,39 @@ describe('BrsFile', () => {
                 end sub
             `);
             let hover = file.getHover(vscode_languageserver_1.Position.create(5, 24));
-            chai_1.expect(hover.range).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 29));
-            chai_1.expect(hover.contents).to.equal('sub (name as string) as void');
+            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 29));
+            (0, chai_1.expect)(hover.contents).to.equal([
+                '```brightscript',
+                'sub (name as string) as void',
+                '```'
+            ].join('\n'));
+        });
+        it('does not crash when hovering on built-in functions', async () => {
+            let file = program.setFile('source/main.brs', `
+                function doUcase(text)
+                    return ucase(text)
+                end function
+            `);
+            (0, chai_1.expect)((await program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 30))).contents).to.equal([
+                '```brightscript',
+                'function UCase(s as string) as string',
+                '```'
+            ].join('\n'));
+        });
+        it('does not crash when hovering on object method call', async () => {
+            let file = program.setFile('source/main.brs', `
+                function getInstr(url, text)
+                    return url.instr(text)
+                end function
+            `);
+            (0, chai_1.expect)((await program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 35))).contents).to.equal([
+                '```brightscript',
+                'instr as dynamic',
+                '```'
+            ].join('\n'));
         });
         it('finds function hover in file scope', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     sayMyName()
                 end sub
@@ -1382,82 +1550,132 @@ describe('BrsFile', () => {
                 end sub
             `);
             let hover = file.getHover(vscode_languageserver_1.Position.create(2, 25));
-            chai_1.expect(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 29));
-            chai_1.expect(hover.contents).to.equal('sub sayMyName() as void');
+            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 29));
+            (0, chai_1.expect)(hover.contents).to.equal([
+                '```brightscript',
+                'sub sayMyName() as void',
+                '```'
+            ].join('\n'));
         });
         it('finds function hover in scope', () => {
             let rootDir = process.cwd();
             program = new Program_1.Program({
                 rootDir: rootDir
             });
-            let mainFile = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     sayMyName()
                 end sub
             `);
-            program.addOrReplaceFile({ src: `${rootDir}/source/lib.brs`, dest: 'source/lib.brs' }, `
+            program.setFile({ src: `${rootDir}/source/lib.brs`, dest: 'source/lib.brs' }, `
                 sub sayMyName(name as string)
 
                 end sub
             `);
             let hover = mainFile.getHover(vscode_languageserver_1.Position.create(2, 25));
-            chai_1.expect(hover).to.exist;
-            chai_1.expect(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 29));
-            chai_1.expect(hover.contents).to.equal('sub sayMyName(name as string) as void');
+            (0, chai_1.expect)(hover).to.exist;
+            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 29));
+            (0, chai_1.expect)(hover.contents).to.equal([
+                '```brightscript',
+                'sub sayMyName(name as string) as void',
+                '```'
+            ].join('\n'));
+        });
+        it('includes markdown comments in hover.', async () => {
+            let rootDir = process.cwd();
+            program = new Program_1.Program({
+                rootDir: rootDir
+            });
+            const file = program.setFile('source/lib.brs', `
+                '
+                ' The main function
+                '
+                sub main()
+                    log("hello")
+                end sub
+
+                '
+                ' Prints a message to the log.
+                ' Works with *markdown* **content**
+                '
+                sub log(message as string)
+                    print message
+                end sub
+            `);
+            //hover over log("hello")
+            (0, chai_1.expect)((await program.getHover(file.srcPath, vscode_languageserver_1.Position.create(5, 22))).contents).to.equal([
+                '```brightscript',
+                'sub log(message as string) as void',
+                '```',
+                '***',
+                '',
+                ' Prints a message to the log.',
+                ' Works with *markdown* **content**',
+                ''
+            ].join('\n'));
+            //hover over sub ma|in()
+            (0, chai_1.expect)((0, testHelpers_spec_1.trim)((await program.getHover(file.srcPath, vscode_languageserver_1.Position.create(4, 22))).contents.toString())).to.equal((0, testHelpers_spec_1.trim) `
+                \`\`\`brightscript
+                sub main() as void
+                \`\`\`
+                ***
+
+                 The main function
+                `);
         });
         it('handles mixed case `then` partions of conditionals', () => {
-            let mainFile = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     if true then
                         print "works"
                     end if
                 end sub
             `);
-            chai_1.expect(mainFile.getDiagnostics()).to.be.lengthOf(0);
-            mainFile = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
+            mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     if true Then
                         print "works"
                     end if
                 end sub
             `);
-            chai_1.expect(mainFile.getDiagnostics()).to.be.lengthOf(0);
-            mainFile = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
+            mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     if true THEN
                         print "works"
                     end if
                 end sub
             `);
-            chai_1.expect(mainFile.getDiagnostics()).to.be.lengthOf(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
         });
         it('displays the context from multiple scopes', () => {
-            let commonFile = program.addOrReplaceFile('source/common.brs', `
+            let commonFile = program.setFile('source/common.brs', `
                 sub displayPi()
                     pi = getPi()
                     print pi
                 end sub
             `);
-            let scope1File = program.addOrReplaceFile('components/comp1/scope1.brs', `
+            let scope1File = program.setFile('components/comp1/scope1.brs', `
                 function getPi() as string
                     return "apple"
                 end function
             `);
-            chai_1.expect(scope1File.getDiagnostics()).to.be.lengthOf(0);
-            program.addOrReplaceFile('components/comp1/comp1.xml', testHelpers_spec_1.trim `
+            (0, chai_1.expect)(scope1File.getDiagnostics()).to.be.lengthOf(0);
+            program.setFile('components/comp1/comp1.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component1" extends="Group">
                     <script type="text/brightscript" uri="scope1.brs" />
                     <script type="text/brightscript" uri="pkg:/source/common.brs" />
                 </component>
             `);
-            let scope2File = program.addOrReplaceFile('components/comp2/scope2.brs', `
+            let scope2File = program.setFile('components/comp2/scope2.brs', `
                 function getPi() as float
                     return 3.14
                 end function
             `);
-            chai_1.expect(scope2File.getDiagnostics()).to.be.lengthOf(0);
-            program.addOrReplaceFile('components/comp2/comp2.xml', testHelpers_spec_1.trim `
+            (0, chai_1.expect)(scope2File.getDiagnostics()).to.be.lengthOf(0);
+            program.setFile('components/comp2/comp2.xml', (0, testHelpers_spec_1.trim) `
                 <?xml version="1.0" encoding="utf-8" ?>
                 <component name="Component2" extends="Group">
                     <script type="text/brightscript" uri="scope2.brs" />
@@ -1466,15 +1684,65 @@ describe('BrsFile', () => {
             `);
             program.validate();
             let funcCallHover = commonFile.getHover(vscode_languageserver_1.Position.create(2, 27));
-            chai_1.expect(funcCallHover).to.exist;
-            chai_1.expect(funcCallHover.contents).to.equal('function getPi() as string | function getPi() as float');
+            (0, chai_1.expect)(funcCallHover === null || funcCallHover === void 0 ? void 0 : funcCallHover.contents).to.equal([
+                '```brightscript',
+                'function getPi() as string | function getPi() as float | getPi as uninitialized',
+                '```'
+            ].join('\n'));
             let variableHover = commonFile.getHover(vscode_languageserver_1.Position.create(3, 27));
-            chai_1.expect(variableHover).to.exist;
-            chai_1.expect(variableHover.contents).to.equal('pi as uninitialized | pi as string | pi as float');
+            (0, chai_1.expect)(variableHover === null || variableHover === void 0 ? void 0 : variableHover.contents).to.equal([
+                '```brightscript',
+                'pi as string | pi as float | pi as uninitialized',
+                '```'
+            ].join('\n'));
+        });
+        it('finds function with custom types as parameters and return types', () => {
+            let file = program.setFile('source/main.bs', `
+                sub main()
+                    k = new MyKlass()
+                    processMyKlass(k)
+                end sub
+
+                function processMyKlass(data as MyKlass) as MyKlass
+                    return data
+                end function
+
+                class MyKlass
+                end class
+            `);
+            let hover = file.getHover(vscode_languageserver_1.Position.create(3, 29));
+            (0, chai_1.expect)(hover).to.exist;
+            (0, chai_1.expect)(hover.contents).to.equal([
+                '```brightscript',
+                'function processMyKlass(data as MyKlass) as MyKlass',
+                '```'
+            ].join('\n'));
+        });
+        it('finds function with arrays as parameters and return types', () => {
+            let file = program.setFile('source/main.bs', `
+                sub main()
+                    k = new MyKlass()
+                    processData([k])
+                end sub
+
+                function processData(data as MyKlass[]) as MyKlass[]
+                    return data
+                end function
+
+                class MyKlass
+                end class
+            `);
+            let hover = file.getHover(vscode_languageserver_1.Position.create(3, 29));
+            (0, chai_1.expect)(hover).to.exist;
+            (0, chai_1.expect)(hover.contents).to.equal([
+                '```brightscript',
+                'function processData(data as MyKlass[]) as MyKlass[]',
+                '```'
+            ].join('\n'));
         });
     });
     it('does not throw when encountering incomplete import statement', () => {
-        program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
             import
             sub main()
             end sub
@@ -1483,6 +1751,135 @@ describe('BrsFile', () => {
         //this test will throw an exception if something went wrong
     });
     describe('transpile', () => {
+        it('excludes trailing commas in array literals', () => {
+            testTranspile(`
+                sub main()
+                    arr = [
+                        1,
+                        2,
+                        3
+                    ]
+                    obj = {
+                        one: 1,
+                        two: 2,
+                        three: 3
+                    }
+                end sub
+            `, `
+                sub main()
+                    arr = [
+                        1
+                        2
+                        3
+                    ]
+                    obj = {
+                        one: 1
+                        two: 2
+                        three: 3
+                    }
+                end sub
+            `);
+        });
+        it('transpiles if statement keywords as provided', () => {
+            const code = `
+                If True Then
+                    Print True
+                Else If True Then
+                    print True
+                Else If False Then
+                    Print False
+                Else
+                    Print False
+                End If
+            `;
+            testTranspile(code);
+            testTranspile(code.toLowerCase());
+            testTranspile(code.toUpperCase());
+        });
+        it('does not transpile `then` tokens', () => {
+            const code = `
+                if true
+                    print true
+                else if true
+                    print false
+                end if
+            `;
+            testTranspile(code);
+        });
+        it('honors spacing between multi-word tokens', () => {
+            testTranspile(`
+                if true
+                    print true
+                elseif true
+                    print false
+                endif
+            `);
+        });
+        it('handles when only some of the statements have `then`', () => {
+            testTranspile(`
+                if true
+                else if true then
+                else if true
+                else if true then
+                    if true then
+                        return true
+                    end if
+                end if
+            `);
+        });
+        it('retains casing of parameter types', () => {
+            function test(type) {
+                testTranspile(`
+                    sub one(a as ${type}, b as ${type.toUpperCase()}, c as ${type.toLowerCase()})
+                    end sub
+                `);
+            }
+            test('Boolean');
+            test('Double');
+            test('Dynamic');
+            test('Float');
+            test('Integer');
+            test('LongInteger');
+            test('Object');
+            test('String');
+        });
+        it('retains casing of return types', () => {
+            function test(type) {
+                testTranspile(`
+                    sub one() as ${type}
+                    end sub
+
+                    sub two() as ${type.toLowerCase()}
+                    end sub
+
+                    sub three() as ${type.toUpperCase()}
+                    end sub
+                `);
+            }
+            test('Boolean');
+            test('Double');
+            test('Dynamic');
+            test('Float');
+            test('Integer');
+            test('LongInteger');
+            test('Object');
+            test('String');
+            test('Void');
+        });
+        it('retains casing of literal types', () => {
+            function test(type) {
+                testTranspile(`
+                    sub main()
+                        thing = ${type}
+                        thing = ${type.toLowerCase()}
+                        thing = ${type.toUpperCase()}
+                    end sub
+                `);
+            }
+            test('Invalid');
+            test('True');
+            test('False');
+        });
         describe('throwStatement', () => {
             it('transpiles properly', () => {
                 testTranspile(`
@@ -1621,7 +2018,7 @@ describe('BrsFile', () => {
             `, `
                 function Vertibrates_Birds_GetAllBirds()
                     return [
-                        Vertibrates_Birds_GetDuck(),
+                        Vertibrates_Birds_GetDuck()
                         Vertibrates_Birds_GetGoose()
                     ]
                 end function
@@ -1731,29 +2128,6 @@ describe('BrsFile', () => {
                 end sub
         `, null, 'trim');
         });
-        it('adds `then` when missing', () => {
-            testTranspile(`
-                sub a()
-                    if true
-                        print "true"
-                    else if true
-                        print "true"
-                    else
-                        print "true"
-                    end if
-                end sub
-            `, `
-                sub a()
-                    if true then
-                        print "true"
-                    else if true then
-                        print "true"
-                    else
-                        print "true"
-                    end if
-                end sub
-            `, 'trim');
-        });
         it('does not add leading or trailing newlines', () => {
             testTranspile(`function abc()\nend function`, undefined, 'none');
         });
@@ -1770,18 +2144,18 @@ describe('BrsFile', () => {
                 return consumer.generatedPositionFor({
                     line: 3,
                     column: 0,
-                    source: util_1.standardizePath `${rootDir}/source/main.bs`,
+                    source: (0, util_1.standardizePath) `${rootDir}/source/main.bs`,
                     bias: source_map_1.SourceMapConsumer.LEAST_UPPER_BOUND
                 });
             });
-            chai_1.expect(location.line).to.eql(2);
-            chai_1.expect(location.column).eql(4);
+            (0, chai_1.expect)(location.line).to.eql(2);
+            (0, chai_1.expect)(location.column).eql(4);
         });
         it('computes correct locations for sourcemap', async () => {
             let source = `function abc(name)\n    firstName = name\nend function`;
-            let tokens = lexer_1.Lexer.scan(source).tokens
+            let tokens = Lexer_1.Lexer.scan(source).tokens
                 //remove newlines and EOF
-                .filter(x => x.kind !== lexer_1.TokenKind.Eof && x.kind !== lexer_1.TokenKind.Newline);
+                .filter(x => x.kind !== TokenKind_1.TokenKind.Eof && x.kind !== TokenKind_1.TokenKind.Newline);
             program.options.sourceMap = true;
             let result = testTranspile(source, source, 'none');
             //load the source map
@@ -1803,7 +2177,7 @@ describe('BrsFile', () => {
                         originalPosition.line - 1, originalPosition.column)
                     };
                 });
-                chai_1.expect(sourcemapResult).to.eql(tokenResult);
+                (0, chai_1.expect)(sourcemapResult).to.eql(tokenResult);
             });
         });
         it('handles empty if block', () => {
@@ -1890,20 +2264,20 @@ describe('BrsFile', () => {
             testTranspile(`
                 sub doSomething()
                     person = {
-                        age: 12, 'comment
+                        age: 12 'comment
                         name: "child"
                     }
                     person = {
-                        age: 12, 'comment
+                        age: 12 'comment
                         name: "child" 'comment
                     }
                     person = {
-                        age: 12, 'comment
+                        age: 12 'comment
                         name: "child"
                         'comment
                     }
                     person = {
-                        age: 12, 'comment
+                        age: 12 'comment
                         name: "child" 'comment
                         'comment
                     }
@@ -1918,8 +2292,8 @@ describe('BrsFile', () => {
                 'a function that does something
                 function doSomething(age as integer, name = "bob") 'comment
                     person = { 'comment
-                        name: "parent", 'comment
-                        "age": 12,
+                        name: "parent" 'comment
+                        "age": 12
                         'comment as whole line
                         child: { 'comment
                             name: "child" 'comment
@@ -1955,8 +2329,8 @@ describe('BrsFile', () => {
                     stop 'comment
                     indexes = [ 'comment
                         'comment on its own line
-                        1, 'comment
-                        2, 'comment
+                        1 'comment
+                        2 'comment
                         3 'comment
                     ] 'comment
                     firstIndex = indexes[0] 'comment
@@ -1997,25 +2371,25 @@ describe('BrsFile', () => {
             `);
         });
         it('simple mapped files include a reference to the source map', () => {
-            let file = program.addOrReplaceFile('source/logger.brs', testHelpers_spec_1.trim `
+            let file = program.setFile('source/logger.brs', (0, testHelpers_spec_1.trim) `
                 sub logInfo()
                 end sub
             `);
             file.needsTranspiled = false;
             const { code } = file.transpile();
-            chai_1.expect(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
+            (0, chai_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
         });
         it('AST generated files include a reference to the source map', () => {
-            let file = program.addOrReplaceFile('source/logger.brs', testHelpers_spec_1.trim `
+            let file = program.setFile('source/logger.brs', (0, testHelpers_spec_1.trim) `
                 sub logInfo()
                 end sub
             `);
             file.needsTranspiled = true;
             const { code } = file.transpile();
-            chai_1.expect(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
+            (0, chai_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
         });
         it('replaces custom types in parameter types and return types', () => {
-            program.addOrReplaceFile('source/SomeKlass.bs', `
+            program.setFile('source/SomeKlass.bs', `
                 class SomeKlass
                 end class
             `);
@@ -2039,14 +2413,13 @@ describe('BrsFile', () => {
     describe('callfunc operator', () => {
         describe('transpile', () => {
             it('does not produce diagnostics', () => {
-                var _a;
-                program.addOrReplaceFile('source/main.bs', `
+                program.setFile('source/main.bs', `
                     sub main()
                         someObject@.someFunction(paramObject.value)
                     end sub
                 `);
                 program.validate();
-                chai_1.expect((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).not.to.exist;
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('sets invalid on empty callfunc', () => {
                 testTranspile(`
@@ -2086,116 +2459,116 @@ describe('BrsFile', () => {
                 name: 'transform callback',
                 afterFileParse: onParsed
             });
-            file = program.addOrReplaceFile(`source/file.${ext}`, `
+            file = program.setFile({ src: `absolute_path/file${ext}`, dest: `relative_path/file${ext}` }, `
                 sub Sum()
                 print "hello world"
                 end sub
             `);
-            chai_1.expect(file.extension).to.equal(ext);
+            (0, chai_1.expect)(file.extension).to.equal(ext);
             return file;
         }
         it('called for BRS file', () => {
             const onParsed = sinon.spy();
             parseFileWithCallback('.brs', onParsed);
-            chai_1.expect(onParsed.callCount).to.equal(1);
+            (0, chai_1.expect)(onParsed.callCount).to.equal(1);
         });
         it('called for BS file', () => {
             const onParsed = sinon.spy();
             parseFileWithCallback('.bs', onParsed);
-            chai_1.expect(onParsed.callCount).to.equal(1);
+            (0, chai_1.expect)(onParsed.callCount).to.equal(1);
         });
     });
     describe('typedefKey', () => {
         it('works for .brs files', () => {
-            chai_1.expect(util_1.standardizePath((program.addOrReplaceFile('source/main.brs', '')).typedefSrcPath)).to.equal(util_1.standardizePath `${rootDir.toLowerCase()}/source/main.d.bs`);
+            (0, chai_1.expect)((0, util_1.standardizePath)((program.setFile('source/main.brs', '')).typedefSrcPath)).to.equal((0, util_1.standardizePath) `${rootDir.toLowerCase()}/source/main.d.bs`);
         });
         it('returns undefined for files that should not have a typedef', () => {
-            chai_1.expect((program.addOrReplaceFile('source/main.bs', '')).typedefSrcPath).to.be.undefined;
-            chai_1.expect((program.addOrReplaceFile('source/main.d.bs', '')).typedefSrcPath).to.be.undefined;
-            const xmlFile = program.addOrReplaceFile('components/comp.xml', '');
-            chai_1.expect(xmlFile.typedefSrcPath).to.be.undefined;
+            (0, chai_1.expect)((program.setFile('source/main.bs', '')).typedefSrcPath).to.be.undefined;
+            (0, chai_1.expect)((program.setFile('source/main.d.bs', '')).typedefSrcPath).to.be.undefined;
+            const xmlFile = program.setFile('components/comp.xml', '');
+            (0, chai_1.expect)(xmlFile.typedefSrcPath).to.be.undefined;
         });
     });
     describe('type definitions', () => {
         it('only exposes defined functions even if source has more', () => {
             //parse the .brs file first so it doesn't know about the typedef
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                 end sub
                 sub speak()
                 end sub
             `);
-            program.addOrReplaceFile('source/main.d.bs', `
+            program.setFile('source/main.d.bs', `
                 sub main()
                 end sub
             `);
             const sourceScope = program.getScopeByName('source');
             const functionNames = sourceScope.getAllCallables().map(x => x.callable.name);
-            chai_1.expect(functionNames).to.include('main');
-            chai_1.expect(functionNames).not.to.include('speak');
+            (0, chai_1.expect)(functionNames).to.include('main');
+            (0, chai_1.expect)(functionNames).not.to.include('speak');
         });
         it('reacts to typedef file changes', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 sub main()
                 end sub
                 sub speak()
                 end sub
             `);
-            chai_1.expect(file.hasTypedef).to.be.false;
-            chai_1.expect(file.typedefFile).not.to.exist;
-            program.addOrReplaceFile('source/main.d.bs', `
+            (0, chai_1.expect)(file.hasTypedef).to.be.false;
+            (0, chai_1.expect)(file.typedefFile).not.to.exist;
+            program.setFile('source/main.d.bs', `
                 sub main()
                 end sub
             `);
-            chai_1.expect(file.hasTypedef).to.be.true;
-            chai_1.expect(file.typedefFile).to.exist;
+            (0, chai_1.expect)(file.hasTypedef).to.be.true;
+            (0, chai_1.expect)(file.typedefFile).to.exist;
             //add replace file, does it still find the typedef
-            file = program.addOrReplaceFile('source/main.brs', `
+            file = program.setFile('source/main.brs', `
                 sub main()
                 end sub
                 sub speak()
                 end sub
             `);
-            chai_1.expect(file.hasTypedef).to.be.true;
-            chai_1.expect(file.typedefFile).to.exist;
-            program.removeFile(util_1.standardizePath `${rootDir}/source/main.d.bs`);
-            chai_1.expect(file.hasTypedef).to.be.false;
-            chai_1.expect(file.typedefFile).not.to.exist;
+            (0, chai_1.expect)(file.hasTypedef).to.be.true;
+            (0, chai_1.expect)(file.typedefFile).to.exist;
+            program.removeFile((0, util_1.standardizePath) `${rootDir}/source/main.d.bs`);
+            (0, chai_1.expect)(file.hasTypedef).to.be.false;
+            (0, chai_1.expect)(file.typedefFile).not.to.exist;
         });
     });
     describe('typedef', () => {
         it('sets typedef path properly', () => {
-            chai_1.expect((program.addOrReplaceFile('source/main1.brs', '')).typedefSrcPath).to.equal(util_1.standardizePath `${rootDir}/source/main1.d.bs`.toLowerCase());
-            chai_1.expect((program.addOrReplaceFile('source/main2.d.bs', '')).typedefSrcPath).to.equal(undefined);
-            chai_1.expect((program.addOrReplaceFile('source/main3.bs', '')).typedefSrcPath).to.equal(undefined);
+            (0, chai_1.expect)((program.setFile('source/main1.brs', '')).typedefSrcPath).to.equal((0, util_1.standardizePath) `${rootDir}/source/main1.d.bs`.toLowerCase());
+            (0, chai_1.expect)((program.setFile('source/main2.d.bs', '')).typedefSrcPath).to.equal(undefined);
+            (0, chai_1.expect)((program.setFile('source/main3.bs', '')).typedefSrcPath).to.equal(undefined);
             //works for dest with `.brs` extension
-            chai_1.expect((program.addOrReplaceFile({ src: 'source/main4.bs', dest: 'source/main4.brs' }, '')).typedefSrcPath).to.equal(undefined);
+            (0, chai_1.expect)((program.setFile({ src: 'source/main4.bs', dest: 'source/main4.brs' }, '')).typedefSrcPath).to.equal(undefined);
         });
         it('does not link when missing from program', () => {
-            const file = program.addOrReplaceFile('source/main.brs', ``);
-            chai_1.expect(file.typedefFile).not.to.exist;
+            const file = program.setFile('source/main.brs', ``);
+            (0, chai_1.expect)(file.typedefFile).not.to.exist;
         });
         it('links typedef when added BEFORE .brs file', () => {
-            const typedef = program.addOrReplaceFile('source/main.d.bs', ``);
-            const file = program.addOrReplaceFile('source/main.brs', ``);
-            chai_1.expect(file.typedefFile).to.equal(typedef);
+            const typedef = program.setFile('source/main.d.bs', ``);
+            const file = program.setFile('source/main.brs', ``);
+            (0, chai_1.expect)(file.typedefFile).to.equal(typedef);
         });
         it('links typedef when added AFTER .brs file', () => {
-            const file = program.addOrReplaceFile('source/main.brs', ``);
-            const typedef = program.addOrReplaceFile('source/main.d.bs', ``);
-            chai_1.expect(file.typedefFile).to.eql(typedef);
+            const file = program.setFile('source/main.brs', ``);
+            const typedef = program.setFile('source/main.d.bs', ``);
+            (0, chai_1.expect)(file.typedefFile).to.eql(typedef);
         });
         it('removes typedef link when typedef is removed', () => {
-            const typedef = program.addOrReplaceFile('source/main.d.bs', ``);
-            const file = program.addOrReplaceFile('source/main.brs', ``);
+            const typedef = program.setFile('source/main.d.bs', ``);
+            const file = program.setFile('source/main.brs', ``);
             program.removeFile(typedef.srcPath);
-            chai_1.expect(file.typedefFile).to.be.undefined;
+            (0, chai_1.expect)(file.typedefFile).to.be.undefined;
         });
     });
     describe('getTypedef', () => {
         function testTypedef(original, expected) {
-            let file = program.addOrReplaceFile('source/main.brs', original);
-            chai_1.expect(file.getTypedef()).to.eql(expected);
+            let file = program.setFile('source/main.brs', original);
+            (0, chai_1.expect)(file.getTypedef().trimEnd()).to.eql(expected);
         }
         it('includes namespace on extend class names', () => {
             testTypedef(`
@@ -2204,11 +2577,16 @@ describe('BrsFile', () => {
                     end class
                     class Duck extends Bird
                     end class
-                end namespace`, testHelpers_spec_1.trim `
+                end namespace
+            `, (0, testHelpers_spec_1.trim) `
                 namespace AnimalKingdom
                     class Bird
+                        sub new()
+                        end sub
                     end class
                     class Duck extends AnimalKingdom.Bird
+                        sub new()
+                        end sub
                     end class
                 end namespace
             `);
@@ -2218,7 +2596,7 @@ describe('BrsFile', () => {
                 sub main(param1 as string)
                     print "main"
                 end sub
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 sub main(param1 as string)
                 end sub
             `);
@@ -2241,13 +2619,15 @@ describe('BrsFile', () => {
                         end function
                     end class
                 end namespace
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 namespace test
                     @an
                     @anFunc("value")
                     function getDuck()
                     end function
                     class Duck
+                        sub new()
+                        end sub
                         @anMember
                         @anMember("field")
                         private thing as dynamic
@@ -2262,7 +2642,7 @@ describe('BrsFile', () => {
         it('includes import statements', () => {
             testTypedef(`
                import "pkg:/source/lib.brs"
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 import "pkg:/source/lib.brs"
             `);
         });
@@ -2276,7 +2656,7 @@ describe('BrsFile', () => {
                     sub logInfo()
                     end sub
                 end namespace
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 namespace Name
                     sub logInfo()
                     end sub
@@ -2305,8 +2685,10 @@ describe('BrsFile', () => {
                         end sub
                     end class
                 end namespace
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 class Person
+                    sub new()
+                    end sub
                     public name as string
                     public age as integer
                     public sub getAge() as integer
@@ -2314,6 +2696,8 @@ describe('BrsFile', () => {
                 end class
                 namespace NameA.NameB
                     class Person
+                        sub new()
+                        end sub
                         public name as string
                         public age as integer
                         public sub getAge() as integer
@@ -2322,14 +2706,27 @@ describe('BrsFile', () => {
                 end namespace
             `);
         });
+        it('creates constructor properly', () => {
+            testTypedef(`
+                class Parent
+                end class
+            `, (0, testHelpers_spec_1.trim) `
+                class Parent
+                    sub new()
+                    end sub
+                end class
+            `);
+        });
         it('sets properties to dynamic when initialized to invalid', () => {
             testTypedef(`
                 class Human
                     public firstName = invalid
                     public lastName as string = invalid
                 end class
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 class Human
+                    sub new()
+                    end sub
                     public firstName as dynamic
                     public lastName as string
                 end class
@@ -2347,7 +2744,7 @@ describe('BrsFile', () => {
                         super(name)
                     end sub
                 end class
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 class Human
                     sub new(name as string)
                     end sub
@@ -2374,8 +2771,10 @@ describe('BrsFile', () => {
                         return m.lastName
                     end function
                 end class
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 class Human
+                    sub new()
+                    end sub
                     public firstName as string
                     protected middleName as string
                     private lastName as string
@@ -2400,12 +2799,16 @@ describe('BrsFile', () => {
                         print "Hello Dog"
                     end sub
                 end class
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 class Animal
+                    sub new()
+                    end sub
                     public sub speak()
                     end sub
                 end class
                 class Dog extends Animal
+                    sub new()
+                    end sub
                     public override sub speak()
                     end sub
                 end class
@@ -2427,7 +2830,7 @@ describe('BrsFile', () => {
                         end sub
                     end class
                 end namespace
-            `, testHelpers_spec_1.trim `
+            `, (0, testHelpers_spec_1.trim) `
                 namespace NameA
                     class Human
                         sub new(name as string)
@@ -2445,7 +2848,7 @@ describe('BrsFile', () => {
     });
     describe('parser getter', () => {
         it('recreates the parser when missing', () => {
-            const file = program.addOrReplaceFile('source/main.brs', `
+            const file = program.setFile('source/main.brs', `
                 sub main()
                 end sub
             `);
@@ -2454,71 +2857,274 @@ describe('BrsFile', () => {
             file['_parser'] = undefined;
             //force the file to get a new instance of parser
             const newParser = file.parser;
-            chai_1.expect(newParser).to.exist.and.to.not.equal(parser);
+            (0, chai_1.expect)(newParser).to.exist.and.to.not.equal(parser);
             //reference shouldn't change in subsequent accesses
-            chai_1.expect(file.parser).to.equal(newParser);
+            (0, chai_1.expect)(file.parser).to.equal(newParser);
         });
         it('call parse when previously skipped', () => {
-            program.addOrReplaceFile('source/main.d.bs', `
+            program.setFile('source/main.d.bs', `'typedef
                 sub main()
                 end sub
             `);
-            const file = program.addOrReplaceFile('source/main.brs', `
+            const file = program.setFile('source/main.brs', `'source
                 sub main()
                 end sub
             `);
             //no functions should be found since the parser was skipped
-            chai_1.expect(file['_parser']).to.not.exist;
+            (0, chai_1.expect)(file['_parser']).to.not.exist;
             const stub = sinon.stub(file, 'parse').callThrough();
             //`file.parser` is a getter, so that should force the parse to occur
-            chai_1.expect(file.parser.references.functionStatements).to.be.lengthOf(1);
-            chai_1.expect(stub.called).to.be.true;
+            (0, chai_1.expect)(file.parser.references.functionStatements).to.be.lengthOf(1);
+            (0, chai_1.expect)(stub.called).to.be.true;
             //parse should have been called
         });
     });
     describe('Plugins', () => {
-        function testPluginTranspile() {
-            testTranspile(`
-                sub main()
-                    sayHello(sub()
-                        print "sub hello"
-                    end sub)
-                    print "something"
+        let pluginFileName;
+        let idx = 1;
+        beforeEach(() => {
+            pluginFileName = `plugin-${idx++}.js`;
+            fsExtra.outputFileSync((0, util_1.standardizePath) `${tempDir}/plugins/${pluginFileName}`, `
+                function plugin() {
+                    return {
+                        name: 'lower-file-name',
+                        afterFileParse: (evt) => {
+                            evt.file._customProp = true;
+                        }
+                    };
+                }
+                exports.default = plugin;
+            `);
+        });
+        it('can load an absolute plugin which receives callbacks', () => {
+            program.plugins = new PluginInterface_1.default(util_1.default.loadPlugins(tempDir, [
+                (0, util_1.standardizePath) `${tempDir}/plugins/${pluginFileName}`
+            ]), new Logger_1.Logger());
+            const file = program.setFile('source/MAIN.brs', '');
+            (0, chai_1.expect)(file._customProp).to.exist;
+        });
+        it('can load a relative plugin which receives callbacks', () => {
+            program.plugins = new PluginInterface_1.default(util_1.default.loadPlugins(tempDir, [
+                `./plugins/${pluginFileName}`
+            ]), new Logger_1.Logger());
+            const file = program.setFile('source/MAIN.brs', '');
+            (0, chai_1.expect)(file._customProp).to.exist;
+        });
+    });
+    describe('getSymbolTypeFromToken', () => {
+        function checkSymbolLookups(file, funcExpr, lookups) {
+            const mainScope = program.getScopesForFile(file)[0];
+            mainScope.linkSymbolTable();
+            for (const lookup of lookups) {
+                const position = vscode_languageserver_1.Position.create(lookup.line, lookup.col);
+                const token = file.parser.getTokenAt(position);
+                const symbol = file.getSymbolTypeFromToken(token, funcExpr, mainScope);
+                const context = {
+                    file: file,
+                    scope: mainScope,
+                    position: position
+                };
+                (0, chai_1.expect)(symbol.expandedTokenText).to.equal(lookup.name);
+                (0, chai_1.expect)(symbol.type.equals(lookup.type, context)).be.true;
+            }
+        }
+        it('gets simple types based on the containing function expression', () => {
+            const file = program.setFile('source/main.bs', `
+                sub doSomething(aInt as integer, aFloat as float, aStr as string, aBool as boolean, aObj as object)
+                    print aInt
+                    print aFloat
+                    print aStr
+                    print aBool
+                    print aObj
+                end sub
+            `);
+            const funcExpr = file.parser.references.functionExpressions[0];
+            const lookups = [
+                { line: 2, col: 28, name: 'aInt', type: new IntegerType_1.IntegerType() },
+                { line: 3, col: 28, name: 'aFloat', type: new FloatType_1.FloatType() },
+                { line: 4, col: 28, name: 'aStr', type: new StringType_1.StringType() },
+                { line: 5, col: 28, name: 'aBool', type: new BooleanType_1.BooleanType() },
+                { line: 6, col: 28, name: 'aObj', type: new ObjectType_1.ObjectType() }
+            ];
+            checkSymbolLookups(file, funcExpr, lookups);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        });
+        it('gets custom types based on the containing function expression', () => {
+            const file = program.setFile('source/main.bs', `
+                sub doSomething(klass as MyKlass)
+                    print klass
                 end sub
 
-                sub sayHello(fn)
-                    fn()
-                    print "hello"
+                class MyKlass
+                end class
+            `);
+            const mainScope = program.getScopesForFile(file)[0];
+            mainScope.linkSymbolTable();
+            const funcExpr = file.parser.references.functionExpressions[0];
+            const token = file.parser.getTokenAt(vscode_languageserver_1.Position.create(2, 28));
+            const symbol = file.getSymbolTypeFromToken(token, funcExpr, mainScope);
+            (0, chai_1.expect)(symbol.expandedTokenText).to.equal('klass');
+            const classStmt = file.parser.references.classStatements[0];
+            (0, chai_1.expect)(classStmt.name.text).to.equal('MyKlass');
+            (0, chai_1.expect)(symbol.type.isAssignableTo(classStmt.getThisBscType())).be.true;
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        });
+        it('gets types of properties of a klass', () => {
+            const file = program.setFile('source/main.bs', `
+                sub doSomething()
+                    klass = new MyKlass()
+                    print klass.name
+                    print klass.age
+                    ' verify case insensitivity
+                    print KLASS.NAME
+                    print klass.AGE
                 end sub
-            `, `
-                sub main()
-                    sayHello(sub()
-                        \n                    end sub)
-                    \n                end sub
 
-                sub sayHello(fn)
-                    fn()
-                    \n                end sub
+                class MyKlass
+                    name as string
+                    age as integer
+                end class
             `);
-        }
-        it('can use a plugin object which transforms the AST', () => {
-            program.plugins = new PluginInterface_1.default(util_1.default.loadPlugins('', [
-                require.resolve('../examples/plugins/removePrint')
-            ]), new Logger_1.Logger());
-            testPluginTranspile();
+            const funcExpr = file.parser.references.functionExpressions[0];
+            const lookups = [
+                { line: 3, col: 35, name: 'MyKlass.name', type: new StringType_1.StringType() },
+                { line: 4, col: 35, name: 'MyKlass.age', type: new IntegerType_1.IntegerType() }
+            ];
+            checkSymbolLookups(file, funcExpr, lookups);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
-        it('can load an absolute plugin which transforms the AST', () => {
-            program.plugins = new PluginInterface_1.default(util_1.default.loadPlugins('', [
-                path.resolve(process.cwd(), './dist/examples/plugins/removePrint.js')
-            ]), new Logger_1.Logger());
-            testPluginTranspile();
+        it('gets types of properties of an object', () => {
+            const file = program.setFile('source/main.bs', `
+                sub doSomething()
+                    obj = { name: "Joe", age: 37}
+                    print obj.name
+                    print obj.age
+                end sub
+            `);
+            const funcExpr = file.parser.references.functionExpressions[0];
+            const lookups = [
+                { line: 3, col: 32, name: 'obj.name', type: new StringType_1.StringType() },
+                { line: 4, col: 32, name: 'obj.age', type: new IntegerType_1.IntegerType() }
+            ];
+            checkSymbolLookups(file, funcExpr, lookups);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
-        it('can load a relative plugin which transforms the AST', () => {
-            program.plugins = new PluginInterface_1.default(util_1.default.loadPlugins(process.cwd(), [
-                './dist/examples/plugins/removePrint.js'
-            ]), new Logger_1.Logger());
-            testPluginTranspile();
+        it('gets return types of functions', () => {
+            const file = program.setFile('source/main.bs', `
+                sub doSomething()
+                    pi = makeKlass().getSelf().getPi()
+                    print pi
+                end sub
+
+                function makeKlass() as MyKlass
+                    return new MyKlass()
+                end function
+
+                class MyKlass
+                    function getPi() as float
+                        return 3.14
+                    end function
+
+                    function getSelf() as MyKlass
+                        return m
+                    end function
+                end class
+            `);
+            const mainScope = program.getScopesForFile(file)[0];
+            mainScope.linkSymbolTable();
+            const funcExpr = file.parser.references.functionExpressions[0];
+            const klassMemberTable = file.parser.references.classStatements[0].memberTable;
+            const lookups = [
+                { line: 2, col: 31, name: 'makeKlass', type: file.parser.references.functionExpressions[1].getFunctionType() },
+                // The expanded text for this should probably be MyKlass.getSelf()
+                { line: 2, col: 41, name: 'MyKlass.MyKlass', type: klassMemberTable.getSymbol('getSelf')[0].type },
+                { line: 2, col: 51, name: 'MyKlass.getPi', type: klassMemberTable.getSymbol('getPi')[0].type },
+                { line: 3, col: 28, name: 'pi', type: new FloatType_1.FloatType() }
+            ];
+            checkSymbolLookups(file, funcExpr, lookups);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        });
+        it('gets types of elements of arrays', () => {
+            const file = program.setFile('source/main.bs', `
+                sub doSomething(words as string[], klasses as MyKlass[])
+                    myWord = words[0]
+                    pi = klasses[0].getPi()
+                    print myWord
+                    print pi
+                end sub
+
+                class MyKlass
+                    function getPi() as float
+                        return 3.14
+                    end function
+                end class
+            `);
+            const mainScope = program.getScopesForFile(file)[0];
+            mainScope.linkSymbolTable();
+            const funcExpr = file.parser.references.functionExpressions[0];
+            const klassMemberTable = file.parser.references.classStatements[0].memberTable;
+            const lookups = [
+                { line: 2, col: 34, name: 'words', type: new ArrayType_1.ArrayType(new StringType_1.StringType()) },
+                { line: 3, col: 41, name: 'MyKlass.getPi', type: klassMemberTable.getSymbol('getPi')[0].type },
+                { line: 4, col: 28, name: 'myWord', type: new StringType_1.StringType() },
+                { line: 5, col: 28, name: 'pi', type: new FloatType_1.FloatType() }
+            ];
+            checkSymbolLookups(file, funcExpr, lookups);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        });
+        it('gets types of elements of arrays via square bracket reference', () => {
+            const file = program.setFile('source/main.bs', `
+                function printFirst(numbers as float[]) as float
+                    firstFloat = numbers[0]
+                    print firstFloat
+                    return firstFloat
+                end function
+            `);
+            const mainScope = program.getScopesForFile(file)[0];
+            mainScope.linkSymbolTable();
+            const funcExpr = file.parser.references.functionExpressions[0];
+            const lookups = [
+                { line: 2, col: 26, name: 'firstFloat', type: new FloatType_1.FloatType() },
+                { line: 3, col: 32, name: 'firstFloat', type: new FloatType_1.FloatType() }
+            ];
+            checkSymbolLookups(file, funcExpr, lookups);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        });
+        it('gets types of elements of arrays after for each', () => {
+            const file = program.setFile('source/main.bs', `
+                function printAllReturnFirst(numbers as float[]) as float
+                    for each num in numbers
+                        print num
+                    end for
+
+                    firstFloat = numbers[0]
+                    print firstFloat
+                    return firstFloat
+                end function
+            `);
+            const mainScope = program.getScopesForFile(file)[0];
+            mainScope.linkSymbolTable();
+            const funcExpr = file.parser.references.functionExpressions[0];
+            const lookups = [
+                { line: 6, col: 26, name: 'firstFloat', type: new FloatType_1.FloatType() },
+                { line: 7, col: 32, name: 'firstFloat', type: new FloatType_1.FloatType() }
+            ];
+            checkSymbolLookups(file, funcExpr, lookups);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
     });
+    it('defaults to `dynamic` type for a complex expression', () => {
+        const file = program.setFile('source/main.brs', `
+            sub main()
+                name = "cat"
+                thing = m["key"](true)
+            end sub
+        `);
+        program.validate();
+        //sanity check
+        (0, chai_1.expect)(file.parser.references.assignmentStatements[0].containingFunction.symbolTable.getSymbolType('name')).be.instanceof(StringType_1.StringType);
+        //this complex expression should resolve to dynamic type when not known
+        (0, chai_1.expect)(file.parser.references.assignmentStatements[0].containingFunction.symbolTable.getSymbolType('thing')).be.instanceof(DynamicType_1.DynamicType);
+    });
 });
 //# sourceMappingURL=BrsFile.spec.js.map