brighterscript 1.0.0-alpha.25 → 1.0.0-alpha.27

package/dist/files/BrsFile.d.ts

@@ -2,22 +2,21 @@ import type { CodeWithSourceMap } from 'source-map';
 import type { CompletionItem, Position, Location, Diagnostic } from 'vscode-languageserver';
 import { DocumentSymbol, SymbolInformation } from 'vscode-languageserver';
 import { FunctionScope } from '../FunctionScope';
-import type { Callable, CommentFlag, FunctionCall, BsDiagnostic, FileReference, FileLink, SerializedCodeFile, NamespaceContainer } from '../interfaces';
-import { type Token } from '../lexer/Token';
+import type { Callable, CommentFlag, BsDiagnostic, FileReference, FileLink, SerializedCodeFile, NamespaceContainer } from '../interfaces';
+import type { Token } from '../lexer/Token';
 import { TokenKind } from '../lexer/TokenKind';
 import { Parser, ParseMode } from '../parser/Parser';
 import type { FunctionExpression } from '../parser/Expression';
 import type { ClassStatement, NamespaceStatement, MethodStatement } from '../parser/Statement';
 import type { Program } from '../Program';
 import type { DependencyGraph } from '../DependencyGraph';
-import type { AstNode } from '../parser/AstNode';
-import { type Expression } from '../parser/AstNode';
-import type { BscSymbol } from '../SymbolTable';
-import { SymbolTypeFlag } from '../SymbolTable';
-import type { BscFile } from './BscFile';
-import { Editor } from '../astUtils/Editor';
+import type { AstNode, Expression } from '../parser/AstNode';
 import type { UnresolvedSymbol } from '../AstValidationSegmenter';
 import { AstValidationSegmenter } from '../AstValidationSegmenter';
