brighterscript 1.0.0-alpha.23 → 1.0.0-alpha.24

package/dist/files/BrsFile.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.KeywordCompletions = exports.BrsFile = void 0;
 const source_map_1 = require("source-map");
 const vscode_languageserver_1 = require("vscode-languageserver");
+const vscode_languageserver_2 = require("vscode-languageserver");
 const chalk_1 = require("chalk");
 const path = require("path");
 const DiagnosticMessages_1 = require("../DiagnosticMessages");
@@ -17,11 +18,12 @@ const Preprocessor_1 = require("../preprocessor/Preprocessor");
 const Logger_1 = require("../Logger");
 const serialize_error_1 = require("serialize-error");
 const reflection_1 = require("../astUtils/reflection");
+const BscType_1 = require("../types/BscType");
 const visitors_1 = require("../astUtils/visitors");
 const CommentFlagProcessor_1 = require("../CommentFlagProcessor");
-const BscType_1 = require("../types/BscType");
-const UninitializedType_1 = require("../types/UninitializedType");
+const vscode_uri_1 = require("vscode-uri");
 const InvalidType_1 = require("../types/InvalidType");
+const UninitializedType_1 = require("../types/UninitializedType");
 /**
  * Holds all details about this file within the scope of the whole program
  */
@@ -86,16 +88,26 @@ class BrsFile {
     getDiagnostics() {
         return [...this.diagnostics];
     }
+    addDiagnostic(diagnostic) {
+        if (!diagnostic.file) {
+            diagnostic.file = this;
+        }
+        this.diagnostics.push(diagnostic);
+    }
     addDiagnostics(diagnostics) {
         this.diagnostics.push(...diagnostics);
     }
+    get cache() {
+        var _a;
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        return (_a = this._parser) === null || _a === void 0 ? void 0 : _a.references['cache'];
+    }
     /**
      * files referenced by import statements
      */
     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', () => {
+        const result = (_b = (_a = this.cache) === null || _a === void 0 ? void 0 : _a.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 : []) {
@@ -119,6 +131,40 @@ class BrsFile {
     get ast() {
         return this.parser.ast;
     }
+    /**
+     * Get the token at the specified position
+     * @param position
+     */
+    getTokenAt(position) {
+        for (let token of this.parser.tokens) {
+            if (util_1.util.rangeContains(token.range, position)) {
+                return token;
+            }
+        }
+    }
+    /**
+     * Walk the AST and find the expression that this token is most specifically contained within
+     */
+    getClosestExpression(position) {
+        const handle = new vscode_languageserver_1.CancellationTokenSource();
+        let containingNode;
+        this.ast.walk((node) => {
+            const latestContainer = containingNode;
+            //bsc walks depth-first
+            if (util_1.util.rangeContains(node.range, position)) {
+                containingNode = node;
+            }
+            //we had a match before, and don't now. this means we've finished walking down the whole way, and found our match
+            if (latestContainer && !containingNode) {
+                containingNode = latestContainer;
+                handle.cancel();
+            }
+        }, {
+            walkMode: visitors_1.WalkMode.visitAllRecursive,
+            cancel: handle.token
+        });
+        return containingNode;
+    }
     get parser() {
         if (!this._parser) {
             //remove the typedef file (if it exists)
@@ -225,6 +271,7 @@ class BrsFile {
         }
     }
     validate() {
+        util_1.util.validateTooDeepFile(this);
         //only validate the file if it was actually parsed (skip files containing typedefs)
         if (!this.hasTypedef) {
             this.validateImportStatements();
@@ -289,7 +336,7 @@ class BrsFile {
         for (const key of Object.keys(propertyHints)) {
             results.push({
                 label: propertyHints[key],
-                kind: vscode_languageserver_1.CompletionItemKind.Text
+                kind: vscode_languageserver_2.CompletionItemKind.Text
             });
         }
         return results;
@@ -405,17 +452,22 @@ class BrsFile {
             }
         }
     }
+    getFunctionExpressionAtPosition(position) {
+        return this.cache.getOrAdd(`functionExpressionAtPosition-${position.line}:${position.character}`, () => {
+            return this._getFunctionExpressionAtPosition(position, this.parser.references.functionExpressions);
+        });
+    }
     /**
      * Find the function expression at the given position.
      */
-    getFunctionExpressionAtPosition(position, functionExpressions) {
+    _getFunctionExpressionAtPosition(position, functionExpressions) {
         if (!functionExpressions) {
             functionExpressions = this.parser.references.functionExpressions;
         }
         for (let functionExpression of functionExpressions) {
             if (util_1.util.rangeContains(functionExpression.range, position)) {
                 //see if any of that scope's children match the position also, and give them priority
-                let childFunc = this.getFunctionExpressionAtPosition(position, functionExpression.childFunctionExpressions);
+                let childFunc = this._getFunctionExpressionAtPosition(position, functionExpression.childFunctionExpressions);
                 if (childFunc) {
                     return childFunc;
                 }
@@ -432,11 +484,13 @@ class BrsFile {
      */
     getNamespaceStatementForPosition(position) {
         if (position) {
-            for (const statement of this.parser.references.namespaceStatements) {
-                if (util_1.util.rangeContains(statement.range, position)) {
-                    return statement;
+            return this.cache.getOrAdd(`namespaceStatementForPosition-${position.line}:${position.character}`, () => {
+                for (const statement of this.parser.references.namespaceStatements) {
+                    if (util_1.util.rangeContains(statement.range, position)) {
+                        return statement;
+                    }
                 }
-            }
+            });
         }
     }
     /**
@@ -467,12 +521,12 @@ class BrsFile {
                     const pkgPath = `${fileProtocol}:/${file.pkgPath.replace('pkg:/', '')}`;
                     result.push({
                         label: pkgPath,
-                        textEdit: vscode_languageserver_1.TextEdit.replace(util_1.util.createRange(currentToken.range.start.line, 
+                        textEdit: vscode_languageserver_2.TextEdit.replace(util_1.util.createRange(currentToken.range.start.line, 
                         //+1 to step past the opening quote
                         currentToken.range.start.character + (openingQuote ? 1 : 0), currentToken.range.end.line, 
                         //-1 to exclude the closing quotemark (or the end character if there is no closing quotemark)
                         currentToken.range.end.character + (currentToken.text.endsWith('"') ? -1 : 0)), pkgPath),
-                        kind: vscode_languageserver_1.CompletionItemKind.File
+                        kind: vscode_languageserver_2.CompletionItemKind.File
                     });
                 }
                 return result;
@@ -542,20 +596,23 @@ class BrsFile {
             }
         }
         else {
+            result.push(
             //include namespaces
-            result.push(...namespaceCompletions);
+            ...namespaceCompletions, 
             //include class names
-            result.push(...classNameCompletions);
+            ...classNameCompletions, 
             //include interfaces
-            result.push(...interfaceNameCompletions);
+            ...interfaceNameCompletions, 
             //include enums
-            result.push(...this.getNonNamespacedEnumStatementCompletions(currentToken, this.parseMode, scope));
+            ...this.getNonNamespacedEnumStatementCompletions(currentToken, this.parseMode, scope), 
+            //include constants
+            ...this.getNonNamespacedConstStatementCompletions(currentToken, this.parseMode, scope), 
             //include the global callables
-            result.push(...scope.getCallablesAsCompletions(this.parseMode));
+            ...scope.getCallablesAsCompletions(this.parseMode));
             //add `m` because that's always valid within a function
             result.push({
                 label: 'm',
-                kind: vscode_languageserver_1.CompletionItemKind.Variable
+                kind: vscode_languageserver_2.CompletionItemKind.Variable
             });
             names.m = true;
             result.push(...exports.KeywordCompletions);
@@ -573,7 +630,7 @@ class BrsFile {
                     //TODO does this work?
                     label: symbol.name,
                     //TODO TYPES find type for local vars - SEE above
-                    kind: vscode_languageserver_1.CompletionItemKind.Variable
+                    kind: vscode_languageserver_2.CompletionItemKind.Variable
                     // kind: isFunctionType(foundType) ? CompletionItemKind.Function : CompletionItemKind.Variable
                 });
             }
@@ -589,7 +646,7 @@ class BrsFile {
                     names[firstPart.toLowerCase()] = true;
                     result.push({
                         label: firstPart,
-                        kind: vscode_languageserver_1.CompletionItemKind.Module
+                        kind: vscode_languageserver_2.CompletionItemKind.Module
                     });
                 }
             }
@@ -600,14 +657,14 @@ class BrsFile {
         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
+                kind: (0, reflection_1.isTypedFunctionType)(bscType.type) ? vscode_languageserver_2.CompletionItemKind.Method : vscode_languageserver_2.CompletionItemKind.Field
             };
         });
     }
     getLabelCompletion(func) {
         return func.labelStatements.map(label => ({
             label: label.tokens.identifier.text,
-            kind: vscode_languageserver_1.CompletionItemKind.Reference
+            kind: vscode_languageserver_2.CompletionItemKind.Reference
         }));
     }
     getClassMemberCompletions(position, currentToken, functionExpression, scope) {
@@ -621,7 +678,7 @@ class BrsFile {
                     if (!results.has(member.name.text.toLowerCase())) {
                         results.set(member.name.text.toLowerCase(), {
                             label: member.name.text,
-                            kind: (0, reflection_1.isFieldStatement)(member) ? vscode_languageserver_1.CompletionItemKind.Field : vscode_languageserver_1.CompletionItemKind.Method
+                            kind: (0, reflection_1.isFieldStatement)(member) ? vscode_languageserver_2.CompletionItemKind.Field : vscode_languageserver_2.CompletionItemKind.Method
                         });
                     }
                 }
@@ -780,6 +837,7 @@ class BrsFile {
         let symbolType;
         let tokenText = [];
         let justReturnDynamic = false;
+        let fullNamespaceName = nameSpacedTokenChain.namespaceContainer ? nameSpacedTokenChain.namespaceContainer.fullName + '.' : '';
         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;
@@ -891,7 +949,7 @@ class BrsFile {
                 expandedTokenText = currentToken.text;
             }
         }
-        const symbolData = { type: backUpReturnType, expandedTokenText: expandedTokenText };
+        const symbolData = { type: backUpReturnType, expandedTokenText: expandedTokenText, fullName: fullNamespaceName + expandedTokenText };
         scope.symbolCache.set(currentToken, symbolData);
         return symbolData;
     }
@@ -912,7 +970,7 @@ class BrsFile {
             if (!results.has(cs.name.text)) {
                 results.set(cs.name.text, {
                     label: cs.name.text,
-                    kind: vscode_languageserver_1.CompletionItemKind.Class
+                    kind: vscode_languageserver_2.CompletionItemKind.Class
                 });
             }
         }
@@ -933,7 +991,28 @@ class BrsFile {
             if (fullName.startsWith(containingNamespaceName) || !fullName.includes('.')) {
                 results.set(fullName, {
                     label: enumStatement.name,
-                    kind: vscode_languageserver_1.CompletionItemKind.Enum
+                    kind: vscode_languageserver_2.CompletionItemKind.Enum
+                });
+            }
+        }
+        return [...results.values()];
+    }
+    getNonNamespacedConstStatementCompletions(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 map = scope.getConstMap();
+        for (const key of [...map.keys()]) {
+            const statement = map.get(key).item;
+            const fullName = statement.fullName;
+            //if the item is contained within our own namespace, or if it's non-namespaced
+            if (fullName.startsWith(containingNamespaceName) || !fullName.includes('.')) {
+                results.set(fullName, {
+                    label: statement.name,
+                    kind: vscode_languageserver_2.CompletionItemKind.Constant
                 });
             }
         }
@@ -962,7 +1041,7 @@ class BrsFile {
                 const nameLower = name.toLowerCase();
                 results.set(nameLower, {
                     label: member.name,
-                    kind: vscode_languageserver_1.CompletionItemKind.EnumMember
+                    kind: vscode_languageserver_2.CompletionItemKind.EnumMember
                 });
             }
         }
@@ -984,7 +1063,7 @@ class BrsFile {
             if (!results.has(cs.name.text)) {
                 results.set(cs.name.text, {
                     label: cs.name.text,
-                    kind: vscode_languageserver_1.CompletionItemKind.Interface
+                    kind: vscode_languageserver_2.CompletionItemKind.Interface
                 });
             }
         }
@@ -1018,7 +1097,7 @@ class BrsFile {
                         if (!result.has(ns.lastPartName)) {
                             result.set(ns.lastPartName, {
                                 label: ns.lastPartName,
-                                kind: vscode_languageserver_1.CompletionItemKind.Module
+                                kind: vscode_languageserver_2.CompletionItemKind.Module
                             });
                         }
                     }
@@ -1028,19 +1107,25 @@ class BrsFile {
                     if ((0, reflection_1.isClassStatement)(stmt)) {
                         result.set(stmt.name.text, {
                             label: stmt.name.text,
-                            kind: vscode_languageserver_1.CompletionItemKind.Class
+                            kind: vscode_languageserver_2.CompletionItemKind.Class
                         });
                     }
                     else if ((0, reflection_1.isFunctionStatement)(stmt) && !newToken) {
                         result.set(stmt.name.text, {
                             label: stmt.name.text,
-                            kind: vscode_languageserver_1.CompletionItemKind.Function
+                            kind: vscode_languageserver_2.CompletionItemKind.Function
                         });
                     }
                     else if ((0, reflection_1.isEnumStatement)(stmt) && !newToken) {
                         result.set(stmt.name, {
                             label: stmt.name,
-                            kind: vscode_languageserver_1.CompletionItemKind.Enum
+                            kind: vscode_languageserver_2.CompletionItemKind.Enum
+                        });
+                    }
+                    else if ((0, reflection_1.isConstStatement)(stmt) && !newToken) {
+                        result.set(stmt.name, {
+                            label: stmt.name,
+                            kind: vscode_languageserver_2.CompletionItemKind.Constant
                         });
                     }
                 }
@@ -1062,7 +1147,7 @@ class BrsFile {
                 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);
+                        location = util_1.util.createLocation(uri, statement.range);
                     }
                 };
                 file.parser.ast.walk((0, visitors_1.createVisitor)({
@@ -1186,16 +1271,16 @@ class BrsFile {
         let symbolKind;
         const children = [];
         if ((0, reflection_1.isFunctionStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Function;
+            symbolKind = vscode_languageserver_2.SymbolKind.Function;
         }
         else if ((0, reflection_1.isMethodStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Method;
+            symbolKind = vscode_languageserver_2.SymbolKind.Method;
         }
         else if ((0, reflection_1.isFieldStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Field;
+            symbolKind = vscode_languageserver_2.SymbolKind.Field;
         }
         else if ((0, reflection_1.isNamespaceStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Namespace;
+            symbolKind = vscode_languageserver_2.SymbolKind.Namespace;
             for (const childStatement of statement.body.statements) {
                 const symbol = this.getDocumentSymbol(childStatement);
                 if (symbol) {
@@ -1204,7 +1289,7 @@ class BrsFile {
             }
         }
         else if ((0, reflection_1.isClassStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Class;
+            symbolKind = vscode_languageserver_2.SymbolKind.Class;
             for (const childStatement of statement.body) {
                 const symbol = this.getDocumentSymbol(childStatement);
                 if (symbol) {
@@ -1216,7 +1301,7 @@ class BrsFile {
             return;
         }
         const name = (0, reflection_1.isFieldStatement)(statement) ? statement.name.text : statement.getName(Parser_1.ParseMode.BrighterScript);
-        return vscode_languageserver_1.DocumentSymbol.create(name, '', symbolKind, statement.range, statement.range, children);
+        return vscode_languageserver_2.DocumentSymbol.create(name, '', symbolKind, statement.range, statement.range, children);
     }
     /**
      * Builds a single SymbolInformation object for use by LanguageServer's onWorkspaceSymbol functionality
@@ -1225,13 +1310,13 @@ class BrsFile {
         let symbolKind;
         const symbols = [];
         if ((0, reflection_1.isFunctionStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Function;
+            symbolKind = vscode_languageserver_2.SymbolKind.Function;
         }
         else if ((0, reflection_1.isMethodStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Method;
+            symbolKind = vscode_languageserver_2.SymbolKind.Method;
         }
         else if ((0, reflection_1.isNamespaceStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Namespace;
+            symbolKind = vscode_languageserver_2.SymbolKind.Namespace;
             for (const childStatement of statement.body.statements) {
                 for (const symbol of this.generateWorkspaceSymbols(childStatement, statement)) {
                     symbols.push(symbol);
@@ -1239,7 +1324,7 @@ class BrsFile {
             }
         }
         else if ((0, reflection_1.isClassStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Class;
+            symbolKind = vscode_languageserver_2.SymbolKind.Class;
             for (const childStatement of statement.body) {
                 for (const symbol of this.generateWorkspaceSymbols(childStatement, statement)) {
                     symbols.push(symbol);
@@ -1251,7 +1336,7 @@ class BrsFile {
         }
         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_2.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;
     }
@@ -1260,6 +1345,7 @@ class BrsFile {
      * 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.parser.getTokenAt(position);
@@ -1272,14 +1358,28 @@ class BrsFile {
         if (!token || !definitionTokenTypes.includes(token.kind)) {
             return results;
         }
+        const scopesForFile = this.program.getScopesForFile(this);
+        const [scope] = scopesForFile;
+        scope.linkSymbolTable();
+        const expression = this.getClosestExpression(position);
+        if (expression) {
+            let containingNamespace = (_a = this.getNamespaceStatementForPosition(expression.range.start)) === 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.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;
+            }
+        }
         let textToSearchFor = token.text.toLowerCase();
         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()) {
+            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(vscode_languageserver_1.Location.create(util_1.util.pathToUri(callable.callable.file.srcPath), callable.callable.functionStatement.range));
+                    results.push(util_1.util.createLocation(util_1.util.pathToUri(callable.callable.file.srcPath), callable.callable.functionStatement.range));
                 }
             }
             return results;
@@ -1291,7 +1391,7 @@ class BrsFile {
                 const nameParts = cs.parentClassName.getNameParts();
                 let extendedClass = this.getClassFileLink(nameParts[nameParts.length - 1], nameParts.slice(0, -1).join('.'));
                 if (extendedClass) {
-                    results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(extendedClass.file.srcPath), extendedClass.item.range));
+                    results.push(util_1.util.createLocation(util_1.util.pathToUri(extendedClass.file.srcPath), extendedClass.item.range));
                 }
             }
             return results;
@@ -1313,21 +1413,21 @@ class BrsFile {
                 //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));
+                    results.push(util_1.util.createLocation(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));
+                        results.push(util_1.util.createLocation(uri, label.tokens.identifier.range));
                     }
                 }
             }
         }
         const filesSearched = new Set();
         //look through all files in scope for matches
-        for (const scope of this.program.getScopesForFile(this)) {
+        for (const scope of scopesForFile) {
             for (const file of scope.getAllFiles()) {
                 if ((0, reflection_1.isXmlFile)(file) || filesSearched.has(file)) {
                     continue;
@@ -1343,7 +1443,7 @@ class BrsFile {
                 const statementHandler = (statement) => {
                     if (statement.getName(this.parseMode).toLowerCase() === textToSearchFor) {
                         const uri = util_1.util.pathToUri(file.srcPath);
-                        results.push(vscode_languageserver_1.Location.create(uri, statement.range));
+                        results.push(util_1.util.createLocation(uri, statement.range));
                     }
                 };
                 file.parser.ast.walk((0, visitors_1.createVisitor)({
@@ -1361,12 +1461,12 @@ class BrsFile {
         file.parser.ast.walk((0, visitors_1.createVisitor)({
             MethodStatement: (statement) => {
                 if (statement.getName(file.parseMode).toLowerCase() === textToSearchFor) {
-                    results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), statement.range));
+                    results.push(util_1.util.createLocation(util_1.util.pathToUri(file.srcPath), statement.range));
                 }
             },
             FieldStatement: (statement) => {
                 if (statement.name.text.toLowerCase() === textToSearchFor) {
-                    results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), statement.range));
+                    results.push(util_1.util.createLocation(util_1.util.pathToUri(file.srcPath), statement.range));
                 }
             }
         }), {
@@ -1374,127 +1474,6 @@ class BrsFile {
         });
         return results;
     }
-    getHover(position) {
-        var _a, _b, _c;
-        const fence = (code) => util_1.util.mdFence(code, 'brightscript');
-        //get the token at the position
-        let token = this.parser.getTokenAt(position);
-        let hoverTokenTypes = [
-            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)) {
-            return null;
-        }
-        let lowerTokenText = token.text.toLowerCase();
-        //look through local variables first
-        {
-            const func = this.getFunctionExpressionAtPosition(position);
-            if (func) {
-                // this identifier could possibly be a class field, so no function expression is available
-                for (const labelStatement of (_a = func === null || func === void 0 ? void 0 : func.labelStatements) !== null && _a !== void 0 ? _a : []) {
-                    if (labelStatement.tokens.identifier.text.toLocaleLowerCase() === lowerTokenText) {
-                        return {
-                            range: token.range,
-                            contents: `${labelStatement.tokens.identifier.text}: label`
-                        };
-                    }
-                }
-            }
-            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();
-                const typeContext = { file: this, scope: scope, position: position };
-                const typeTextPair = this.getSymbolTypeFromToken(token, func, scope);
-                if (typeTextPair) {
-                    let scopeTypeText = '';
-                    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 = `${typeTextPair.expandedTokenText} as ${(_c = typeTextPair.type) === null || _c === void 0 ? void 0 : _c.toString(typeContext)}`;
-                    }
-                    if (scopeTypeText) {
-                        typeTexts.add(scopeTypeText);
-                    }
-                }
-                scope.unlinkSymbolTable();
-            }
-            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: 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: 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) {
@@ -1565,11 +1544,11 @@ class BrsFile {
         let key = statement.name.text + documentation;
         const params = [];
         for (const param of func.parameters) {
-            params.push(vscode_languageserver_1.ParameterInformation.create(param.name.text));
+            params.push(vscode_languageserver_2.ParameterInformation.create(param.name.text));
             key += param.name.text;
         }
         const label = util_1.util.getTextForRange(lines, func.functionDeclarationRange).trim();
-        const signature = vscode_languageserver_1.SignatureInformation.create(label, documentation, ...params);
+        const signature = vscode_languageserver_2.SignatureInformation.create(label, documentation, ...params);
         const index = 1;
         return { key: key, signature: signature, index: index };
     }
@@ -1626,7 +1605,7 @@ class BrsFile {
                 file.ast.walk((0, visitors_1.createVisitor)({
                     VariableExpression: (e) => {
                         if (e.name.text.toLowerCase() === searchFor) {
-                            locations.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), e.range));
+                            locations.push(util_1.util.createLocation(util_1.util.pathToUri(file.srcPath), e.range));
                         }
                     }
                 }), {
@@ -1699,7 +1678,7 @@ exports.KeywordCompletions = Object.keys(TokenKind_1.Keywords)
     .map(x => {
     return {
         label: x,
-        kind: vscode_languageserver_1.CompletionItemKind.Keyword
+        kind: vscode_languageserver_2.CompletionItemKind.Keyword
     };
 });
 //# sourceMappingURL=BrsFile.js.map