brighterscript 0.41.2 → 1.0.0-alpha.12

package/dist/files/BrsFile.js

@@ -6,12 +6,8 @@ const vscode_languageserver_1 = require("vscode-languageserver");
 const chalk_1 = require("chalk");
 const path = require("path");
 const DiagnosticMessages_1 = require("../DiagnosticMessages");
-const FunctionScope_1 = require("../FunctionScope");
 const lexer_1 = require("../lexer");
 const parser_1 = require("../parser");
-const DynamicType_1 = require("../types/DynamicType");
-const FunctionType_1 = require("../types/FunctionType");
-const VoidType_1 = require("../types/VoidType");
 const util_1 = require("../util");
 const BrsTranspileState_1 = require("../parser/BrsTranspileState");
 const Preprocessor_1 = require("../preprocessor/Preprocessor");
@@ -20,23 +16,36 @@ const serialize_error_1 = require("serialize-error");
 const reflection_1 = require("../astUtils/reflection");
 const visitors_1 = require("../astUtils/visitors");
 const CommentFlagProcessor_1 = require("../CommentFlagProcessor");
+const BscType_1 = require("../types/BscType");
+const UninitializedType_1 = require("../types/UninitializedType");
+const InvalidType_1 = require("../types/InvalidType");
+const globalCallables_1 = require("../globalCallables");
+const DynamicType_1 = require("../types/DynamicType");
 /**
  * Holds all details about this file within the scope of the whole program
  */
 class BrsFile {
-    constructor(pathAbsolute, 
+    constructor(
+    /**
+     * The absolute path to the source file on disk (e.g. '/usr/you/projects/RokuApp/source/main.brs' or 'c:/projects/RokuApp/source/main.brs').
+     */
+    srcPath, 
     /**
-     * The full pkg path to this file
+     * The full pkg path (i.e. `pkg:/path/to/file.brs`)
      */
     pkgPath, program) {
         var _a;
-        this.pathAbsolute = pathAbsolute;
+        this.srcPath = srcPath;
         this.pkgPath = pkgPath;
         this.program = program;
         /**
          * The parseMode used for the parser for this file
          */
         this.parseMode = parser_1.ParseMode.BrightScript;
+        /**
+         * Indicates whether this file needs to be validated.
+         */
+        this.isValidated = false;
         this.diagnostics = [];
         this.commentFlags = [];
         this.callables = [];
@@ -49,11 +58,9 @@ class BrsFile {
          * Does this file need to be transpiled?
          */
         this.needsTranspiled = false;
-        this.scopesByFunc = new Map();
-        this.pathAbsolute = (0, util_1.standardizePath) `${this.pathAbsolute}`;
-        this.pkgPath = (0, util_1.standardizePath) `${this.pkgPath}`;
+        this.srcPath = (0, util_1.standardizePath) `${this.srcPath}`;
         this.dependencyGraphKey = this.pkgPath.toLowerCase();
-        this.extension = util_1.util.getExtension(this.pathAbsolute);
+        this.extension = util_1.util.getExtension(this.srcPath);
         //all BrighterScript files need to be transpiled
         if ((_a = this.extension) === null || _a === void 0 ? void 0 : _a.endsWith('.bs')) {
             this.needsTranspiled = true;
@@ -61,7 +68,7 @@ class BrsFile {
         }
         this.isTypedef = this.extension === '.d.bs';
         if (!this.isTypedef) {
-            this.typedefKey = util_1.util.getTypedefPath(this.pathAbsolute);
+            this.typedefSrcPath = util_1.util.getTypedefPath(this.srcPath);
         }
         //global file doesn't have a program, so only resolve typedef info if we have a program
         if (this.program) {
@@ -74,29 +81,12 @@ class BrsFile {
     addDiagnostics(diagnostics) {
         this.diagnostics.push(...diagnostics);
     }
-    get functionScopes() {
-        if (!this._functionScopes) {
-            this.createFunctionScopes();
-        }
-        return this._functionScopes;
-    }
     /**
      * The AST for this file
      */
     get ast() {
         return this.parser.ast;
     }
-    /**
-     * Get the token at the specified position
-     * @param position
-     */
-    getTokenAt(position) {
-        for (let token of this.parser.tokens) {
-            if (util_1.util.rangeContains(token.range, position)) {
-                return token;
-            }
-        }
-    }
     get parser() {
         if (!this._parser) {
             //remove the typedef file (if it exists)
@@ -113,7 +103,7 @@ class BrsFile {
      * Find and set the typedef variables (if a matching typedef file exists)
      */
     resolveTypedef() {
-        this.typedefFile = this.program.getFileByPathAbsolute(this.typedefKey);
+        this.typedefFile = this.program.getFile(this.typedefSrcPath);
         this.hasTypedef = !!this.typedefFile;
     }
     /**
@@ -148,7 +138,7 @@ class BrsFile {
                 return;
             }
             //tokenize the input file
-            let lexer = this.program.logger.time(Logger_1.LogLevel.debug, ['lexer.lex', chalk_1.default.green(this.pathAbsolute)], () => {
+            let lexer = this.program.logger.time(Logger_1.LogLevel.debug, ['lexer.lex', chalk_1.default.green(this.srcPath)], () => {
                 return lexer_1.Lexer.scan(fileContents, {
                     includeWhitespace: false
                 });
@@ -159,7 +149,7 @@ class BrsFile {
             //TODO preprocessor should go away in favor of the AST handling this internally (because it affects transpile)
             //currently the preprocessor throws exceptions on syntax errors...so we need to catch it
             try {
-                this.program.logger.time(Logger_1.LogLevel.debug, ['preprocessor.process', chalk_1.default.green(this.pathAbsolute)], () => {
+                this.program.logger.time(Logger_1.LogLevel.debug, ['preprocessor.process', chalk_1.default.green(this.srcPath)], () => {
                     preprocessor.process(lexer.tokens, this.program.getManifest());
                 });
             }
@@ -171,7 +161,7 @@ class BrsFile {
             }
             //if the preprocessor generated tokens, use them.
             let tokens = preprocessor.processedTokens.length > 0 ? preprocessor.processedTokens : lexer.tokens;
-            this.program.logger.time(Logger_1.LogLevel.debug, ['parser.parse', chalk_1.default.green(this.pathAbsolute)], () => {
+            this.program.logger.time(Logger_1.LogLevel.debug, ['parser.parse', chalk_1.default.green(this.srcPath)], () => {
                 this._parser = parser_1.Parser.parse(tokens, {
                     mode: this.parseMode,
                     logger: this.program.logger
@@ -179,8 +169,6 @@ class BrsFile {
             });
             //absorb all lexing/preprocessing/parsing diagnostics
             this.diagnostics.push(...lexer.diagnostics, ...preprocessor.diagnostics, ...this._parser.diagnostics);
-            //notify AST ready
-            this.program.plugins.emit('afterFileParse', this);
             //extract all callables from this file
             this.findCallables();
             //find all places where a sub/function is being called
@@ -196,6 +184,7 @@ class BrsFile {
             this.diagnostics.push(Object.assign({ file: this, range: util_1.util.createRange(0, 0, 0, Number.MAX_VALUE) }, DiagnosticMessages_1.DiagnosticMessages.genericParserMessage('Critical error parsing file: ' + JSON.stringify((0, serialize_error_1.serializeError)(e)))));
         }
     }
+    validate() { }
     findAndValidateImportAndImportStatements() {
         var _a;
         let topOfFileIncludeStatements = [];
@@ -291,160 +280,17 @@ class BrsFile {
         this.commentFlags.push(...processor.commentFlags);
         this.diagnostics.push(...processor.diagnostics);
     }
-    /**
-     * Create a scope for every function in this file
-     */
-    createFunctionScopes() {
-        var _a;
-        //find every function
-        let functions = this.parser.references.functionExpressions;
-        //create a functionScope for every function
-        this._functionScopes = [];
-        for (let func of functions) {
-            let scope = new FunctionScope_1.FunctionScope(func);
-            //find parent function, and add this scope to it if found
-            {
-                let parentScope = this.scopesByFunc.get(func.parentFunction);
-                //add this child scope to its parent
-                if (parentScope) {
-                    parentScope.childrenScopes.push(scope);
-                }
-                //store the parent scope for this scope
-                scope.parentScope = parentScope;
-            }
-            //add every parameter
-            for (let param of func.parameters) {
-                scope.variableDeclarations.push({
-                    nameRange: param.name.range,
-                    lineIndex: param.name.range.start.line,
-                    name: param.name.text,
-                    type: param.type
-                });
-            }
-            //add all of ForEachStatement loop varibales
-            (_a = func.body) === null || _a === void 0 ? void 0 : _a.walk((0, visitors_1.createVisitor)({
-                ForEachStatement: (stmt) => {
-                    scope.variableDeclarations.push({
-                        nameRange: stmt.item.range,
-                        lineIndex: stmt.item.range.start.line,
-                        name: stmt.item.text,
-                        type: new DynamicType_1.DynamicType()
-                    });
-                },
-                LabelStatement: (stmt) => {
-                    const { identifier } = stmt.tokens;
-                    scope.labelStatements.push({
-                        nameRange: identifier.range,
-                        lineIndex: identifier.range.start.line,
-                        name: identifier.text
-                    });
-                }
-            }), {
-                walkMode: visitors_1.WalkMode.visitStatements
-            });
-            this.scopesByFunc.set(func, scope);
-            //find every statement in the scope
-            this._functionScopes.push(scope);
-        }
-        //find every variable assignment in the whole file
-        let assignmentStatements = this.parser.references.assignmentStatements;
-        for (let statement of assignmentStatements) {
-            //find this statement's function scope
-            let scope = this.scopesByFunc.get(statement.containingFunction);
-            //skip variable declarations that are outside of any scope
-            if (scope) {
-                scope.variableDeclarations.push({
-                    nameRange: statement.name.range,
-                    lineIndex: statement.name.range.start.line,
-                    name: statement.name.text,
-                    type: this.getBscTypeFromAssignment(statement, scope)
-                });
-            }
-        }
-    }
-    getBscTypeFromAssignment(assignment, scope) {
-        var _a, _b, _c, _d;
-        try {
-            //function
-            if ((0, reflection_1.isFunctionExpression)(assignment.value)) {
-                let functionType = new FunctionType_1.FunctionType(assignment.value.returnType);
-                functionType.isSub = assignment.value.functionType.text === 'sub';
-                if (functionType.isSub) {
-                    functionType.returnType = new VoidType_1.VoidType();
-                }
-                functionType.setName(assignment.name.text);
-                for (let param of assignment.value.parameters) {
-                    let isRequired = !param.defaultValue;
-                    //TODO compute optional parameters
-                    functionType.addParameter(param.name.text, param.type, isRequired);
-                }
-                return functionType;
-                //literal
-            }
-            else if ((0, reflection_1.isLiteralExpression)(assignment.value)) {
-                return assignment.value.type;
-                //function call
-            }
-            else if ((0, reflection_1.isCallExpression)(assignment.value)) {
-                let calleeName = (_b = (_a = assignment.value.callee) === null || _a === void 0 ? void 0 : _a.name) === null || _b === void 0 ? void 0 : _b.text;
-                if (calleeName) {
-                    let func = this.getCallableByName(calleeName);
-                    if (func) {
-                        return func.type.returnType;
-                    }
-                }
-            }
-            else if ((0, reflection_1.isVariableExpression)(assignment.value)) {
-                let variableName = (_d = (_c = assignment.value) === null || _c === void 0 ? void 0 : _c.name) === null || _d === void 0 ? void 0 : _d.text;
-                let variable = scope.getVariableByName(variableName);
-                return variable.type;
-            }
-        }
-        catch (e) {
-            //do nothing. Just return dynamic
-        }
-        //fallback to dynamic
-        return new DynamicType_1.DynamicType();
-    }
-    getCallableByName(name) {
-        name = name ? name.toLowerCase() : undefined;
-        if (!name) {
-            return;
-        }
-        for (let func of this.callables) {
-            if (func.name.toLowerCase() === name) {
-                return func;
-            }
-        }
-    }
     findCallables() {
         var _a;
         for (let statement of (_a = this.parser.references.functionStatements) !== null && _a !== void 0 ? _a : []) {
-            let functionType = new FunctionType_1.FunctionType(statement.func.returnType);
+            let functionType = statement.func.getFunctionType();
             functionType.setName(statement.name.text);
-            functionType.isSub = statement.func.functionType.text.toLowerCase() === 'sub';
-            if (functionType.isSub) {
-                functionType.returnType = new VoidType_1.VoidType();
-            }
-            //extract the parameters
-            let params = [];
-            for (let param of statement.func.parameters) {
-                let callableParam = {
-                    name: param.name.text,
-                    type: param.type,
-                    isOptional: !!param.defaultValue,
-                    isRestArgument: false
-                };
-                params.push(callableParam);
-                let isRequired = !param.defaultValue;
-                functionType.addParameter(callableParam.name, callableParam.type, isRequired);
-            }
             this.callables.push({
                 isSub: statement.func.functionType.text.toLowerCase() === 'sub',
                 name: statement.name.text,
                 nameRange: statement.name.range,
                 file: this,
-                params: params,
+                params: functionType.params,
                 range: statement.func.range,
                 type: functionType,
                 getName: statement.getName.bind(statement),
@@ -454,21 +300,24 @@ class BrsFile {
         }
     }
     findFunctionCalls() {
+        var _a;
         this.functionCalls = [];
         //for every function in the file
         for (let func of this._parser.references.functionExpressions) {
             //for all function calls in this function
             for (let expression of func.callExpressions) {
                 if (
-                //filter out dotted function invocations (i.e. object.doSomething()) (not currently supported. TODO support it)
-                expression.callee.obj ||
-                    //filter out method calls on method calls for now (i.e. getSomething().getSomethingElse())
-                    expression.callee.callee ||
+                //filter out method calls on method calls for now (i.e. getSomething().getSomethingElse())
+                expression.callee.callee ||
+                    //filter out method calls on regexp literals for now
+                    (0, reflection_1.isRegexLiteralExpression)((_a = expression.callee) === null || _a === void 0 ? void 0 : _a.obj) ||
                     //filter out callees without a name (immediately-invoked function expressions)
                     !expression.callee.name) {
                     continue;
                 }
-                let functionName = expression.callee.name.text;
+                //Flag dotted function invocations (i.e. object.doSomething())
+                const dottedInvocation = expression.callee.obj;
+                let functionName = expression.callee.name;
                 //callee is the name of the function being called
                 let callee = expression.callee;
                 let columnIndexBegin = callee.range.start.character;
@@ -476,81 +325,65 @@ class BrsFile {
                 let args = [];
                 //TODO convert if stmts to use instanceof instead
                 for (let arg of expression.args) {
-                    //is a literal parameter value
-                    if ((0, reflection_1.isLiteralExpression)(arg)) {
-                        args.push({
-                            range: arg.range,
-                            type: arg.type,
-                            text: arg.token.text
-                        });
-                        //is variable being passed into argument
+                    let inferredType = (0, parser_1.getBscTypeFromExpression)(arg, func);
+                    let argText = '';
+                    // Get the text to display for the arg
+                    if (arg.token) {
+                        argText = arg.token.text;
+                        //is a function call being passed into argument
                     }
                     else if (arg.name) {
-                        args.push({
-                            range: arg.range,
-                            //TODO - look up the data type of the actual variable
-                            type: new DynamicType_1.DynamicType(),
-                            text: arg.name.text
-                        });
+                        if ((0, lexer_1.isToken)(arg.name)) {
+                            argText = arg.name.text;
+                        }
                     }
                     else if (arg.value) {
-                        let text = '';
                         /* istanbul ignore next: TODO figure out why value is undefined sometimes */
                         if (arg.value.value) {
-                            text = arg.value.value.toString();
+                            if (arg.value.value.toString) {
+                                argText = arg.value.value.toString();
+                            }
                         }
-                        let callableArg = {
-                            range: arg.range,
-                            //TODO not sure what to do here
-                            type: new DynamicType_1.DynamicType(),
-                            text: text
-                        };
                         //wrap the value in quotes because that's how it appears in the code
-                        if ((0, reflection_1.isStringType)(callableArg.type)) {
-                            callableArg.text = '"' + callableArg.text + '"';
+                        if (argText && (0, reflection_1.isStringType)(inferredType)) {
+                            argText = '"' + argText + '"';
                         }
-                        args.push(callableArg);
-                    }
-                    else {
-                        args.push({
-                            range: arg.range,
-                            type: new DynamicType_1.DynamicType(),
-                            //TODO get text from other types of args
-                            text: ''
-                        });
                     }
+                    args.push({
+                        range: arg.range,
+                        type: inferredType,
+                        text: argText
+                    });
                 }
                 let functionCall = {
                     range: util_1.util.createRangeFromPositions(expression.range.start, expression.closingParen.range.end),
-                    functionScope: this.getFunctionScopeAtPosition(callee.range.start),
+                    functionExpression: this.getFunctionExpressionAtPosition(callee.range.start),
                     file: this,
                     name: functionName,
                     nameRange: util_1.util.createRange(callee.range.start.line, columnIndexBegin, callee.range.start.line, columnIndexEnd),
-                    //TODO keep track of parameters
-                    args: args
+                    args: args,
+                    isDottedInvocation: dottedInvocation
                 };
                 this.functionCalls.push(functionCall);
             }
         }
     }
     /**
-     * Find the function scope at the given position.
-     * @param position
-     * @param functionScopes
+     * Find the function expression at the given position.
      */
-    getFunctionScopeAtPosition(position, functionScopes) {
-        if (!functionScopes) {
-            functionScopes = this.functionScopes;
+    getFunctionExpressionAtPosition(position, functionExpressions) {
+        if (!functionExpressions) {
+            functionExpressions = this.parser.references.functionExpressions;
         }
-        for (let scope of functionScopes) {
-            if (util_1.util.rangeContains(scope.range, position)) {
+        for (let functionExpression of functionExpressions) {
+            if (util_1.util.rangeContains(functionExpression.range, position)) {
                 //see if any of that scope's children match the position also, and give them priority
-                let childScope = this.getFunctionScopeAtPosition(position, scope.childrenScopes);
-                if (childScope) {
-                    return childScope;
+                let childFunc = this.getFunctionExpressionAtPosition(position, functionExpression.childFunctionExpressions);
+                if (childFunc) {
+                    return childFunc;
                 }
                 else {
-                    return scope;
+                    return functionExpression;
                 }
             }
         }
@@ -559,6 +392,7 @@ class BrsFile {
      * Get completions available at the given cursor. This aggregates all values from this file and the current scope.
      */
     getCompletions(position, scope) {
+        var _a;
         let result = [];
         //a map of lower-case names of all added options
         let names = {};
@@ -568,7 +402,7 @@ class BrsFile {
             return this.program.getScriptImportCompletions(this.pkgPath, scriptImport);
         }
         //if cursor is within a comment, disable completions
-        let currentToken = this.getTokenAt(position);
+        let currentToken = this.parser.getTokenAt(position);
         const tokenKind = currentToken === null || currentToken === void 0 ? void 0 : currentToken.kind;
         if (tokenKind === lexer_1.TokenKind.Comment) {
             return [];
@@ -577,9 +411,9 @@ class BrsFile {
             const match = /^("?)(pkg|libpkg):/.exec(currentToken.text);
             if (match) {
                 const [, openingQuote, fileProtocol] = match;
-                //include every absolute file path from this scope
+                //include every pkgPath from this scope
                 for (const file of scope.getAllFiles()) {
-                    const pkgPath = `${fileProtocol}:/${file.pkgPath.replace(/\\/g, '/')}`;
+                    const pkgPath = `${fileProtocol}:/${file.pkgPath.replace('pkg:/', '')}`;
                     result.push({
                         label: pkgPath,
                         textEdit: vscode_languageserver_1.TextEdit.replace(util_1.util.createRange(currentToken.range.start.line, 
@@ -602,10 +436,10 @@ class BrsFile {
             return namespaceCompletions;
         }
         //determine if cursor is inside a function
-        let functionScope = this.getFunctionScopeAtPosition(position);
-        if (!functionScope) {
+        let functionExpression = this.getFunctionExpressionAtPosition(position);
+        if (!functionExpression) {
             //we aren't in any function scope, so return the keyword completions and namespaces
-            if (this.getTokenBefore(currentToken, lexer_1.TokenKind.New)) {
+            if (this.parser.getTokenBefore(currentToken, lexer_1.TokenKind.New)) {
                 // there's a new keyword, so only class types are viable here
                 return [...this.getGlobalClassStatementCompletions(currentToken, this.parseMode)];
             }
@@ -614,26 +448,31 @@ class BrsFile {
             }
         }
         const classNameCompletions = this.getGlobalClassStatementCompletions(currentToken, this.parseMode);
-        const newToken = this.getTokenBefore(currentToken, lexer_1.TokenKind.New);
+        const newToken = this.parser.getTokenBefore(currentToken, lexer_1.TokenKind.New);
         if (newToken) {
             //we are after a new keyword; so we can only be namespaces or classes at this point
             result.push(...classNameCompletions);
             result.push(...namespaceCompletions);
             return result;
         }
-        if (this.tokenFollows(currentToken, lexer_1.TokenKind.Goto)) {
-            return this.getLabelCompletion(functionScope);
+        if (this.parser.tokenFollows(currentToken, lexer_1.TokenKind.Goto)) {
+            return this.getLabelCompletion(functionExpression);
         }
-        if (this.isPositionNextToTokenKind(position, lexer_1.TokenKind.Dot)) {
+        if (this.parser.isPositionNextToTokenKind(position, lexer_1.TokenKind.Dot)) {
             if (namespaceCompletions.length > 0) {
                 //if we matched a namespace, after a dot, it can't be anything else but something from our namespace completions
                 return namespaceCompletions;
             }
-            const selfClassMemberCompletions = this.getClassMemberCompletions(position, currentToken, functionScope, scope);
+            const selfClassMemberCompletions = this.getClassMemberCompletions(position, currentToken, functionExpression, scope);
             if (selfClassMemberCompletions.size > 0) {
                 return [...selfClassMemberCompletions.values()].filter((i) => i.label !== 'new');
             }
-            if (!this.getClassFromMReference(position, currentToken, functionScope)) {
+            const tokenLookup = this.getSymbolTypeFromToken(currentToken, functionExpression, scope);
+            if ((_a = tokenLookup.symbolContainer) === null || _a === void 0 ? void 0 : _a.memberTable) {
+                return this.getCompletionsFromSymbolTable(tokenLookup.symbolContainer.memberTable);
+            }
+            const foundClassLink = this.getClassFromTokenLookup(tokenLookup, scope);
+            if (!foundClassLink) {
                 //and anything from any class in scope to a non m class
                 let classMemberCompletions = scope.getAllClassMemberCompletions();
                 result.push(...classMemberCompletions.values());
@@ -658,16 +497,21 @@ class BrsFile {
             names.m = true;
             result.push(...exports.KeywordCompletions);
             //include local variables
-            let variables = functionScope.variableDeclarations;
-            for (let variable of variables) {
+            for (let symbol of functionExpression.symbolTable.getOwnSymbols()) {
+                const symbolNameLower = symbol.name.toLowerCase();
                 //skip duplicate variable names
-                if (names[variable.name.toLowerCase()]) {
+                if (names[symbolNameLower]) {
                     continue;
                 }
-                names[variable.name.toLowerCase()] = true;
+                names[symbolNameLower] = true;
+                // TODO TYPES (This may be a performance hit?)
+                // const foundType = getTypeFromContext(symbol.type, { scope: scope, file: this });
                 result.push({
-                    label: variable.name,
-                    kind: (0, reflection_1.isFunctionType)(variable.type) ? vscode_languageserver_1.CompletionItemKind.Function : vscode_languageserver_1.CompletionItemKind.Variable
+                    //TODO does this work?
+                    label: symbol.name,
+                    //TODO TYPES find type for local vars - SEE above
+                    kind: vscode_languageserver_1.CompletionItemKind.Variable
+                    // kind: isFunctionType(foundType) ? CompletionItemKind.Function : CompletionItemKind.Variable
                 });
             }
             if (this.parseMode === parser_1.ParseMode.BrighterScript) {
@@ -689,15 +533,23 @@ class BrsFile {
         }
         return result;
     }
-    getLabelCompletion(functionScope) {
-        return functionScope.labelStatements.map(label => ({
-            label: label.name,
+    getCompletionsFromSymbolTable(symbolTable) {
+        return symbolTable.getAllSymbols().map(bscType => {
+            return {
+                label: bscType.name,
+                kind: (0, reflection_1.isFunctionType)(bscType.type) ? vscode_languageserver_1.CompletionItemKind.Method : vscode_languageserver_1.CompletionItemKind.Field
+            };
+        });
+    }
+    getLabelCompletion(func) {
+        return func.labelStatements.map(label => ({
+            label: label.tokens.identifier.text,
             kind: vscode_languageserver_1.CompletionItemKind.Reference
         }));
     }
-    getClassMemberCompletions(position, currentToken, functionScope, scope) {
+    getClassMemberCompletions(position, currentToken, functionExpression, scope) {
         var _a, _b, _c, _d;
-        let classStatement = this.getClassFromMReference(position, currentToken, functionScope);
+        let classStatement = this.getClassFromToken(currentToken, functionExpression, scope);
         let results = new Map();
         if (classStatement) {
             let classes = scope.getClassHierarchy(classStatement.item.getName(parser_1.ParseMode.BrighterScript).toLowerCase());
@@ -714,16 +566,265 @@ class BrsFile {
         }
         return results;
     }
-    getClassFromMReference(position, currentToken, functionScope) {
-        let previousToken = this.getPreviousToken(currentToken);
-        if ((previousToken === null || previousToken === void 0 ? void 0 : previousToken.kind) === lexer_1.TokenKind.Dot) {
-            previousToken = this.getPreviousToken(previousToken);
+    /**
+     * Gets the class (if any) of a given token based on the scope
+     * @param currentToken token in question
+     * @param functionExpression current functionExpression
+     * @param scope the current scope
+     * @returns A fileLink of the ClassStatement, if it is a class, otherwise undefined
+     */
+    getClassFromToken(currentToken, functionExpression, scope) {
+        const tokenLookup = this.getSymbolTypeFromToken(currentToken, functionExpression, scope);
+        return this.getClassFromTokenLookup(tokenLookup, scope);
+    }
+    /**
+     * Gets the class (if any) of a given token based on the scope
+     * @param currentToken token in question
+     * @param functionExpression current functionExpression
+     * @param scope the current scope
+     * @returns A fileLink of the ClassStatement, if it is a class, otherwise undefined
+     */
+    getClassFromTokenLookup(tokenLookup, scope) {
+        const currentClass = tokenLookup === null || tokenLookup === void 0 ? void 0 : tokenLookup.symbolContainer;
+        if ((0, reflection_1.isClassStatement)(currentClass)) {
+            return { item: currentClass, file: this };
         }
-        if ((previousToken === null || previousToken === void 0 ? void 0 : previousToken.kind) === lexer_1.TokenKind.Identifier && (previousToken === null || previousToken === void 0 ? void 0 : previousToken.text.toLowerCase()) === 'm' && (0, reflection_1.isClassMethodStatement)(functionScope.func.functionStatement)) {
-            return { item: this.parser.references.classStatements.find((cs) => util_1.util.rangeContains(cs.range, position)), file: this };
+        else if ((0, reflection_1.isCustomType)(currentClass)) {
+            const foundClass = scope.getClass(currentClass.name);
+            if (foundClass) {
+                return { item: foundClass, file: this };
+            }
         }
         return undefined;
     }
+    findNamespaceFromTokenChain(originalTokenChain, scope) {
+        let namespaceTokens = [];
+        let startsWithNamespace = '';
+        let namespaceContainer;
+        let tokenChain = [...originalTokenChain];
+        while (tokenChain[0] && tokenChain[0].usage === parser_1.TokenUsage.Direct) {
+            const namespaceNameToCheck = `${startsWithNamespace}${startsWithNamespace.length > 0 ? '.' : ''}${tokenChain[0].token.text}`.toLowerCase();
+            const foundNamespace = scope.namespaceLookup[namespaceNameToCheck];
+            if (foundNamespace) {
+                namespaceContainer = foundNamespace;
+                namespaceTokens.push(tokenChain[0].token);
+                startsWithNamespace = namespaceTokens.map(token => token.text).join('.');
+                tokenChain.shift();
+            }
+            else {
+                break;
+            }
+        }
+        if (namespaceTokens.length > 0) {
+            namespaceContainer = scope.namespaceLookup[startsWithNamespace.toLowerCase()];
+        }
+        return { namespaceContainer: namespaceContainer, tokenChain: tokenChain };
+    }
+    checkForSpecialClassSymbol(currentToken, scope, func) {
+        var _a;
+        const containingClass = this.parser.getContainingClass(currentToken);
+        let symbolType;
+        let currentClassRef;
+        const currentTokenLower = currentToken.text.toLowerCase();
+        const typeContext = { file: this, scope: scope, position: currentToken.range.start };
+        if (containingClass) {
+            // Special cases for a single token inside a class
+            let expandedText = '';
+            let useExpandedTextOnly = false;
+            if (containingClass.name === currentToken) {
+                symbolType = containingClass.getCustomType();
+                expandedText = `class ${containingClass.getName(parser_1.ParseMode.BrighterScript)}`;
+                useExpandedTextOnly = true;
+                currentClassRef = containingClass;
+            }
+            else if (currentTokenLower === 'm') {
+                symbolType = containingClass.getCustomType();
+                expandedText = currentToken.text;
+                currentClassRef = containingClass;
+            }
+            else if (currentTokenLower === 'super') {
+                symbolType = (0, BscType_1.getTypeFromContext)(containingClass.symbolTable.getSymbolType(currentTokenLower, true, typeContext), typeContext);
+                if ((0, reflection_1.isFunctionType)(symbolType)) {
+                    currentClassRef = scope.getParentClass(containingClass);
+                }
+            }
+            else if (((_a = func === null || func === void 0 ? void 0 : func.functionStatement) === null || _a === void 0 ? void 0 : _a.name) === currentToken) {
+                // check if this is a method declaration
+                currentClassRef = containingClass;
+                symbolType = containingClass === null || containingClass === void 0 ? void 0 : containingClass.memberTable.getSymbolType(currentTokenLower, true, { file: this, scope: scope });
+                expandedText = [containingClass.getName(parser_1.ParseMode.BrighterScript), currentToken.text].join('.');
+            }
+            else if (!func) {
+                // check if this is a field  declaration
+                currentClassRef = containingClass;
+                symbolType = containingClass === null || containingClass === void 0 ? void 0 : containingClass.memberTable.getSymbolType(currentTokenLower, true, { file: this, scope: scope });
+                expandedText = [containingClass.getName(parser_1.ParseMode.BrighterScript), currentToken.text].join('.');
+            }
+            if (symbolType) {
+                return { type: symbolType, expandedTokenText: expandedText, symbolContainer: currentClassRef, useExpandedTextOnly: useExpandedTextOnly };
+            }
+        }
+    }
+    checkForSpecialCaseToken(nameSpacedTokenChain, functionExpression, scope) {
+        var _a;
+        const tokenChain = (_a = nameSpacedTokenChain.tokenChain) !== null && _a !== void 0 ? _a : [];
+        if (nameSpacedTokenChain.namespaceContainer && tokenChain.length === 0) {
+            //currentToken was part of a namespace
+            return {
+                type: null,
+                expandedTokenText: `namespace ${nameSpacedTokenChain.namespaceContainer.fullName}`,
+                useExpandedTextOnly: true
+            };
+        }
+        const specialCase = tokenChain.length === 1 ? this.checkForSpecialClassSymbol(tokenChain[0].token, scope, functionExpression) : null;
+        if (specialCase) {
+            return specialCase;
+        }
+    }
+    /**
+     * Checks previous tokens for the start of a symbol chain (eg. m.property.subProperty.method())
+     * @param currentToken  The token to check
+     * @param functionExpression The current function context
+     * @param scope use this scope for finding class maps
+     * @returns the BscType, expanded text (e.g <Class.field>) and classStatement (if available) for the token
+     */
+    getSymbolTypeFromToken(currentToken, functionExpression, scope) {
+        var _a, _b, _c, _d, _e;
+        if (!scope) {
+            return undefined;
+        }
+        const cachedSymbolData = scope.symbolCache.get(currentToken);
+        if (cachedSymbolData) {
+            return cachedSymbolData;
+        }
+        const tokenChainResponse = this.parser.getTokenChain(currentToken);
+        if (tokenChainResponse.includesUnknowableTokenType) {
+            const symbolData = { type: new DynamicType_1.DynamicType(), expandedTokenText: currentToken.text };
+            scope.symbolCache.set(currentToken, symbolData);
+            return symbolData;
+        }
+        const nameSpacedTokenChain = this.findNamespaceFromTokenChain(tokenChainResponse.chain, scope);
+        const specialCase = this.checkForSpecialCaseToken(nameSpacedTokenChain, functionExpression, scope);
+        if (specialCase) {
+            scope.symbolCache.set(currentToken, specialCase);
+            return specialCase;
+        }
+        const tokenChain = nameSpacedTokenChain.tokenChain;
+        let symbolContainer = this.parser.getContainingAA(currentToken) || this.parser.getContainingClass(currentToken);
+        let currentSymbolTable = (_b = (_a = nameSpacedTokenChain.namespaceContainer) === null || _a === void 0 ? void 0 : _a.symbolTable) !== null && _b !== void 0 ? _b : functionExpression === null || functionExpression === void 0 ? void 0 : functionExpression.symbolTable;
+        let tokenFoundCount = 0;
+        let symbolTypeBeforeReference;
+        let symbolType;
+        let tokenText = [];
+        let justReturnDynamic = false;
+        const typeContext = { file: this, scope: scope, position: (_c = tokenChain[0]) === null || _c === void 0 ? void 0 : _c.token.range.start };
+        for (const tokenChainMember of tokenChain) {
+            const token = tokenChainMember === null || tokenChainMember === void 0 ? void 0 : tokenChainMember.token;
+            const tokenLowerText = token.text.toLowerCase();
+            if (tokenLowerText === 'super' && (0, reflection_1.isClassStatement)(symbolContainer) && tokenFoundCount === 0) {
+                /// Special cases for first item in chain inside a class
+                symbolContainer = scope === null || scope === void 0 ? void 0 : scope.getParentClass(symbolContainer);
+                currentSymbolTable = (_d = symbolContainer) === null || _d === void 0 ? void 0 : _d.memberTable;
+                if (symbolContainer && currentSymbolTable) {
+                    tokenText.push(symbolContainer.getName(parser_1.ParseMode.BrighterScript));
+                    tokenFoundCount++;
+                    continue;
+                }
+            }
+            if (!currentSymbolTable) {
+                // uh oh... no symbol table to continue to check
+                break;
+            }
+            symbolType = currentSymbolTable.getSymbolType(tokenLowerText, true, typeContext);
+            if (tokenFoundCount === 0 && !symbolType) {
+                //check for global callable
+                symbolType = (_e = globalCallables_1.globalCallableMap.get(tokenLowerText)) === null || _e === void 0 ? void 0 : _e.type;
+            }
+            if (symbolType) {
+                // found this symbol, and it's valid. increase found counter
+                tokenFoundCount++;
+            }
+            symbolTypeBeforeReference = symbolType;
+            if ((0, reflection_1.isFunctionType)(symbolType)) {
+                // this is a function, and it is in the start or middle of the chain
+                // the next symbol to check will be the return value of this function
+                symbolType = (0, BscType_1.getTypeFromContext)(symbolType.returnType, typeContext);
+                if (tokenFoundCount < tokenChain.length) {
+                    // We're still
+                    symbolTypeBeforeReference = symbolType;
+                }
+            }
+            if (symbolType === null || symbolType === void 0 ? void 0 : symbolType.memberTable) {
+                if ((0, reflection_1.isCustomType)(symbolType)) {
+                    // we're currently looking at a customType, that has it's own symbol table
+                    // use the name of the custom type
+                    // TODO TYPES: get proper parent name for methods/fields defined in super classes
+                    tokenText.push(tokenChain.length === 1 ? token.text : symbolType.name);
+                }
+                else {
+                    justReturnDynamic = true;
+                    tokenText.push(token.text);
+                }
+                symbolContainer = symbolType;
+                currentSymbolTable = symbolContainer === null || symbolContainer === void 0 ? void 0 : symbolContainer.memberTable;
+            }
+            else if ((0, reflection_1.isObjectType)(symbolType) || (0, reflection_1.isArrayType)(symbolType) || (0, reflection_1.isDynamicType)(symbolType)) {
+                // this is an object that has no member table
+                // this could happen if a parameter is marked as object
+                // assume all fields are dynamic
+                symbolContainer = undefined;
+                tokenText.push(token.text);
+                justReturnDynamic = true;
+                break;
+            }
+            else {
+                // No further symbol tables were found
+                symbolContainer = undefined;
+                tokenText.push(token.text);
+                break;
+            }
+            if (tokenText.length > 2) {
+                tokenText.shift(); // only care about last two symbols
+            }
+        }
+        let expandedTokenText = tokenText.join('.');
+        let backUpReturnType;
+        if (tokenFoundCount === tokenChain.length) {
+            // did we complete the chain? if so, we have a valid token at the end
+            const symbolData = { type: symbolTypeBeforeReference, expandedTokenText: tokenText.join('.'), symbolContainer: symbolContainer };
+            scope.symbolCache.set(currentToken, symbolData);
+            return symbolData;
+        }
+        if ((0, reflection_1.isDynamicType)(symbolTypeBeforeReference) || (0, reflection_1.isArrayType)(symbolTypeBeforeReference) || justReturnDynamic) {
+            // last type in chain is dynamic... so currentToken could be anything.
+            backUpReturnType = new DynamicType_1.DynamicType();
+            expandedTokenText = currentToken.text;
+        }
+        else if ((0, reflection_1.isPrimitiveType)(symbolTypeBeforeReference)) {
+            // last type in chain is dynamic... so currentToken could be anything.
+            backUpReturnType = new DynamicType_1.DynamicType();
+            expandedTokenText = currentToken.text;
+        }
+        else if (tokenChain.length === 1) {
+            // variable that has not been assigned
+            expandedTokenText = currentToken.text;
+            backUpReturnType = new UninitializedType_1.UninitializedType();
+        }
+        else if (tokenFoundCount === tokenChain.length - 1) {
+            // member field that is not known
+            if (symbolContainer) {
+                backUpReturnType = new InvalidType_1.InvalidType();
+            }
+            else {
+                // TODO TYPES: once we have stricter object/node member type checking, we could say this is invalid, but until then, call it dynamic
+                backUpReturnType = new DynamicType_1.DynamicType();
+                expandedTokenText = currentToken.text;
+            }
+        }
+        const symbolData = { type: backUpReturnType, expandedTokenText: expandedTokenText };
+        scope.symbolCache.set(currentToken, symbolData);
+        return symbolData;
+    }
     getGlobalClassStatementCompletions(currentToken, parseMode) {
         var _a;
         if (parseMode === parser_1.ParseMode.BrightScript) {
@@ -762,7 +863,7 @@ class BrsFile {
         //remove any trailing identifer and then any trailing dot, to give us the
         //name of its immediate parent namespace
         let closestParentNamespaceName = completionName.replace(/\.([a-z0-9_]*)?$/gi, '');
-        let newToken = this.getTokenBefore(currentToken, lexer_1.TokenKind.New);
+        let newToken = this.parser.getTokenBefore(currentToken, lexer_1.TokenKind.New);
         let namespaceLookup = scope.namespaceLookup;
         let result = new Map();
         for (let key in namespaceLookup) {
@@ -821,7 +922,7 @@ class BrsFile {
             if (!location && statement.getName(parser_1.ParseMode.BrighterScript).toLowerCase() === namespaceName) {
                 const namespaceItemStatementHandler = (statement) => {
                     if (!location && statement.name.text.toLowerCase() === endName) {
-                        const uri = util_1.util.pathToUri(file.pathAbsolute);
+                        const uri = util_1.util.pathToUri(file.srcPath);
                         location = vscode_languageserver_1.Location.create(uri, statement.range);
                     }
                 };
@@ -865,64 +966,6 @@ class BrsFile {
             return undefined;
         }
     }
-    isPositionNextToTokenKind(position, tokenKind) {
-        const closestToken = this.getClosestToken(position);
-        const previousToken = this.getPreviousToken(closestToken);
-        const previousTokenKind = previousToken === null || previousToken === void 0 ? void 0 : previousToken.kind;
-        //next to matched token
-        if (!closestToken || closestToken.kind === lexer_1.TokenKind.Eof) {
-            return false;
-        }
-        else if (closestToken.kind === tokenKind) {
-            return true;
-        }
-        else if (closestToken.kind === lexer_1.TokenKind.Newline || previousTokenKind === lexer_1.TokenKind.Newline) {
-            return false;
-            //next to an identifier, which is next to token kind
-        }
-        else if (closestToken.kind === lexer_1.TokenKind.Identifier && previousTokenKind === tokenKind) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-    getTokenBefore(currentToken, tokenKind) {
-        const index = this.parser.tokens.indexOf(currentToken);
-        for (let i = index - 1; i >= 0; i--) {
-            currentToken = this.parser.tokens[i];
-            if (currentToken.kind === lexer_1.TokenKind.Newline) {
-                break;
-            }
-            else if (currentToken.kind === tokenKind) {
-                return currentToken;
-            }
-        }
-        return undefined;
-    }
-    tokenFollows(currentToken, tokenKind) {
-        const index = this.parser.tokens.indexOf(currentToken);
-        if (index > 0) {
-            return this.parser.tokens[index - 1].kind === tokenKind;
-        }
-        return false;
-    }
-    getTokensUntil(currentToken, tokenKind, direction = -1) {
-        let tokens = [];
-        for (let i = this.parser.tokens.indexOf(currentToken); direction === -1 ? i >= 0 : i === this.parser.tokens.length; i += direction) {
-            currentToken = this.parser.tokens[i];
-            if (currentToken.kind === lexer_1.TokenKind.Newline || currentToken.kind === tokenKind) {
-                break;
-            }
-            tokens.push(currentToken);
-        }
-        return tokens;
-    }
-    getPreviousToken(token) {
-        const parser = this.parser;
-        let idx = parser.tokens.indexOf(token);
-        return parser.tokens[idx - 1];
-    }
     /**
      * Find the first scope that has a namespace with this name.
      * Returns false if no namespace was found with that name
@@ -964,28 +1007,6 @@ class BrsFile {
         }
         return false;
     }
-    /**
-     * Get the token closest to the position. if no token is found, the previous token is returned
-     * @param position
-     * @param tokens
-     */
-    getClosestToken(position) {
-        let tokens = this.parser.tokens;
-        for (let i = 0; i < tokens.length; i++) {
-            let token = tokens[i];
-            if (util_1.util.rangeContains(token.range, position)) {
-                return token;
-            }
-            //if the position less than this token range, then this position touches no token,
-            if (util_1.util.positionIsGreaterThanRange(position, token.range) === false) {
-                let t = tokens[i - 1];
-                //return the token or the first token
-                return t ? t : tokens[0];
-            }
-        }
-        //return the last token
-        return tokens[tokens.length - 1];
-    }
     /**
      * Builds a list of document symbols for this file. Used by LanguageServer's onDocumentSymbol functionality
      */
@@ -1090,7 +1111,7 @@ class BrsFile {
             return symbols;
         }
         const name = statement.getName(parser_1.ParseMode.BrighterScript);
-        const uri = util_1.util.pathToUri(this.pathAbsolute);
+        const uri = util_1.util.pathToUri(this.srcPath);
         const symbol = vscode_languageserver_1.SymbolInformation.create(name, symbolKind, statement.range, uri, containerStatement === null || containerStatement === void 0 ? void 0 : containerStatement.getName(parser_1.ParseMode.BrighterScript));
         symbols.push(symbol);
         return symbols;
@@ -1102,7 +1123,7 @@ class BrsFile {
     getDefinition(position) {
         let results = [];
         //get the token at the position
-        const token = this.getTokenAt(position);
+        const token = this.parser.getTokenAt(position);
         // While certain other tokens are allowed as local variables (AllowedLocalIdentifiers: https://github.com/rokucommunity/brighterscript/blob/master/src/lexer/TokenKind.ts#L418), these are converted by the parser to TokenKind.Identifier by the time we retrieve the token using getTokenAt
         let definitionTokenTypes = [
             lexer_1.TokenKind.Identifier,
@@ -1113,25 +1134,25 @@ class BrsFile {
             return results;
         }
         let textToSearchFor = token.text.toLowerCase();
-        const previousToken = this.getTokenAt({ line: token.range.start.line, character: token.range.start.character });
+        const previousToken = this.parser.getTokenAt({ line: token.range.start.line, character: token.range.start.character });
         if ((previousToken === null || previousToken === void 0 ? void 0 : previousToken.kind) === lexer_1.TokenKind.Callfunc) {
             for (const scope of this.program.getScopes()) {
                 //to only get functions defined in interface methods
                 const callable = scope.getAllCallables().find((c) => c.callable.name.toLowerCase() === textToSearchFor); // eslint-disable-line @typescript-eslint/no-loop-func
                 if (callable) {
-                    results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(callable.callable.file.pathAbsolute), callable.callable.functionStatement.range));
+                    results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(callable.callable.file.srcPath), callable.callable.functionStatement.range));
                 }
             }
             return results;
         }
-        let classToken = this.getTokenBefore(token, lexer_1.TokenKind.Class);
+        let classToken = this.parser.getTokenBefore(token, lexer_1.TokenKind.Class);
         if (classToken) {
             let cs = this.parser.references.classStatements.find((cs) => cs.classKeyword.range === classToken.range);
             if (cs === null || cs === void 0 ? void 0 : cs.parentClassName) {
                 const nameParts = cs.parentClassName.getNameParts();
                 let extendedClass = this.getClassFileLink(nameParts[nameParts.length - 1], nameParts.slice(0, -1).join('.'));
                 if (extendedClass) {
-                    results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(extendedClass.file.pathAbsolute), extendedClass.item.range));
+                    results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(extendedClass.file.srcPath), extendedClass.item.range));
                 }
             }
             return results;
@@ -1145,23 +1166,21 @@ class BrsFile {
             }
             textToSearchFor = textToSearchFor.substring(startIndex, endIndex);
         }
-        //look through local variables first, get the function scope for this position (if it exists)
-        const functionScope = this.getFunctionScopeAtPosition(position);
-        if (functionScope) {
-            //find any variable or label with this name
-            for (const varDeclaration of functionScope.variableDeclarations) {
-                //we found a variable declaration with this token text!
-                if (varDeclaration.name.toLowerCase() === textToSearchFor) {
-                    const uri = util_1.util.pathToUri(this.pathAbsolute);
-                    results.push(vscode_languageserver_1.Location.create(uri, varDeclaration.nameRange));
-                }
-            }
-            if (this.tokenFollows(token, lexer_1.TokenKind.Goto)) {
-                for (const label of functionScope.labelStatements) {
-                    if (label.name.toLocaleLowerCase() === textToSearchFor) {
-                        const uri = util_1.util.pathToUri(this.pathAbsolute);
-                        results.push(vscode_languageserver_1.Location.create(uri, label.nameRange));
-                    }
+        const func = this.getFunctionExpressionAtPosition(position);
+        //look through local variables first
+        //find any variable with this name
+        for (const symbol of func.symbolTable.getOwnSymbols()) {
+            //we found a variable declaration with this token text
+            if (symbol.name.toLowerCase() === textToSearchFor) {
+                const uri = util_1.util.pathToUri(this.srcPath);
+                results.push(vscode_languageserver_1.Location.create(uri, symbol.range));
+            }
+        }
+        if (this.parser.tokenFollows(token, lexer_1.TokenKind.Goto)) {
+            for (const label of func.labelStatements) {
+                if (label.tokens.identifier.text.toLocaleLowerCase() === textToSearchFor) {
+                    const uri = util_1.util.pathToUri(this.srcPath);
+                    results.push(vscode_languageserver_1.Location.create(uri, label.tokens.identifier.range));
                 }
             }
         }
@@ -1182,7 +1201,7 @@ class BrsFile {
                 }
                 const statementHandler = (statement) => {
                     if (statement.getName(this.parseMode).toLowerCase() === textToSearchFor) {
-                        const uri = util_1.util.pathToUri(file.pathAbsolute);
+                        const uri = util_1.util.pathToUri(file.srcPath);
                         results.push(vscode_languageserver_1.Location.create(uri, statement.range));
                     }
                 };
@@ -1200,12 +1219,12 @@ class BrsFile {
         //get class fields and members
         const statementHandler = (statement) => {
             if (statement.getName(file.parseMode).toLowerCase() === textToSearchFor) {
-                results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.pathAbsolute), statement.range));
+                results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), statement.range));
             }
         };
         const fieldStatementHandler = (statement) => {
             if (statement.name.text.toLowerCase() === textToSearchFor) {
-                results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.pathAbsolute), statement.range));
+                results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), statement.range));
             }
         };
         file.parser.ast.walk((0, visitors_1.createVisitor)({
@@ -1217,8 +1236,9 @@ class BrsFile {
         return results;
     }
     getHover(position) {
+        var _a, _b, _c;
         //get the token at the position
-        let token = this.getTokenAt(position);
+        let token = this.parser.getTokenAt(position);
         let hoverTokenTypes = [
             lexer_1.TokenKind.Identifier,
             lexer_1.TokenKind.Function,
@@ -1233,35 +1253,45 @@ class BrsFile {
         let lowerTokenText = token.text.toLowerCase();
         //look through local variables first
         {
-            //get the function scope for this position (if exists)
-            let functionScope = this.getFunctionScopeAtPosition(position);
-            if (functionScope) {
-                //find any variable with this name
-                for (const varDeclaration of functionScope.variableDeclarations) {
-                    //we found a variable declaration with this token text!
-                    if (varDeclaration.name.toLowerCase() === lowerTokenText) {
-                        let typeText;
-                        if ((0, reflection_1.isFunctionType)(varDeclaration.type)) {
-                            typeText = varDeclaration.type.toString();
-                        }
-                        else {
-                            typeText = `${varDeclaration.name} as ${varDeclaration.type.toString()}`;
-                        }
+            const func = this.getFunctionExpressionAtPosition(position);
+            if (func) {
+                // this identifier could possibly be a class field, so no function expression is available
+                for (const labelStatement of (_a = func === null || func === void 0 ? void 0 : func.labelStatements) !== null && _a !== void 0 ? _a : []) {
+                    if (labelStatement.tokens.identifier.text.toLocaleLowerCase() === lowerTokenText) {
                         return {
                             range: token.range,
-                            //append the variable name to the front for scope
-                            contents: typeText
+                            contents: `${labelStatement.tokens.identifier.text}: label`
                         };
                     }
                 }
-                for (const labelStatement of functionScope.labelStatements) {
-                    if (labelStatement.name.toLocaleLowerCase() === lowerTokenText) {
-                        return {
-                            range: token.range,
-                            contents: `${labelStatement.name}: label`
-                        };
+            }
+            const typeTexts = [];
+            for (const scope of this.program.getScopesForFile(this)) {
+                scope.linkSymbolTable();
+                const typeTextPair = this.getSymbolTypeFromToken(token, func, scope);
+                if (typeTextPair) {
+                    let scopeTypeText = '';
+                    if ((0, reflection_1.isFunctionType)(typeTextPair.type)) {
+                        scopeTypeText = (_b = typeTextPair.type) === null || _b === void 0 ? void 0 : _b.toString();
+                    }
+                    else if (typeTextPair.useExpandedTextOnly) {
+                        scopeTypeText = typeTextPair.expandedTokenText;
+                    }
+                    else {
+                        scopeTypeText = `${typeTextPair.expandedTokenText} as ${(_c = typeTextPair.type) === null || _c === void 0 ? void 0 : _c.toString()}`;
+                    }
+                    if (scopeTypeText && !typeTexts.includes(scopeTypeText)) {
+                        typeTexts.push(scopeTypeText);
                     }
                 }
+                scope.unlinkSymbolTable();
+            }
+            const typeText = typeTexts.join(' | ');
+            if (typeText) {
+                return {
+                    range: token.range,
+                    contents: typeText
+                };
             }
         }
         //look through all callables in relevant scopes
@@ -1313,10 +1343,10 @@ class BrsFile {
         const func = statement.func;
         const funcStartPosition = func.range.start;
         // Get function comments in reverse order
-        let currentToken = this.getTokenAt(funcStartPosition);
+        let currentToken = this.parser.getTokenAt(funcStartPosition);
         let functionComments = [];
         while (currentToken) {
-            currentToken = this.getPreviousToken(currentToken);
+            currentToken = this.parser.getPreviousToken(currentToken);
             if (!currentToken) {
                 break;
             }
@@ -1360,7 +1390,8 @@ class BrsFile {
     }
     getClassMethod(classStatement, name, walkParents = true) {
         var _a;
-        //TODO - would like to write this with getClassHieararchy; but got stuck on working out the scopes to use... :(
+        //TODO - would like to write this with getClassHierarchy; but got stuck on working out the scopes to use... :(
+        //TODO types - this could be solved with symbolTable?
         let statement;
         const statementHandler = (e) => {
             if (!statement && e.name.text.toLowerCase() === name.toLowerCase()) {
@@ -1396,7 +1427,7 @@ class BrsFile {
         return sigHelp;
     }
     getReferences(position) {
-        const callSiteToken = this.getTokenAt(position);
+        const callSiteToken = this.parser.getTokenAt(position);
         let locations = [];
         const searchFor = callSiteToken.text.toLowerCase();
         const scopes = this.program.getScopesForFile(this);
@@ -1410,7 +1441,7 @@ class BrsFile {
                 file.ast.walk((0, visitors_1.createVisitor)({
                     VariableExpression: (e) => {
                         if (e.name.text.toLowerCase() === searchFor) {
-                            locations.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.pathAbsolute), e.range));
+                            locations.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), e.range));
                         }
                     }
                 }), {
@@ -1454,7 +1485,7 @@ class BrsFile {
     getTypedef() {
         const state = new BrsTranspileState_1.BrsTranspileState(this);
         const typedef = this.ast.getTypedef(state);
-        const programNode = new source_map_1.SourceNode(null, null, this.pathAbsolute, typedef);
+        const programNode = new source_map_1.SourceNode(null, null, this.srcPath, typedef);
         return programNode.toString();
     }
     dispose() {