+import type { BscSymbol } from '../SymbolTable';
+import { SymbolTypeFlag } from '../SymbolTableFlag';
+import { Editor } from '../astUtils/Editor';
+import type { BscFile } from './BscFile';
 export declare type ProvidedSymbolMap = Map<SymbolTypeFlag, Map<string, BscSymbol>>;
 export declare type ChangedSymbolMap = Map<SymbolTypeFlag, Set<string>>;
 export interface ProvidedSymbolInfo {
@@ -178,7 +177,6 @@ export declare class BrsFile implements BscFile {
     private createFunctionScopes;
     staticCallables: Callable[];
     get callables(): Callable[];
-    get functionCalls(): FunctionCall[];
     /**
      * Find the function scope at the given position.
      * @param position the position used to find the deepest scope that contains it
@@ -189,7 +187,6 @@ export declare class BrsFile implements BscFile {
      * Find the NamespaceStatement enclosing the given position
      */
     getNamespaceStatementForPosition(position: Position): NamespaceStatement;
-    private getNamespaceDefinitions;
     /**
      * Given a current token, walk
      */
@@ -233,11 +230,6 @@ export declare class BrsFile implements BscFile {
      * Builds a single SymbolInformation object for use by LanguageServer's onWorkspaceSymbol functionality
      */
     private generateWorkspaceSymbols;
-    /**
-     * Given a position in a file, if the position is sitting on some type of identifier,
-     * go to the definition of that identifier (where this thing was first defined)
-     */
-    getDefinition(position: Position): Location[];
     getClassMemberDefinitions(textToSearchFor: string, file: BrsFile): Location[];
     getClassMethod(classStatement: ClassStatement, name: string, walkParents?: boolean): MethodStatement | undefined;
     getReferences(position: Position): Location[];

package/dist/files/BrsFile.js

@@ -20,11 +20,10 @@ 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 vscode_uri_1 = require("vscode-uri");
-const SymbolTable_1 = require("../SymbolTable");
-const Editor_1 = require("../astUtils/Editor");
 const AstValidationSegmenter_1 = require("../AstValidationSegmenter");
+const SymbolTable_1 = require("../SymbolTable");
 const CachedLookups_1 = require("../astUtils/CachedLookups");
+const Editor_1 = require("../astUtils/Editor");
 /**
  * Holds all details about this file within the scope of the whole program
  */
@@ -128,16 +127,16 @@ class BrsFile {
     get ownScriptImports() {
         var _a, _b;
         const result = (_b = (_a = this.cache) === null || _a === void 0 ? void 0 : _a.getOrAdd('BrsFile_ownScriptImports', () => {
-            var _a, _b, _c;
+            var _a, _b;
             const result = [];
             for (const statement of (_b = (_a = this._cachedLookups) === null || _a === void 0 ? void 0 : _a.importStatements) !== null && _b !== void 0 ? _b : []) {
                 //register import statements
-                if ((0, reflection_1.isImportStatement)(statement) && statement.filePathToken) {
+                if ((0, reflection_1.isImportStatement)(statement) && statement.tokens.path) {
                     result.push({
-                        filePathRange: statement.filePathToken.range,
+                        filePathRange: statement.tokens.path.range,
                         destPath: util_1.util.getPkgPathFromTarget(this.destPath, statement.filePath),
                         sourceFile: this,
-                        text: (_c = statement.filePathToken) === null || _c === void 0 ? void 0 : _c.text
+                        text: statement.tokens.path.text
                     });
                 }
             }
@@ -370,11 +369,11 @@ class BrsFile {
             //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,
+                    nameRange: param.tokens.name.range,
+                    lineIndex: param.tokens.name.range.start.line,
+                    name: param.tokens.name.text,
                     getType: () => {
-                        return param.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+                        return param.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
                     }
                 });
             }
@@ -382,14 +381,14 @@ class BrsFile {
             (_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,
+                        nameRange: stmt.tokens.item.range,
+                        lineIndex: stmt.tokens.item.range.start.line,
+                        name: stmt.tokens.item.text,
                         getType: () => DynamicType_1.DynamicType.instance //TODO: Infer types from array
                     });
                 },
                 LabelStatement: (stmt) => {
-                    const { identifier } = stmt.tokens;
+                    const { name: identifier } = stmt.tokens;
                     scope.labelStatements.push({
                         nameRange: identifier.range,
                         lineIndex: identifier.range.start.line,
@@ -410,12 +409,13 @@ class BrsFile {
             let scope = this.scopesByFunc.get(statement.findAncestor(reflection_1.isFunctionExpression));
             //skip variable declarations that are outside of any scope
             if (scope) {
+                const variableName = statement.tokens.name;
                 scope.variableDeclarations.push({
-                    nameRange: statement.name.range,
-                    lineIndex: statement.name.range.start.line,
-                    name: statement.name.text,
+                    nameRange: variableName.range,
+                    lineIndex: variableName.range.start.line,
+                    name: variableName.text,
                     getType: () => {
-                        return statement.getType({ flags: SymbolTable_1.SymbolTypeFlag.runtime });
+                        return statement.getType({ flags: 1 /* SymbolTypeFlag.runtime */ });
                     }
                 });
             }
@@ -427,26 +427,26 @@ class BrsFile {
             return this.staticCallables;
         }
         return this.cache.getOrAdd(`BrsFile_callables`, () => {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             const callables = [];
             for (let statement of (_a = this._cachedLookups.functionStatements) !== null && _a !== void 0 ? _a : []) {
                 //extract the parameters
                 let params = [];
                 for (let param of statement.func.parameters) {
-                    const paramType = param.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+                    const paramType = param.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
                     let callableParam = {
-                        name: (_b = param.name) === null || _b === void 0 ? void 0 : _b.text,
+                        name: (_b = param.tokens.name) === null || _b === void 0 ? void 0 : _b.text,
                         type: paramType,
                         isOptional: !!param.defaultValue,
                         isRestArgument: false
                     };
                     params.push(callableParam);
                 }
-                const funcType = statement.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+                const funcType = statement.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
                 callables.push({
-                    isSub: statement.func.functionType.text.toLowerCase() === 'sub',
-                    name: (_c = statement.name) === null || _c === void 0 ? void 0 : _c.text,
-                    nameRange: (_d = statement.name) === null || _d === void 0 ? void 0 : _d.range,
+                    isSub: ((_c = statement.func.tokens.functionType) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()) === 'sub',
+                    name: (_d = statement.tokens.name) === null || _d === void 0 ? void 0 : _d.text,
+                    nameRange: (_e = statement.tokens.name) === null || _e === void 0 ? void 0 : _e.range,
                     file: this,
                     params: params,
                     range: statement.func.range,
@@ -459,98 +459,6 @@ class BrsFile {
             return callables;
         });
     }
-    get functionCalls() {
-        return this.cache.getOrAdd(`BrsFile_functionCalls`, () => {
-            const functionCalls = [];
-            //for every function in the file
-            for (let func of this._cachedLookups.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 callees without a name (immediately-invoked function expressions)
-                        !expression.callee.name) {
-                        continue;
-                    }
-                    let functionName = expression.callee.name.text;
-                    //callee is the name of the function being called
-                    let callee = expression.callee;
-                    let columnIndexBegin = callee.range.start.character;
-                    let columnIndexEnd = callee.range.end.character;
-                    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.getType(),
-                                text: arg.token.text,
-                                expression: arg,
-                                typeToken: undefined
-                            });
-                            //is variable 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,
-                                expression: arg,
-                                typeToken: undefined
-                            });
-                        }
-                        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();
-                            }
-                            let callableArg = {
-                                range: arg.range,
-                                //TODO not sure what to do here
-                                type: new DynamicType_1.DynamicType(),
-                                text: text,
-                                expression: arg,
-                                typeToken: undefined
-                            };
-                            //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 + '"';
-                            }
-                            args.push(callableArg);
-                        }
-                        else {
-                            args.push({
-                                range: arg.range,
-                                type: new DynamicType_1.DynamicType(),
-                                //TODO get text from other types of args
-                                text: '',
-                                expression: arg,
-                                typeToken: undefined
-                            });
-                        }
-                    }
-                    let functionCall = {
-                        range: expression.range,
-                        functionScope: this.getFunctionScopeAtPosition(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,
-                        expression: expression
-                    };
-                    functionCalls.push(functionCall);
-                }
-            }
-            return functionCalls;
-        });
-    }
     /**
      * Find the function scope at the given position.
      * @param position the position used to find the deepest scope that contains it
@@ -591,38 +499,6 @@ class BrsFile {
             });
         }
     }
-    getNamespaceDefinitions(token, file) {
-        //BrightScript does not support namespaces, so return an empty list in that case
-        if (!token) {
-            return undefined;
-        }
-        let location;
-        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) {
-                const namespaceItemStatementHandler = (statement) => {
-                    if (!location && statement.name.text.toLowerCase() === endName) {
-                        const uri = util_1.util.pathToUri(file.srcPath);
-                        location = util_1.util.createLocation(uri, statement.range);
-                    }
-                };
-                file.parser.ast.walk((0, visitors_1.createVisitor)({
-                    ClassStatement: namespaceItemStatementHandler,
-                    FunctionStatement: namespaceItemStatementHandler
-                }), {
-                    walkMode: visitors_1.WalkMode.visitStatements
-                });
-            }
-        };
-        file.parser.ast.walk((0, visitors_1.createVisitor)({
-            NamespaceStatement: statementHandler
-        }), {
-            walkMode: visitors_1.WalkMode.visitStatements
-        });
-        return location;
-    }
     /**
      * Given a current token, walk
      */
@@ -722,7 +598,7 @@ class BrsFile {
             left = left.obj;
         }
         if ((0, reflection_1.isVariableExpression)(left)) {
-            let lowerName = left.name.text.toLowerCase();
+            let lowerName = left.tokens.name.text.toLowerCase();
             //find the first scope that contains this namespace
             let scopes = this.program.getScopesForFile(this);
             for (let scope of scopes) {
@@ -740,7 +616,7 @@ class BrsFile {
         var _a, _b;
         //if we have a variable and a namespace
         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();
+            let lowerCalleeName = (_b = (_a = callee === null || callee === void 0 ? void 0 : callee.tokens.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) {
@@ -767,7 +643,7 @@ class BrsFile {
                 return this.calleeIsKnownNamespaceFunction(callee, namespaceName);
             }
             let scopes = this.program.getScopesForFile(this);
-            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();
+            let lowerCalleeName = (_b = (_a = callee === null || callee === void 0 ? void 0 : callee.tokens.name) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.toLowerCase();
             for (let scope of scopes) {
                 if (scope.getCallableByName(lowerCalleeName)) {
                     return true;
@@ -868,7 +744,7 @@ class BrsFile {
         else {
             return;
         }
-        const name = (0, reflection_1.isFieldStatement)(statement) ? statement.name.text : statement.getName(Parser_1.ParseMode.BrighterScript);
+        const name = (0, reflection_1.isFieldStatement)(statement) ? statement.tokens.name.text : statement.getName(Parser_1.ParseMode.BrighterScript);
         return vscode_languageserver_2.DocumentSymbol.create(name, '', symbolKind, statement.range, statement.range, children);
     }
     /**
@@ -908,142 +784,6 @@ class BrsFile {
         symbols.push(symbol);
         return symbols;
     }
-    /**
-     * Given a position in a file, if the position is sitting on some type of identifier,
-     * go to the definition of that identifier (where this thing was first defined)
-     */
-    getDefinition(position) {
-        var _a, _b;
-        let results = [];
-        //get the token at the position
-        const token = this.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 = [
-            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;
-        }
-        const scopesForFile = this.program.getScopesForFile(this);
-        const [scope] = scopesForFile;
-        const expression = this.getClosestExpression(position);
-        if (scope && expression) {
-            scope.linkSymbolTable();
-            let containingNamespace = (_a = expression.findAncestor(reflection_1.isNamespaceStatement)) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript);
-            const fullName = (_b = util_1.util.getAllDottedGetParts(expression)) === null || _b === void 0 ? void 0 : _b.map(x => x.text).join('.');
-            //find a constant with this name
-            const constant = scope === null || scope === void 0 ? void 0 : scope.getConstFileLink(fullName, containingNamespace);
-            if (constant) {
-                results.push(util_1.util.createLocation(vscode_uri_1.URI.file(constant.file.srcPath).toString(), constant.item.tokens.name.range));
-                return results;
-            }
-            if ((0, reflection_1.isDottedGetExpression)(expression) || (0, reflection_1.isVariableExpression)(expression)) {
-                const enumLink = scope.getEnumFileLink(fullName, containingNamespace);
-                if (enumLink) {
-                    results.push(util_1.util.createLocation(vscode_uri_1.URI.file(enumLink.file.srcPath).toString(), enumLink.item.tokens.name.range));
-                    return results;
-                }
-                const enumMemberLink = scope.getEnumMemberFileLink(fullName, containingNamespace);
-                if (enumMemberLink) {
-                    results.push(util_1.util.createLocation(vscode_uri_1.URI.file(enumMemberLink.file.srcPath).toString(), enumMemberLink.item.tokens.name.range));
-                    return results;
-                }
-                const interfaceFileLink = scope.getInterfaceFileLink(fullName, containingNamespace);
-                if (interfaceFileLink) {
-                    results.push(util_1.util.createLocation(vscode_uri_1.URI.file(interfaceFileLink.file.srcPath).toString(), interfaceFileLink.item.tokens.name.range));
-                    return results;
-                }
-                const classFileLink = scope.getClassFileLink(fullName, containingNamespace);
-                if (classFileLink) {
-                    results.push(util_1.util.createLocation(vscode_uri_1.URI.file(classFileLink.file.srcPath).toString(), classFileLink.item.name.range));
-                    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) === TokenKind_1.TokenKind.Callfunc) {
-            for (const scope of scopesForFile) {
-                //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(util_1.util.createLocation(util_1.util.pathToUri(callable.callable.file.srcPath), callable.callable.functionStatement.range));
-                }
-            }
-            return results;
-        }
-        let classToken = this.getTokenBefore(token, TokenKind_1.TokenKind.Class);
-        if (classToken) {
-            let cs = this._cachedLookups.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(util_1.util.createLocation(util_1.util.pathToUri(extendedClass.file.srcPath), extendedClass.item.range));
-                }
-            }
-            return results;
-        }
-        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;
-            if (textToSearchFor.endsWith('"')) {
-                endIndex--;
-            }
-            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.srcPath);
-                    results.push(util_1.util.createLocation(uri, varDeclaration.nameRange));
-                }
-            }
-            if (this.tokenFollows(token, TokenKind_1.TokenKind.Goto)) {
-                for (const label of functionScope.labelStatements) {
-                    if (label.name.toLocaleLowerCase() === textToSearchFor) {
-                        const uri = util_1.util.pathToUri(this.srcPath);
-                        results.push(util_1.util.createLocation(uri, label.nameRange));
-                    }
-                }
-            }
-        }
-        const filesSearched = new Set();
-        //look through all files in scope for matches
-        for (const scope of scopesForFile) {
-            for (const file of scope.getAllFiles()) {
-                if ((0, reflection_1.isBrsFile)(file) && !filesSearched.has(file)) {
-                    filesSearched.add(file);
-                    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) {
-                            results.push(namespaceDefinition);
-                        }
-                    }
-                    const statementHandler = (statement) => {
-                        if (statement.getName(this.parseMode).toLowerCase() === textToSearchFor) {
-                            const uri = util_1.util.pathToUri(file.srcPath);
-                            results.push(util_1.util.createLocation(uri, statement.range));
-                        }
-                    };
-                    file.parser.ast.walk((0, visitors_1.createVisitor)({
-                        FunctionStatement: statementHandler
-                    }), {
-                        walkMode: visitors_1.WalkMode.visitStatements
-                    });
-                }
-            }
-        }
-        return results;
-    }
     getClassMemberDefinitions(textToSearchFor, file) {
         let results = [];
         //get class fields and members
@@ -1053,7 +793,7 @@ class BrsFile {
             }
         };
         const fieldStatementHandler = (statement) => {
-            if (statement.name.text.toLowerCase() === textToSearchFor) {
+            if (statement.tokens.name.text.toLowerCase() === textToSearchFor) {
                 results.push(util_1.util.createLocation(util_1.util.pathToUri(file.srcPath), statement.range));
             }
         };
@@ -1070,7 +810,7 @@ class BrsFile {
         //TODO - would like to write this with getClassHieararchy; but got stuck on working out the scopes to use... :(
         let statement;
         const statementHandler = (e) => {
-            if (!statement && e.name.text.toLowerCase() === name.toLowerCase()) {
+            if (!statement && e.tokens.name.text.toLowerCase() === name.toLowerCase()) {
                 statement = e;
             }
         };
@@ -1105,7 +845,7 @@ class BrsFile {
                     processedFiles.add(file);
                     file.ast.walk((0, visitors_1.createVisitor)({
                         VariableExpression: (e) => {
-                            if (e.name.text.toLowerCase() === searchFor) {
+                            if (e.tokens.name.text.toLowerCase() === searchFor) {
                                 locations.push(util_1.util.createLocation(util_1.util.pathToUri(file.srcPath), e.range));
                             }
                         }
@@ -1187,12 +927,12 @@ class BrsFile {
             const allNeededSymbolSets = this.validationSegmenter.unresolvedSegmentsSymbols.values();
             const requiredSymbols = [];
             const addedSymbols = new Map();
-            addedSymbols.set(SymbolTable_1.SymbolTypeFlag.runtime, new Set());
-            addedSymbols.set(SymbolTable_1.SymbolTypeFlag.typetime, new Set());
+            addedSymbols.set(1 /* SymbolTypeFlag.runtime */, new Set());
+            addedSymbols.set(2 /* SymbolTypeFlag.typetime */, new Set());
             for (const setOfSymbols of allNeededSymbolSets) {
                 for (const symbol of setOfSymbols) {
                     const fullSymbolKey = symbol.typeChain.map(tce => tce.name).join('.').toLowerCase();
-                    for (const flag of [SymbolTable_1.SymbolTypeFlag.runtime, SymbolTable_1.SymbolTypeFlag.typetime]) {
+                    for (const flag of [1 /* SymbolTypeFlag.runtime */, 2 /* SymbolTypeFlag.typetime */]) {
                         // eslint-disable-next-line no-bitwise
                         if (symbol.flags & flag) {
                             if ((_a = this.providedSymbols.symbolMap.get(flag)) === null || _a === void 0 ? void 0 : _a.has(fullSymbolKey)) {
@@ -1231,8 +971,8 @@ class BrsFile {
             });
         }
         for (const symbolTable of tablesToGetSymbolsFrom) {
-            const runTimeSymbols = symbolTable.table.getOwnSymbols(SymbolTable_1.SymbolTypeFlag.runtime);
-            const typeTimeSymbols = symbolTable.table.getOwnSymbols(SymbolTable_1.SymbolTypeFlag.typetime);
+            const runTimeSymbols = symbolTable.table.getOwnSymbols(1 /* SymbolTypeFlag.runtime */);
+            const typeTimeSymbols = symbolTable.table.getOwnSymbols(2 /* SymbolTypeFlag.typetime */);
             for (const symbol of runTimeSymbols) {
                 if (!(0, reflection_1.isAnyReferenceType)(symbol.type)) {
                     const symbolNameLower = symbolTable.namePrefixLower
@@ -1250,16 +990,16 @@ class BrsFile {
                 }
             }
         }
-        symbolMap.set(SymbolTable_1.SymbolTypeFlag.runtime, runTimeSymbolMap);
-        symbolMap.set(SymbolTable_1.SymbolTypeFlag.typetime, typeTimeSymbolMap);
+        symbolMap.set(1 /* SymbolTypeFlag.runtime */, runTimeSymbolMap);
+        symbolMap.set(2 /* SymbolTypeFlag.typetime */, typeTimeSymbolMap);
         const changes = new Map();
-        changes.set(SymbolTable_1.SymbolTypeFlag.runtime, new Set());
-        changes.set(SymbolTable_1.SymbolTypeFlag.typetime, new Set());
+        changes.set(1 /* SymbolTypeFlag.runtime */, new Set());
+        changes.set(2 /* SymbolTypeFlag.typetime */, new Set());
         const previouslyProvidedSymbols = (_a = this.program.getFileSymbolInfo(this)) === null || _a === void 0 ? void 0 : _a.provides.symbolMap;
         const previousSymbolsChecked = new Map();
-        previousSymbolsChecked.set(SymbolTable_1.SymbolTypeFlag.runtime, new Set());
-        previousSymbolsChecked.set(SymbolTable_1.SymbolTypeFlag.typetime, new Set());
-        for (const flag of [SymbolTable_1.SymbolTypeFlag.runtime, SymbolTable_1.SymbolTypeFlag.typetime]) {
+        previousSymbolsChecked.set(1 /* SymbolTypeFlag.runtime */, new Set());
+        previousSymbolsChecked.set(2 /* SymbolTypeFlag.typetime */, new Set());
+        for (const flag of [1 /* SymbolTypeFlag.runtime */, 2 /* SymbolTypeFlag.typetime */]) {
             const newSymbolMapForFlag = symbolMap.get(flag);
             const oldSymbolMapForFlag = previouslyProvidedSymbols === null || previouslyProvidedSymbols === void 0 ? void 0 : previouslyProvidedSymbols.get(flag);
             const previousSymbolsCheckedForFlag = previousSymbolsChecked.get(flag);
@@ -1354,11 +1094,11 @@ class BrsFile {
             ns.namespaceStatements.push(namespaceStatement);
             ns.statements.push(...namespaceStatement.body.statements);
             for (let statement of namespaceStatement.body.statements) {
-                if ((0, reflection_1.isClassStatement)(statement) && statement.name) {
-                    ns.classStatements.set(statement.name.text.toLowerCase(), statement);
+                if ((0, reflection_1.isClassStatement)(statement) && statement.tokens.name) {
+                    ns.classStatements.set(statement.tokens.name.text.toLowerCase(), statement);
                 }
-                else if ((0, reflection_1.isFunctionStatement)(statement) && statement.name) {
-                    ns.functionStatements.set(statement.name.text.toLowerCase(), statement);
+                else if ((0, reflection_1.isFunctionStatement)(statement) && statement.tokens.name) {
+                    ns.functionStatements.set(statement.tokens.name.text.toLowerCase(), statement);
                 }
                 else if ((0, reflection_1.isEnumStatement)(statement) && statement.fullName) {
                     ns.enumStatements.set(statement.fullName.toLowerCase(), statement);