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

package/dist/files/BrsFile.spec.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
+const chai_config_spec_1 = require("../chai-config.spec");
 const sinonImport = require("sinon");
 const vscode_languageserver_1 = require("vscode-languageserver");
 const Program_1 = require("../Program");
@@ -15,37 +15,62 @@ 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 undent_1 = require("undent");
-const ArrayType_1 = require("../types/ArrayType");
-const FloatType_1 = require("../types/FloatType");
-const ObjectType_1 = require("../types/ObjectType");
-const VoidType_1 = require("../types/VoidType");
 const vscode_uri_1 = require("vscode-uri");
+const undent_1 = require("undent");
+const testHelpers_spec_2 = require("../testHelpers.spec");
+const SymbolTable_1 = require("../SymbolTable");
+const types_1 = require("../types");
 let sinon = sinonImport.createSandbox();
 describe('BrsFile', () => {
-    let tempDir = (0, util_1.standardizePath) `${process.cwd()}/.tmp`;
-    let rootDir = (0, util_1.standardizePath) `${tempDir}/rootDir`;
     let program;
-    let srcPath = (0, util_1.standardizePath) `${rootDir}/source/main.brs`;
+    let srcPath = (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.brs`;
     let destPath = 'source/main.brs';
     let file;
-    let testTranspile = (0, testHelpers_spec_1.getTestTranspile)(() => [program, rootDir]);
+    let testTranspile = (0, testHelpers_spec_1.getTestTranspile)(() => [program, testHelpers_spec_2.rootDir]);
+    let testGetTypedef = (0, testHelpers_spec_1.getTestGetTypedef)(() => [program, testHelpers_spec_2.rootDir]);
     beforeEach(() => {
-        fsExtra.emptyDirSync(tempDir);
-        program = new Program_1.Program({ rootDir: rootDir, sourceMap: true });
-        file = new BrsFile_1.BrsFile(srcPath, destPath, program);
+        fsExtra.emptyDirSync(testHelpers_spec_2.tempDir);
+        program = new Program_1.Program({ rootDir: testHelpers_spec_2.rootDir, sourceMap: true });
+        file = new BrsFile_1.BrsFile({
+            srcPath: srcPath,
+            destPath: destPath,
+            program: program
+        });
     });
     afterEach(() => {
         sinon.restore();
         program.dispose();
     });
+    describe('constructor', () => {
+        it('calculates correct paths when no pkgPath specified', () => {
+            (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile({
+                srcPath: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
+                destPath: (0, util_1.standardizePath) `source/main.bs`,
+                program: program
+            })).to.include({
+                srcPath: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
+                destPath: (0, util_1.standardizePath) `source/main.bs`,
+                pkgPath: (0, util_1.standardizePath) `source/main.brs`
+            });
+        });
+        it('uses supplied pkgPath', () => {
+            (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile({
+                srcPath: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
+                destPath: (0, util_1.standardizePath) `source/main.bs`,
+                pkgPath: (0, util_1.standardizePath) `source/main.transpiled.brs`,
+                program: program
+            })).to.include({
+                srcPath: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
+                destPath: (0, util_1.standardizePath) `source/main.bs`,
+                pkgPath: (0, util_1.standardizePath) `source/main.transpiled.brs`
+            });
+        });
+    });
     describe('allowBrighterScriptInBrightScript', () => {
         it('is false by default', () => {
             program.setFile('source/main.brs', `
@@ -65,6 +90,66 @@ describe('BrsFile', () => {
             (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
         });
     });
+    it('flags namespaces used as variables', () => {
+        program.setFile('source/main.bs', `
+            sub main()
+                alpha.beta.charlie.test()
+                print alpha
+                print alpha.beta
+                print alpha.beta.charlie
+            end sub
+
+            namespace alpha
+                namespace beta
+                    namespace charlie
+                        sub test()
+                        end sub
+                    end namespace
+                end namespace
+            end namespace
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')), { range: util_1.default.createRange(3, 22, 3, 27) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')), { range: util_1.default.createRange(4, 22, 4, 32) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable('namespace')), { range: util_1.default.createRange(5, 22, 5, 40) })]);
+    });
+    it('allows namespaces with the name `optional`', () => {
+        program.setFile('source/main.bs', `
+            namespace optional
+                namespace optional
+                end namespace
+            end namespace
+            namespace alpha
+                namespace optional
+                end namespace
+            end namespace
+            namespace alpha.beta.optional
+            end namespace
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+    });
+    it('flags enums used as variables', () => {
+        program.setFile('source/main.bs', `
+            enum Foo
+                bar
+                baz
+            end enum
+
+            sub main()
+                print getFooValue()
+                print getFoo()
+            end sub
+
+            function getFoo() as Foo
+                return Foo ' Error - cannot return an enum, just an enum value
+            end function
+
+            function getFooValue() as Foo
+                return Foo.bar
+            end function
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [DiagnosticMessages_1.DiagnosticMessages.itemCannotBeUsedAsVariable('enum').message]);
+    });
     it('supports the third parameter in CreateObject', () => {
         program.setFile('source/main.brs', `
             sub main()
@@ -85,17 +170,28 @@ describe('BrsFile', () => {
     });
     it('sets needsTranspiled to true for .bs files', () => {
         //BrightScript
-        (0, chai_1.expect)(new BrsFile_1.BrsFile(`${rootDir}/source/main.brs`, 'source/main.brs', program).needsTranspiled).to.be.false;
+        (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile({
+            srcPath: `${testHelpers_spec_2.rootDir}/source/main.brs`,
+            destPath: 'source/main.brs',
+            program: program
+        })['needsTranspiled']).to.be.false;
         //BrighterScript
-        (0, chai_1.expect)(new BrsFile_1.BrsFile(`${rootDir}/source/main.bs`, 'source/main.bs', program).needsTranspiled).to.be.true;
+        (0, chai_config_spec_1.expect)(new BrsFile_1.BrsFile({
+            srcPath: `${testHelpers_spec_2.rootDir}/source/main.bs`,
+            destPath: 'source/main.bs',
+            program: 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']);
+        (0, chai_config_spec_1.expect)(file.ownScriptImports).to.be.empty;
+        file.parser.ast.statements.push(new Statement_1.ImportStatement({
+            import: (0, creators_1.createToken)(TokenKind_1.TokenKind.Import),
+            filePath: (0, creators_1.createToken)(TokenKind_1.TokenKind.StringLiteral, 'pkg:/source/lib.brs')
+        }));
+        (0, chai_config_spec_1.expect)(file.ownScriptImports).to.be.empty;
+        file['_cachedLookups'].invalidate();
+        (0, chai_config_spec_1.expect)(file.ownScriptImports.map(x => x.text)).to.eql(['pkg:/source/lib.brs']);
     });
     it('allows adding diagnostics', () => {
         const expected = [{
@@ -108,282 +204,78 @@ describe('BrsFile', () => {
     });
     describe('getPartialVariableName', () => {
         let entry = {
-            src: `${rootDir}/source/lib.brs`,
+            src: `${testHelpers_spec_2.rootDir}/source/lib.brs`,
             dest: `source/lib.brs`
         };
         it('creates proper tokens', () => {
             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.setFile('source/main.brs', ``);
-            (0, chai_1.expect)((_a = program.getScopesForFile(file)[0]) === null || _a === void 0 ? void 0 : _a.name).to.equal('source');
+            (0, chai_config_spec_1.expect)(file['getPartialVariableName'](file.parser.tokens[7])).to.equal('ModuleA.ModuleB.ModuleC.');
+            (0, chai_config_spec_1.expect)(file['getPartialVariableName'](file.parser.tokens[6])).to.equal('ModuleA.ModuleB.ModuleC');
+            (0, chai_config_spec_1.expect)(file['getPartialVariableName'](file.parser.tokens[5])).to.equal('ModuleA.ModuleB.');
+            (0, chai_config_spec_1.expect)(file['getPartialVariableName'](file.parser.tokens[4])).to.equal('ModuleA.ModuleB');
+            (0, chai_config_spec_1.expect)(file['getPartialVariableName'](file.parser.tokens[3])).to.equal('ModuleA.');
+            (0, chai_config_spec_1.expect)(file['getPartialVariableName'](file.parser.tokens[2])).to.equal('ModuleA');
         });
     });
-    describe('getCompletions', () => {
-        it('does not crash for callfunc on a function call', () => {
-            const file = program.setFile('source/main.brs', `
-                sub main()
-                    getManager()@.
-                end sub
-            `);
-            (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', () => {
+    describe('canBePruned', () => {
+        it('returns false is target file has contains a function statement', () => {
             program.setFile('source/main.brs', `
                 sub main()
-                    print "pkg:"
+                    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);
-            (0, chai_1.expect)(names.sort()).to.eql([
-                'pkg:/source/main.brs'
-            ]);
+            const file = program.getFile('source/main.brs');
+            (0, chai_config_spec_1.expect)(file.canBePruned).to.be.false;
         });
-        it('suggests libpkg paths in strings that match that criteria', () => {
+        it('returns false if target file contains a class statement', () => {
             program.setFile('source/main.brs', `
-                sub main()
-                    print "libpkg:"
-                end sub
+                class Animal
+                    public name as string
+                end class
             `);
-            const result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 31));
-            const names = result.map(x => x.label);
-            (0, chai_1.expect)(names.sort()).to.eql([
-                'libpkg:/source/main.brs'
-            ]);
+            const file = program.getFile('source/main.brs');
+            (0, chai_config_spec_1.expect)(file.canBePruned).to.be.false;
         });
-        it('suggests pkg paths in template strings', () => {
+        it('returns false if target file contains a class statement', () => {
             program.setFile('source/main.brs', `
-                sub main()
-                    print \`pkg:\`
-                end sub
+                namespace Vertibrates.Birds
+                    function GetDucks()
+                    end function
+                end namespace
             `);
-            const result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(2, 31));
-            const names = result.map(x => x.label);
-            (0, chai_1.expect)(names.sort()).to.eql([
-                'pkg:/source/main.brs'
-            ]);
+            const file = program.getFile('source/main.brs');
+            (0, chai_config_spec_1.expect)(file.canBePruned).to.be.false;
         });
-        it('waits for the file to be processed before collecting completions', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
+        it('returns true if target file contains only enum', () => {
             program.setFile('source/main.brs', `
-                sub Main()
-                    print "hello"
-                    Say
-                end sub
-
-                sub SayHello()
-                end sub
-            `);
-            let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(3, 23));
-            let names = result.map(x => x.label);
-            (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
+                    up
+                    down
+                    left
+                    right
                 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.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);
-            (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.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.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-                sub Main()
-
-                end sub
-            `);
-            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) {
-                (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) {
-                (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.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));
-            (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.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-                sub Main()
-                    name = "bob"
-                    age = 12
-                    name = "john"
-                end sub
-            `);
-            let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(3, 23));
-            let count = result.reduce((total, x) => {
-                return x.label === 'name' ? total + 1 : total;
-            }, 0);
-            (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.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));
-            (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');
+            const file = program.getFile('source/main.brs');
+            (0, chai_config_spec_1.expect)(file.canBePruned).to.be.true;
         });
-        it('does not provide intellisense results when inside a comment', () => {
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            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));
-            (0, chai_1.expect)(results).to.be.empty;
+        it('returns true if target file is empty', () => {
+            program.setFile('source/main.brs', '');
+            const file = program.getFile('source/main.brs');
+            (0, chai_config_spec_1.expect)(file.canBePruned).to.be.true;
         });
-        it('does provide intellisence for labels only after a goto keyword', () => {
-            var _a;
-            //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            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));
-            (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
+        it('returns true if target file only has comments', () => {
             program.setFile('source/main.brs', `
-                sub Main()
-                    myObj = {name:"Bob", age: 34, height:6.0}
-                    myObj.
-                end sub
+                ' this is an interesting comment
             `);
-            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');
+            const file = program.getFile('source/main.brs');
+            (0, chai_config_spec_1.expect)(file.canBePruned).to.be.true;
         });
-        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('getScopesForFile', () => {
+        it('finds the scope for the file', () => {
+            var _a;
+            let file = program.setFile('source/main.brs', ``);
+            (0, chai_config_spec_1.expect)((_a = program.getScopesForFile(file)[0]) === null || _a === void 0 ? void 0 : _a.name).to.equal('source');
         });
     });
     describe('comment flags', () => {
@@ -419,14 +311,14 @@ describe('BrsFile', () => {
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('works for all', () => {
-                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         'bs:disable-next-line
                         name = "bob
                     end sub
                 `);
-                (0, chai_1.expect)(file.commentFlags[0]).to.exist;
-                (0, chai_1.expect)(file.commentFlags[0]).to.deep.include({
+                (0, chai_config_spec_1.expect)(file.commentFlags[0]).to.exist;
+                (0, chai_config_spec_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)
@@ -436,14 +328,14 @@ describe('BrsFile', () => {
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('works for specific codes', () => {
-                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         'bs:disable-next-line: 1083, 1001
                         name = "bob
                     end sub
                 `);
-                (0, chai_1.expect)(file.commentFlags[0]).to.exist;
-                (0, chai_1.expect)(file.commentFlags[0]).to.deep.include({
+                (0, chai_config_spec_1.expect)(file.commentFlags[0]).to.exist;
+                (0, chai_config_spec_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)
@@ -452,13 +344,13 @@ describe('BrsFile', () => {
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('recognizes non-numeric codes', () => {
-                let file = program.setFile('source/main.brs', `
+                let file = program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         'bs:disable-next-line: LINT9999
                         name = "bob
                     end sub
-                    `);
-                (0, chai_1.expect)(file.commentFlags[0]).to.exist;
+                `);
+                (0, chai_config_spec_1.expect)(file.commentFlags[0]).to.exist;
                 (0, testHelpers_spec_1.expectHasDiagnostics)(program);
             });
             it('supports disabling non-numeric error codes', () => {
@@ -467,35 +359,35 @@ describe('BrsFile', () => {
                     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)
-                    }]);
+                `);
+                file.diagnostics.push({
+                    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.setFile({ src: `${rootDir} / source / main.brs`, dest: 'source/main.brs' }, `
+                program.setFile('source/main.brs', `
                     sub main()
                         print "hi" 'bs:disable-line: 123456 999999   aaaab
                     end sub
-                    `);
+                `);
                 program.validate();
                 (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.setFile({ src: `${rootDir} / source / main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${testHelpers_spec_2.rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         z::;;%%%%%% 'bs:disable-line
                     end sub
                 `);
-                (0, chai_1.expect)(file.commentFlags[0]).to.exist;
-                (0, chai_1.expect)(file.commentFlags[0]).to.deep.include({
+                (0, chai_config_spec_1.expect)(file.commentFlags[0]).to.exist;
+                (0, chai_config_spec_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)
@@ -505,7 +397,7 @@ describe('BrsFile', () => {
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('works for specific codes', () => {
-                program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                program.setFile('source/main.brs', `
                     sub main()
                         'should not have any errors
                         DoSomething(1) 'bs:disable-line:1002
@@ -524,12 +416,12 @@ describe('BrsFile', () => {
                 //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.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                program.setFile('source/main.brs', `
                     sub main()
                         stop 'bs:disable-line
                         print "need a valid line to fix stop error"
                     end sub
-                    `);
+                `);
                 program.validate();
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
@@ -576,9 +468,9 @@ describe('BrsFile', () => {
         it('supports iife in assignment', () => {
             program.setFile('source/main.brs', `
                 sub main()
-                result = sub()
+                    result = sub()
                     end sub()
-                result = (sub()
+                    result = (sub()
                     end sub)()
                 end sub
             `);
@@ -587,7 +479,7 @@ describe('BrsFile', () => {
         it('uses the proper parse mode based on file extension', () => {
             function testParseMode(destPath, expectedParseMode) {
                 const file = program.setFile(destPath, '');
-                (0, chai_1.expect)(file.parseMode).to.equal(expectedParseMode);
+                (0, chai_config_spec_1.expect)(file.parseMode).to.equal(expectedParseMode);
             }
             testParseMode('source/main.brs', Parser_1.ParseMode.BrightScript);
             testParseMode('source/main.spec.brs', Parser_1.ParseMode.BrightScript);
@@ -597,26 +489,26 @@ describe('BrsFile', () => {
             testParseMode('source/main.spec.bs', Parser_1.ParseMode.BrighterScript);
         });
         it('supports labels and goto statements', () => {
-            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile('source/main.brs', `
                 sub Main()
                     'multiple goto statements on one line
-                    goto myLabel: goto myLabel
+                    goto myLabel : goto myLabel
                     myLabel:
                 end sub
             `);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports empty print statements', () => {
-            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile('source/main.brs', `
                 sub main()
-                    print
+                   print
                 end sub
             `);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         describe('conditional compile', () => {
             it('supports case-insensitive bs_const variables', () => {
-                fsExtra.outputFileSync(`${rootDir}/manifest`, (0, undent_1.default) `
+                fsExtra.outputFileSync(`${testHelpers_spec_2.rootDir}/manifest`, (0, undent_1.default) `
                     bs_const=SomeKey=true
                 `);
                 program.setFile('source/main.brs', `
@@ -636,7 +528,7 @@ describe('BrsFile', () => {
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
             it('works for upper case keywords', () => {
-                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile('source/main.brs', `
                     sub main()
                         #CONST someFlag = true
                         #IF someFlag
@@ -651,7 +543,7 @@ describe('BrsFile', () => {
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
             });
             it('supports single-word #elseif and #endif', () => {
-                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile('source/main.brs', `
                     sub main()
                         #const someFlag = true
                         #if someFlag
@@ -664,7 +556,7 @@ describe('BrsFile', () => {
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
             });
             it('supports multi-word #else if and #end if', () => {
-                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile('source/main.brs', `
                     sub main()
                         #const someFlag = true
                         #if someFlag
@@ -677,17 +569,17 @@ describe('BrsFile', () => {
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
             });
             it('does not choke on invalid code inside a false conditional compile', () => {
-                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile('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
                 `);
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
             });
             it('detects syntax error in #if', () => {
-                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile('source/main.brs', `
                     sub main()
                         #if true1
                             print "true"
@@ -699,7 +591,7 @@ describe('BrsFile', () => {
                 ]);
             });
             it('detects syntax error in #const', () => {
-                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile('source/main.brs', `
                     sub main()
                         #if %
                             print "true"
@@ -712,7 +604,7 @@ describe('BrsFile', () => {
                 ]);
             });
             it('detects #const name using reserved word', () => {
-                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile('source/main.brs', `
                     sub main()
                         #const function = true
                     end sub
@@ -723,7 +615,7 @@ describe('BrsFile', () => {
                 ]);
             });
             it('detects syntax error in #const', () => {
-                let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile('source/main.brs', `
                     sub main()
                         #const someConst = 123
                     end sub
@@ -734,22 +626,22 @@ describe('BrsFile', () => {
             });
         });
         it('supports stop statement', () => {
-            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile('source/main.brs', `
                 sub main()
-                    stop
+                   stop
                 end sub
             `);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         it('supports single-line if statements', () => {
-            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile('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
             `);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
@@ -834,7 +726,7 @@ describe('BrsFile', () => {
                     print &he2
                     print 1.2E+2
                     print 2!
-                    print 12D - 12
+                    print 12D-12
                     print 2.3#
                     print &hFEDCBA9876543210&
                     print 9876543210&
@@ -850,7 +742,7 @@ describe('BrsFile', () => {
             `);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
-        it('does not lose function statements when mismatched end sub', () => {
+        it('does not lose function scopes when mismatched end sub', () => {
             file.parse(`
                 sub main()
                     sayHi()
@@ -860,7 +752,7 @@ describe('BrsFile', () => {
                     print "hello world"
                 end sub
             `);
-            (0, chai_1.expect)(file.parser.references.functionStatements).to.be.lengthOf(2);
+            (0, chai_config_spec_1.expect)(file.functionScopes).to.be.lengthOf(2);
         });
         it('does not lose sub scope when mismatched end function', () => {
             file.parse(`
@@ -872,7 +764,7 @@ describe('BrsFile', () => {
                     print "hello world"
                 end sub
             `);
-            (0, chai_1.expect)(file.parser.references.functionStatements).to.be.lengthOf(2);
+            (0, chai_config_spec_1.expect)(file.functionScopes).to.be.lengthOf(2);
         });
         it('does not error with boolean in RHS of set statement', () => {
             file.parse(`
@@ -901,11 +793,11 @@ describe('BrsFile', () => {
         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
             `);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
@@ -915,7 +807,7 @@ describe('BrsFile', () => {
                 sub main()
                     if true then
                         print "true"
-                    else if true then
+                    else    if true then
                         print "also true"
                     end if
                 end sub
@@ -926,9 +818,9 @@ describe('BrsFile', () => {
             file.parse(`
                 function GetObject()
                     obj = {
-                    stop: function () as void
+                        stop: function() as void
 
-                            end function
+                        end function
                     }
                     return obj
                 end function
@@ -939,10 +831,10 @@ describe('BrsFile', () => {
             file.parse(`
                 function GetObject()
                     obj = {
-                        run: function () as void
+                        run: function() as void
 
                         end function
-                        }
+                    }
                     return obj
                 end function
             `);
@@ -970,7 +862,7 @@ describe('BrsFile', () => {
                 function Main()
                     promise = {
                         then: sub()
-                                end sub
+                        end sub
                     }
                     promise.then()
                 end function
@@ -980,7 +872,8 @@ describe('BrsFile', () => {
         it('supports function as parameter type', () => {
             file.parse(`
                 sub Main()
-                    doWork = function (callback as function)
+                    doWork = function(callback as function)
+                        callback()
                     end function
                 end sub
             `);
@@ -1096,7 +989,7 @@ describe('BrsFile', () => {
                 sub main()
                 end sub
                 import "file.brs"
-        `);
+            `);
             program.validate();
             (0, testHelpers_spec_1.expectDiagnostics)(program, [
                 DiagnosticMessages_1.DiagnosticMessages.importStatementMustBeDeclaredAtTopOfFile()
@@ -1133,7 +1026,7 @@ describe('BrsFile', () => {
         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
             `);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
@@ -1144,47 +1037,59 @@ describe('BrsFile', () => {
                     return value.subType()
                 end function
             `);
-            (0, chai_1.expect)(file.callables[0]).to.deep.include({
+            (0, chai_config_spec_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
             `);
         });
         it('finds line and column numbers for functions', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     print "A"
                 end function
 
-                function DoB()
-                    print "B"
-                end function
+                 function DoB()
+                     print "B"
+                 end function
             `);
-            (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));
+            (0, chai_config_spec_1.expect)(file.callables[0].name).to.equal('DoA');
+            (0, chai_config_spec_1.expect)(file.callables[0].nameRange).to.eql(vscode_languageserver_1.Range.create(1, 25, 1, 28));
+            (0, chai_config_spec_1.expect)(file.callables[1].name).to.equal('DoB');
+            (0, chai_config_spec_1.expect)(file.callables[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 26, 5, 29));
         });
         it('throws an error if the file has already been parsed', () => {
-            let file = new BrsFile_1.BrsFile('abspath', 'relpath', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'abspath',
+                destPath: 'relpath',
+                program: program
+            });
             file.parse(`'a comment`);
             try {
                 file.parse(`'a new comment`);
-                chai_1.assert.fail(null, null, 'Should have thrown an exception, but did not');
+                chai_config_spec_1.assert.fail(null, null, 'Should have thrown an exception, but did not');
             }
             catch (e) {
                 //test passes
             }
         });
         it('finds and registers duplicate callables', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     print "A"
@@ -1194,14 +1099,18 @@ describe('BrsFile', () => {
                      print "A"
                  end function
             `);
-            (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);
+            (0, chai_config_spec_1.expect)(file.callables.length).to.equal(2);
+            (0, chai_config_spec_1.expect)(file.callables[0].name).to.equal('DoA');
+            (0, chai_config_spec_1.expect)(file.callables[0].nameRange.start.line).to.equal(1);
+            (0, chai_config_spec_1.expect)(file.callables[1].name).to.equal('DoA');
+            (0, chai_config_spec_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);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoA()
                     DoB("a")
@@ -1210,24 +1119,59 @@ describe('BrsFile', () => {
                     DoC()
                 end function
             `);
-            (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));
+            (0, chai_config_spec_1.expect)(file.functionCalls.length).to.equal(2);
+            (0, chai_config_spec_1.expect)(file.functionCalls[0].range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 28));
+            (0, chai_config_spec_1.expect)(file.functionCalls[0].nameRange).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 23));
+            (0, chai_config_spec_1.expect)(file.functionCalls[1].range).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 25));
+            (0, chai_config_spec_1.expect)(file.functionCalls[1].nameRange).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 23));
+        });
+        it('finds function calls that are unfinished', () => {
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
+            file.parse(`
+                function DoA()
+                    DoB("a"
+                end function
+                function DoB(a as string)
+                    DoC(
+                end function
+            `);
+            (0, testHelpers_spec_1.expectDiagnostics)(file.parser.diagnostics, [
+                DiagnosticMessages_1.DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
+                DiagnosticMessages_1.DiagnosticMessages.expectedNewlineOrColon(),
+                DiagnosticMessages_1.DiagnosticMessages.unexpectedToken('end function'),
+                DiagnosticMessages_1.DiagnosticMessages.expectedRightParenAfterFunctionCallArguments(),
+                DiagnosticMessages_1.DiagnosticMessages.expectedNewlineOrColon()
+            ]);
+            (0, chai_config_spec_1.expect)(file.functionCalls.length).to.equal(2);
+            (0, chai_config_spec_1.expect)(file.functionCalls[0].range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 27));
+            (0, chai_config_spec_1.expect)(file.functionCalls[0].nameRange).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 23));
+            (0, chai_config_spec_1.expect)(file.functionCalls[1].range).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 24));
+            (0, chai_config_spec_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);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function DoSomething
                 end function
             `);
             (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);
+            (0, chai_config_spec_1.expect)(file.getDiagnostics()[0].file).to.equal(file);
+            (0, chai_config_spec_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);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub countit()
                     for each num in [1,2,3]
@@ -1239,7 +1183,11 @@ describe('BrsFile', () => {
         });
         //test is not working yet, but will be enabled when brs supports this syntax
         it('supports assigning functions to objects', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function main()
                     o = CreateObject("roAssociativeArray")
@@ -1250,20 +1198,42 @@ describe('BrsFile', () => {
             `);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
+        it('supports parameter types in functions in AA literals', () => {
+            program.setFile('source/main.brs', `
+                sub main()
+                    aa = {
+                        name: "test"
+                        addInts: function(a as integer, b as integer) as integer
+                            return a + b
+                        end function
+                    }
+                end sub
+            `);
+            program.validate();
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        });
     });
     describe('findCallables', () => {
         it('finds range', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub Sum()
                     print "hello world"
                 end sub
             `);
             let callable = file.callables[0];
-            (0, chai_1.expect)(callable.range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
+            (0, chai_config_spec_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);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 sub Sum()
                     sayHi = sub()
@@ -1273,101 +1243,117 @@ describe('BrsFile', () => {
                 end sub
             `);
             let callable = file.callables[0];
-            (0, chai_1.expect)(callable.range).to.eql(vscode_languageserver_1.Range.create(1, 16, 6, 23));
+            (0, chai_config_spec_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);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a, b, c)
 
                 end function
             `);
             let callable = file.callables[0];
-            (0, chai_1.expect)(callable.params[0]).to.deep.include({
+            (0, chai_config_spec_1.expect)(callable.params[0]).to.deep.include({
                 name: 'a',
                 isOptional: false,
                 isRestArgument: false
             });
-            (0, chai_1.expect)(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
-            (0, chai_1.expect)(callable.params[1]).to.deep.include({
+            (0, chai_config_spec_1.expect)(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_config_spec_1.expect)(callable.params[1]).to.deep.include({
                 name: 'b',
                 isOptional: false,
                 isRestArgument: false
             });
-            (0, chai_1.expect)(callable.params[1].type).instanceof(DynamicType_1.DynamicType);
-            (0, chai_1.expect)(callable.params[2]).to.deep.include({
+            (0, chai_config_spec_1.expect)(callable.params[1].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_config_spec_1.expect)(callable.params[2]).to.deep.include({
                 name: 'c',
                 isOptional: false,
                 isRestArgument: false
             });
-            (0, chai_1.expect)(callable.params[2].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_config_spec_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);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a=2)
 
                 end function
             `);
             let callable = file.callables[0];
-            (0, chai_1.expect)(callable.params[0]).to.deep.include({
+            (0, chai_config_spec_1.expect)(callable.params[0]).to.deep.include({
                 name: 'a',
                 isOptional: true,
                 isRestArgument: false
             });
-            (0, chai_1.expect)(callable.params[0].type).instanceof(IntegerType_1.IntegerType);
+            (0, chai_config_spec_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);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum(a, b as integer, c as string)
 
                 end function
             `);
             let callable = file.callables[0];
-            (0, chai_1.expect)(callable.params[0]).to.deep.include({
+            (0, chai_config_spec_1.expect)(callable.params[0]).to.deep.include({
                 name: 'a',
                 isOptional: false,
                 isRestArgument: false
             });
-            (0, chai_1.expect)(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
-            (0, chai_1.expect)(callable.params[1]).to.deep.include({
+            (0, chai_config_spec_1.expect)(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_config_spec_1.expect)(callable.params[1]).to.deep.include({
                 name: 'b',
                 isOptional: false,
                 isRestArgument: false
             });
-            (0, chai_1.expect)(callable.params[1].type).instanceof(IntegerType_1.IntegerType);
-            (0, chai_1.expect)(callable.params[2]).to.deep.include({
+            (0, chai_config_spec_1.expect)(callable.params[1].type).instanceof(IntegerType_1.IntegerType);
+            (0, chai_config_spec_1.expect)(callable.params[2]).to.deep.include({
                 name: 'c',
                 isOptional: false,
                 isRestArgument: false
             });
-            (0, chai_1.expect)(callable.params[2].type).instanceof(StringType_1.StringType);
+            (0, chai_config_spec_1.expect)(callable.params[2].type).instanceof(StringType_1.StringType);
         });
     });
     describe('findCallableInvocations', () => {
         it('finds arguments with literal values', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum()
                     DoSomething("name", 12, true)
                 end function
             `);
-            (0, chai_1.expect)(file.functionCalls.length).to.equal(1);
+            (0, chai_config_spec_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(),
+            (0, chai_config_spec_1.expect)(argsMap).to.eql([{
+                    type: StringType_1.StringType.instance,
                     range: util_1.default.createRange(2, 32, 2, 38),
                     text: '"name"'
                 }, {
-                    type: new IntegerType_1.IntegerType(),
+                    type: IntegerType_1.IntegerType.instance,
                     range: util_1.default.createRange(2, 40, 2, 42),
                     text: '12'
                 }, {
-                    type: new BooleanType_1.BooleanType(),
+                    type: BooleanType_1.BooleanType.instance,
                     range: util_1.default.createRange(2, 44, 2, 48),
                     text: 'true'
                 }]);
@@ -1386,7 +1372,11 @@ describe('BrsFile', () => {
             ]);
         });
         it('finds arguments with variable values', () => {
-            let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute_path/file.brs',
+                destPath: 'relative_path/file.brs',
+                program: program
+            });
             file.parse(`
                 function Sum()
                     count = 1
@@ -1395,17 +1385,17 @@ describe('BrsFile', () => {
                     DoSomething(count, name, isAlive)
                 end function
             `);
-            (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(),
+            (0, chai_config_spec_1.expect)(file.functionCalls.length).to.equal(1);
+            (0, chai_config_spec_1.expect)(file.functionCalls[0].args[0]).deep.include({
+                type: new DynamicType_1.DynamicType(),
                 text: 'count'
             });
-            (0, chai_1.expect)(file.functionCalls[0].args[1]).deep.include({
-                type: new StringType_1.StringType(),
+            (0, chai_config_spec_1.expect)(file.functionCalls[0].args[1]).deep.include({
+                type: new DynamicType_1.DynamicType(),
                 text: 'name'
             });
-            (0, chai_1.expect)(file.functionCalls[0].args[2]).deep.include({
-                type: new BooleanType_1.BooleanType(),
+            (0, chai_config_spec_1.expect)(file.functionCalls[0].args[2]).deep.include({
+                type: new DynamicType_1.DynamicType(),
                 text: 'isAlive'
             });
         });
@@ -1413,32 +1403,36 @@ describe('BrsFile', () => {
     describe('findCallables', () => {
         //this test is to help with code coverage
         it('skips top-level statements', () => {
-            let file = new BrsFile_1.BrsFile('absolute', 'relative', program);
+            let file = new BrsFile_1.BrsFile({
+                srcPath: 'absolute',
+                destPath: 'relative',
+                program: program
+            });
             file.parse('name = "Bob"');
-            (0, chai_1.expect)(file.callables.length).to.equal(0);
+            (0, chai_config_spec_1.expect)(file.callables.length).to.equal(0);
         });
         it('finds return type', () => {
             let file = program.setFile('source/main.brs', `
                 function DoSomething() as string
                 end function
             `);
-            (0, chai_1.expect)(file.callables[0]).to.deep.include({
+            (0, chai_config_spec_1.expect)(file.callables[0]).to.deep.include({
                 file: file,
                 nameRange: vscode_languageserver_1.Range.create(1, 25, 1, 36),
                 name: 'DoSomething',
                 params: []
             });
-            (0, chai_1.expect)(file.callables[0].type.returnType).instanceof(StringType_1.StringType);
+            (0, chai_config_spec_1.expect)(file.callables[0].type.returnType).instanceof(StringType_1.StringType);
         });
     });
-    describe('function local variable handling', () => {
+    describe('createFunctionScopes', () => {
         it('creates range properly', () => {
             file.parse(`
                 sub Main()
                     name = 'bob"
                 end sub
             `);
-            (0, chai_1.expect)(file.parser.references.functionStatements[0].range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
         });
         it('creates scopes for parent and child functions', () => {
             file.parse(`
@@ -1452,9 +1446,23 @@ describe('BrsFile', () => {
                     end sub)
                 end sub
             `);
-            (0, chai_1.expect)(file.parser.references.functionExpressions).to.be.length(3);
+            (0, chai_config_spec_1.expect)(file.functionScopes).to.length(3);
         });
-        it('finds variables declared in function expressions', () => {
+        it('outer function does not capture inner statements', () => {
+            file.parse(`
+                sub Main()
+                    name = "john"
+                    sayHi = sub()
+                        age = 12
+                    end sub
+                end sub
+            `);
+            let outerScope = file.getFunctionScopeAtPosition(vscode_languageserver_1.Position.create(2, 25));
+            (0, chai_config_spec_1.expect)(outerScope.variableDeclarations).to.be.lengthOf(2);
+            let innerScope = file.getFunctionScopeAtPosition(vscode_languageserver_1.Position.create(4, 10));
+            (0, chai_config_spec_1.expect)(innerScope.variableDeclarations).to.be.lengthOf(1);
+        });
+        it('finds variables declared in function scopes', () => {
             file.parse(`
                 sub Main()
                     sayHi = sub()
@@ -1466,15 +1474,24 @@ describe('BrsFile', () => {
                     end sub)
                 end sub
             `);
-            (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)]
-            ]);
-            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[1].symbolTable, [
-                ['age', new IntegerType_1.IntegerType(), util_1.default.createRange(3, 24, 3, 27)]
-            ]);
-            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[2].symbolTable, [
-                ['name', new StringType_1.StringType(), util_1.default.createRange(7, 24, 7, 28)]
-            ]);
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].variableDeclarations).to.be.length(1);
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].variableDeclarations[0]).to.deep.include({
+                lineIndex: 2,
+                name: 'sayHi'
+            });
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].variableDeclarations[0].getType()).instanceof(TypedFunctionType_1.TypedFunctionType);
+            (0, chai_config_spec_1.expect)(file.functionScopes[1].variableDeclarations).to.be.length(1);
+            (0, chai_config_spec_1.expect)(file.functionScopes[1].variableDeclarations[0]).to.deep.include({
+                lineIndex: 3,
+                name: 'age'
+            });
+            (0, chai_config_spec_1.expect)(file.functionScopes[1].variableDeclarations[0].getType()).instanceof(IntegerType_1.IntegerType);
+            (0, chai_config_spec_1.expect)(file.functionScopes[2].variableDeclarations).to.be.length(1);
+            (0, chai_config_spec_1.expect)(file.functionScopes[2].variableDeclarations[0]).to.deep.include({
+                lineIndex: 7,
+                name: 'name'
+            });
+            (0, chai_config_spec_1.expect)(file.functionScopes[2].variableDeclarations[0].getType()).instanceof(StringType_1.StringType);
         });
         it('finds variable declarations inside of if statements', () => {
             file.parse(`
@@ -1484,9 +1501,9 @@ describe('BrsFile', () => {
                     end if
                 end sub
             `);
-            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
-                ['theLength', new IntegerType_1.IntegerType(), util_1.default.createRange(3, 24, 3, 33)]
-            ]);
+            let scope = file.getFunctionScopeAtPosition(vscode_languageserver_1.Position.create(3, 0));
+            (0, chai_config_spec_1.expect)(scope.variableDeclarations[0]).to.exist;
+            (0, chai_config_spec_1.expect)(scope.variableDeclarations[0].name).to.equal('theLength');
         });
         it('finds value from global return', () => {
             let file = program.setFile('source/main.brs', `
@@ -1498,21 +1515,31 @@ describe('BrsFile', () => {
                     return "bob"
                 end function
             `);
-            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
-                ['myName', new StringType_1.StringType(), util_1.default.createRange(2, 19, 2, 25)]
-            ]);
+            // Types are only guaranteed after validation
+            program.validate();
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].variableDeclarations).to.be.length(1);
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].variableDeclarations[0]).to.deep.include({
+                lineIndex: 2,
+                name: 'myName'
+            });
+            (0, testHelpers_spec_1.expectTypeToBe)(file.functionScopes[0].variableDeclarations[0].getType(), StringType_1.StringType);
         });
         it('finds variable type from other variable', () => {
-            file.parse(`
+            let file = program.setFile('source/main.brs', `
                 sub Main()
-                    name = "bob"
-                    nameCopy = name
+                   name = "bob"
+                   nameCopy = name
                 end sub
             `);
-            (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)]
-            ]);
+            // Types are only guaranteed after validation
+            program.validate();
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].variableDeclarations).to.be.length(2);
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].variableDeclarations[1]).to.deep.include({
+                lineIndex: 3,
+                name: 'nameCopy'
+            });
+            (0, testHelpers_spec_1.expectTypeToBe)(file.functionScopes[0].variableDeclarations[1].getType(), StringType_1.StringType);
         });
         it('sets proper range for functions', () => {
             file.parse(`
@@ -1522,469 +1549,69 @@ describe('BrsFile', () => {
                     end function
                 end sub
             `);
-            (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)
-            ]);
+            (0, chai_config_spec_1.expect)(file.functionScopes).to.be.length(2);
+            (0, chai_config_spec_1.expect)(file.functionScopes[0].range).to.eql(vscode_languageserver_1.Range.create(1, 16, 5, 23));
+            (0, chai_config_spec_1.expect)(file.functionScopes[1].range).to.eql(vscode_languageserver_1.Range.create(2, 30, 4, 32));
         });
     });
     it('handles mixed case `then` partions of conditionals', () => {
-        let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        let mainFile = program.setFile('source/main.brs', `
             sub Main()
                 if true then
                     print "works"
                 end if
             end sub
         `);
-        (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
-        mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
+        mainFile = program.setFile('source/main.brs', `
             sub Main()
                 if true Then
                     print "works"
                 end if
             end sub
         `);
-        (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
-        mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
+        mainFile = program.setFile('source/main.brs', `
             sub Main()
                 if true THEN
                     print "works"
                 end if
             end sub
         `);
-        (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
+        (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
     });
-    describe('getHover', () => {
-        it('works for param types', () => {
-            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)
-                    end function
-                end sub
+    it('does not throw when encountering incomplete import statement', () => {
+        program.setFile('source/main.brs', `
+            import
+            sub main()
+            end sub
+        `);
+        program.validate();
+        //this test will throw an exception if something went wrong
+    });
+    describe('transpile', () => {
+        it('transpilies libpkg:/ paths when encountered', async () => {
+            program.setFile('source/lib.bs', `
+                import "libpkg:/source/numbers.bs"
             `);
-            //hover over the `name = 1` line
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 24))[0];
-            (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 = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(1, 34))[0];
-            (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.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
-                sub Main(name as string)
-                end sub
-                sub as ()
+            program.setFile('source/numbers.bs', `
+                sub test()
                 end sub
             `);
-            //hover over the `as`
-            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(1, 31))).to.be.empty;
-            //hover over the `string`
-            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(1, 36))).to.be.empty;
+            await testTranspile(`
+                <component name="TestButton" extends="Group">
+                    <script type="text/brightscript" uri="libpkg:/source/lib.bs"/>
+                </component>
+            `, `
+                <component name="TestButton" extends="Group">
+                    <script type="text/brightscript" uri="libpkg:/source/lib.brs" />
+                    <script type="text/brightscript" uri="pkg:/source/numbers.brs" />
+                    <script type="text/brightscript" uri="pkg:/source/bslib.brs" />
+                </component>
+            `, undefined, 'components/TestButton.xml');
         });
-        it('finds declared function', () => {
-            let file = program.setFile({ src: `${rootDir} /source/main.brs`, dest: 'source/main.brs' }, `
-                function Main(count = 1)
-                    firstName = "bob"
-                    age = 21
-                    shoeSize = 10
-                end function
-            `);
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(1, 28))[0];
-            (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 declared namespace function', () => {
-            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-            namespace mySpace
-                function Main(count = 1)
-                    firstName = "bob"
-                    age = 21
-                    shoeSize = 10
-                end function
-            end namespace
-            `);
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 28))[0];
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 25, 2, 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.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-                sub Main()
-                    sayMyName = sub(name as string)
-                    end sub
-
-                    sayMyName()
-                end sub
-            `);
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(5, 24))[0];
-            (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', () => {
-            let file = program.setFile('source/main.brs', `
-                function doUcase(text)
-                    return ucase(text)
-                end function
-            `);
-            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 30))[0].contents).to.equal([
-                '```brightscript',
-                'function UCase(s as string) as string',
-                '```'
-            ].join('\n'));
-        });
-        it('does not crash when hovering on object method call', () => {
-            let file = program.setFile('source/main.brs', `
-                function getInstr(url, text)
-                    return url.instr(text)
-                end function
-            `);
-            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 35))[0].contents).to.equal([
-                '```brightscript',
-                'instr as dynamic',
-                '```'
-            ].join('\n'));
-        });
-        it('finds function hover in file scope', () => {
-            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-                sub Main()
-                    sayMyName()
-                end sub
-
-                sub sayMyName()
-
-                end sub
-            `);
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 25))[0];
-            (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 namespace function hover in file scope', () => {
-            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-                namespace mySpace
-                sub Main()
-                    sayMyName()
-                end sub
-
-                sub sayMyName()
-
-                end sub
-                end namespace
-            `);
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(3, 25))[0];
-            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(3, 20, 3, 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.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-                sub Main()
-                    sayMyName()
-                end sub
-            `);
-            program.setFile({ src: `${rootDir}/source/lib.brs`, dest: 'source/lib.brs' }, `
-                sub sayMyName(name as string)
-
-                end sub
-            `);
-            let hover = program.getHover(mainFile.srcPath, vscode_languageserver_1.Position.create(2, 25))[0];
-            (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('finds namespace function hover in scope', () => {
-            let rootDir = process.cwd();
-            program = new Program_1.Program({
-                rootDir: rootDir
-            });
-            let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-                sub Main()
-                    mySpace.sayMyName()
-                end sub
-            `);
-            program.setFile({ src: `${rootDir}/source/lib.brs`, dest: 'source/lib.brs' }, `
-                namespace mySpace
-                    sub sayMyName(name as string)
-                    end sub
-                end namespace
-            `);
-            let hover = program.getHover(mainFile.srcPath, vscode_languageserver_1.Position.create(2, 34))[0];
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 28, 2, 37));
-            (0, chai_1.expect)(hover.contents).to.equal([
-                '```brightscript',
-                'sub sayMyName(name as string) as void',
-                '```'
-            ].join('\n'));
-        });
-        it('includes markdown comments in hover.', () => {
-            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)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(5, 22))[0].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)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(4, 22))[0].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.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-                sub Main()
-                    if true then
-                        print "works"
-                    end if
-                end sub
-            `);
-            (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
-            `);
-            (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
-            `);
-            (0, testHelpers_spec_1.expectZeroDiagnostics)(mainFile);
-        });
-        it('displays the context from multiple scopes', () => {
-            var _a, _b;
-            let commonFile = program.setFile('source/common.brs', `
-                sub displayPi()
-                    pi = getPi()
-                    print pi
-                end sub
-            `);
-            let scope1File = program.setFile('components/comp1/scope1.brs', `
-                function getPi() as string
-                    return "apple"
-                end function
-            `);
-            (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.setFile('components/comp2/scope2.brs', `
-                function getPi() as float
-                    return 3.14
-                end function
-            `);
-            (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" />
-                    <script type="text/brightscript" uri="pkg:/source/common.brs" />
-                </component>
-            `);
-            program.validate();
-            let funcCallHover = program.getHover(commonFile.srcPath, vscode_languageserver_1.Position.create(2, 27));
-            (0, chai_1.expect)((_a = funcCallHover[0]) === null || _a === void 0 ? void 0 : _a.contents).to.equal([
-                '```brightscript',
-                'function getPi() as string | function getPi() as float | getPi as uninitialized',
-                '```'
-            ].join('\n'));
-            let variableHover = program.getHover(commonFile.srcPath, vscode_languageserver_1.Position.create(3, 27));
-            (0, chai_1.expect)((_b = variableHover[0]) === null || _b === void 0 ? void 0 : _b.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 = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(3, 29));
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover[0].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 = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(3, 29));
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover[0].contents).to.equal([
-                '```brightscript',
-                'function processData(data as MyKlass[]) as MyKlass[]',
-                '```'
-            ].join('\n'));
-        });
-        it('display literal enum members', () => {
-            let file = program.setFile('source/main.bs', `
-                enum MyEnum
-                    foo
-                    bar
-                end enum
-
-                sub main()
-                    value = MyEnum.foo
-                    print value
-                end sub
-            `);
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(7, 38)); // 'myEnum.foo' in value assignnmnt
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover[0].contents).to.equal([
-                '```brightscript',
-                'MyEnum.foo as MyEnum',
-                '```'
-            ].join('\n'));
-        });
-        it('finds enum values from assignments', () => {
-            let file = program.setFile('source/main.bs', `
-                enum MyEnum
-                    foo
-                    bar
-                end enum
-
-                sub main()
-                    value = MyEnum.foo
-                    print value
-                end sub
-            `);
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(8, 30)); // 'value' in print statement
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover[0].contents).to.equal([
-                '```brightscript',
-                'value as MyEnum',
-                '```'
-            ].join('\n'));
-        });
-        it('finds enum values as parameters', () => {
-            let file = program.setFile('source/main.bs', `
-                enum MyEnum
-                    foo
-                    bar
-                end enum
-
-                sub printEnum(enumParamVal as MyEnum)
-                    print enumParamVal
-                end sub
-
-                sub main()
-                    printEnum(MyEnum.foo)
-                end sub
-            `);
-            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(7, 30)); // 'enumParamVal' in print statement
-            (0, chai_1.expect)(hover).to.exist;
-            (0, chai_1.expect)(hover[0].contents).to.equal([
-                '```brightscript',
-                'enumParamVal as MyEnum',
-                '```'
-            ].join('\n'));
-        });
-    });
-    it('does not throw when encountering incomplete import statement', () => {
-        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
-            import
-            sub main()
-            end sub
-        `);
-        program.validate();
-        //this test will throw an exception if something went wrong
-    });
-    describe('transpile', () => {
-        it('excludes trailing commas in array literals', () => {
-            testTranspile(`
+        it('excludes trailing commas in array literals', async () => {
+            await testTranspile(`
                 sub main()
                     arr = [
                         1,
@@ -2012,7 +1639,7 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('transpiles if statement keywords as provided', () => {
+        it('transpiles if statement keywords as provided', async () => {
             const code = `
                 sub main()
                     If True Then
@@ -2026,12 +1653,12 @@ describe('BrsFile', () => {
                     End If
                 end sub
             `;
-            testTranspile(code);
-            testTranspile(code.toLowerCase());
-            testTranspile(code.toUpperCase());
+            await testTranspile(code);
+            await testTranspile(code.toLowerCase());
+            await testTranspile(code.toUpperCase());
         });
-        it('does not transpile `then` tokens', () => {
-            testTranspile(`
+        it('does not transpile `then` tokens', async () => {
+            await testTranspile(`
                 sub main()
                     if true
                         print true
@@ -2041,8 +1668,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('honors spacing between multi-word tokens', () => {
-            testTranspile(`
+        it('honors spacing between multi-word tokens', async () => {
+            await testTranspile(`
                 sub main()
                     if true
                         print true
@@ -2052,39 +1679,39 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('handles when only some of the statements have `then`', () => {
-            testTranspile(`
+        it('handles when only some of the statements have `then`', async () => {
+            await testTranspile(`
                 sub main()
                     if true
                     else if true then
                     else if true
                     else if true then
                         if true then
-                            return true
+                            return
                         end if
                     end if
                 end sub
             `);
         });
-        it('retains casing of parameter types', () => {
-            function test(type) {
-                testTranspile(`
+        it('retains casing of parameter types', async () => {
+            async function test(type) {
+                await 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(`
+            await test('Boolean');
+            await test('Double');
+            await test('Dynamic');
+            await test('Float');
+            await test('Integer');
+            await test('LongInteger');
+            await test('Object');
+            await test('String');
+        });
+        it('retains casing of return types', async () => {
+            async function test(type) {
+                await testTranspile(`
                     sub one() as ${type}
                     end sub
 
@@ -2095,19 +1722,19 @@ describe('BrsFile', () => {
                     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(`
+            await test('Boolean');
+            await test('Double');
+            await test('Dynamic');
+            await test('Float');
+            await test('Integer');
+            await test('LongInteger');
+            await test('Object');
+            await test('String');
+            await test('Void');
+        });
+        it('retains casing of literal types', async () => {
+            async function test(type) {
+                await testTranspile(`
                     sub main()
                         thing = ${type}
                         thing = ${type.toLowerCase()}
@@ -2115,13 +1742,13 @@ describe('BrsFile', () => {
                     end sub
                 `);
             }
-            test('Invalid');
-            test('True');
-            test('False');
+            await test('Invalid');
+            await test('True');
+            await test('False');
         });
         describe('throwStatement', () => {
-            it('transpiles properly', () => {
-                testTranspile(`
+            it('transpiles properly', async () => {
+                await testTranspile(`
                     sub main()
                         try
                             throw "some message"
@@ -2132,8 +1759,8 @@ describe('BrsFile', () => {
             });
         });
         describe('try/catch', () => {
-            it('transpiles properly', () => {
-                testTranspile(`
+            it('transpiles properly', async () => {
+                await testTranspile(`
                     sub main()
                         try
                             print m.b.c
@@ -2145,8 +1772,8 @@ describe('BrsFile', () => {
             });
         });
         describe('namespaces', () => {
-            it('properly transpiles namespace functions for assignments', () => {
-                testTranspile(`
+            it('properly transpiles namespace functions for assignments', async () => {
+                await testTranspile(`
                     namespace NameA.NameB
                         sub Speak()
                         end sub
@@ -2167,8 +1794,8 @@ describe('BrsFile', () => {
                     end sub
                 `);
             });
-            it('properly transpiles inferred namespace function for assignment', () => {
-                testTranspile(`
+            it('properly transpiles inferred namespace function for assignment', async () => {
+                await testTranspile(`
                     namespace NameA.NameB
                         sub Speak()
                         end sub
@@ -2188,24 +1815,47 @@ describe('BrsFile', () => {
                 `);
             });
         });
-        it('includes all text to end of line for a non-terminated string', () => {
-            testTranspile('sub main()\n    name = "john \nend sub', 'sub main()\n    name = "john "\nend sub', null, 'source/main.bs', false);
+        it('includes all text to end of line for a non-terminated string', async () => {
+            await testTranspile('sub main()\n    name = "john \nend sub', 'sub main()\n    name = "john "\nend sub', null, 'source/main.bs', false);
         });
-        it('escapes quotes in string literals', () => {
-            testTranspile(`
+        it('escapes quotes in string literals', async () => {
+            await testTranspile(`
                 sub main()
+                    expected = "Hello"
                     expected += chr(10) + " version=""2.0"""
                 end sub
             `);
         });
-        it('keeps function parameter types in proper order', () => {
-            testTranspile(`
+        it('keeps function parameter types in proper order', async () => {
+            await testTranspile(`
                 function CreateTestStatistic(name as string, result = "Success" as string, time = 0 as integer, errorCode = 0 as integer, errorMessage = "" as string) as object
                 end function
             `);
         });
-        it('transpiles local var assignment operators', () => {
-            testTranspile(`
+        it('discard parameter types when removeParameterTypes is true', async () => {
+            program.options.removeParameterTypes = true;
+            await testTranspile(`
+                sub one(a as integer, b = "" as string, c = invalid as dynamic)
+                end sub
+            `, `
+                sub one(a, b = "", c = invalid)
+                end sub
+            `);
+        });
+        it('discard return type when removeParameterTypes is true', async () => {
+            program.options.removeParameterTypes = true;
+            await testTranspile(`
+                function one() as string
+                    return ""
+                end function
+            `, `
+                function one()
+                    return ""
+                end function
+            `);
+        });
+        it('transpiles local var assignment operators', async () => {
+            await testTranspile(`
                 sub main()
                     count = 0
                     count += 1
@@ -2218,8 +1868,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('transpiles AA property assignment operators', () => {
-            testTranspile(`
+        it('transpiles AA property assignment operators', async () => {
+            await testTranspile(`
                 sub main()
                     person = {
                         count: 0
@@ -2228,8 +1878,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('transpiles AA indexed assignment operators', () => {
-            testTranspile(`
+        it('transpiles AA indexed assignment operators', async () => {
+            await testTranspile(`
                 sub main()
                     person = {
                         count: 0
@@ -2238,8 +1888,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('relative-referenced namespaced functions get prefixed', () => {
-            testTranspile(`
+        it('relative-referenced namespaced functions get prefixed', async () => {
+            await testTranspile(`
                 namespace Vertibrates.Birds
                     function GetAllBirds()
                         return [
@@ -2269,8 +1919,8 @@ describe('BrsFile', () => {
                 end function
             `, 'trim', 'source/main.bs');
         });
-        it('transpiles namespaced functions', () => {
-            testTranspile(`
+        it('transpiles namespaced functions', async () => {
+            await testTranspile(`
                 namespace NameA
                     sub alert()
                     end sub
@@ -2286,9 +1936,9 @@ describe('BrsFile', () => {
                 end sub
             `, 'trim', 'source/main.bs');
         });
-        it('transpiles dim', () => {
-            function doTest(code) {
-                testTranspile(`
+        it('transpiles dim', async () => {
+            async function doTest(code) {
+                await testTranspile(`
                     sub main()
                         requestList = []
                         ${code}
@@ -2300,20 +1950,20 @@ describe('BrsFile', () => {
                     end sub
                 `);
             }
-            doTest(`Dim c[5]`);
-            doTest(`Dim c[5, 4]`);
-            doTest(`Dim c[5, 4, 6]`);
-            doTest(`Dim requestData[requestList.count()]`);
-            doTest(`Dim requestData[1, requestList.count()]`);
-            doTest(`Dim requestData[1, requestList.count(), 2]`);
-            doTest(`Dim requestData[requestList[2]]`);
-            doTest(`Dim requestData[1, requestList[2]]`);
-            doTest(`Dim requestData[1, requestList[2], 2]`);
-            doTest(`Dim requestData[requestList["2"]]`);
-            doTest(`Dim requestData[1, requestList["2"]]`);
-            doTest(`Dim requestData[1, requestList["2"], 2]`);
-            doTest(`Dim requestData[1, StrToI("1"), 2]`);
-            testTranspile(`
+            await doTest(`Dim c[5]`);
+            await doTest(`Dim c[5, 4]`);
+            await doTest(`Dim c[5, 4, 6]`);
+            await doTest(`Dim requestData[requestList.count()]`);
+            await doTest(`Dim requestData[1, requestList.count()]`);
+            await doTest(`Dim requestData[1, requestList.count(), 2]`);
+            await doTest(`Dim requestData[requestList[2]]`);
+            await doTest(`Dim requestData[1, requestList[2]]`);
+            await doTest(`Dim requestData[1, requestList[2], 2]`);
+            await doTest(`Dim requestData[requestList["2"]]`);
+            await doTest(`Dim requestData[1, requestList["2"]]`);
+            await doTest(`Dim requestData[1, requestList["2"], 2]`);
+            await doTest(`Dim requestData[1, StrToI("1"), 2]`);
+            await testTranspile(`
                 function getValue(param1)
                 end function
 
@@ -2325,8 +1975,41 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('transpiles calls to fully-qualified namespaced functions', () => {
-            testTranspile(`
+        it('handles multi-index multi-dimensional arrays', async () => {
+            await testTranspile(`
+                sub main()
+                    myMultiArray = [[[[[[[[["hello"]]]]]]]]]
+                    myMultiArray[0][0][0][0][0][0][0][0][0] = "goodbye"
+                    print myMultiArray[0, 0, 0, 0, 0, 0, 0, 0, 0]
+                end sub
+            `, `
+                sub main()
+                    myMultiArray = [
+                        [
+                            [
+                                [
+                                    [
+                                        [
+                                            [
+                                                [
+                                                    [
+                                                        "hello"
+                                                    ]
+                                                ]
+                                            ]
+                                        ]
+                                    ]
+                                ]
+                            ]
+                        ]
+                    ]
+                    myMultiArray[0][0][0][0][0][0][0][0][0] = "goodbye"
+                    print myMultiArray[0, 0, 0, 0, 0, 0, 0, 0, 0]
+                end sub
+            `);
+        });
+        it('transpiles calls to fully-qualified namespaced functions', async () => {
+            await testTranspile(`
                 namespace NameA
                     sub alert()
                     end sub
@@ -2351,15 +2034,15 @@ describe('BrsFile', () => {
                 end sub
             `, 'trim', 'source/main.bs');
         });
-        it('keeps end-of-line comments with their line', () => {
-            testTranspile(`
+        it('keeps end-of-line comments with their line', async () => {
+            await testTranspile(`
                 function DoSomething() 'comment 1
                     name = "bob" 'comment 2
                 end function 'comment 3
             `);
         });
-        it('works for functions', () => {
-            testTranspile(`
+        it('works for functions', async () => {
+            await testTranspile(`
                 function DoSomething()
                     'lots of empty white space
                     'that will be removed during transpile
@@ -2374,16 +2057,16 @@ describe('BrsFile', () => {
                 end function
             `);
         });
-        it('keeps empty AAs and arrays on same line', () => {
-            testTranspile(`
+        it('keeps empty AAs and arrays on same line', async () => {
+            await testTranspile(`
                 sub a()
                     person = {}
                     stuff = []
                 end sub
         `, null, 'trim');
         });
-        it('does not add leading or trailing newlines', () => {
-            testTranspile(`function abc()\nend function`, undefined, 'none');
+        it('does not add leading or trailing newlines', async () => {
+            await testTranspile(`function abc()\nend function`, undefined, 'none');
         });
         it('handles sourcemap edge case', async () => {
             let source = 'sub main()\n' +
@@ -2392,18 +2075,18 @@ describe('BrsFile', () => {
                 '\n' +
                 'end sub';
             program.options.sourceMap = true;
-            let result = testTranspile(source, `sub main()\n    print 1\nend sub`, 'none', 'source/main.bs');
+            let result = await testTranspile(source, `sub main()\n    print 1\nend sub`, 'none', 'source/main.bs');
             //load the source map
-            let location = await source_map_1.SourceMapConsumer.with(result.map.toJSON(), null, (consumer) => {
+            let location = await source_map_1.SourceMapConsumer.with(result.map, null, (consumer) => {
                 return consumer.generatedPositionFor({
                     line: 3,
                     column: 0,
-                    source: (0, util_1.standardizePath) `${rootDir}/source/main.bs`,
+                    source: (0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.bs`,
                     bias: source_map_1.SourceMapConsumer.LEAST_UPPER_BOUND
                 });
             });
-            (0, chai_1.expect)(location.line).to.eql(2);
-            (0, chai_1.expect)(location.column).eql(4);
+            (0, chai_config_spec_1.expect)(location.line).to.eql(2);
+            (0, chai_config_spec_1.expect)(location.column).eql(4);
         });
         it('computes correct locations for sourcemap', async () => {
             let source = `function abc(name)\n    firstName = name\nend function`;
@@ -2411,7 +2094,7 @@ describe('BrsFile', () => {
                 //remove newlines and EOF
                 .filter(x => x.kind !== TokenKind_1.TokenKind.Eof && x.kind !== TokenKind_1.TokenKind.Newline);
             program.options.sourceMap = true;
-            let result = testTranspile(source, source, 'none');
+            let result = await testTranspile(source, source, 'none');
             //load the source map
             await source_map_1.SourceMapConsumer.with(result.map.toString(), null, (consumer) => {
                 let tokenResult = tokens.map(token => ({
@@ -2431,11 +2114,11 @@ describe('BrsFile', () => {
                         originalPosition.line - 1, originalPosition.column)
                     };
                 });
-                (0, chai_1.expect)(sourcemapResult).to.eql(tokenResult);
+                (0, chai_config_spec_1.expect)(sourcemapResult).to.eql(tokenResult);
             });
         });
-        it('handles empty if block', () => {
-            testTranspile(`
+        it('handles empty if block', async () => {
+            await testTranspile(`
                 sub main()
                     if true then
                     end if
@@ -2456,8 +2139,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('handles empty elseif block', () => {
-            testTranspile(`
+        it('handles empty elseif block', async () => {
+            await testTranspile(`
                 sub main()
                     if true then
                         print "if"
@@ -2471,8 +2154,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('handles empty else block', () => {
-            testTranspile(`
+        it('handles empty else block', async () => {
+            await testTranspile(`
                 sub main()
                     if true then
                         print "if"
@@ -2487,8 +2170,20 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('works for function parameters', () => {
-            testTranspile(`
+        it('handles else block with a leading comment', async () => {
+            await testTranspile(`
+                sub main()
+                    if true then
+                        print "if"
+                    else
+                        ' leading comment
+                        print "else"
+                    end if
+                end sub
+            `);
+        });
+        it('works for function parameters', async () => {
+            await testTranspile(`
                 function DoSomething(name, age as integer, text as string)
                 end function
             `, `
@@ -2496,8 +2191,8 @@ describe('BrsFile', () => {
                 end function
             `);
         });
-        it('adds newlines between top-level statements', () => {
-            testTranspile(`
+        it('adds newlines between top-level statements', async () => {
+            await testTranspile(`
                 function a()
                 end function
 
@@ -2505,8 +2200,8 @@ describe('BrsFile', () => {
                 end function
             `);
         });
-        it('properly indents nested AA literals', () => {
-            testTranspile(`
+        it('properly indents nested AA literals', async () => {
+            await testTranspile(`
                 sub doSomething()
                     grandparent = {
                         parent: {
@@ -2520,8 +2215,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('does not add comma after final object property even when comments are present', () => {
-            testTranspile(`
+        it('does not add comma after final object property even when comments are present', async () => {
+            await testTranspile(`
                 sub doSomething()
                     person = {
                         age: 12 'comment
@@ -2544,8 +2239,8 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
-        it('works for a complex function with comments all over the place', () => {
-            testTranspile(`
+        it('works for a complex function with comments all over the place', async () => {
+            await testTranspile(`
                 'import some library
                 library "v30/bslCore.brs" 'comment
 
@@ -2635,25 +2330,25 @@ describe('BrsFile', () => {
                 sub logInfo()
                 end sub
             `);
-            file.needsTranspiled = false;
+            file['needsTranspiled'] = false;
             const { code } = file.transpile();
-            (0, chai_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
+            (0, chai_config_spec_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.setFile('source/logger.brs', (0, testHelpers_spec_1.trim) `
                 sub logInfo()
                 end sub
             `);
-            file.needsTranspiled = true;
+            file['needsTranspiled'] = true;
             const { code } = file.transpile();
-            (0, chai_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
+            (0, chai_config_spec_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
         });
-        it('replaces custom types in parameter types and return types', () => {
+        it('replaces custom types in parameter types and return types', async () => {
             program.setFile('source/SomeKlass.bs', `
                 class SomeKlass
                 end class
             `);
-            testTranspile(`
+            await testTranspile(`
                 function foo() as SomeKlass
                     return new SomeKlass()
                 end function
@@ -2661,11 +2356,70 @@ describe('BrsFile', () => {
                 sub bar(obj as SomeKlass)
                 end sub
             `, `
-                function foo() as object
+                function foo() as dynamic
                     return SomeKlass()
                 end function
 
-                sub bar(obj as object)
+                sub bar(obj as dynamic)
+                end sub
+            `);
+        });
+        it('allows typecasts wrapped in parens', async () => {
+            program.setFile('source/SomeKlass.bs', `
+                class SomeKlass
+                end class
+            `);
+            await testTranspile(`
+                sub foo(obj as SomeKlass)
+                    (obj as roAssociativeArray).append({key:"value"})
+                    print 3 + (obj as roAssociativeArray).count()
+                end sub
+            `, `
+                sub foo(obj as dynamic)
+                    obj.append({
+                        key: "value"
+                    })
+                    print 3 + obj.count()
+                end sub
+            `);
+        });
+        it('allows multiple typecasts wrapped in parens', async () => {
+            program.setFile('source/SomeKlass.bs', `
+                class SomeKlass
+                    function value()
+                        return 0.123
+                    end function
+                end class
+            `);
+            await testTranspile(`
+                sub foo(obj)
+                    print val( sin( (0.707 + (obj as SomeKlass).value()) as float ).toStr() as string)
+                end sub
+            `, `
+                sub foo(obj)
+                    print val(sin((0.707 + obj.value())).toStr())
+                end sub
+            `);
+        });
+        it('allows a string of typecasts wrapped in parens', async () => {
+            program.setFile('source/SomeKlass.bs', `
+                class SomeKlass
+                    function data()
+                        return {key: "value"}
+                    end function
+                end class
+
+                interface SomeIFace
+                    key
+                end interface
+            `);
+            await testTranspile(`
+                sub foo(obj)
+                    print (((obj as SomeKlass).data() as SomeIFace).key as string).len() as integer
+                end sub
+            `, `
+                sub foo(obj)
+                    print obj.data().key.len()
                 end sub
             `);
         });
@@ -2682,28 +2436,50 @@ describe('BrsFile', () => {
                 program.validate();
                 (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
             });
-            it('sets invalid on empty callfunc', () => {
-                testTranspile(`
+            it('sets invalid on empty callfunc with legacyCallfuncHandling=true', async () => {
+                program.options.legacyCallfuncHandling = true;
+                await testTranspile(`
                     sub main()
+                        node = invalid
                         node@.doSomething()
                         m.top.node@.doSomething()
                         m.top.node@.doSomething(1)
                     end sub
                 `, `
                     sub main()
+                        node = invalid
                         node.callfunc("doSomething", invalid)
                         m.top.node.callfunc("doSomething", invalid)
                         m.top.node.callfunc("doSomething", 1)
                     end sub
                 `);
             });
-            it('includes original arguments', () => {
-                testTranspile(`
+            it('empty callfunc allowed by default', async () => {
+                await testTranspile(`
+                    sub main()
+                        node = invalid
+                        node@.doSomething()
+                        m.top.node@.doSomething()
+                        m.top.node@.doSomething(1)
+                    end sub
+                `, `
+                    sub main()
+                        node = invalid
+                        node.callfunc("doSomething")
+                        m.top.node.callfunc("doSomething")
+                        m.top.node.callfunc("doSomething", 1)
+                    end sub
+                `);
+            });
+            it('includes original arguments', async () => {
+                await testTranspile(`
                     sub main()
+                        node = invalid
                         node@.doSomething(1, true, m.top.someVal)
                     end sub
                 `, `
                     sub main()
+                        node = invalid
                         node.callfunc("doSomething", 1, true, m.top.someVal)
                     end sub
                 `);
@@ -2720,34 +2496,34 @@ describe('BrsFile', () => {
                 name: 'transform callback',
                 afterFileParse: onParsed
             });
-            file = program.setFile({ src: `absolute_path/file${ext}`, dest: `relative_path/file${ext}` }, `
+            file = program.setFile(`source/file${ext}`, `
                 sub Sum()
-                print "hello world"
+                    print "hello world"
                 end sub
             `);
-            (0, chai_1.expect)(file.extension).to.equal(ext);
+            (0, chai_config_spec_1.expect)(file.extension).to.equal(ext);
             return file;
         }
         it('called for BRS file', () => {
             const onParsed = sinon.spy();
             parseFileWithCallback('.brs', onParsed);
-            (0, chai_1.expect)(onParsed.callCount).to.equal(1);
+            (0, chai_config_spec_1.expect)(onParsed.callCount).to.equal(1);
         });
-        it('called for BS file', () => {
+        it('called for BR file', () => {
             const onParsed = sinon.spy();
             parseFileWithCallback('.bs', onParsed);
-            (0, chai_1.expect)(onParsed.callCount).to.equal(1);
+            (0, chai_config_spec_1.expect)(onParsed.callCount).to.equal(1);
         });
     });
     describe('typedefKey', () => {
         it('works for .brs files', () => {
-            (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`);
+            (0, chai_config_spec_1.expect)((0, util_1.standardizePath)((program.setFile('source/main.brs', '')).typedefKey)).to.equal((0, util_1.standardizePath) `${testHelpers_spec_2.rootDir.toLowerCase()}/source/main.d.bs`);
         });
         it('returns undefined for files that should not have a typedef', () => {
-            (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;
+            (0, chai_config_spec_1.expect)((program.setFile('source/main.bs', '')).typedefKey).to.be.undefined;
+            (0, chai_config_spec_1.expect)((program.setFile('source/main.d.bs', '')).typedefKey).to.be.undefined;
             const xmlFile = program.setFile('components/comp.xml', '');
-            (0, chai_1.expect)(xmlFile.typedefSrcPath).to.be.undefined;
+            (0, chai_config_spec_1.expect)(xmlFile.typedefKey).to.be.undefined;
         });
     });
     describe('type definitions', () => {
@@ -2765,8 +2541,8 @@ describe('BrsFile', () => {
             `);
             const sourceScope = program.getScopeByName('source');
             const functionNames = sourceScope.getAllCallables().map(x => x.callable.name);
-            (0, chai_1.expect)(functionNames).to.include('main');
-            (0, chai_1.expect)(functionNames).not.to.include('speak');
+            (0, chai_config_spec_1.expect)(functionNames).to.include('main');
+            (0, chai_config_spec_1.expect)(functionNames).not.to.include('speak');
         });
         it('reacts to typedef file changes', () => {
             let file = program.setFile('source/main.brs', `
@@ -2775,14 +2551,14 @@ describe('BrsFile', () => {
                 sub speak()
                 end sub
             `);
-            (0, chai_1.expect)(file.hasTypedef).to.be.false;
-            (0, chai_1.expect)(file.typedefFile).not.to.exist;
+            (0, chai_config_spec_1.expect)(file.hasTypedef).to.be.false;
+            (0, chai_config_spec_1.expect)(file.typedefFile).not.to.exist;
             program.setFile('source/main.d.bs', `
                 sub main()
                 end sub
             `);
-            (0, chai_1.expect)(file.hasTypedef).to.be.true;
-            (0, chai_1.expect)(file.typedefFile).to.exist;
+            (0, chai_config_spec_1.expect)(file.hasTypedef).to.be.true;
+            (0, chai_config_spec_1.expect)(file.typedefFile).to.exist;
             //add replace file, does it still find the typedef
             file = program.setFile('source/main.brs', `
                 sub main()
@@ -2790,46 +2566,72 @@ describe('BrsFile', () => {
                 sub speak()
                 end sub
             `);
-            (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;
+            (0, chai_config_spec_1.expect)(file.hasTypedef).to.be.true;
+            (0, chai_config_spec_1.expect)(file.typedefFile).to.exist;
+            program.removeFile((0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main.d.bs`);
+            (0, chai_config_spec_1.expect)(file.hasTypedef).to.be.false;
+            (0, chai_config_spec_1.expect)(file.typedefFile).not.to.exist;
         });
     });
     describe('typedef', () => {
+        it('includes enum and interface types', async () => {
+            await testGetTypedef(`
+                interface Foo
+                    field as string
+                end interface
+
+                enum Bar
+                    value
+                end enum
+
+                function baz(parameter as Foo) as Bar
+                    return Bar.value
+                end function
+            `, `
+                interface Foo
+                    field as string
+                end interface
+
+                enum Bar
+                    value
+                end enum
+                function baz(parameter as Foo) as Bar
+                end function
+            `);
+        });
         it('sets typedef path properly', () => {
-            (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);
+            (0, chai_config_spec_1.expect)((program.setFile('source/main1.brs', '')).typedefKey).to.equal((0, util_1.standardizePath) `${testHelpers_spec_2.rootDir}/source/main1.d.bs`.toLowerCase());
+            (0, chai_config_spec_1.expect)((program.setFile('source/main2.d.bs', '')).typedefKey).to.equal(undefined);
+            (0, chai_config_spec_1.expect)((program.setFile('source/main3.bs', '')).typedefKey).to.equal(undefined);
             //works for dest with `.brs` extension
-            (0, chai_1.expect)((program.setFile({ src: 'source/main4.bs', dest: 'source/main4.brs' }, '')).typedefSrcPath).to.equal(undefined);
+            (0, chai_config_spec_1.expect)((program.setFile({ src: 'source/main4.bs', dest: 'source/main4.brs' }, '')).typedefKey).to.equal(undefined);
         });
         it('does not link when missing from program', () => {
             const file = program.setFile('source/main.brs', ``);
-            (0, chai_1.expect)(file.typedefFile).not.to.exist;
+            (0, chai_config_spec_1.expect)(file.typedefFile).not.to.exist;
         });
         it('links typedef when added BEFORE .brs file', () => {
             const typedef = program.setFile('source/main.d.bs', ``);
             const file = program.setFile('source/main.brs', ``);
-            (0, chai_1.expect)(file.typedefFile).to.equal(typedef);
+            (0, chai_config_spec_1.expect)(file.typedefFile).to.equal(typedef);
         });
         it('links typedef when added AFTER .brs file', () => {
             const file = program.setFile('source/main.brs', ``);
             const typedef = program.setFile('source/main.d.bs', ``);
-            (0, chai_1.expect)(file.typedefFile).to.eql(typedef);
+            (0, chai_config_spec_1.expect)(file.typedefFile).to.eql(typedef);
         });
         it('removes typedef link when typedef is removed', () => {
             const typedef = program.setFile('source/main.d.bs', ``);
             const file = program.setFile('source/main.brs', ``);
             program.removeFile(typedef.srcPath);
-            (0, chai_1.expect)(file.typedefFile).to.be.undefined;
+            (0, chai_config_spec_1.expect)(file.typedefFile).to.be.undefined;
         });
     });
     describe('getTypedef', () => {
         function testTypedef(original, expected) {
             let file = program.setFile('source/main.brs', original);
-            (0, chai_1.expect)(file.getTypedef().trimEnd()).to.eql(expected);
+            program.validate();
+            (0, chai_config_spec_1.expect)(file.getTypedef().trimEnd()).to.eql(expected);
         }
         it('includes namespace on extend class names', () => {
             testTypedef(`
@@ -3118,9 +2920,9 @@ describe('BrsFile', () => {
             file['_parser'] = undefined;
             //force the file to get a new instance of parser
             const newParser = file.parser;
-            (0, chai_1.expect)(newParser).to.exist.and.to.not.equal(parser);
+            (0, chai_config_spec_1.expect)(newParser).to.exist.and.to.not.equal(parser);
             //reference shouldn't change in subsequent accesses
-            (0, chai_1.expect)(file.parser).to.equal(newParser);
+            (0, chai_config_spec_1.expect)(file.parser).to.equal(newParser);
         });
         it('call parse when previously skipped', () => {
             program.setFile('source/main.d.bs', `'typedef
@@ -3132,11 +2934,11 @@ describe('BrsFile', () => {
                 end sub
             `);
             //no functions should be found since the parser was skipped
-            (0, chai_1.expect)(file['_parser']).to.not.exist;
+            (0, chai_config_spec_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
-            (0, chai_1.expect)(file.parser.references.functionStatements).to.be.lengthOf(1);
-            (0, chai_1.expect)(stub.called).to.be.true;
+            (0, chai_config_spec_1.expect)(file.parser.ast).to.exist;
+            (0, chai_config_spec_1.expect)(stub.called).to.be.true;
             //parse should have been called
         });
     });
@@ -3145,12 +2947,12 @@ describe('BrsFile', () => {
         let idx = 1;
         beforeEach(() => {
             pluginFileName = `plugin-${idx++}.js`;
-            fsExtra.outputFileSync((0, util_1.standardizePath) `${tempDir}/plugins/${pluginFileName}`, `
+            fsExtra.outputFileSync((0, util_1.standardizePath) `${testHelpers_spec_2.tempDir}/plugins/${pluginFileName}`, `
                 function plugin() {
                     return {
                         name: 'lower-file-name',
-                        afterFileParse: (evt) => {
-                            evt.file._customProp = true;
+                        afterProvideFile: (evt) => {
+                            evt.files[0]._customProp = true;
                         }
                     };
                 }
@@ -3158,251 +2960,999 @@ describe('BrsFile', () => {
             `);
         });
         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());
+            for (const plugin of util_1.default.loadPlugins(testHelpers_spec_2.tempDir, [(0, util_1.standardizePath) `${testHelpers_spec_2.tempDir}/plugins/${pluginFileName}`])) {
+                program.plugins.add(plugin);
+            }
             const file = program.setFile('source/MAIN.brs', '');
-            (0, chai_1.expect)(file._customProp).to.exist;
+            (0, chai_config_spec_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());
+            for (const plugin of util_1.default.loadPlugins(testHelpers_spec_2.tempDir, [`./plugins/${pluginFileName}`])) {
+                program.plugins.add(plugin);
+            }
             const file = program.setFile('source/MAIN.brs', '');
-            (0, chai_1.expect)(file._customProp).to.exist;
+            (0, chai_config_spec_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', () => {
+    describe('getDefinition', () => {
+        it('returns const locations', () => {
             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);
+                sub main()
+                    print alpha.beta.charlie
+                end sub
+                namespace alpha.beta
+                    const CHARLIE = true
+                end namespace
+            `);
+            program.validate();
+            //print alpha.beta.char|lie
+            (0, chai_config_spec_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(2, 41))).to.eql([{
+                    uri: vscode_uri_1.URI.file(file.srcPath).toString(),
+                    range: util_1.default.createRange(5, 26, 5, 33)
+                }]);
         });
-        it('gets custom types based on the containing function expression', () => {
+        it('returns enum locations', () => {
             const file = program.setFile('source/main.bs', `
-                sub doSomething(klass as MyKlass)
-                    print klass
+                sub main()
+                    print alpha.beta.people.charlie
                 end sub
-
-                class MyKlass
-                end class
+                namespace alpha.beta
+                    enum people
+                        charlie = "charles"
+                    end enum
+                end namespace
             `);
-            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);
+            program.validate();
+            //print alpha.beta.char|lie
+            (0, chai_config_spec_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(2, 40))).to.eql([{
+                    uri: vscode_uri_1.URI.file(file.srcPath).toString(),
+                    range: util_1.default.createRange(5, 25, 5, 31)
+                }]);
         });
-        it('gets types of properties of a klass', () => {
+        it('returns interface location', () => {
             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
+                sub test(selectedMovie as Movie)
+                    print selectedMovie
                 end sub
-
-                class MyKlass
-                    name as string
-                    age as integer
+                interface Movie
+                    url as string
+                end interface
+            `);
+            program.validate();
+            // sub test(selectedMovie as Mo|vie)
+            (0, chai_config_spec_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(1, 44))).to.eql([{
+                    uri: vscode_uri_1.URI.file(file.srcPath).toString(),
+                    range: util_1.default.createRange(4, 26, 4, 31)
+                }]);
+        });
+        it('returns namespaced interface location', () => {
+            const file = program.setFile('source/main.bs', `
+                sub test(selectedMovie as interfaces.Movie)
+                    print selectedMovie
+                end sub
+                namespace interfaces
+                    interface Movie
+                        url as string
+                    end interface
+                end namespace
+            `);
+            program.validate();
+            //sub test(selectedMovie as interfaces.Mo|vie)
+            (0, chai_config_spec_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(1, 55))).to.eql([{
+                    uri: vscode_uri_1.URI.file(file.srcPath).toString(),
+                    range: util_1.default.createRange(5, 30, 5, 35)
+                }]);
+        });
+        it('returns class location', () => {
+            const file = program.setFile('source/main.bs', `
+                sub test(selectedMovie as Movie)
+                    print selectedMovie
+                end sub
+                class Movie
+                    url as string
                 end class
             `);
-            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);
+            program.validate();
+            //sub test(selectedMovie as Mo|vie)
+            (0, chai_config_spec_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(1, 44))).to.eql([{
+                    uri: vscode_uri_1.URI.file(file.srcPath).toString(),
+                    range: util_1.default.createRange(4, 22, 4, 27)
+                }]);
         });
-        it('gets types of properties of an object', () => {
+        it('returns namespaced class location', () => {
             const file = program.setFile('source/main.bs', `
-                sub doSomething()
-                    obj = { name: "Joe", age: 37}
-                    print obj.name
-                    print obj.age
+                sub test(selectedMovie as classes.Movie)
+                    print selectedMovie
                 end sub
+                namespace classes
+                    class Movie
+                        url as string
+                    end class
+                end namespace
             `);
-            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);
+            program.validate();
+            //sub test(selectedMovie as classes.Mo|vie)
+            (0, chai_config_spec_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(1, 52))).to.eql([{
+                    uri: vscode_uri_1.URI.file(file.srcPath).toString(),
+                    range: util_1.default.createRange(5, 26, 5, 31)
+                }]);
         });
-        it('gets return types of functions', () => {
+        it('does not crash on nulls', () => {
             const file = program.setFile('source/main.bs', `
-                sub doSomething()
-                    pi = makeKlass().getSelf().getPi()
-                    print pi
+                sub main()
+                    print alpha.beta
                 end sub
-
-                function makeKlass() as MyKlass
-                    return new MyKlass()
+            `);
+            program.validate();
+            sinon.stub(util_1.default, 'getAllDottedGetParts').returns(null);
+            // print alpha.be|ta
+            (0, chai_config_spec_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(2, 34))).to.eql([]);
+        });
+        it('returns enum member locations', () => {
+            const file = program.setFile('source/main.bs', `
+                sub main()
+                    print alpha.beta.people.charlie
+                end sub
+                namespace alpha.beta
+                    enum people
+                        charlie = "charles"
+                    end enum
+                end namespace
+            `);
+            program.validate();
+            //print alpha.beta.char|lie
+            (0, chai_config_spec_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(2, 48))).to.eql([{
+                    uri: vscode_uri_1.URI.file(file.srcPath).toString(),
+                    range: util_1.default.createRange(6, 24, 6, 31)
+                }]);
+        });
+    });
+    it('catches mismatched `end` keywords for functions', () => {
+        program.setFile('source/main.brs', `
+            function speak()
+            end sub
+            sub walk()
+            end function
+        `);
+        program.validate();
+        (0, testHelpers_spec_1.expectDiagnostics)(program, [Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchedEndCallableKeyword('function', 'sub')), { range: util_1.default.createRange(2, 12, 2, 19) }), Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.mismatchedEndCallableKeyword('sub', 'function')), { range: util_1.default.createRange(4, 12, 4, 24) })]);
+    });
+    describe('requiredSymbols', () => {
+        it('should be empty for a simple file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                function someFunc() as integer
+                    return 1
+                end function
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(0);
+        });
+        it('should be empty if the file needs no external symbols', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                function someFunc() as integer
+                    return 1
                 end function
 
-                class MyKlass
-                    function getPi() as float
-                        return 3.14
-                    end function
+                sub useKlass()
+                    k = new Klass()
+                    k.addTwo()
+                end sub
+
+                class Klass
+                    sub addTwo()
+                        print someFunc() + someFunc()
+                    end sub
+                end class
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(0);
+        });
+        it('should not include global callables or types', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                function printLower(s as string) as integer
+                    print lcase(s.trim())
+                end function
 
-                    function getSelf() as MyKlass
-                        return m
+                sub setLabelText( label as roSGNodeLabel, text as string)
+                    label.text = text
+                end sub
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(0);
+        });
+        it('should include unknown param and return types', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                function someFunc(arg as OneType) as TwoType
+                    return arg.getTwo()
+                end function
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(2);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.map(x => x.typeChain[0].name)).to.have.same.members([
+                'TwoType', 'OneType'
+            ]);
+        });
+        it('should include unknown param and return types on class methods', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                class Klass
+                    function someFunc(arg as OneType) as TwoType
+                        return arg.getTwo()
                     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);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(2);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.map(x => x.typeChain[0].name)).to.have.same.members([
+                'TwoType', 'OneType'
+            ]);
         });
-        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
+        it('should not include assigned symbols', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                sub someFunc(arg as SomeOtherType)
+                    x = arg.member
+                    print x+1
+                end sub
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(1);
+            // x and arg are assigned.. they are not included in the required symbols
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols[0].typeChain[0].name).to.equal('SomeOtherType');
+        });
+        it('should include functions called that are not in the file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                sub someFunc()
+                    x = otherFileFunc1()
+                    print x+1
+                end sub
+
+                function deepFunctionCall(i as integer)
+                    x = 2*i and otherFileFunc2()
+                    y = sin(x+fix(78.2)*log(otherFileFunc3()))
+                    ' this is a comment otherFileFunc5()
+                    return y-otherFileFunc4()
+                end function
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(4);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.map(x => x.typeChain[0].name)).to.have.same.members([
+                'otherFileFunc1', 'otherFileFunc2', 'otherFileFunc3', 'otherFileFunc4'
+            ]);
+        });
+        it('should include classes called that are not in the file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                function someFunc(other as OtherKlass) as NS1.Thing
+                    x = new AnotherClass()
+                    return other.getThing(x)
+                end function
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(3);
+            const requiredTypeChains = mainFile.requiredSymbols.map(x => x.typeChain.map(tc => tc.name).join('.'));
+            (0, chai_config_spec_1.expect)(requiredTypeChains).to.have.same.members([
+                'OtherKlass', 'NS1.Thing', 'AnotherClass'
+            ]);
+            const requiredSymbolsFlags = mainFile.requiredSymbols.map(x => x.flags);
+            (0, chai_config_spec_1.expect)(requiredSymbolsFlags).to.have.same.members([
+                SymbolTable_1.SymbolTypeFlag.typetime, SymbolTable_1.SymbolTypeFlag.typetime, SymbolTable_1.SymbolTypeFlag.runtime
+            ]);
+        });
+        it('should include enums and consts that are not in the file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                sub someFunc(myEnum as SomeEnum)
+                    if myEnum = SomeEnum.value1
+                        print 1
+                    else if myEnum = SomeEnum.value2
+                        print 2
+                    else if myEnum = SomeConstValue
+                        print 3
+                    end if
                 end sub
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(4);
+            const requiredTypeChains = mainFile.requiredSymbols.map(x => x.typeChain.map(tc => tc.name).join('.'));
+            (0, chai_config_spec_1.expect)(requiredTypeChains).to.have.same.members([
+                'SomeEnum', 'SomeEnum.value1', 'SomeEnum.value2', 'SomeConstValue'
+            ]);
+            const requiredSymbolsFlags = mainFile.requiredSymbols.map(x => x.flags);
+            (0, chai_config_spec_1.expect)(requiredSymbolsFlags).to.have.same.members([
+                SymbolTable_1.SymbolTypeFlag.typetime, SymbolTable_1.SymbolTypeFlag.runtime, SymbolTable_1.SymbolTypeFlag.runtime, SymbolTable_1.SymbolTypeFlag.runtime
+            ]);
+        });
+        it('should include types not defined in the file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                interface Data
+                    kind as DataKind
+                    getObj as DataObject
+                    subData as SubData
+                end interface
 
-                class MyKlass
-                    function getPi() as float
-                        return 3.14
+                class DataObject extends BaseData
+                    kind as DataKind
+                    function process(dataProcess as DataProcessor) as ProcessedData
+                        return dataProcess.work(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: 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);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(5);
+            const requiredTypeChains = mainFile.requiredSymbols.map(x => x.typeChain.map(tc => tc.name).join('.'));
+            (0, chai_config_spec_1.expect)(requiredTypeChains).to.have.same.members([
+                'DataKind', 'SubData', 'BaseData', 'DataProcessor', 'ProcessedData'
+            ]);
+            const requiredSymbolsFlags = mainFile.requiredSymbols.map(x => x.flags);
+            (0, chai_config_spec_1.expect)(requiredSymbolsFlags).to.have.same.members([
+                SymbolTable_1.SymbolTypeFlag.typetime, SymbolTable_1.SymbolTypeFlag.typetime, SymbolTable_1.SymbolTypeFlag.typetime, SymbolTable_1.SymbolTypeFlag.typetime, SymbolTable_1.SymbolTypeFlag.typetime
+            ]);
         });
-        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
+        it('includes namespace details', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                namespace Alpha.Beta
+                    sub printConstVal()
+                        print CONST_VALUE
+                    end sub
+                end namespace
+
+                namespace Delta
+                    namespace Gamma
+                        namespace Eta
+                            sub doStuff(x as OtherType)
+                                x.something()
+                            end sub
+                        end namespace
+                    end namespace
+                end namespace
             `);
-            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);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(2);
+            const requiredTypeChains = mainFile.requiredSymbols.map(x => x.typeChain.map(tc => tc.name).join('.'));
+            (0, chai_config_spec_1.expect)(requiredTypeChains).to.have.same.members([
+                'CONST_VALUE', 'OtherType'
+            ]);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols[0].containingNamespaces).to.have.same.members(['Alpha', 'Beta']);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols[1].containingNamespaces).to.have.same.members(['Delta', 'Gamma', 'Eta']);
         });
-        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
+        it('does not include namespaces that are defined in the file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                namespace name1
+                    const PI = 3.14
 
-                    firstFloat = numbers[0]
-                    print firstFloat
-                    return firstFloat
+                    namespace name2
+                        function getPi() as float
+                            return name1.PI
+                        end function
+                    end namespace
+                end namespace
+            `);
+            program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(0);
+        });
+        it('should put types from typecasts as typetime required', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                function takesIface(z) as string
+                    return (z as MyInterface).name
                 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);
+            program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols.length).to.eq(1);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols[0].flags).to.eq(SymbolTable_1.SymbolTypeFlag.typetime);
         });
     });
-    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();
-        const symbolTable = file.parser.references.functionExpressions[0].symbolTable;
-        //sanity check
-        (0, chai_1.expect)(symbolTable.getSymbolType('name')).be.instanceof(StringType_1.StringType);
-        //this complex expression should resolve to dynamic type when not known
-        (0, chai_1.expect)(symbolTable.getSymbolType('thing')).be.instanceof(DynamicType_1.DynamicType);
-    });
-    describe('getDefinition', () => {
-        it('returns const locations', () => {
-            const file = program.setFile('source/main.bs', `
-                sub main()
-                    print alpha.beta.charlie
-                end sub
-                namespace alpha.beta
-                    const CHARLIE = true
+    describe('providedSymbols', () => {
+        it('includes functions defined in the file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                function someFunc() as integer
+                    return 1
+                end function
+
+                function someFunc2() as float
+                    return 2.3
+                end function
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+            (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
+            const someFuncType = runtimeSymbols.get('somefunc').type;
+            (0, testHelpers_spec_1.expectTypeToBe)(someFuncType, TypedFunctionType_1.TypedFunctionType);
+            const someFunc2Type = runtimeSymbols.get('somefunc2').type;
+            (0, testHelpers_spec_1.expectTypeToBe)(someFunc2Type, TypedFunctionType_1.TypedFunctionType);
+        });
+        it('includes functions with unresolved params/return types', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                function someFunc() as OtherFileType
+                    return new OtherFileType()
+                end function
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+            (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+            const someFuncType = runtimeSymbols.get('somefunc').type;
+            (0, testHelpers_spec_1.expectTypeToBe)(someFuncType, TypedFunctionType_1.TypedFunctionType);
+            const requiredSymbols = mainFile.requiredSymbols.map(x => x.typeChain[0].name);
+            (0, chai_config_spec_1.expect)(requiredSymbols).to.have.same.members(['OtherFileType', 'OtherFileType']);
+            const requiredSymbolTypes = mainFile.requiredSymbols.map(x => x.flags);
+            (0, chai_config_spec_1.expect)(requiredSymbolTypes).to.have.same.members([SymbolTable_1.SymbolTypeFlag.runtime, SymbolTable_1.SymbolTypeFlag.typetime]);
+        });
+        it('includes classes defined in the file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                class Klass
+                    name as string
+                end class
+
+                class Klass2 extends Klass
+                    age as integer
+
+                    function getId() as string
+                        return m.name + " " + m.age.toStr()
+                    end function
+                end class
+
+                class Klass3
+                    propClass = new Klass2()
+                end class
+            `);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+            (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(3);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('klass').type, types_1.ClassType);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('klass2').type, types_1.ClassType);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('klass3').type, types_1.ClassType);
+            const typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.typetime);
+            (0, chai_config_spec_1.expect)(typetimeSymbols.size).to.eq(3);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('klass').type, types_1.ClassType);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('klass2').type, types_1.ClassType);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('klass3').type, types_1.ClassType);
+        });
+        it('includes other types defined in the file', () => {
+            const mainFile = program.setFile('source/main.bs', `
+                interface MyInterface
+                    name as string
+                end interface
+
+                enum MyEnum
+                    val1
+                    val2
+                end enum
+
+                namespace MyNamespace
+                    const MyConst = 3.14
                 end namespace
             `);
-            //print alpha.beta.char|lie
-            (0, chai_1.expect)(program.getDefinition(file.srcPath, vscode_languageserver_1.Position.create(2, 41))).to.eql([{
-                    uri: vscode_uri_1.URI.file(file.srcPath).toString(),
-                    range: util_1.default.createRange(5, 26, 5, 33)
-                }]);
+            const validateFileEvent = {
+                program: program,
+                file: mainFile
+            };
+            program.plugins.emit('onFileValidate', validateFileEvent);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+            (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('myenum').type, types_1.EnumType);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('mynamespace.myconst').type, types_1.FloatType);
+            const typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.typetime);
+            (0, chai_config_spec_1.expect)(typetimeSymbols.size).to.eq(2);
+            (0, testHelpers_spec_1.expectTypeToBe)(typetimeSymbols.get('myinterface').type, types_1.InterfaceType);
+            (0, testHelpers_spec_1.expectTypeToBe)(runtimeSymbols.get('myenum').type, types_1.EnumType);
+        });
+        describe('changes', () => {
+            it('new symbols are added to the changes set', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    sub someFunc()
+                        print 1
+                    end sub
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                mainFile = program.setFile('source/main.bs', `
+                    sub someFunc()
+                        print 1
+                    end sub
+
+                    sub someFunc2()
+                        print 2
+                    end sub
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('somefunc2')).to.be.true;
+            });
+            it('removed symbols are added to the changes set', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    sub someFunc()
+                        print 1
+                    end sub
+
+                    sub someFunc2()
+                        print 2
+                    end sub
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
+                mainFile = program.setFile('source/main.bs', `
+                    sub someFunc()
+                        print 1
+                    end sub
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('somefunc2')).to.be.true;
+            });
+            it('new symbols in a namespace are added to the changes set', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    namespace Alpha
+                    end namespace
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(0);
+                mainFile = program.setFile('source/main.bs', `
+                    namespace Alpha
+                        const ABC = "abc"
+                    end namespace
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('alpha.abc')).to.be.true;
+            });
+            it('should be empty if no changes in actual provided symbols', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    sub printSomething()
+                        print "Something"
+                    end sub
+
+                    namespace alpha.beta
+                        const PI = 3.14
+                    end namespace
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
+                mainFile = program.setFile('source/main.bs', `
+                    sub printSomething()
+                        print "Something Else"
+                    end sub
+
+                    namespace alpha.beta
+                        const PI = 3.14159
+                    end namespace
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
+            });
+            it('should include changes in function signatures', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    function someFunc(x)
+                        return x
+                    end function
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                mainFile = program.setFile('source/main.bs', `
+                    function someFunc(x, y)
+                        return x+y
+                    end function
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('somefunc'));
+            });
+            it('should include changes in classes', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    class MyKlass
+                        name as string
+                        function getValue() as float
+                            return 3.14
+                        end function
+                    end class
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                mainFile = program.setFile('source/main.bs', `
+                    class MyKlass
+                        name as string
+                        function getValue() as string
+                            return "hello"
+                        end function
+                    end class
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('myklass'));
+                let typeTimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                (0, chai_config_spec_1.expect)(typeTimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(typeTimeChanges.has('myklass'));
+            });
+            it('should include changes in interfaces', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    interface Iface1
+                        name as string
+                        function doStuff() as float
+                    end interface
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                (0, chai_config_spec_1.expect)(typetimeSymbols.size).to.eq(1);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(0);
+                mainFile = program.setFile('source/main.bs', `
+                    interface Iface1
+                        name as string
+                        age as integer
+                        function doStuff() as float
+                    end interface
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                (0, chai_config_spec_1.expect)(typetimeSymbols.size).to.eq(1);
+                let typeTimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                (0, chai_config_spec_1.expect)(typeTimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(typeTimeChanges.has('iface1'));
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
+            });
+            it('should not include changes in enum values, if inner type is the same', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    enum MyEnum
+                        north = 4
+                        east = 3
+                        south = 2
+                        west = 1
+                    end enum
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                mainFile = program.setFile('source/main.bs', `
+                    enum MyEnum
+                        north = 1
+                        east = 2
+                        south = 3
+                        west = 4
+                    end enum
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
+                let typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                (0, chai_config_spec_1.expect)(typetimeSymbols.size).to.eq(1);
+                let typetimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                (0, chai_config_spec_1.expect)(typetimeChanges.size).to.eq(0);
+            });
+            it('should include changes in enum, if different number of members', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    enum Direction
+                        north = 1
+                        east = 2
+                        south = 3
+                        west = 4
+                    end enum
+
+                    enum Weather
+                        rainy
+                        sunny
+                    end enum
+
+                    enum Colors
+                        blue
+                        red
+                        green
+                        purple
+                    end enum
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(3);
+                mainFile = program.setFile('source/main.bs', `
+                    enum Direction ' same
+                        north = 1
+                        east = 2
+                        south = 3
+                        west = 4
+                    end enum
+
+                    enum Weather 'added member
+                        rainy
+                        sunny
+                        snowy
+                    end enum
+
+                    enum Colors 'removed member
+                        blue
+                        red
+                        green
+                    end enum
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(3);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(2);
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('weather'));
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('colors'));
+            });
+            it('should include changes in enum, if different underlying type', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    enum Direction
+                        north = 1
+                        east = 2
+                        south = 3
+                        west = 4
+                    end enum
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                mainFile = program.setFile('source/main.bs', `
+                    enum Direction ' now is a string
+                        north = "N"
+                        east = "E"
+                        south = "S"
+                        west = "W"
+                    end enum
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('direction'));
+            });
+            it('should include changes in const, if different underlying type', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    namespace alpha.beta
+                        const PI = 3.14
+                    end namespace
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                mainFile = program.setFile('source/main.bs', `
+                    namespace alpha.beta
+                        const PI = "lemon chiffon"
+                    end namespace
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
+                (0, chai_config_spec_1.expect)(runtimeChanges.has('alpha.beta.pi'));
+            });
+            it('should not include changes inside a function if the param types are known', () => {
+                let mainFile = program.setFile('source/main.bs', `
+                    function func1(p as string) as integer
+                        return len(p)
+                    end function
+
+                    sub displayModelTypeInLabel(myLabel as roSgNodeLabel)
+                        print myLabel.text
+                        di = createObject("roDeviceInfo")' as roDeviceInfo
+                        myLabel.text = di.GetFriendlyName()
+                        print myLabel.getChildren(0, -1)
+                    end sub
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
+                mainFile = program.setFile('source/main.bs', `
+                    function func1(p as string) as integer
+                        return len(p)+1
+                    end function
+
+                    sub displayModelTypeInLabel(myLabel as roSgNodeLabel)
+                        print myLabel.text
+                        di = createObject("roDeviceInfo") as roDeviceInfo
+                        myLabel.text = di.GetFriendlyName()
+                        print myLabel.getChildren(0, -1)
+                    end sub
+                `);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
+            });
+            it('classes that override AA built-in methods show change properly', () => {
+                const classFileContent = `
+                    class AAOverRide
+                        sub count(num as integer) as void
+                            print num
+                        end sub
+                    end class
+                `;
+                let mainFile = program.setFile('source/class.bs', classFileContent);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                // No changes!
+                mainFile = program.setFile('source/class.bs', classFileContent);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
+            });
+            it('functions in a namespace that return classes show change properly', () => {
+                const fileContent = `
+                    namespace Alpha.Beta
+
+                        class SomeKlass
+                            name as string
+                            function combineName(klass as SomeKlass)
+                                m.name = m.name+klass.name
+                            end function
+                        end class
+
+                        function getSomeKlass(name as string) as SomeKlass
+                            k = new SomeKlass()
+                            k.name = name
+                            return k
+                        end function
+                    end namespace
+                `;
+                let mainFile = program.setFile('source/class.bs', fileContent);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                // No changes!
+                mainFile = program.setFile('source/class.bs', fileContent);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
+            });
+            it('functions in a namespace that have class params show change properly', () => {
+                const fileContent = `
+                    namespace Alpha.Beta
+
+                        class SomeKlass
+                            name as string
+                            function combineName(klass as SomeKlass)
+                                m.name = m.name+klass.name
+                            end function
+                        end class
+
+                        function combineKlass(klass1 as SomeKlass, klass2 as SomeKlass) as SomeKlass
+                            klass1.combineName(klass2)
+                            return klass1
+                        end function
+                    end namespace
+                `;
+                let mainFile = program.setFile('source/class.bs', fileContent);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                // No changes!
+                mainFile = program.setFile('source/class.bs', fileContent);
+                program.plugins.emit('onFileValidate', { program: program, file: mainFile });
+                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
+            });
+        });
+    });
+    describe('propertyHints', () => {
+        it('extracts property names for completion', () => {
+            const file = program.setFile('source/main.brs', `
+                function main(arg as string)
+                    aa1 = {
+                        "sprop1": 0,
+                        prop1: 1
+                        prop2: {
+                            prop3: 2
+                        }
+                    }
+                    aa2 = {
+                        prop4: {
+                            prop5: 5,
+                            "sprop2": 0,
+                            prop6: 6
+                        },
+                        prop7: 7
+                    }
+                    calling({
+                        prop8: 8,
+                        prop9: 9
+                    })
+                    aa1.field1 = 1
+                    aa1.field2.field3 = 2
+                    calling(aa2.field4, 3 + aa2.field5.field6)
+                end function
+            `);
+            const expected = [
+                'field1', 'field2', 'field3', 'field4', 'field5', 'field6',
+                'prop1', 'prop2', 'prop3', 'prop4', 'prop5', 'prop6', 'prop7', 'prop8', 'prop9'
+            ];
+            const { propertyHints } = file['_cachedLookups'];
+            (0, chai_config_spec_1.expect)(Object.keys(propertyHints).sort()).to.deep.equal(expected, 'Initial hints');
+        });
+        it('extracts property names matching JavaScript reserved names', () => {
+            const file = program.setFile('source/main.brs', `
+                function main(arg as string)
+                    aa1 = {
+                        "constructor": 0,
+                        constructor: 1
+                        valueOf: {
+                            toString: 2
+                        }
+                    }
+                    aa1.constructor = 1
+                    aa1.valueOf.toString = 2
+                end function
+            `);
+            const expected = [
+                'constructor', 'tostring', 'valueof'
+            ];
+            const { propertyHints } = file['_cachedLookups'];
+            (0, chai_config_spec_1.expect)(Object.keys(propertyHints).sort()).to.deep.equal(expected, 'Initial hints');
         });
     });
 });