brighterscript 0.41.2 → 1.0.0-alpha.12

package/dist/files/BrsFile.spec.js

@@ -19,6 +19,7 @@ const PluginInterface_1 = require("../PluginInterface");
 const testHelpers_spec_1 = require("../testHelpers.spec");
 const Parser_1 = require("../parser/Parser");
 const Logger_1 = require("../Logger");
+const VoidType_1 = require("../types/VoidType");
 let sinon = sinonImport.createSandbox();
 describe('BrsFile', () => {
     let rootDir = (0, util_1.standardizePath) `${process.cwd()}/.tmp/rootDir`;
@@ -37,7 +38,7 @@ describe('BrsFile', () => {
     });
     it('supports the third parameter in CreateObject', () => {
         var _a;
-        program.addOrReplaceFile('source/main.brs', `
+        program.setFile('source/main.brs', `
             sub main()
                 regexp = CreateObject("roRegex", "[a-z]+", "i")
             end sub
@@ -47,7 +48,7 @@ describe('BrsFile', () => {
     });
     it('supports the 6 params in CreateObject for roRegion', () => {
         var _a;
-        program.addOrReplaceFile('source/main.brs', `
+        program.setFile('source/main.brs', `
             sub createRegion(bitmap as object)
                 region = CreateObject("roRegion", bitmap, 20, 40, 100, 200)
             end sub
@@ -77,7 +78,7 @@ describe('BrsFile', () => {
             dest: `source/lib.brs`
         };
         it('creates proper tokens', () => {
-            file = program.addOrReplaceFile(entry, `call(ModuleA.ModuleB.ModuleC.`);
+            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.');
@@ -89,23 +90,23 @@ describe('BrsFile', () => {
     describe('getScopesForFile', () => {
         it('finds the scope for the file', () => {
             var _a;
-            let file = program.addOrReplaceFile('source/main.brs', ``);
+            let file = program.setFile('source/main.brs', ``);
             (0, chai_1.expect)((_a = program.getScopesForFile(file)[0]) === null || _a === void 0 ? void 0 : _a.name).to.equal('source');
         });
     });
     describe('getCompletions', () => {
         it('does not crash for callfunc on a function call', () => {
-            const file = program.addOrReplaceFile('source/main.brs', `
+            const file = program.setFile('source/main.brs', `
                 sub main()
                     getManager()@.
                 end sub
             `);
             (0, chai_1.expect)(() => {
-                program.getCompletions(file.pathAbsolute, util_1.default.createPosition(2, 34));
+                program.getCompletions(file.srcPath, util_1.default.createPosition(2, 34));
             }).not.to.throw;
         });
         it('suggests pkg paths in strings that match that criteria', () => {
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     print "pkg:"
                 end sub
@@ -117,7 +118,7 @@ describe('BrsFile', () => {
             ]);
         });
         it('suggests libpkg paths in strings that match that criteria', () => {
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     print "libpkg:"
                 end sub
@@ -129,7 +130,7 @@ describe('BrsFile', () => {
             ]);
         });
         it('suggests pkg paths in template strings', () => {
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     print \`pkg:\`
                 end sub
@@ -142,7 +143,7 @@ describe('BrsFile', () => {
         });
         it('waits for the file to be processed before collecting completions', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub Main()
                     print "hello"
                     Say
@@ -158,7 +159,7 @@ describe('BrsFile', () => {
         });
         it('always includes `m`', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
 
                 end sub
@@ -169,14 +170,14 @@ describe('BrsFile', () => {
         });
         it('does not fail for missing previousToken', () => {
             //add a single character to the file, and get completions after it
-            program.addOrReplaceFile('source/main.brs', `i`);
+            program.setFile('source/main.brs', `i`);
             (0, chai_1.expect)(() => {
                 program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(0, 1)).map(x => x.label);
             }).not.to.throw;
         });
         it('includes all keywords`', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
 
                 end sub
@@ -197,7 +198,7 @@ describe('BrsFile', () => {
         });
         it('does not provide completions within a comment', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     'some comment
                 end sub
@@ -208,7 +209,7 @@ describe('BrsFile', () => {
         });
         it('does not provide duplicate entries for variables', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     name = "bob"
                     age = 12
@@ -223,7 +224,7 @@ describe('BrsFile', () => {
         });
         it('does not include `as` and `string` text options when used in function params', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main(name as string)
 
                 end sub
@@ -234,7 +235,7 @@ describe('BrsFile', () => {
         });
         it('does not provide intellisense results when inside a comment', () => {
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main(name as string)
                     'this is a comment
                 end sub
@@ -245,7 +246,7 @@ describe('BrsFile', () => {
         it('does provide intellisence for labels only after a goto keyword', () => {
             var _a;
             //eslint-disable-next-line @typescript-eslint/no-floating-promises
-            program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main(name as string)
                     something:
                     goto \nend sub
@@ -254,12 +255,38 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(results.length).to.equal(1);
             (0, chai_1.expect)((_a = results[0]) === null || _a === void 0 ? void 0 : _a.label).to.equal('something');
         });
+        it('includes properties of objects', () => {
+            //eslint-disable-next-line @typescript-eslint/no-floating-promises
+            program.setFile('source/main.brs', `
+                sub Main()
+                    myObj = {name:"Bob", age: 34, height:6.0}
+                    myObj.
+                end sub
+            `);
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(3, 26));
+            let names = result.map(x => x.label);
+            (0, chai_1.expect)(names).to.contain('name');
+            (0, chai_1.expect)(names).to.contain('age');
+            (0, chai_1.expect)(names).to.contain('height');
+        });
+        it('includes properties of m', () => {
+            //eslint-disable-next-line @typescript-eslint/no-floating-promises
+            program.setFile('source/main.brs', `
+                sub Main()
+                    m.someField= "hello"
+                    m.
+                end sub
+            `);
+            let result = program.getCompletions(`${rootDir}/source/main.brs`, vscode_languageserver_1.Position.create(3, 22));
+            let names = result.map(x => x.label);
+            (0, chai_1.expect)(names).to.contain('someField');
+        });
     });
     describe('comment flags', () => {
         describe('bs:disable-next-line', () => {
             it('disables critical diagnostic issues', () => {
                 var _a, _b;
-                program.addOrReplaceFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         Dim requestData
                     end sub
@@ -267,7 +294,7 @@ describe('BrsFile', () => {
                 //should have an error
                 program.validate();
                 (0, chai_1.expect)((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.exist;
-                program.addOrReplaceFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         'bs:disable-next-line
                         Dim requestData
@@ -279,7 +306,7 @@ describe('BrsFile', () => {
             });
             it('works with leading whitespace', () => {
                 var _a;
-                program.addOrReplaceFile('source/main.brs', `
+                program.setFile('source/main.brs', `
                     sub main()
                         ' bs:disable-next-line
                         =asdf=sadf=
@@ -291,7 +318,7 @@ describe('BrsFile', () => {
             });
             it('works for all', () => {
                 var _a;
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         'bs:disable-next-line
                         name = "bob
@@ -309,7 +336,7 @@ describe('BrsFile', () => {
             });
             it('works for specific codes', () => {
                 var _a;
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         'bs:disable-next-line: 1083, 1001
                         name = "bob
@@ -326,7 +353,7 @@ describe('BrsFile', () => {
             });
             it('ignores non-numeric codes', () => {
                 var _a;
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         'bs:disable-next-line: LINT9999
                         name = "bob
@@ -336,7 +363,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)((_a = program.getDiagnostics()[0]) === null || _a === void 0 ? void 0 : _a.message).to.exist;
             });
             it('adds diagnostics for unknown numeric diagnostic codes', () => {
-                program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         print "hi" 'bs:disable-line: 123456 999999   aaaab
                     end sub
@@ -353,7 +380,7 @@ describe('BrsFile', () => {
         });
         describe('bs:disable-line', () => {
             it('works for all', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub Main()
                         z::;;%%%%%% 'bs:disable-line
                     end sub
@@ -369,7 +396,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)(program.getDiagnostics()).to.be.lengthOf(0);
             });
             it('works for specific codes', () => {
-                program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         'should not have any errors
                         DoSomething(1) 'bs:disable-line:1002
@@ -389,7 +416,7 @@ 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.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         stop 'bs:disable-line
                         print "need a valid line to fix stop error"
@@ -402,7 +429,7 @@ describe('BrsFile', () => {
     });
     describe('parse', () => {
         it('supports iife in assignment', () => {
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                     result = sub()
                     end sub()
@@ -414,7 +441,7 @@ describe('BrsFile', () => {
         });
         it('uses the proper parse mode based on file extension', () => {
             function testParseMode(destPath, expectedParseMode) {
-                const file = program.addOrReplaceFile(destPath, '');
+                const file = program.setFile(destPath, '');
                 (0, chai_1.expect)(file.parseMode).to.equal(expectedParseMode);
             }
             testParseMode('source/main.brs', Parser_1.ParseMode.BrightScript);
@@ -425,7 +452,7 @@ describe('BrsFile', () => {
             testParseMode('source/main.spec.bs', Parser_1.ParseMode.BrighterScript);
         });
         it('supports labels and goto statements', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     'multiple goto statements on one line
                     goto myLabel : goto myLabel
@@ -435,7 +462,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
         });
         it('supports empty print statements', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub main()
                    print
                 end sub
@@ -444,7 +471,7 @@ describe('BrsFile', () => {
         });
         describe('conditional compile', () => {
             it('works for upper case keywords', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #CONST someFlag = true
                         #IF someFlag
@@ -459,7 +486,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
             });
             it('supports single-word #elseif and #endif', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #const someFlag = true
                         #if someFlag
@@ -472,7 +499,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
             });
             it('supports multi-word #else if and #end if', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #const someFlag = true
                         #if someFlag
@@ -485,7 +512,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
             });
             it('does not choke on invalid code inside a false conditional compile', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #if false
                             non-commented code here should not cause parse errors
@@ -495,7 +522,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
             });
             it('detects syntax error in #if', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #if true1
                             print "true"
@@ -505,7 +532,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)(file.getDiagnostics()[0]).to.exist.and.deep.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.invalidHashConstValue));
             });
             it('detects syntax error in #const', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #if %
                             print "true"
@@ -515,7 +542,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)(file.getDiagnostics()[0]).to.exist.and.deep.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.unexpectedCharacter('%')));
             });
             it('detects #const name using reserved word', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #const function = true
                     end sub
@@ -523,7 +550,7 @@ describe('BrsFile', () => {
                 (0, chai_1.expect)(file.getDiagnostics()[0]).to.exist.and.deep.include(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.constNameCannotBeReservedWord()));
             });
             it('detects syntax error in #const', () => {
-                let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+                let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                     sub main()
                         #const someConst = 123
                     end sub
@@ -532,7 +559,7 @@ describe('BrsFile', () => {
             });
         });
         it('supports stop statement', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub main()
                    stop
                 end sub
@@ -540,7 +567,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
         });
         it('supports single-line if statements', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub main()
                     if 1 < 2: return true: end if
                     if 1 < 2: return true
@@ -649,7 +676,7 @@ describe('BrsFile', () => {
             `);
             (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
         });
-        it('does not lose function scopes when mismatched end sub', () => {
+        it('does not lose function statements when mismatched end sub', () => {
             file.parse(`
                 sub main()
                     sayHi()
@@ -659,7 +686,7 @@ describe('BrsFile', () => {
                     print "hello world"
                 end sub
             `);
-            (0, chai_1.expect)(file.functionScopes).to.be.lengthOf(2);
+            (0, chai_1.expect)(file.parser.references.functionStatements).to.be.lengthOf(2);
         });
         it('does not lose sub scope when mismatched end function', () => {
             file.parse(`
@@ -671,7 +698,7 @@ describe('BrsFile', () => {
                     print "hello world"
                 end sub
             `);
-            (0, chai_1.expect)(file.functionScopes).to.be.lengthOf(2);
+            (0, chai_1.expect)(file.parser.references.functionStatements).to.be.lengthOf(2);
         });
         it('does not error with boolean in RHS of set statement', () => {
             file.parse(`
@@ -892,7 +919,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
         });
         it('adds error for library statements NOT at top of file', () => {
-            let file = program.addOrReplaceFile('source/main.bs', `
+            let file = program.setFile('source/main.bs', `
                 sub main()
                 end sub
                 import "file.brs"
@@ -908,7 +935,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
         });
         it('adds error for library statements NOT at top of file', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 sub main()
                 end sub
                 Library "v30/bslCore.brs"
@@ -918,7 +945,7 @@ describe('BrsFile', () => {
             ]);
         });
         it('adds error for library statements inside of function body', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 sub main()
                     Library "v30/bslCore.brs"
                 end sub
@@ -936,7 +963,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.getDiagnostics()).to.be.lengthOf(0);
         });
         it('succeeds when finding variables with "sub" in them', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 function DoSomething()
                     return value.subType()
                 end function
@@ -1114,7 +1141,7 @@ describe('BrsFile', () => {
                 isOptional: true,
                 isRestArgument: false
             });
-            (0, chai_1.expect)(callable.params[0].type).instanceof(DynamicType_1.DynamicType);
+            (0, chai_1.expect)(callable.params[0].type).instanceof(IntegerType_1.IntegerType);
         });
         it('finds parameter types', () => {
             let file = new BrsFile_1.BrsFile('absolute_path/file.brs', 'relative_path/file.brs', program);
@@ -1169,7 +1196,7 @@ describe('BrsFile', () => {
         });
         it('finds function calls nested inside statements', () => {
             var _a;
-            program.addOrReplaceFile(`source/main.brs`, `
+            program.setFile(`source/main.brs`, `
                 sub main()
                     if true then
                         DoesNotExist(1, 2)
@@ -1191,15 +1218,15 @@ describe('BrsFile', () => {
             `);
             (0, chai_1.expect)(file.functionCalls.length).to.equal(1);
             (0, chai_1.expect)(file.functionCalls[0].args[0]).deep.include({
-                type: new DynamicType_1.DynamicType(),
+                type: new IntegerType_1.IntegerType(),
                 text: 'count'
             });
             (0, chai_1.expect)(file.functionCalls[0].args[1]).deep.include({
-                type: new DynamicType_1.DynamicType(),
+                type: new StringType_1.StringType(),
                 text: 'name'
             });
             (0, chai_1.expect)(file.functionCalls[0].args[2]).deep.include({
-                type: new DynamicType_1.DynamicType(),
+                type: new BooleanType_1.BooleanType(),
                 text: 'isAlive'
             });
         });
@@ -1212,7 +1239,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.callables.length).to.equal(0);
         });
         it('finds return type', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 function DoSomething() as string
                 end function
             `);
@@ -1225,14 +1252,14 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.callables[0].type.returnType).instanceof(StringType_1.StringType);
         });
     });
-    describe('createFunctionScopes', () => {
+    describe('function local variable handling', () => {
         it('creates range properly', () => {
             file.parse(`
                 sub Main()
                     name = 'bob"
                 end sub
             `);
-            (0, chai_1.expect)(file.functionScopes[0].range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
+            (0, chai_1.expect)(file.parser.references.functionStatements[0].range).to.eql(vscode_languageserver_1.Range.create(1, 16, 3, 23));
         });
         it('creates scopes for parent and child functions', () => {
             file.parse(`
@@ -1246,23 +1273,9 @@ describe('BrsFile', () => {
                     end sub)
                 end sub
             `);
-            (0, chai_1.expect)(file.functionScopes).to.length(3);
-        });
-        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_1.expect)(outerScope.variableDeclarations).to.be.lengthOf(2);
-            let innerScope = file.getFunctionScopeAtPosition(vscode_languageserver_1.Position.create(4, 10));
-            (0, chai_1.expect)(innerScope.variableDeclarations).to.be.lengthOf(1);
+            (0, chai_1.expect)(file.parser.references.functionExpressions).to.be.length(3);
         });
-        it('finds variables declared in function scopes', () => {
+        it('finds variables declared in function expressions', () => {
             file.parse(`
                 sub Main()
                     sayHi = sub()
@@ -1274,24 +1287,15 @@ describe('BrsFile', () => {
                     end sub)
                 end sub
             `);
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations).to.be.length(1);
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations[0]).to.deep.include({
-                lineIndex: 2,
-                name: 'sayHi'
-            });
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations[0].type).instanceof(FunctionType_1.FunctionType);
-            (0, chai_1.expect)(file.functionScopes[1].variableDeclarations).to.be.length(1);
-            (0, chai_1.expect)(file.functionScopes[1].variableDeclarations[0]).to.deep.include({
-                lineIndex: 3,
-                name: 'age'
-            });
-            (0, chai_1.expect)(file.functionScopes[1].variableDeclarations[0].type).instanceof(IntegerType_1.IntegerType);
-            (0, chai_1.expect)(file.functionScopes[2].variableDeclarations).to.be.length(1);
-            (0, chai_1.expect)(file.functionScopes[2].variableDeclarations[0]).to.deep.include({
-                lineIndex: 7,
-                name: 'name'
-            });
-            (0, chai_1.expect)(file.functionScopes[2].variableDeclarations[0].type).instanceof(StringType_1.StringType);
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
+                ['sayHi', new FunctionType_1.FunctionType(new VoidType_1.VoidType(), true), util_1.default.createRange(2, 20, 2, 25)]
+            ]);
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[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)]
+            ]);
         });
         it('finds variable declarations inside of if statements', () => {
             file.parse(`
@@ -1301,12 +1305,12 @@ describe('BrsFile', () => {
                     end if
                 end sub
             `);
-            let scope = file.getFunctionScopeAtPosition(vscode_languageserver_1.Position.create(3, 0));
-            (0, chai_1.expect)(scope.variableDeclarations[0]).to.exist;
-            (0, chai_1.expect)(scope.variableDeclarations[0].name).to.equal('theLength');
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
+                ['theLength', new IntegerType_1.IntegerType(), util_1.default.createRange(3, 24, 3, 33)]
+            ]);
         });
         it('finds value from global return', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 sub Main()
                    myName = GetName()
                 end sub
@@ -1315,12 +1319,9 @@ describe('BrsFile', () => {
                     return "bob"
                 end function
             `);
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations).to.be.length(1);
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations[0]).to.deep.include({
-                lineIndex: 2,
-                name: 'myName'
-            });
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations[0].type).instanceof(StringType_1.StringType);
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
+                ['myName', new StringType_1.StringType(), util_1.default.createRange(2, 19, 2, 25)]
+            ]);
         });
         it('finds variable type from other variable', () => {
             file.parse(`
@@ -1329,12 +1330,10 @@ describe('BrsFile', () => {
                    nameCopy = name
                 end sub
             `);
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations).to.be.length(2);
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations[1]).to.deep.include({
-                lineIndex: 3,
-                name: 'nameCopy'
-            });
-            (0, chai_1.expect)(file.functionScopes[0].variableDeclarations[1].type).instanceof(StringType_1.StringType);
+            (0, testHelpers_spec_1.expectSymbolTableEquals)(file.parser.references.functionExpressions[0].symbolTable, [
+                ['name', new StringType_1.StringType(), util_1.default.createRange(2, 19, 2, 23)],
+                ['nameCopy', new StringType_1.StringType(), util_1.default.createRange(3, 19, 3, 27)]
+            ]);
         });
         it('sets proper range for functions', () => {
             file.parse(`
@@ -1344,14 +1343,16 @@ describe('BrsFile', () => {
                     end function
                 end sub
             `);
-            (0, chai_1.expect)(file.functionScopes).to.be.length(2);
-            (0, chai_1.expect)(file.functionScopes[0].range).to.eql(vscode_languageserver_1.Range.create(1, 16, 5, 23));
-            (0, chai_1.expect)(file.functionScopes[1].range).to.eql(vscode_languageserver_1.Range.create(2, 30, 4, 32));
+            (0, chai_1.expect)(file.parser.references.functionExpressions).to.be.length(2);
+            (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)
+            ]);
         });
     });
     describe('getHover', () => {
         it('works for param types', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub DoSomething(name as string)
                     name = 1
                     sayMyName = function(name as string)
@@ -1369,7 +1370,7 @@ describe('BrsFile', () => {
         });
         //ignore this for now...it's not a huge deal
         it('does not match on keywords or data types', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main(name as string)
                 end sub
                 sub as()
@@ -1381,7 +1382,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.getHover(vscode_languageserver_1.Position.create(1, 36))).not.to.exist;
         });
         it('finds declared function', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 function Main(count = 1)
                     firstName = "bob"
                     age = 21
@@ -1391,10 +1392,10 @@ describe('BrsFile', () => {
             let hover = file.getHover(vscode_languageserver_1.Position.create(1, 28));
             (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('function Main(count? as dynamic) as dynamic');
+            (0, chai_1.expect)(hover.contents).to.equal('function Main(count? as integer) as dynamic');
         });
         it('finds variable function hover in same scope', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     sayMyName = sub(name as string)
                     end sub
@@ -1404,10 +1405,10 @@ describe('BrsFile', () => {
             `);
             let hover = file.getHover(vscode_languageserver_1.Position.create(5, 24));
             (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('sub sayMyName(name as string) as void');
+            (0, chai_1.expect)(hover.contents).to.equal('sub (name as string) as void');
         });
         it('finds function hover in file scope', () => {
-            let file = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     sayMyName()
                 end sub
@@ -1425,12 +1426,12 @@ describe('BrsFile', () => {
             program = new Program_1.Program({
                 rootDir: rootDir
             });
-            let mainFile = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     sayMyName()
                 end sub
             `);
-            program.addOrReplaceFile({ src: `${rootDir}/source/lib.brs`, dest: 'source/lib.brs' }, `
+            program.setFile({ src: `${rootDir}/source/lib.brs`, dest: 'source/lib.brs' }, `
                 sub sayMyName(name as string)
 
                 end sub
@@ -1441,7 +1442,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(hover.contents).to.equal('sub sayMyName(name as string) as void');
         });
         it('handles mixed case `then` partions of conditionals', () => {
-            let mainFile = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     if true then
                         print "works"
@@ -1449,7 +1450,7 @@ describe('BrsFile', () => {
                 end sub
             `);
             (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
-            mainFile = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     if true Then
                         print "works"
@@ -1457,7 +1458,7 @@ describe('BrsFile', () => {
                 end sub
             `);
             (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
-            mainFile = program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
                 sub Main()
                     if true THEN
                         print "works"
@@ -1466,9 +1467,50 @@ describe('BrsFile', () => {
             `);
             (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
         });
+        it('displays the context from multiple scopes', () => {
+            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 = commonFile.getHover(vscode_languageserver_1.Position.create(2, 27));
+            (0, chai_1.expect)(funcCallHover).to.exist;
+            (0, chai_1.expect)(funcCallHover.contents).to.equal('getPi as uninitialized | function getPi() as string | function getPi() as float');
+            let variableHover = commonFile.getHover(vscode_languageserver_1.Position.create(3, 27));
+            (0, chai_1.expect)(variableHover).to.exist;
+            (0, chai_1.expect)(variableHover.contents).to.equal('pi as uninitialized | pi as string | pi as float');
+        });
     });
     it('does not throw when encountering incomplete import statement', () => {
-        program.addOrReplaceFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+        program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
             import
             sub main()
             end sub
@@ -1991,7 +2033,7 @@ describe('BrsFile', () => {
             `);
         });
         it('simple mapped files include a reference to the source map', () => {
-            let file = program.addOrReplaceFile('source/logger.brs', (0, testHelpers_spec_1.trim) `
+            let file = program.setFile('source/logger.brs', (0, testHelpers_spec_1.trim) `
                 sub logInfo()
                 end sub
             `);
@@ -2000,7 +2042,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
         });
         it('AST generated files include a reference to the source map', () => {
-            let file = program.addOrReplaceFile('source/logger.brs', (0, testHelpers_spec_1.trim) `
+            let file = program.setFile('source/logger.brs', (0, testHelpers_spec_1.trim) `
                 sub logInfo()
                 end sub
             `);
@@ -2009,7 +2051,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(code.endsWith(`'//# sourceMappingURL=./logger.brs.map`)).to.be.true;
         });
         it('replaces custom types in parameter types and return types', () => {
-            program.addOrReplaceFile('source/SomeKlass.bs', `
+            program.setFile('source/SomeKlass.bs', `
                 class SomeKlass
                 end class
             `);
@@ -2034,7 +2076,7 @@ describe('BrsFile', () => {
         describe('transpile', () => {
             it('does not produce diagnostics', () => {
                 var _a;
-                program.addOrReplaceFile('source/main.bs', `
+                program.setFile('source/main.bs', `
                     sub main()
                         someObject@.someFunction(paramObject.value)
                     end sub
@@ -2080,13 +2122,12 @@ describe('BrsFile', () => {
                 name: 'transform callback',
                 afterFileParse: onParsed
             });
-            const file = new BrsFile_1.BrsFile(`absolute_path/file${ext}`, `relative_path/file${ext}`, program);
-            (0, chai_1.expect)(file.extension).to.equal(ext);
-            file.parse(`
+            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);
             return file;
         }
         it('called for BRS file', () => {
@@ -2094,7 +2135,7 @@ describe('BrsFile', () => {
             parseFileWithCallback('.brs', onParsed);
             (0, chai_1.expect)(onParsed.callCount).to.equal(1);
         });
-        it('called for BR file', () => {
+        it('called for BS file', () => {
             const onParsed = sinon.spy();
             parseFileWithCallback('.bs', onParsed);
             (0, chai_1.expect)(onParsed.callCount).to.equal(1);
@@ -2102,25 +2143,25 @@ describe('BrsFile', () => {
     });
     describe('typedefKey', () => {
         it('works for .brs files', () => {
-            (0, chai_1.expect)((0, util_1.standardizePath)((program.addOrReplaceFile('source/main.brs', '')).typedefKey)).to.equal((0, util_1.standardizePath) `${rootDir.toLowerCase()}/source/main.d.bs`);
+            (0, chai_1.expect)((0, util_1.standardizePath)((program.setFile('source/main.brs', '')).typedefSrcPath)).to.equal((0, util_1.standardizePath) `${rootDir.toLowerCase()}/source/main.d.bs`);
         });
         it('returns undefined for files that should not have a typedef', () => {
-            (0, chai_1.expect)((program.addOrReplaceFile('source/main.bs', '')).typedefKey).to.be.undefined;
-            (0, chai_1.expect)((program.addOrReplaceFile('source/main.d.bs', '')).typedefKey).to.be.undefined;
-            const xmlFile = program.addOrReplaceFile('components/comp.xml', '');
-            (0, chai_1.expect)(xmlFile.typedefKey).to.be.undefined;
+            (0, chai_1.expect)((program.setFile('source/main.bs', '')).typedefSrcPath).to.be.undefined;
+            (0, chai_1.expect)((program.setFile('source/main.d.bs', '')).typedefSrcPath).to.be.undefined;
+            const xmlFile = program.setFile('components/comp.xml', '');
+            (0, chai_1.expect)(xmlFile.typedefSrcPath).to.be.undefined;
         });
     });
     describe('type definitions', () => {
         it('only exposes defined functions even if source has more', () => {
             //parse the .brs file first so it doesn't know about the typedef
-            program.addOrReplaceFile('source/main.brs', `
+            program.setFile('source/main.brs', `
                 sub main()
                 end sub
                 sub speak()
                 end sub
             `);
-            program.addOrReplaceFile('source/main.d.bs', `
+            program.setFile('source/main.d.bs', `
                 sub main()
                 end sub
             `);
@@ -2130,7 +2171,7 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(functionNames).not.to.include('speak');
         });
         it('reacts to typedef file changes', () => {
-            let file = program.addOrReplaceFile('source/main.brs', `
+            let file = program.setFile('source/main.brs', `
                 sub main()
                 end sub
                 sub speak()
@@ -2138,14 +2179,14 @@ describe('BrsFile', () => {
             `);
             (0, chai_1.expect)(file.hasTypedef).to.be.false;
             (0, chai_1.expect)(file.typedefFile).not.to.exist;
-            program.addOrReplaceFile('source/main.d.bs', `
+            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;
             //add replace file, does it still find the typedef
-            file = program.addOrReplaceFile('source/main.brs', `
+            file = program.setFile('source/main.brs', `
                 sub main()
                 end sub
                 sub speak()
@@ -2160,36 +2201,36 @@ describe('BrsFile', () => {
     });
     describe('typedef', () => {
         it('sets typedef path properly', () => {
-            (0, chai_1.expect)((program.addOrReplaceFile('source/main1.brs', '')).typedefKey).to.equal((0, util_1.standardizePath) `${rootDir}/source/main1.d.bs`.toLowerCase());
-            (0, chai_1.expect)((program.addOrReplaceFile('source/main2.d.bs', '')).typedefKey).to.equal(undefined);
-            (0, chai_1.expect)((program.addOrReplaceFile('source/main3.bs', '')).typedefKey).to.equal(undefined);
+            (0, chai_1.expect)((program.setFile('source/main1.brs', '')).typedefSrcPath).to.equal((0, util_1.standardizePath) `${rootDir}/source/main1.d.bs`.toLowerCase());
+            (0, chai_1.expect)((program.setFile('source/main2.d.bs', '')).typedefSrcPath).to.equal(undefined);
+            (0, chai_1.expect)((program.setFile('source/main3.bs', '')).typedefSrcPath).to.equal(undefined);
             //works for dest with `.brs` extension
-            (0, chai_1.expect)((program.addOrReplaceFile({ src: 'source/main4.bs', dest: 'source/main4.brs' }, '')).typedefKey).to.equal(undefined);
+            (0, chai_1.expect)((program.setFile({ src: 'source/main4.bs', dest: 'source/main4.brs' }, '')).typedefSrcPath).to.equal(undefined);
         });
         it('does not link when missing from program', () => {
-            const file = program.addOrReplaceFile('source/main.brs', ``);
+            const file = program.setFile('source/main.brs', ``);
             (0, chai_1.expect)(file.typedefFile).not.to.exist;
         });
         it('links typedef when added BEFORE .brs file', () => {
-            const typedef = program.addOrReplaceFile('source/main.d.bs', ``);
-            const file = program.addOrReplaceFile('source/main.brs', ``);
+            const typedef = program.setFile('source/main.d.bs', ``);
+            const file = program.setFile('source/main.brs', ``);
             (0, chai_1.expect)(file.typedefFile).to.equal(typedef);
         });
         it('links typedef when added AFTER .brs file', () => {
-            const file = program.addOrReplaceFile('source/main.brs', ``);
-            const typedef = program.addOrReplaceFile('source/main.d.bs', ``);
+            const file = program.setFile('source/main.brs', ``);
+            const typedef = program.setFile('source/main.d.bs', ``);
             (0, chai_1.expect)(file.typedefFile).to.eql(typedef);
         });
         it('removes typedef link when typedef is removed', () => {
-            const typedef = program.addOrReplaceFile('source/main.d.bs', ``);
-            const file = program.addOrReplaceFile('source/main.brs', ``);
-            program.removeFile(typedef.pathAbsolute);
+            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;
         });
     });
     describe('getTypedef', () => {
         function testTypedef(original, expected) {
-            let file = program.addOrReplaceFile('source/main.brs', original);
+            let file = program.setFile('source/main.brs', original);
             (0, chai_1.expect)(file.getTypedef()).to.eql(expected);
         }
         it('includes namespace on extend class names', () => {
@@ -2440,7 +2481,7 @@ describe('BrsFile', () => {
     });
     describe('parser getter', () => {
         it('recreates the parser when missing', () => {
-            const file = program.addOrReplaceFile('source/main.brs', `
+            const file = program.setFile('source/main.brs', `
                 sub main()
                 end sub
             `);
@@ -2454,11 +2495,11 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.parser).to.equal(newParser);
         });
         it('call parse when previously skipped', () => {
-            program.addOrReplaceFile('source/main.d.bs', `
+            program.setFile('source/main.d.bs', `
                 sub main()
                 end sub
             `);
-            const file = program.addOrReplaceFile('source/main.brs', `
+            const file = program.setFile('source/main.brs', `
                 sub main()
                 end sub
             `);