brighterscript 1.0.0-alpha.26 → 1.0.0-alpha.28

package/dist/files/BrsFile.spec.js

@@ -4,7 +4,6 @@ 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");
-const BooleanType_1 = require("../types/BooleanType");
 const DynamicType_1 = require("../types/DynamicType");
 const TypedFunctionType_1 = require("../types/TypedFunctionType");
 const IntegerType_1 = require("../types/IntegerType");
@@ -23,8 +22,8 @@ const fsExtra = require("fs-extra");
 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");
+const fileUrl = require("file-url");
 let sinon = sinonImport.createSandbox();
 describe('BrsFile', () => {
     let program;
@@ -187,7 +186,7 @@ describe('BrsFile', () => {
         (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')
+            path: (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();
@@ -507,6 +506,27 @@ describe('BrsFile', () => {
             (0, testHelpers_spec_1.expectZeroDiagnostics)(file);
         });
         describe('conditional compile', () => {
+            it('supports whitespace-separated directives', async () => {
+                const file = program.setFile('source/main.bs', `
+                    sub main()
+                        #\t const thing=true
+                        #\t if thing
+                            print "if"
+                        #\t elseif false
+                            print "elseif"
+                            #\t error crash
+                        #\t else
+                            print "else"
+                        #\t endif
+                    end sub
+                `);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+                await testTranspile(file.fileContents, `
+                    sub main()
+                        print "if"
+                    end sub
+                `);
+            });
             it('supports case-insensitive bs_const variables', () => {
                 fsExtra.outputFileSync(`${testHelpers_spec_2.rootDir}/manifest`, (0, undent_1.default) `
                     bs_const=SomeKey=true
@@ -1105,26 +1125,6 @@ describe('BrsFile', () => {
             (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({
-                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, 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',
@@ -1146,11 +1146,6 @@ describe('BrsFile', () => {
                 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({
@@ -1327,79 +1322,6 @@ describe('BrsFile', () => {
             (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({
-                srcPath: 'absolute_path/file.brs',
-                destPath: 'relative_path/file.brs',
-                program: program
-            });
-            file.parse(`
-                function Sum()
-                    DoSomething("name", 12, true)
-                end function
-            `);
-            (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_config_spec_1.expect)(argsMap).to.eql([{
-                    type: StringType_1.StringType.instance,
-                    range: util_1.default.createRange(2, 32, 2, 38),
-                    text: '"name"'
-                }, {
-                    type: IntegerType_1.IntegerType.instance,
-                    range: util_1.default.createRange(2, 40, 2, 42),
-                    text: '12'
-                }, {
-                    type: BooleanType_1.BooleanType.instance,
-                    range: util_1.default.createRange(2, 44, 2, 48),
-                    text: 'true'
-                }]);
-        });
-        it('finds function calls nested inside statements', () => {
-            program.setFile(`source/main.brs`, `
-                sub main()
-                    if true then
-                        DoesNotExist(1, 2)
-                    end if
-                end sub
-            `);
-            program.validate();
-            (0, testHelpers_spec_1.expectDiagnostics)(program, [
-                DiagnosticMessages_1.DiagnosticMessages.cannotFindName('DoesNotExist')
-            ]);
-        });
-        it('finds arguments with variable values', () => {
-            let file = new BrsFile_1.BrsFile({
-                srcPath: 'absolute_path/file.brs',
-                destPath: 'relative_path/file.brs',
-                program: program
-            });
-            file.parse(`
-                function Sum()
-                    count = 1
-                    name = "John"
-                    isAlive = true
-                    DoSomething(count, name, isAlive)
-                end function
-            `);
-            (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_config_spec_1.expect)(file.functionCalls[0].args[1]).deep.include({
-                type: new DynamicType_1.DynamicType(),
-                text: 'name'
-            });
-            (0, chai_config_spec_1.expect)(file.functionCalls[0].args[2]).deep.include({
-                type: new DynamicType_1.DynamicType(),
-                text: 'isAlive'
-            });
-        });
-    });
     describe('findCallables', () => {
         //this test is to help with code coverage
         it('skips top-level statements', () => {
@@ -1590,6 +1512,230 @@ describe('BrsFile', () => {
         //this test will throw an exception if something went wrong
     });
     describe('transpile', () => {
+        describe('null tokens', () => {
+            it('succeeds when token locations are omitted', () => {
+                doTest(`
+                    library "something" 'comment before func
+                    sub main(arg0, arg1 as string, arg2 = invalid)
+                        'comment
+                        aa = {
+                            'comment
+                            one: 1
+                            "two": 2
+                        }
+                        arr = [
+                            'comment
+                            1
+                            'comment
+                            2
+                        ]
+                        val = + m.val
+                        print "hello"
+                        'comment after print
+                        num = 1
+                        num++
+                        num += 2
+                        num = +num
+                        test(num)
+                        for i = 0 to 10 step 1
+                            exit for
+                        end for
+                        while true
+                            exit while
+                        end while
+                        if true then
+                            print 1
+                        else if true
+                            print 1
+                        else
+                            print 1
+                        end if
+                        dim thing[1, 2]
+                        label1:
+                        goto label1
+                        end
+                        stop
+                        stuff = [
+                            1
+                            2
+                            3
+                        ]
+                        for each item in stuff
+                            print item
+                        end for
+                        m.thing = 1
+                        m.thing += 1
+                        m[1] = 1
+                        m[1] += 1
+                        m[1, 2] = 2
+                        try
+                            print m.b.c
+                        catch e
+                            print e
+                        end try
+                        throw "crash"
+                        for i = 0 to 10
+                            continue
+                        end for
+                        print m@name
+                        print (1 + 2)
+                    end sub
+
+                    sub test(p1)
+                        return p1
+                    end sub
+                `);
+            });
+            it('works for bs content', () => {
+                program.setFile('source/lib.bs', ``);
+                doTest(`
+                    import "pkg:/source/lib.bs"
+                    @annotation()
+                    sub test()
+                        two = 2
+                        print \`1\${two}\${3}\n\`
+                        print (1 as integer)
+                        print SOURCE_LINE_NUM
+                        print FUNCTION_NAME
+                        print SOURCE_FUNCTION_NAME
+                        print PKG_LOCATION
+                        print PKG_PATH
+                        print LINE_NUM
+                        print new Person()
+                        m@.someCallfunc()
+                        m@.someCallfunc(1, 2)
+                        print tag\`stuff\${LINE_NUM}\${LINE_NUM}\`
+                        print 1 = 1 ? 1 : 2
+                        print 1 = 1 ? m.one : m.two
+                        print 1 ?? 2
+                        print m.one ?? m.two
+                        print /123/gi
+                    end sub
+                    function tag(param1, param2)
+                    end function
+                    const a = 1
+                    namespace alpha
+                        function beta()
+                            throw "An error has occurred"
+                        end function
+                        function charlie()
+                        end function
+                    end namespace
+                    sub test2()
+                        ' alpha.charlie()
+                    end sub
+
+                    enum Direction
+                        up = "up"
+                    end enum
+
+                    class Person
+                        name as string
+                        sub new()
+                            print m.name
+                        end sub
+
+                        sub test()
+                        end sub
+                    end class
+
+                    interface Beta
+                        name as string
+                    end interface
+                `, `
+                    'import "pkg:/source/lib.bs"
+
+                    sub test()
+                        two = 2
+                        print ("1" + bslib_toString(two) + bslib_toString(3) + chr(10))
+                        print 1
+                        print -1
+                        print "test"
+                        print "test"
+                        print "pkg:/source/main.brs:" + str(LINE_NUM)
+                        print "pkg:/source/main.brs"
+                        print LINE_NUM
+                        print Person()
+                        m.callfunc("someCallfunc")
+                        m.callfunc("someCallfunc", 1, 2)
+                        print tag(["stuff", "", ""], [LINE_NUM, LINE_NUM])
+                        print bslib_ternary(1 = 1, 1, 2)
+                        print (function(__bsCondition, m)
+                                if __bsCondition then
+                                    return m.one
+                                else
+                                    return m.two
+                                end if
+                            end function)(1 = 1, m)
+                        print bslib_coalesce(1, 2)
+                        print (function(m)
+                                __bsConsequent = m.one
+                                if __bsConsequent <> invalid then
+                                    return __bsConsequent
+                                else
+                                    return m.two
+                                end if
+                            end function)(m)
+                        print CreateObject("roRegex", "123", "gi")
+                    end sub
+
+                    function tag(param1, param2)
+                    end function
+
+                    function alpha_beta()
+                        throw "An error has occurred"
+                    end function
+
+                    function alpha_charlie()
+                    end function
+
+                    sub test2()
+                        ' alpha.charlie()
+                    end sub
+
+                    function __Person_builder()
+                        instance = {}
+                        instance.new = sub()
+                            m.name = invalid
+                            print m.name
+                        end sub
+                        instance.test = sub()
+                        end sub
+                        return instance
+                    end function
+                    function Person()
+                        instance = __Person_builder()
+                        instance.new()
+                        return instance
+                    end function
+                `);
+            });
+            it('handles source literals properly', () => {
+                const pathUrl = fileUrl(testHelpers_spec_2.rootDir);
+                let text = `"${pathUrl.substring(0, 4)}" + "${pathUrl.substring(4)}`;
+                doTest(`
+                    sub test()
+                        print SOURCE_FILE_PATH
+                        print SOURCE_LOCATION
+                    end sub
+                `, `
+                    sub test()
+                        print ${text}/source/main.bs"
+                        print ${text}/source/main.bs:-1"
+                    end sub
+                `);
+            });
+            function doTest(source, expected = source) {
+                const file = program.setFile('source/main.bs', '');
+                //override the parser with our locationless parser
+                file['_parser'] = Parser_1.Parser.parse(source, { mode: Parser_1.ParseMode.BrighterScript, trackLocations: false });
+                program.getScopesForFile(file).forEach(x => x['cache'].clear());
+                program.validate();
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+                const result = file.transpile();
+                (0, chai_config_spec_1.expect)((0, testHelpers_spec_1.trimMap)((0, undent_1.default)(result.code))).to.eql((0, undent_1.default)(expected));
+            }
+        });
         it('transpilies libpkg:/ paths when encountered', async () => {
             program.setFile('source/lib.bs', `
                 import "libpkg:/source/numbers.bs"
@@ -1757,6 +1903,24 @@ describe('BrsFile', () => {
                     end sub
                 `);
             });
+            it('transpiles empty throw with "User-specified exception"', async () => {
+                await testTranspile(`
+                    sub main()
+                        try
+                            throw 'bs:disable-line
+                        catch e
+                        end try
+                    end sub
+                `, `
+                    sub main()
+                        try
+                            throw "User-specified exception"
+                        'bs:disable-line
+                        catch e
+                        end try
+                    end sub
+                `);
+            });
         });
         describe('try/catch', () => {
             it('transpiles properly', async () => {
@@ -2046,6 +2210,7 @@ describe('BrsFile', () => {
                 function DoSomething()
                     'lots of empty white space
                     'that will be removed during transpile
+                    'since there are newlines below this comment one newline will be preserved
 
 
 
@@ -2054,6 +2219,8 @@ describe('BrsFile', () => {
                 function DoSomething()
                     'lots of empty white space
                     'that will be removed during transpile
+                    'since there are newlines below this comment one newline will be preserved
+
                 end function
             `);
         });
@@ -2068,6 +2235,26 @@ describe('BrsFile', () => {
         it('does not add leading or trailing newlines', async () => {
             await testTranspile(`function abc()\nend function`, undefined, 'none');
         });
+        it('generates proper sourcemap comment', () => {
+            program.options.sourceMap = true;
+            const file = program.setFile('source/main.bs', `
+                sub main()
+                end sub
+            `);
+            (0, chai_config_spec_1.expect)(file.transpile().code).to.eql((0, undent_1.default) `
+                sub main()
+                end sub
+                '//# sourceMappingURL=./main.brs.map
+            `);
+        });
+        it('includes sourcemap.name property', () => {
+            program.options.sourceMap = true;
+            const file = program.setFile('source/main.bs', `
+                sub main()
+                end sub
+            `);
+            (0, chai_config_spec_1.expect)(file.transpile().map.toJSON().file).to.eql('main.brs');
+        });
         it('handles sourcemap edge case', async () => {
             let source = 'sub main()\n' +
                 '\n' +
@@ -2239,6 +2426,25 @@ describe('BrsFile', () => {
                 end sub
             `);
         });
+        it('keeps spaces in between comments when a statement ends in a comment ', async () => {
+            await testTranspile(`
+                sub foo()
+                end sub 'comment
+
+                'a function that does something
+                sub foo2()
+                end sub
+            `);
+        });
+        it('keeps comment in correct place in empty function', async () => {
+            await testTranspile(`
+                sub noop1()
+                end sub
+
+                sub noop2() 'comment in empty function
+                end sub
+            `);
+        });
         it('works for a complex function with comments all over the place', async () => {
             await testTranspile(`
                 'import some library
@@ -2430,7 +2636,7 @@ describe('BrsFile', () => {
                 program.setFile('source/main.bs', `
                     sub test()
                         someNode = createObject("roSGNode", "Rectangle")
-                        someNode@.someFunction(test.value)
+                        someNode@.someFunction({test: "value"})
                     end sub
                 `);
                 program.validate();
@@ -3188,6 +3394,30 @@ describe('BrsFile', () => {
                 'TwoType', 'OneType'
             ]);
         });
+        it('allows built-in types for interface members', () => {
+            program.setFile('source/main.bs', `
+                interface MyBase
+                    regex as roRegex
+                    node as roSGNodeLabel
+                    sub outputMatches(textInput as string)
+                    function getLabelParent() as roSGNode
+                end interface
+                `);
+            program.validate();
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        });
+        it('allows extends on interfaces', async () => {
+            await testTranspile(`
+                interface MyBase
+                    url as string
+                end interface
+
+                interface MyExtends extends MyBase
+                    method as string
+                end interface
+            `, `
+            `);
+        });
         it('should include unknown param and return types on class methods', () => {
             const mainFile = program.setFile('source/main.bs', `
                 class Klass
@@ -3265,7 +3495,7 @@ describe('BrsFile', () => {
             ]);
             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
+                2 /* SymbolTypeFlag.typetime */, 2 /* SymbolTypeFlag.typetime */, 1 /* SymbolTypeFlag.runtime */
             ]);
         });
         it('should include enums and consts that are not in the file', () => {
@@ -3292,7 +3522,7 @@ describe('BrsFile', () => {
             ]);
             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
+                2 /* SymbolTypeFlag.typetime */, 1 /* SymbolTypeFlag.runtime */, 1 /* SymbolTypeFlag.runtime */, 1 /* SymbolTypeFlag.runtime */
             ]);
         });
         it('should include types not defined in the file', () => {
@@ -3322,7 +3552,7 @@ describe('BrsFile', () => {
             ]);
             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
+                2 /* SymbolTypeFlag.typetime */, 2 /* SymbolTypeFlag.typetime */, 2 /* SymbolTypeFlag.typetime */, 2 /* SymbolTypeFlag.typetime */, 2 /* SymbolTypeFlag.typetime */
             ]);
         });
         it('includes namespace details', () => {
@@ -3379,7 +3609,7 @@ describe('BrsFile', () => {
             `);
             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);
+            (0, chai_config_spec_1.expect)(mainFile.requiredSymbols[0].flags).to.eq(2 /* SymbolTypeFlag.typetime */);
         });
     });
     describe('providedSymbols', () => {
@@ -3398,7 +3628,7 @@ describe('BrsFile', () => {
                 file: mainFile
             };
             program.plugins.emit('onFileValidate', validateFileEvent);
-            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(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);
@@ -3416,14 +3646,14 @@ describe('BrsFile', () => {
                 file: mainFile
             };
             program.plugins.emit('onFileValidate', validateFileEvent);
-            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(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]);
+            (0, chai_config_spec_1.expect)(requiredSymbolTypes).to.have.same.members([1 /* SymbolTypeFlag.runtime */, 2 /* SymbolTypeFlag.typetime */]);
         });
         it('includes classes defined in the file', () => {
             const mainFile = program.setFile('source/main.bs', `
@@ -3448,12 +3678,12 @@ describe('BrsFile', () => {
                 file: mainFile
             };
             program.plugins.emit('onFileValidate', validateFileEvent);
-            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(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);
+            const typetimeSymbols = mainFile.providedSymbols.symbolMap.get(2 /* 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);
@@ -3479,11 +3709,11 @@ describe('BrsFile', () => {
                 file: mainFile
             };
             program.plugins.emit('onFileValidate', validateFileEvent);
-            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+            const runtimeSymbols = mainFile.providedSymbols.symbolMap.get(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);
+            const typetimeSymbols = mainFile.providedSymbols.symbolMap.get(2 /* 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);
@@ -3496,7 +3726,7 @@ describe('BrsFile', () => {
                     end sub
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
                 mainFile = program.setFile('source/main.bs', `
                     sub someFunc()
@@ -3508,9 +3738,9 @@ describe('BrsFile', () => {
                     end sub
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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;
             });
@@ -3525,7 +3755,7 @@ describe('BrsFile', () => {
                     end sub
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
                 mainFile = program.setFile('source/main.bs', `
                     sub someFunc()
@@ -3533,9 +3763,9 @@ describe('BrsFile', () => {
                     end sub
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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;
             });
@@ -3545,7 +3775,7 @@ describe('BrsFile', () => {
                     end namespace
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(0);
                 mainFile = program.setFile('source/main.bs', `
                     namespace Alpha
@@ -3553,9 +3783,9 @@ describe('BrsFile', () => {
                     end namespace
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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;
             });
@@ -3570,7 +3800,7 @@ describe('BrsFile', () => {
                     end namespace
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
                 mainFile = program.setFile('source/main.bs', `
                     sub printSomething()
@@ -3582,9 +3812,9 @@ describe('BrsFile', () => {
                     end namespace
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
             });
             it('should include changes in function signatures', () => {
@@ -3594,7 +3824,7 @@ describe('BrsFile', () => {
                     end function
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
                 mainFile = program.setFile('source/main.bs', `
                     function someFunc(x, y)
@@ -3602,9 +3832,9 @@ describe('BrsFile', () => {
                     end function
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
                 (0, chai_config_spec_1.expect)(runtimeChanges.has('somefunc'));
             });
@@ -3618,7 +3848,7 @@ describe('BrsFile', () => {
                     end class
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
                 mainFile = program.setFile('source/main.bs', `
                     class MyKlass
@@ -3629,12 +3859,12 @@ describe('BrsFile', () => {
                     end class
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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);
+                let typeTimeChanges = mainFile.providedSymbols.changes.get(2 /* SymbolTypeFlag.typetime */);
                 (0, chai_config_spec_1.expect)(typeTimeChanges.size).to.eq(1);
                 (0, chai_config_spec_1.expect)(typeTimeChanges.has('myklass'));
             });
@@ -3646,9 +3876,9 @@ describe('BrsFile', () => {
                     end interface
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                let typetimeSymbols = mainFile.providedSymbols.symbolMap.get(2 /* SymbolTypeFlag.typetime */);
                 (0, chai_config_spec_1.expect)(typetimeSymbols.size).to.eq(1);
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(0);
                 mainFile = program.setFile('source/main.bs', `
                     interface Iface1
@@ -3658,12 +3888,12 @@ describe('BrsFile', () => {
                     end interface
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                typetimeSymbols = mainFile.providedSymbols.symbolMap.get(2 /* SymbolTypeFlag.typetime */);
                 (0, chai_config_spec_1.expect)(typetimeSymbols.size).to.eq(1);
-                let typeTimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                let typeTimeChanges = mainFile.providedSymbols.changes.get(2 /* 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);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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', () => {
@@ -3676,7 +3906,7 @@ describe('BrsFile', () => {
                     end enum
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
                 mainFile = program.setFile('source/main.bs', `
                     enum MyEnum
@@ -3687,13 +3917,13 @@ describe('BrsFile', () => {
                     end enum
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
-                let typetimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                let typetimeSymbols = mainFile.providedSymbols.symbolMap.get(2 /* SymbolTypeFlag.typetime */);
                 (0, chai_config_spec_1.expect)(typetimeSymbols.size).to.eq(1);
-                let typetimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.typetime);
+                let typetimeChanges = mainFile.providedSymbols.changes.get(2 /* SymbolTypeFlag.typetime */);
                 (0, chai_config_spec_1.expect)(typetimeChanges.size).to.eq(0);
             });
             it('should include changes in enum, if different number of members', () => {
@@ -3718,7 +3948,7 @@ describe('BrsFile', () => {
                     end enum
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(3);
                 mainFile = program.setFile('source/main.bs', `
                     enum Direction ' same
@@ -3741,9 +3971,9 @@ describe('BrsFile', () => {
                     end enum
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(3);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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'));
@@ -3758,7 +3988,7 @@ describe('BrsFile', () => {
                     end enum
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(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
@@ -3769,9 +3999,9 @@ describe('BrsFile', () => {
                     end enum
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(1);
                 (0, chai_config_spec_1.expect)(runtimeChanges.has('direction'));
             });
@@ -3782,7 +4012,7 @@ describe('BrsFile', () => {
                     end namespace
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
                 mainFile = program.setFile('source/main.bs', `
                     namespace alpha.beta
@@ -3790,9 +4020,9 @@ describe('BrsFile', () => {
                     end namespace
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(1);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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'));
             });
@@ -3810,11 +4040,11 @@ describe('BrsFile', () => {
                     end sub
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeSymbols = mainFile.providedSymbols.symbolMap.get(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
+                        return len(p) + 1
                     end function
 
                     sub displayModelTypeInLabel(myLabel as roSgNodeLabel)
@@ -3825,9 +4055,9 @@ describe('BrsFile', () => {
                     end sub
                 `);
                 program.plugins.emit('onFileValidate', { program: program, file: mainFile });
-                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                runtimeSymbols = mainFile.providedSymbols.symbolMap.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeSymbols.size).to.eq(2);
-                let runtimeChanges = mainFile.providedSymbols.changes.get(SymbolTable_1.SymbolTypeFlag.runtime);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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', () => {
@@ -3843,7 +4073,7 @@ describe('BrsFile', () => {
                 // 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);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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', () => {
@@ -3869,17 +4099,16 @@ describe('BrsFile', () => {
                 // 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);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(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
+                                m.name = m.name + klass.name
                             end function
                         end class
 
@@ -3894,7 +4123,7 @@ describe('BrsFile', () => {
                 // 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);
+                let runtimeChanges = mainFile.providedSymbols.changes.get(1 /* SymbolTypeFlag.runtime */);
                 (0, chai_config_spec_1.expect)(runtimeChanges.size).to.eq(0);
             });
         });
@@ -3906,7 +4135,7 @@ describe('BrsFile', () => {
                     aa1 = {
                         "sprop1": 0,
                         prop1: 1
-                        prop2: {
+                                prop2: {
                             prop3: 2
                         }
                     }
@@ -3940,7 +4169,7 @@ describe('BrsFile', () => {
                     aa1 = {
                         "constructor": 0,
                         constructor: 1
-                        valueOf: {
+                                valueOf: {
                             toString: 2
                         }
                     }
@@ -3954,6 +4183,44 @@ describe('BrsFile', () => {
             const { propertyHints } = file['_cachedLookups'];
             (0, chai_config_spec_1.expect)(Object.keys(propertyHints).sort()).to.deep.equal(expected, 'Initial hints');
         });
+        it('allows built-in types for class members', () => {
+            program.setFile('source/main.bs', `
+                class MyBase
+                    regex as roRegex
+                    node as roSGNodeLabel
+
+                    sub outputMatches(textInput as string)
+                        matches = m.regex.match(textInput)
+                        if matches.count() > 1
+                            m.node.text = matches[1]
+                        else
+                            m.node.text = "no match"
+                        end if
+                    end sub
+
+                    function getLabelParent() as roSGNode
+                        return m.node.getParent()
+                    end function
+                end class
+            `);
+            program.validate();
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(program);
+        });
+        it('allows types on lhs of assignments', async () => {
+            await testTranspile(`
+                sub foo(node as roSGNode)
+                    nodeParent as roSGNode = node.getParent()
+                    text as string = nodeParent.id
+                    print text
+                end sub
+            `, `
+                sub foo(node as dynamic)
+                    nodeParent = node.getParent()
+                    text = nodeParent.id
+                    print text
+                end sub
+            `);
+        });
     });
 });
 //# sourceMappingURL=BrsFile.spec.js.map