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

package/dist/files/BrsFile.js

@@ -6,10 +6,11 @@ const vscode_languageserver_1 = require("vscode-languageserver");
 const chalk_1 = require("chalk");
 const path = require("path");
 const DiagnosticMessages_1 = require("../DiagnosticMessages");
-const lexer_1 = require("../lexer");
-const parser_1 = require("../parser");
-const FunctionType_1 = require("../types/FunctionType");
-const VoidType_1 = require("../types/VoidType");
+const Token_1 = require("../lexer/Token");
+const Lexer_1 = require("../lexer/Lexer");
+const TokenKind_1 = require("../lexer/TokenKind");
+const Parser_1 = require("../parser/Parser");
+const DynamicType_1 = require("../types/DynamicType");
 const util_1 = require("../util");
 const BrsTranspileState_1 = require("../parser/BrsTranspileState");
 const Preprocessor_1 = require("../preprocessor/Preprocessor");
@@ -18,6 +19,9 @@ 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");
 /**
  * Holds all details about this file within the scope of the whole program
  */
@@ -38,30 +42,27 @@ class BrsFile {
         /**
          * The parseMode used for the parser for this file
          */
-        this.parseMode = parser_1.ParseMode.BrightScript;
+        this.parseMode = Parser_1.ParseMode.BrightScript;
         /**
          * Indicates whether this file needs to be validated.
+         * Files are only ever validated a single time
          */
         this.isValidated = false;
         this.diagnostics = [];
         this.commentFlags = [];
         this.callables = [];
         this.functionCalls = [];
-        /**
-         * files referenced by import statements
-         */
-        this.ownScriptImports = [];
         /**
          * Does this file need to be transpiled?
          */
         this.needsTranspiled = false;
-        this.srcPath = util_1.standardizePath `${this.srcPath}`;
+        this.srcPath = (0, util_1.standardizePath) `${this.srcPath}`;
         this.dependencyGraphKey = this.pkgPath.toLowerCase();
         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;
-            this.parseMode = parser_1.ParseMode.BrighterScript;
+            this.parseMode = Parser_1.ParseMode.BrighterScript;
         }
         this.isTypedef = this.extension === '.d.bs';
         if (!this.isTypedef) {
@@ -79,21 +80,34 @@ class BrsFile {
         this.diagnostics.push(...diagnostics);
     }
     /**
-     * The AST for this file
+     * files referenced by import statements
      */
-    get ast() {
-        return this.parser.ast;
+    get ownScriptImports() {
+        var _a, _b;
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        const result = (_b = (_a = this._parser) === null || _a === void 0 ? void 0 : _a.references['cache'].getOrAdd('BrsFile_ownScriptImports', () => {
+            var _a, _b, _c, _d;
+            const result = [];
+            for (const statement of (_c = (_b = (_a = this.parser) === null || _a === void 0 ? void 0 : _a.references) === null || _b === void 0 ? void 0 : _b.importStatements) !== null && _c !== void 0 ? _c : []) {
+                //register import statements
+                if ((0, reflection_1.isImportStatement)(statement) && statement.filePathToken) {
+                    result.push({
+                        filePathRange: statement.filePathToken.range,
+                        pkgPath: util_1.util.getPkgPathFromTarget(this.pkgPath, statement.filePath),
+                        sourceFile: this,
+                        text: (_d = statement.filePathToken) === null || _d === void 0 ? void 0 : _d.text
+                    });
+                }
+            }
+            return result;
+        })) !== null && _b !== void 0 ? _b : [];
+        return result;
     }
     /**
-     * Get the token at the specified position
-     * @param position
+     * The AST for this file
      */
-    getTokenAt(position) {
-        for (let token of this.parser.tokens) {
-            if (util_1.util.rangeContains(token.range, position)) {
-                return token;
-            }
-        }
+    get ast() {
+        return this.parser.ast;
     }
     get parser() {
         if (!this._parser) {
@@ -119,9 +133,8 @@ class BrsFile {
      * Also notify the dependency graph of our current dependencies so other dependents can be notified.
      */
     attachDependencyGraph(dependencyGraph) {
-        if (this.unsubscribeFromDependencyGraph) {
-            this.unsubscribeFromDependencyGraph();
-        }
+        var _a;
+        (_a = this.unsubscribeFromDependencyGraph) === null || _a === void 0 ? void 0 : _a.call(this);
         //event that fires anytime a dependency changes
         this.unsubscribeFromDependencyGraph = dependencyGraph.onchange(this.dependencyGraphKey, () => {
             this.resolveTypedef();
@@ -143,11 +156,13 @@ class BrsFile {
             this.diagnostics = [];
             //if we have a typedef file, skip parsing this file
             if (this.hasTypedef) {
+                //skip validation since the typedef is shadowing this file
+                this.isValidated = true;
                 return;
             }
             //tokenize the input file
             let lexer = this.program.logger.time(Logger_1.LogLevel.debug, ['lexer.lex', chalk_1.default.green(this.srcPath)], () => {
-                return lexer_1.Lexer.scan(fileContents, {
+                return Lexer_1.Lexer.scan(fileContents, {
                     includeWhitespace: false
                 });
             });
@@ -170,7 +185,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.srcPath)], () => {
-                this._parser = parser_1.Parser.parse(tokens, {
+                this._parser = Parser_1.Parser.parse(tokens, {
                     mode: this.parseMode,
                     logger: this.program.logger
                 });
@@ -181,28 +196,31 @@ class BrsFile {
             this.findCallables();
             //find all places where a sub/function is being called
             this.findFunctionCalls();
-            this.findAndValidateImportAndImportStatements();
             //attach this file to every diagnostic
             for (let diagnostic of this.diagnostics) {
                 diagnostic.file = this;
             }
         }
         catch (e) {
-            this._parser = new parser_1.Parser();
-            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(serialize_error_1.serializeError(e)))));
+            this._parser = new Parser_1.Parser();
+            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;
+    validate() {
+        //only validate the file if it was actually parsed (skip files containing typedefs)
+        if (!this.hasTypedef) {
+            this.validateImportStatements();
+        }
+    }
+    validateImportStatements() {
         let topOfFileIncludeStatements = [];
         for (let stmt of this.ast.statements) {
             //skip comments
-            if (reflection_1.isCommentStatement(stmt)) {
+            if ((0, reflection_1.isCommentStatement)(stmt)) {
                 continue;
             }
             //if we found a non-library statement, this statement is not at the top of the file
-            if (reflection_1.isLibraryStatement(stmt) || reflection_1.isImportStatement(stmt)) {
+            if ((0, reflection_1.isLibraryStatement)(stmt) || (0, reflection_1.isImportStatement)(stmt)) {
                 topOfFileIncludeStatements.push(stmt);
             }
             else {
@@ -215,22 +233,13 @@ class BrsFile {
             ...this._parser.references.importStatements
         ];
         for (let result of statements) {
-            //register import statements
-            if (reflection_1.isImportStatement(result) && result.filePathToken) {
-                this.ownScriptImports.push({
-                    filePathRange: result.filePathToken.range,
-                    pkgPath: util_1.util.getPkgPathFromTarget(this.pkgPath, result.filePath),
-                    sourceFile: this,
-                    text: (_a = result.filePathToken) === null || _a === void 0 ? void 0 : _a.text
-                });
-            }
             //if this statement is not one of the top-of-file statements,
             //then add a diagnostic explaining that it is invalid
             if (!topOfFileIncludeStatements.includes(result)) {
-                if (reflection_1.isLibraryStatement(result)) {
+                if ((0, reflection_1.isLibraryStatement)(result)) {
                     this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.libraryStatementMustBeDeclaredAtTopOfFile()), { range: result.range, file: this }));
                 }
-                else if (reflection_1.isImportStatement(result)) {
+                else if ((0, reflection_1.isImportStatement)(result)) {
                     this.diagnostics.push(Object.assign(Object.assign({}, DiagnosticMessages_1.DiagnosticMessages.importStatementMustBeDeclaredAtTopOfFile()), { range: result.range, file: this }));
                 }
             }
@@ -281,7 +290,7 @@ class BrsFile {
         const processor = new CommentFlagProcessor_1.CommentFlagProcessor(this, ['rem', `'`], DiagnosticMessages_1.diagnosticCodes, [DiagnosticMessages_1.DiagnosticCodeMap.unknownDiagnosticCode]);
         this.commentFlags = [];
         for (let token of tokens) {
-            if (token.kind === lexer_1.TokenKind.Comment) {
+            if (token.kind === TokenKind_1.TokenKind.Comment) {
                 processor.tryAdd(token.text, token.range);
             }
         }
@@ -291,31 +300,14 @@ class BrsFile {
     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),
@@ -325,21 +317,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;
@@ -347,7 +342,7 @@ class BrsFile {
                 let args = [];
                 //TODO convert if stmts to use instanceof instead
                 for (let arg of expression.args) {
-                    let impliedType = parser_1.getBscTypeFromExpression(arg, func);
+                    let inferredType = (0, Parser_1.getBscTypeFromExpression)(arg, func);
                     let argText = '';
                     // Get the text to display for the arg
                     if (arg.token) {
@@ -355,24 +350,28 @@ class BrsFile {
                         //is a function call being passed into argument
                     }
                     else if (arg.name) {
-                        if (lexer_1.isToken(arg.name)) {
+                        if ((0, Token_1.isToken)(arg.name)) {
                             argText = arg.name.text;
                         }
                     }
                     else if (arg.value) {
                         /* istanbul ignore next: TODO figure out why value is undefined sometimes */
                         if (arg.value.value) {
-                            argText = arg.value.value.toString();
+                            if (arg.value.value.toString) {
+                                argText = arg.value.value.toString();
+                            }
                         }
                         //wrap the value in quotes because that's how it appears in the code
-                        if (reflection_1.isStringType(impliedType)) {
+                        if (argText && (0, reflection_1.isStringType)(inferredType)) {
                             argText = '"' + argText + '"';
                         }
                     }
                     args.push({
                         range: arg.range,
-                        type: impliedType,
-                        text: argText
+                        type: inferredType,
+                        text: argText,
+                        expression: arg,
+                        typeToken: undefined
                     });
                 }
                 let functionCall = {
@@ -381,8 +380,8 @@ class BrsFile {
                     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);
             }
@@ -408,10 +407,25 @@ class BrsFile {
             }
         }
     }
+    /**
+     * Find the NamespaceStatement enclosing the given position
+     * @param position
+     * @param functionScopes
+     */
+    getNamespaceStatementForPosition(position) {
+        if (position) {
+            for (const statement of this.parser.references.namespaceStatements) {
+                if (util_1.util.rangeContains(statement.range, position)) {
+                    return statement;
+                }
+            }
+        }
+    }
     /**
      * 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 = {};
@@ -421,12 +435,12 @@ 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) {
+        if (tokenKind === TokenKind_1.TokenKind.Comment) {
             return [];
         }
-        else if (tokenKind === lexer_1.TokenKind.StringLiteral || tokenKind === lexer_1.TokenKind.TemplateStringQuasi) {
+        else if (tokenKind === TokenKind_1.TokenKind.StringLiteral || tokenKind === TokenKind_1.TokenKind.TemplateStringQuasi) {
             const match = /^("?)(pkg|libpkg):/.exec(currentToken.text);
             if (match) {
                 const [, openingQuote, fileProtocol] = match;
@@ -450,43 +464,56 @@ class BrsFile {
                 return [];
             }
         }
-        let namespaceCompletions = this.getNamespaceCompletions(currentToken, this.parseMode, scope);
+        const namespaceCompletions = this.getNamespaceCompletions(currentToken, this.parseMode, scope);
         if (namespaceCompletions.length > 0) {
-            return namespaceCompletions;
+            return [...namespaceCompletions];
+        }
+        const enumMemberCompletions = this.getEnumMemberStatementCompletions(currentToken, this.parseMode, scope);
+        if (enumMemberCompletions.length > 0) {
+            // no other completion is valid in this case
+            return enumMemberCompletions;
         }
         //determine if cursor is inside a function
         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, TokenKind_1.TokenKind.New)) {
                 // there's a new keyword, so only class types are viable here
-                return [...this.getGlobalClassStatementCompletions(currentToken, this.parseMode)];
+                return [...this.getGlobalClassStatementCompletions(currentToken, this.parseMode, scope)];
             }
             else {
-                return [...exports.KeywordCompletions, ...this.getGlobalClassStatementCompletions(currentToken, this.parseMode), ...namespaceCompletions];
-            }
-        }
-        const classNameCompletions = this.getGlobalClassStatementCompletions(currentToken, this.parseMode);
-        const newToken = this.getTokenBefore(currentToken, lexer_1.TokenKind.New);
+                return [
+                    ...exports.KeywordCompletions,
+                    ...this.getGlobalClassStatementCompletions(currentToken, this.parseMode, scope),
+                    ...namespaceCompletions,
+                    ...this.getNonNamespacedEnumStatementCompletions(currentToken, this.parseMode, scope),
+                    ...this.getGlobalInterfaceStatementCompletions(currentToken, this.parseMode, scope)
+                ];
+            }
+        }
+        const classNameCompletions = this.getGlobalClassStatementCompletions(currentToken, this.parseMode, scope);
+        const interfaceNameCompletions = this.getGlobalInterfaceStatementCompletions(currentToken, this.parseMode, scope);
+        const newToken = this.parser.getTokenBefore(currentToken, TokenKind_1.TokenKind.New);
         if (newToken) {
-            //we are after a new keyword; so we can only be namespaces or classes at this point
+            //we are after a new keyword; so we can only be top-level namespaces or classes at this point
             result.push(...classNameCompletions);
             result.push(...namespaceCompletions);
             return result;
         }
-        if (this.tokenFollows(currentToken, lexer_1.TokenKind.Goto)) {
+        if (this.parser.tokenFollows(currentToken, TokenKind_1.TokenKind.Goto)) {
             return this.getLabelCompletion(functionExpression);
         }
-        if (this.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;
-            }
+        if (this.parser.isPositionNextToTokenKind(position, TokenKind_1.TokenKind.Dot)) {
             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, functionExpression)) {
+            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());
@@ -501,6 +528,10 @@ class BrsFile {
             result.push(...namespaceCompletions);
             //include class names
             result.push(...classNameCompletions);
+            //include interfaces
+            result.push(...interfaceNameCompletions);
+            //include enums
+            result.push(...this.getNonNamespacedEnumStatementCompletions(currentToken, this.parseMode, scope));
             //include the global callables
             result.push(...scope.getCallablesAsCompletions(this.parseMode));
             //add `m` because that's always valid within a function
@@ -511,22 +542,24 @@ class BrsFile {
             names.m = true;
             result.push(...exports.KeywordCompletions);
             //include local variables
-            for (let symbol of functionExpression.symbolTable.ownSymbols) {
+            for (let symbol of functionExpression.symbolTable.getOwnSymbols()) {
                 const symbolNameLower = symbol.name.toLowerCase();
                 //skip duplicate variable names
                 if (names[symbolNameLower]) {
                     continue;
                 }
                 names[symbolNameLower] = true;
+                // TODO TYPES (This may be a performance hit?)
+                // const foundType = getTypeFromContext(symbol.type, { scope: scope, file: this });
                 result.push({
                     //TODO does this work?
                     label: symbol.name,
-                    //TODO find type for local vars
+                    //TODO TYPES find type for local vars - SEE above
                     kind: vscode_languageserver_1.CompletionItemKind.Variable
-                    // kind: isFunctionType(variable.type) ? CompletionItemKind.Function : CompletionItemKind.Variable
+                    // kind: isFunctionType(foundType) ? CompletionItemKind.Function : CompletionItemKind.Variable
                 });
             }
-            if (this.parseMode === parser_1.ParseMode.BrighterScript) {
+            if (this.parseMode === Parser_1.ParseMode.BrighterScript) {
                 //include the first part of namespaces
                 let namespaces = scope.getAllNamespaceStatements();
                 for (let stmt of namespaces) {
@@ -545,6 +578,14 @@ class BrsFile {
         }
         return result;
     }
+    getCompletionsFromSymbolTable(symbolTable) {
+        return symbolTable.getAllSymbols().map(bscType => {
+            return {
+                label: bscType.name,
+                kind: (0, reflection_1.isTypedFunctionType)(bscType.type) ? vscode_languageserver_1.CompletionItemKind.Method : vscode_languageserver_1.CompletionItemKind.Field
+            };
+        });
+    }
     getLabelCompletion(func) {
         return func.labelStatements.map(label => ({
             label: label.tokens.identifier.text,
@@ -552,17 +593,17 @@ class BrsFile {
         }));
     }
     getClassMemberCompletions(position, currentToken, functionExpression, scope) {
-        var _a, _b;
-        let classStatement = this.getClassFromMReference(position, currentToken, functionExpression);
+        var _a, _b, _c, _d;
+        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());
+            let classes = scope.getClassHierarchy(classStatement.item.getName(Parser_1.ParseMode.BrighterScript).toLowerCase());
             for (let cs of classes) {
-                for (let member of [...(_a = cs === null || cs === void 0 ? void 0 : cs.item) === null || _a === void 0 ? void 0 : _a.fields, ...(_b = cs === null || cs === void 0 ? void 0 : cs.item) === null || _b === void 0 ? void 0 : _b.methods]) {
+                for (let member of [...(_b = (_a = cs === null || cs === void 0 ? void 0 : cs.item) === null || _a === void 0 ? void 0 : _a.fields) !== null && _b !== void 0 ? _b : [], ...(_d = (_c = cs === null || cs === void 0 ? void 0 : cs.item) === null || _c === void 0 ? void 0 : _c.methods) !== null && _d !== void 0 ? _d : []]) {
                     if (!results.has(member.name.text.toLowerCase())) {
                         results.set(member.name.text.toLowerCase(), {
                             label: member.name.text,
-                            kind: reflection_1.isClassFieldStatement(member) ? vscode_languageserver_1.CompletionItemKind.Field : vscode_languageserver_1.CompletionItemKind.Function
+                            kind: (0, reflection_1.isClassFieldStatement)(member) ? vscode_languageserver_1.CompletionItemKind.Field : vscode_languageserver_1.CompletionItemKind.Method
                         });
                     }
                 }
@@ -570,69 +611,392 @@ class BrsFile {
         }
         return results;
     }
-    getClassFromMReference(position, currentToken, functionExpression) {
-        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' && reflection_1.isClassMethodStatement(functionExpression.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;
     }
-    getGlobalClassStatementCompletions(currentToken, parseMode) {
+    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.get(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.get(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.getThisBscType();
+                expandedText = `class ${containingClass.getName(Parser_1.ParseMode.BrighterScript)}`;
+                useExpandedTextOnly = true;
+                currentClassRef = containingClass;
+            }
+            else if (currentTokenLower === 'm') {
+                symbolType = containingClass.getThisBscType();
+                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.isTypedFunctionType)(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 || !currentToken) {
+            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 tokenUsage = tokenChainMember === null || tokenChainMember === void 0 ? void 0 : tokenChainMember.usage;
+            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 = scope.getGlobalCallableByName(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.isTypedFunctionType)(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 still have more tokens, but remember the last known reference
+                    symbolTypeBeforeReference = symbolType;
+                }
+            }
+            if ((0, reflection_1.isArrayType)(symbolType) && tokenUsage === Parser_1.TokenUsage.ArrayReference) {
+                symbolType = (0, BscType_1.getTypeFromContext)(symbolType.getDefaultType(typeContext), typeContext);
+            }
+            if (symbolType === null || symbolType === void 0 ? void 0 : symbolType.memberTable) {
+                if ((0, reflection_1.isCustomType)(symbolType) || (0, reflection_1.isInterfaceType)(symbolType)) {
+                    // we're currently looking at a customType or interface, 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 is used for hovers. We only need the last two tokens for a hover
+            // So in a long chain (e.g. klass.getData()[0].anotherKlass.property), the hover
+            // for the last token should just be "AnotherKlass.property", not the whole chain
+            tokenText = tokenText.slice(-2);
+        }
+        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, scope) {
         var _a;
-        if (parseMode === parser_1.ParseMode.BrightScript) {
+        if (parseMode === Parser_1.ParseMode.BrightScript) {
             return [];
         }
         let results = new Map();
-        let completionName = (_a = this.getPartialVariableName(currentToken, [lexer_1.TokenKind.New])) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        let completionName = (_a = this.getPartialVariableName(currentToken, [TokenKind_1.TokenKind.New])) === null || _a === void 0 ? void 0 : _a.toLowerCase();
         if (completionName === null || completionName === void 0 ? void 0 : completionName.includes('.')) {
             return [];
         }
-        let scopes = this.program.getScopesForFile(this);
-        for (let scope of scopes) {
-            let classMap = scope.getClassMap();
-            // let viableKeys = [...classMap.keys()].filter((k) => k.startsWith(completionName));
-            for (const key of [...classMap.keys()]) {
-                let cs = classMap.get(key).item;
-                if (!results.has(cs.name.text)) {
-                    results.set(cs.name.text, {
-                        label: cs.name.text,
-                        kind: vscode_languageserver_1.CompletionItemKind.Class
-                    });
-                }
+        let classMap = scope.getClassMap();
+        // let viableKeys = [...classMap.keys()].filter((k) => k.startsWith(completionName));
+        for (const key of [...classMap.keys()]) {
+            let cs = classMap.get(key).item;
+            if (!results.has(cs.name.text)) {
+                results.set(cs.name.text, {
+                    label: cs.name.text,
+                    kind: vscode_languageserver_1.CompletionItemKind.Class
+                });
+            }
+        }
+        return [...results.values()];
+    }
+    getNonNamespacedEnumStatementCompletions(currentToken, parseMode, scope) {
+        var _a, _b;
+        if (parseMode !== Parser_1.ParseMode.BrighterScript) {
+            return [];
+        }
+        const containingNamespaceName = ((_b = this.getNamespaceStatementForPosition((_a = currentToken === null || currentToken === void 0 ? void 0 : currentToken.range) === null || _a === void 0 ? void 0 : _a.start)) === null || _b === void 0 ? void 0 : _b.name) + '.';
+        const results = new Map();
+        const enumMap = scope.getEnumMap();
+        for (const key of [...enumMap.keys()]) {
+            const enumStatement = enumMap.get(key).item;
+            const fullName = enumStatement.fullName;
+            //if the enum is contained within our own namespace, or if it's a non-namespaced enum
+            if (fullName.startsWith(containingNamespaceName) || !fullName.includes('.')) {
+                results.set(fullName, {
+                    label: enumStatement.name,
+                    kind: vscode_languageserver_1.CompletionItemKind.Enum
+                });
+            }
+        }
+        return [...results.values()];
+    }
+    getEnumMemberStatementCompletions(currentToken, parseMode, scope) {
+        var _a, _b, _c, _d, _e;
+        if (parseMode === Parser_1.ParseMode.BrightScript || !currentToken) {
+            return [];
+        }
+        const results = new Map();
+        const completionName = (_a = this.getPartialVariableName(currentToken)) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        //if we don't have a completion name, or if there's no period in the name, then this is not to the right of an enum name
+        if (!completionName || !completionName.includes('.')) {
+            return [];
+        }
+        const enumNameLower = (_b = completionName === null || completionName === void 0 ? void 0 : completionName.split(/\.(\w+)?$/)[0]) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+        const namespaceNameLower = (_c = this.getNamespaceStatementForPosition(currentToken.range.end)) === null || _c === void 0 ? void 0 : _c.name.toLowerCase();
+        const enumMap = scope.getEnumMap();
+        //get the enum statement with this name (check without namespace prefix first, then with inferred namespace prefix next)
+        const enumStatement = (_e = ((_d = enumMap.get(enumNameLower)) !== null && _d !== void 0 ? _d : enumMap.get(namespaceNameLower + '.' + enumNameLower))) === null || _e === void 0 ? void 0 : _e.item;
+        //if we found an enum with this name
+        if (enumStatement) {
+            for (const member of enumStatement.getMembers()) {
+                const name = enumStatement.fullName + '.' + member.name;
+                const nameLower = name.toLowerCase();
+                results.set(nameLower, {
+                    label: member.name,
+                    kind: vscode_languageserver_1.CompletionItemKind.EnumMember
+                });
+            }
+        }
+        return [...results.values()];
+    }
+    getGlobalInterfaceStatementCompletions(currentToken, parseMode, scope) {
+        var _a;
+        if (parseMode === Parser_1.ParseMode.BrightScript) {
+            return [];
+        }
+        let results = new Map();
+        let completionName = (_a = this.getPartialVariableName(currentToken, [TokenKind_1.TokenKind.New])) === null || _a === void 0 ? void 0 : _a.toLowerCase();
+        if (completionName === null || completionName === void 0 ? void 0 : completionName.includes('.')) {
+            return [];
+        }
+        let ifaceMap = scope.getInterfaceMap();
+        for (const key of [...ifaceMap.keys()]) {
+            let cs = ifaceMap.get(key).item;
+            if (!results.has(cs.name.text)) {
+                results.set(cs.name.text, {
+                    label: cs.name.text,
+                    kind: vscode_languageserver_1.CompletionItemKind.Interface
+                });
             }
         }
         return [...results.values()];
     }
     getNamespaceCompletions(currentToken, parseMode, scope) {
         //BrightScript does not support namespaces, so return an empty list in that case
-        if (parseMode === parser_1.ParseMode.BrightScript) {
+        if (parseMode === Parser_1.ParseMode.BrightScript) {
             return [];
         }
-        let completionName = this.getPartialVariableName(currentToken, [lexer_1.TokenKind.New]);
-        if (!completionName) {
+        const completionName = this.getPartialVariableName(currentToken, [TokenKind_1.TokenKind.New]);
+        //if we don't have a completion name, or if there's no period in the name, then this is not a namespaced variable
+        if (!completionName || !completionName.includes('.')) {
             return [];
         }
         //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 namespaceLookup = scope.namespaceLookup;
+        let closestParentNamespaceName = completionName.replace(/\.([a-z0-9_]*)?$/gi, '').toLowerCase();
+        let newToken = this.parser.getTokenBefore(currentToken, TokenKind_1.TokenKind.New);
         let result = new Map();
-        for (let key in namespaceLookup) {
-            let namespace = namespaceLookup[key.toLowerCase()];
+        for (let [, namespace] of scope.namespaceLookup) {
             //completionName = "NameA."
             //completionName = "NameA.Na
             //NameA
             //NameA.NameB
             //NameA.NameB.NameC
-            if (namespace.fullName.toLowerCase() === closestParentNamespaceName.toLowerCase()) {
+            if (namespace.fullName.toLowerCase() === closestParentNamespaceName) {
                 //add all of this namespace's immediate child namespaces, bearing in mind if we are after a new keyword
-                for (let childKey in namespace.namespaces) {
-                    const ns = namespace.namespaces[childKey];
-                    if (!newToken || ns.statements.find((s) => reflection_1.isClassStatement(s))) {
+                for (let [, ns] of namespace.namespaces) {
+                    if (!newToken || ns.statements.find((s) => (0, reflection_1.isClassStatement)(s))) {
                         if (!result.has(ns.lastPartName)) {
                             result.set(ns.lastPartName, {
                                 label: ns.lastPartName,
@@ -643,21 +1007,23 @@ class BrsFile {
                 }
                 //add function and class statement completions
                 for (let stmt of namespace.statements) {
-                    if (reflection_1.isClassStatement(stmt)) {
-                        if (!result.has(stmt.name.text)) {
-                            result.set(stmt.name.text, {
-                                label: stmt.name.text,
-                                kind: vscode_languageserver_1.CompletionItemKind.Class
-                            });
-                        }
+                    if ((0, reflection_1.isClassStatement)(stmt)) {
+                        result.set(stmt.name.text, {
+                            label: stmt.name.text,
+                            kind: vscode_languageserver_1.CompletionItemKind.Class
+                        });
                     }
-                    else if (reflection_1.isFunctionStatement(stmt) && !newToken) {
-                        if (!result.has(stmt.name.text)) {
-                            result.set(stmt.name.text, {
-                                label: stmt.name.text,
-                                kind: vscode_languageserver_1.CompletionItemKind.Function
-                            });
-                        }
+                    else if ((0, reflection_1.isFunctionStatement)(stmt) && !newToken) {
+                        result.set(stmt.name.text, {
+                            label: stmt.name.text,
+                            kind: vscode_languageserver_1.CompletionItemKind.Function
+                        });
+                    }
+                    else if ((0, reflection_1.isEnumStatement)(stmt) && !newToken) {
+                        result.set(stmt.name, {
+                            label: stmt.name,
+                            kind: vscode_languageserver_1.CompletionItemKind.Enum
+                        });
                     }
                 }
             }
@@ -670,18 +1036,18 @@ class BrsFile {
             return undefined;
         }
         let location;
-        const nameParts = this.getPartialVariableName(token, [lexer_1.TokenKind.New]).split('.');
+        const nameParts = this.getPartialVariableName(token, [TokenKind_1.TokenKind.New]).split('.');
         const endName = nameParts[nameParts.length - 1].toLowerCase();
         const namespaceName = nameParts.slice(0, -1).join('.').toLowerCase();
         const statementHandler = (statement) => {
-            if (!location && statement.getName(parser_1.ParseMode.BrighterScript).toLowerCase() === namespaceName) {
+            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.srcPath);
                         location = vscode_languageserver_1.Location.create(uri, statement.range);
                     }
                 };
-                file.parser.ast.walk(visitors_1.createVisitor({
+                file.parser.ast.walk((0, visitors_1.createVisitor)({
                     ClassStatement: namespaceItemStatementHandler,
                     FunctionStatement: namespaceItemStatementHandler
                 }), {
@@ -689,7 +1055,7 @@ class BrsFile {
                 });
             }
         };
-        file.parser.ast.walk(visitors_1.createVisitor({
+        file.parser.ast.walk((0, visitors_1.createVisitor)({
             NamespaceStatement: statementHandler
         }), {
             walkMode: visitors_1.WalkMode.visitStatements
@@ -700,7 +1066,7 @@ class BrsFile {
      * Given a current token, walk
      */
     getPartialVariableName(currentToken, excludeTokens = null) {
-        let identifierAndDotKinds = [lexer_1.TokenKind.Identifier, ...lexer_1.AllowedLocalIdentifiers, lexer_1.TokenKind.Dot];
+        let identifierAndDotKinds = [TokenKind_1.TokenKind.Identifier, ...TokenKind_1.AllowedLocalIdentifiers, TokenKind_1.TokenKind.Dot];
         //consume tokens backwards until we find something other than a dot or an identifier
         let tokens = [];
         const parser = this.parser;
@@ -721,79 +1087,21 @@ 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
      */
     calleeStartsWithNamespace(callee) {
         let left = callee;
-        while (reflection_1.isDottedGetExpression(left)) {
+        while ((0, reflection_1.isDottedGetExpression)(left)) {
             left = left.obj;
         }
-        if (reflection_1.isVariableExpression(left)) {
+        if ((0, reflection_1.isVariableExpression)(left)) {
             let lowerName = left.name.text.toLowerCase();
             //find the first scope that contains this namespace
             let scopes = this.program.getScopesForFile(this);
             for (let scope of scopes) {
-                if (scope.namespaceLookup[lowerName]) {
+                if (scope.namespaceLookup.has(lowerName)) {
                     return true;
                 }
             }
@@ -806,12 +1114,12 @@ class BrsFile {
     calleeIsKnownNamespaceFunction(callee, namespaceName) {
         var _a, _b;
         //if we have a variable and a namespace
-        if (reflection_1.isVariableExpression(callee) && namespaceName) {
+        if ((0, reflection_1.isVariableExpression)(callee) && namespaceName) {
             let lowerCalleeName = (_b = (_a = callee === null || callee === void 0 ? void 0 : callee.name) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.toLowerCase();
             if (lowerCalleeName) {
                 let scopes = this.program.getScopesForFile(this);
                 for (let scope of scopes) {
-                    let namespace = scope.namespaceLookup[namespaceName.toLowerCase()];
+                    let namespace = scope.namespaceLookup.get(namespaceName.toLowerCase());
                     if (namespace.functionStatements[lowerCalleeName]) {
                         return true;
                     }
@@ -820,28 +1128,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
      */
@@ -881,16 +1167,16 @@ class BrsFile {
     getDocumentSymbol(statement) {
         let symbolKind;
         const children = [];
-        if (reflection_1.isFunctionStatement(statement)) {
+        if ((0, reflection_1.isFunctionStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Function;
         }
-        else if (reflection_1.isClassMethodStatement(statement)) {
+        else if ((0, reflection_1.isClassMethodStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Method;
         }
-        else if (reflection_1.isClassFieldStatement(statement)) {
+        else if ((0, reflection_1.isClassFieldStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Field;
         }
-        else if (reflection_1.isNamespaceStatement(statement)) {
+        else if ((0, reflection_1.isNamespaceStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Namespace;
             for (const childStatement of statement.body.statements) {
                 const symbol = this.getDocumentSymbol(childStatement);
@@ -899,7 +1185,7 @@ class BrsFile {
                 }
             }
         }
-        else if (reflection_1.isClassStatement(statement)) {
+        else if ((0, reflection_1.isClassStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Class;
             for (const childStatement of statement.body) {
                 const symbol = this.getDocumentSymbol(childStatement);
@@ -911,7 +1197,7 @@ class BrsFile {
         else {
             return;
         }
-        const name = reflection_1.isClassFieldStatement(statement) ? statement.name.text : statement.getName(parser_1.ParseMode.BrighterScript);
+        const name = (0, reflection_1.isClassFieldStatement)(statement) ? statement.name.text : statement.getName(Parser_1.ParseMode.BrighterScript);
         return vscode_languageserver_1.DocumentSymbol.create(name, '', symbolKind, statement.range, statement.range, children);
     }
     /**
@@ -920,13 +1206,13 @@ class BrsFile {
     generateWorkspaceSymbols(statement, containerStatement) {
         let symbolKind;
         const symbols = [];
-        if (reflection_1.isFunctionStatement(statement)) {
+        if ((0, reflection_1.isFunctionStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Function;
         }
-        else if (reflection_1.isClassMethodStatement(statement)) {
+        else if ((0, reflection_1.isClassMethodStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Method;
         }
-        else if (reflection_1.isNamespaceStatement(statement)) {
+        else if ((0, reflection_1.isNamespaceStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Namespace;
             for (const childStatement of statement.body.statements) {
                 for (const symbol of this.generateWorkspaceSymbols(childStatement, statement)) {
@@ -934,7 +1220,7 @@ class BrsFile {
                 }
             }
         }
-        else if (reflection_1.isClassStatement(statement)) {
+        else if ((0, reflection_1.isClassStatement)(statement)) {
             symbolKind = vscode_languageserver_1.SymbolKind.Class;
             for (const childStatement of statement.body) {
                 for (const symbol of this.generateWorkspaceSymbols(childStatement, statement)) {
@@ -945,9 +1231,9 @@ class BrsFile {
         else {
             return symbols;
         }
-        const name = statement.getName(parser_1.ParseMode.BrighterScript);
+        const name = statement.getName(Parser_1.ParseMode.BrighterScript);
         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));
+        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;
     }
@@ -958,19 +1244,19 @@ 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,
-            lexer_1.TokenKind.StringLiteral
+            TokenKind_1.TokenKind.Identifier,
+            TokenKind_1.TokenKind.StringLiteral
         ];
         //throw out invalid tokens and the wrong kind of tokens
         if (!token || !definitionTokenTypes.includes(token.kind)) {
             return results;
         }
         let textToSearchFor = token.text.toLowerCase();
-        const previousToken = this.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) {
+        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) === TokenKind_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
@@ -980,7 +1266,7 @@ class BrsFile {
             }
             return results;
         }
-        let classToken = this.getTokenBefore(token, lexer_1.TokenKind.Class);
+        let classToken = this.parser.getTokenBefore(token, TokenKind_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) {
@@ -992,7 +1278,7 @@ class BrsFile {
             }
             return results;
         }
-        if (token.kind === lexer_1.TokenKind.StringLiteral) {
+        if (token.kind === TokenKind_1.TokenKind.StringLiteral) {
             // We need to strip off the quotes but only if present
             const startIndex = textToSearchFor.startsWith('"') ? 1 : 0;
             let endIndex = textToSearchFor.length;
@@ -1002,20 +1288,22 @@ class BrsFile {
             textToSearchFor = textToSearchFor.substring(startIndex, endIndex);
         }
         const func = this.getFunctionExpressionAtPosition(position);
-        //look through local variables first
-        //find any variable with this name
-        for (const symbol of func.symbolTable.ownSymbols) {
-            //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.tokenFollows(token, lexer_1.TokenKind.Goto)) {
-            for (const label of func.labelStatements) {
-                if (label.tokens.identifier.text.toLocaleLowerCase() === textToSearchFor) {
+        if (func) {
+            //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, label.tokens.identifier.range));
+                    results.push(vscode_languageserver_1.Location.create(uri, symbol.range));
+                }
+            }
+            if (this.parser.tokenFollows(token, TokenKind_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));
+                    }
                 }
             }
         }
@@ -1023,11 +1311,11 @@ class BrsFile {
         //look through all files in scope for matches
         for (const scope of this.program.getScopesForFile(this)) {
             for (const file of scope.getAllFiles()) {
-                if (reflection_1.isXmlFile(file) || filesSearched.has(file)) {
+                if ((0, reflection_1.isXmlFile)(file) || filesSearched.has(file)) {
                     continue;
                 }
                 filesSearched.add(file);
-                if ((previousToken === null || previousToken === void 0 ? void 0 : previousToken.kind) === lexer_1.TokenKind.Dot && file.parseMode === parser_1.ParseMode.BrighterScript) {
+                if ((previousToken === null || previousToken === void 0 ? void 0 : previousToken.kind) === TokenKind_1.TokenKind.Dot && file.parseMode === Parser_1.ParseMode.BrighterScript) {
                     results.push(...this.getClassMemberDefinitions(textToSearchFor, file));
                     const namespaceDefinition = this.getNamespaceDefinitions(token, file);
                     if (namespaceDefinition) {
@@ -1040,7 +1328,7 @@ class BrsFile {
                         results.push(vscode_languageserver_1.Location.create(uri, statement.range));
                     }
                 };
-                file.parser.ast.walk(visitors_1.createVisitor({
+                file.parser.ast.walk((0, visitors_1.createVisitor)({
                     FunctionStatement: statementHandler
                 }), {
                     walkMode: visitors_1.WalkMode.visitStatements
@@ -1062,7 +1350,7 @@ class BrsFile {
                 results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), statement.range));
             }
         };
-        file.parser.ast.walk(visitors_1.createVisitor({
+        file.parser.ast.walk((0, visitors_1.createVisitor)({
             ClassMethodStatement: statementHandler,
             ClassFieldStatement: fieldStatementHandler
         }), {
@@ -1071,15 +1359,16 @@ class BrsFile {
         return results;
     }
     getHover(position) {
-        var _a;
+        var _a, _b, _c;
+        const fence = (code) => util_1.util.mdFence(code, 'brightscript');
         //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,
-            lexer_1.TokenKind.EndFunction,
-            lexer_1.TokenKind.Sub,
-            lexer_1.TokenKind.EndSub
+            TokenKind_1.TokenKind.Identifier,
+            TokenKind_1.TokenKind.Function,
+            TokenKind_1.TokenKind.EndFunction,
+            TokenKind_1.TokenKind.Sub,
+            TokenKind_1.TokenKind.EndSub
         ];
         //throw out invalid tokens and the wrong kind of tokens
         if (!token || !hoverTokenTypes.includes(token.kind)) {
@@ -1089,63 +1378,114 @@ class BrsFile {
         //look through local variables first
         {
             const func = this.getFunctionExpressionAtPosition(position);
-            for (const labelStatement of func.labelStatements) {
-                if (labelStatement.tokens.identifier.text.toLocaleLowerCase() === lowerTokenText) {
-                    return {
-                        range: token.range,
-                        contents: `${labelStatement.tokens.identifier.text}: label`
-                    };
+            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,
+                            contents: `${labelStatement.tokens.identifier.text}: label`
+                        };
+                    }
                 }
             }
-            const typeTexts = [];
-            for (const scope of this.program.getScopesForFile(this)) {
+            const typeTexts = new Set();
+            const fileScopes = this.program.getScopesForFile(this).sort((a, b) => { var _a; return (_a = a.dependencyGraphKey) === null || _a === void 0 ? void 0 : _a.localeCompare(b.dependencyGraphKey); });
+            const callables = [];
+            for (const scope of fileScopes) {
                 scope.linkSymbolTable();
-                if (func.symbolTable.hasSymbol(lowerTokenText)) {
-                    const type = (_a = func.symbolTable) === null || _a === void 0 ? void 0 : _a.getSymbolType(lowerTokenText);
+                const typeContext = { file: this, scope: scope, position: position };
+                const typeTextPair = this.getSymbolTypeFromToken(token, func, scope);
+                if (typeTextPair) {
                     let scopeTypeText = '';
-                    if (reflection_1.isFunctionType(type)) {
-                        scopeTypeText = type.toString();
+                    if ((0, reflection_1.isTypedFunctionType)(typeTextPair.type)) {
+                        scopeTypeText = (_b = typeTextPair.type) === null || _b === void 0 ? void 0 : _b.toString(typeContext);
+                        //keep unique references to the callables for this function
+                        if (!typeTexts.has(scopeTypeText)) {
+                            callables.push(scope.getCallableByName(lowerTokenText));
+                        }
+                    }
+                    else if (typeTextPair.useExpandedTextOnly) {
+                        scopeTypeText = typeTextPair.expandedTokenText;
                     }
                     else {
-                        scopeTypeText = `${token.text} as ${type.toString()}`;
+                        scopeTypeText = `${typeTextPair.expandedTokenText} as ${(_c = typeTextPair.type) === null || _c === void 0 ? void 0 : _c.toString(typeContext)}`;
                     }
-                    if (!typeTexts.includes(scopeTypeText)) {
-                        typeTexts.push(scopeTypeText);
+                    if (scopeTypeText) {
+                        typeTexts.add(scopeTypeText);
                     }
                 }
                 scope.unlinkSymbolTable();
             }
-            const typeText = typeTexts.join(' | ');
-            if (typeText) {
+            if (callables.length === typeTexts.size) {
+                //this is a function in all scopes, so build the function hover
+                return {
+                    range: token.range,
+                    contents: this.getCallableDocumentation([...typeTexts], callables)
+                };
+            }
+            else if ((typeTexts === null || typeTexts === void 0 ? void 0 : typeTexts.size) > 0) {
+                const typeText = [...typeTexts].join(' | ');
                 return {
                     range: token.range,
-                    contents: typeText
+                    contents: fence(typeText)
                 };
             }
         }
-        //look through all callables in relevant scopes
-        {
-            let scopes = this.program.getScopesForFile(this);
-            for (let scope of scopes) {
-                let callable = scope.getCallableByName(lowerTokenText);
-                if (callable) {
-                    return {
-                        range: token.range,
-                        contents: callable.type.toString()
-                    };
-                }
+        // //look through all callables in relevant scopes
+        // {
+        //     let scopes = this.program.getScopesForFile(this);
+        //     for (let scope of scopes) {
+        //         let callable = scope.getCallableByName(lowerTokenText);
+        //         if (callable) {
+        //             return {
+        //                 range: token.range,
+        //                 contents: this.getCallableDocumentation(callables)
+        //             };
+        //         }
+        //     }
+        // }
+    }
+    /**
+     * Build a hover documentation for a callable.
+     */
+    getCallableDocumentation(typeTexts, callables) {
+        var _a;
+        const callable = callables[0];
+        const typeText = typeTexts[0];
+        const comments = [];
+        const tokens = callable === null || callable === void 0 ? void 0 : callable.file.parser.tokens;
+        const idx = tokens === null || tokens === void 0 ? void 0 : tokens.indexOf((_a = callable.functionStatement) === null || _a === void 0 ? void 0 : _a.func.functionType);
+        for (let i = idx - 1; i >= 0; i--) {
+            const token = tokens[i];
+            //skip whitespace and newline chars
+            if (token.kind === TokenKind_1.TokenKind.Comment) {
+                comments.push(token);
+            }
+            else if (token.kind === TokenKind_1.TokenKind.Newline || token.kind === TokenKind_1.TokenKind.Whitespace) {
+                //skip these tokens
+                continue;
+                //any other token means there are no more comments
+            }
+            else {
+                break;
             }
         }
+        //message indicating if there are variations. example: (+3 variations) if there are 4 unique function signatures
+        const multiText = callables.length > 1 ? ` (+${callables.length - 1} variations)` : '';
+        let result = util_1.util.mdFence(typeText + multiText, 'brightscript');
+        if (comments.length > 0) {
+            result += '\n***\n' + comments.reverse().map(x => x.text.replace(/^('|rem)/i, '')).join('\n');
+        }
+        return result;
     }
     getSignatureHelpForNamespaceMethods(callableName, dottedGetText, scope) {
         var _a;
         if (!dottedGetText) {
             return [];
         }
-        let namespaceLookup = scope.namespaceLookup;
         let resultsMap = new Map();
-        for (let key in namespaceLookup) {
-            let namespace = namespaceLookup[key.toLowerCase()];
+        for (let [, namespace] of scope.namespaceLookup) {
             //completionName = "NameA."
             //completionName = "NameA.Na
             //NameA
@@ -1154,7 +1494,7 @@ class BrsFile {
             if (namespace.fullName.toLowerCase() === dottedGetText.toLowerCase()) {
                 //add function and class statement completions
                 for (let stmt of namespace.statements) {
-                    if (reflection_1.isFunctionStatement(stmt) && stmt.name.text.toLowerCase() === callableName.toLowerCase()) {
+                    if ((0, reflection_1.isFunctionStatement)(stmt) && stmt.name.text.toLowerCase() === callableName.toLowerCase()) {
                         const result = (_a = namespace.file) === null || _a === void 0 ? void 0 : _a.getSignatureHelpForStatement(stmt);
                         if (!resultsMap.has(result.key)) {
                             resultsMap.set(result.key, result);
@@ -1166,16 +1506,16 @@ class BrsFile {
         return [...resultsMap.values()];
     }
     getSignatureHelpForStatement(statement) {
-        if (!reflection_1.isFunctionStatement(statement) && !reflection_1.isClassMethodStatement(statement)) {
+        if (!(0, reflection_1.isFunctionStatement)(statement) && !(0, reflection_1.isClassMethodStatement)(statement)) {
             return undefined;
         }
         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;
             }
@@ -1185,12 +1525,12 @@ class BrsFile {
                 }
             }
             const kind = currentToken.kind;
-            if (kind === lexer_1.TokenKind.Comment) {
+            if (kind === TokenKind_1.TokenKind.Comment) {
                 // Strip off common leading characters to make it easier to read
                 const commentText = currentToken.text.replace(/^[' *\/]+/, '');
                 functionComments.unshift(commentText);
             }
-            else if (kind === lexer_1.TokenKind.Newline) {
+            else if (kind === TokenKind_1.TokenKind.Newline) {
                 if (functionComments.length === 0) {
                     continue;
                 }
@@ -1212,14 +1552,15 @@ class BrsFile {
             params.push(vscode_languageserver_1.ParameterInformation.create(param.name.text));
             key += param.name.text;
         }
-        const label = util_1.util.getTextForRange(lines, util_1.util.createRangeFromPositions(func.functionType.range.start, func.body.range.start)).trim();
+        const label = util_1.util.getTextForRange(lines, func.functionDeclarationRange).trim();
         const signature = vscode_languageserver_1.SignatureInformation.create(label, documentation, ...params);
         const index = 1;
         return { key: key, signature: signature, index: index };
     }
     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()) {
@@ -1227,7 +1568,7 @@ class BrsFile {
             }
         };
         while (classStatement) {
-            classStatement.walk(visitors_1.createVisitor({
+            classStatement.walk((0, visitors_1.createVisitor)({
                 ClassMethodStatement: statementHandler
             }), {
                 walkMode: visitors_1.WalkMode.visitStatements
@@ -1249,24 +1590,24 @@ class BrsFile {
         const classConstructor = this.getClassMethod(classStatement, 'new');
         let sigHelp = classConstructor ? this.getSignatureHelpForStatement(classConstructor) : undefined;
         if (sigHelp) {
-            sigHelp.key = classStatement.getName(parser_1.ParseMode.BrighterScript);
+            sigHelp.key = classStatement.getName(Parser_1.ParseMode.BrighterScript);
             sigHelp.signature.label = sigHelp.signature.label.replace(/(function|sub) new/, sigHelp.key);
         }
         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);
         for (const scope of scopes) {
             const processedFiles = new Set();
             for (const file of scope.getAllFiles()) {
-                if (reflection_1.isXmlFile(file) || processedFiles.has(file)) {
+                if ((0, reflection_1.isXmlFile)(file) || processedFiles.has(file)) {
                     continue;
                 }
                 processedFiles.add(file);
-                file.ast.walk(visitors_1.createVisitor({
+                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.srcPath), e.range));
@@ -1317,8 +1658,15 @@ class BrsFile {
         return programNode.toString();
     }
     dispose() {
-        var _a;
+        var _a, _b;
         (_a = this._parser) === null || _a === void 0 ? void 0 : _a.dispose();
+        //unsubscribe from any DependencyGraph subscriptions
+        (_b = this.unsubscribeFromDependencyGraph) === null || _b === void 0 ? void 0 : _b.call(this);
+        //deleting these properties result in lower memory usage (garbage collection is magic!)
+        delete this.fileContents;
+        delete this._parser;
+        delete this.callables;
+        delete this.functionCalls;
     }
 }
 exports.BrsFile = BrsFile;
@@ -1326,7 +1674,7 @@ exports.BrsFile = BrsFile;
  * List of completions for all valid keywords/reserved words.
  * Build this list once because it won't change for the lifetime of this process
  */
-exports.KeywordCompletions = Object.keys(lexer_1.Keywords)
+exports.KeywordCompletions = Object.keys(TokenKind_1.Keywords)
     //remove any keywords with whitespace
     .filter(x => !x.includes(' '))
     //create completions