brighterscript 0.52.3 → 0.54.0

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");
@@ -83,6 +84,12 @@ class BrsFile {
     getDiagnostics() {
         return [...this.diagnostics];
     }
+    addDiagnostic(diagnostic) {
+        if (!diagnostic.file) {
+            diagnostic.file = this;
+        }
+        this.diagnostics.push(diagnostic);
+    }
     addDiagnostics(diagnostics) {
         this.diagnostics.push(...diagnostics);
     }
@@ -92,13 +99,17 @@ class BrsFile {
         }
         return this._functionScopes;
     }
+    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 : []) {
@@ -133,6 +144,29 @@ class BrsFile {
             }
         }
     }
+    /**
+     * 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)
@@ -295,7 +329,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;
@@ -576,14 +610,19 @@ class BrsFile {
      * @param position
      * @param functionScopes
      */
-    getFunctionScopeAtPosition(position, functionScopes) {
+    getFunctionScopeAtPosition(position) {
+        return this.cache.getOrAdd(`functionScope-${position.line}:${position.character}`, () => {
+            return this._getFunctionScopeAtPosition(position, this.functionScopes);
+        });
+    }
+    _getFunctionScopeAtPosition(position, functionScopes) {
         if (!functionScopes) {
             functionScopes = this.functionScopes;
         }
         for (let scope of functionScopes) {
             if (util_1.util.rangeContains(scope.range, position)) {
                 //see if any of that scope's children match the position also, and give them priority
-                let childScope = this.getFunctionScopeAtPosition(position, scope.childrenScopes);
+                let childScope = this._getFunctionScopeAtPosition(position, scope.childrenScopes);
                 if (childScope) {
                     return childScope;
                 }
@@ -600,11 +639,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;
+                    }
                 }
-            }
+            });
         }
     }
     /**
@@ -634,12 +675,12 @@ class BrsFile {
                     const pkgPath = `${fileProtocol}:/${file.pkgPath.replace(/\\/g, '/')}`;
                     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;
@@ -702,18 +743,21 @@ class BrsFile {
             }
         }
         else {
+            result.push(
             //include namespaces
-            result.push(...namespaceCompletions);
+            ...namespaceCompletions, 
             //include class names
-            result.push(...classNameCompletions);
+            ...classNameCompletions, 
             //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);
@@ -727,7 +771,7 @@ class BrsFile {
                 names[variable.name.toLowerCase()] = true;
                 result.push({
                     label: variable.name,
-                    kind: (0, reflection_1.isFunctionType)(variable.type) ? vscode_languageserver_1.CompletionItemKind.Function : vscode_languageserver_1.CompletionItemKind.Variable
+                    kind: (0, reflection_1.isFunctionType)(variable.type) ? vscode_languageserver_2.CompletionItemKind.Function : vscode_languageserver_2.CompletionItemKind.Variable
                 });
             }
             if (this.parseMode === Parser_1.ParseMode.BrighterScript) {
@@ -742,7 +786,7 @@ class BrsFile {
                     names[firstPart.toLowerCase()] = true;
                     result.push({
                         label: firstPart,
-                        kind: vscode_languageserver_1.CompletionItemKind.Module
+                        kind: vscode_languageserver_2.CompletionItemKind.Module
                     });
                 }
             }
@@ -752,7 +796,7 @@ class BrsFile {
     getLabelCompletion(functionScope) {
         return functionScope.labelStatements.map(label => ({
             label: label.name,
-            kind: vscode_languageserver_1.CompletionItemKind.Reference
+            kind: vscode_languageserver_2.CompletionItemKind.Reference
         }));
     }
     getClassMemberCompletions(position, currentToken, functionScope, scope) {
@@ -766,7 +810,7 @@ class BrsFile {
                     if (!results.has(member.name.text.toLowerCase())) {
                         results.set(member.name.text.toLowerCase(), {
                             label: member.name.text,
-                            kind: (0, reflection_1.isClassFieldStatement)(member) ? vscode_languageserver_1.CompletionItemKind.Field : vscode_languageserver_1.CompletionItemKind.Function
+                            kind: (0, reflection_1.isClassFieldStatement)(member) ? vscode_languageserver_2.CompletionItemKind.Field : vscode_languageserver_2.CompletionItemKind.Function
                         });
                     }
                 }
@@ -802,7 +846,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
                     });
                 }
             }
@@ -824,7 +868,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
                 });
             }
         }
@@ -853,7 +918,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
                 });
             }
         }
@@ -887,7 +952,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
                             });
                         }
                     }
@@ -897,19 +962,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
                         });
                     }
                 }
@@ -931,7 +1002,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)({
@@ -1135,16 +1206,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.isClassMethodStatement)(statement)) {
-            symbolKind = vscode_languageserver_1.SymbolKind.Method;
+            symbolKind = vscode_languageserver_2.SymbolKind.Method;
         }
         else if ((0, reflection_1.isClassFieldStatement)(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) {
@@ -1153,7 +1224,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) {
@@ -1165,7 +1236,7 @@ class BrsFile {
             return;
         }
         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);
+        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
@@ -1174,13 +1245,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.isClassMethodStatement)(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);
@@ -1188,7 +1259,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);
@@ -1200,7 +1271,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;
     }
@@ -1228,7 +1299,7 @@ class BrsFile {
                 //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;
@@ -1240,7 +1311,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;
@@ -1262,14 +1333,14 @@ class BrsFile {
                 //we found a variable declaration with this token text!
                 if (varDeclaration.name.toLowerCase() === textToSearchFor) {
                     const uri = util_1.util.pathToUri(this.srcPath);
-                    results.push(vscode_languageserver_1.Location.create(uri, varDeclaration.nameRange));
+                    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(vscode_languageserver_1.Location.create(uri, label.nameRange));
+                        results.push(util_1.util.createLocation(uri, label.nameRange));
                     }
                 }
             }
@@ -1292,7 +1363,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)({
@@ -1309,12 +1380,12 @@ class BrsFile {
         //get class fields and members
         const statementHandler = (statement) => {
             if (statement.getName(file.parseMode).toLowerCase() === textToSearchFor) {
-                results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), statement.range));
+                results.push(util_1.util.createLocation(util_1.util.pathToUri(file.srcPath), statement.range));
             }
         };
         const fieldStatementHandler = (statement) => {
             if (statement.name.text.toLowerCase() === textToSearchFor) {
-                results.push(vscode_languageserver_1.Location.create(util_1.util.pathToUri(file.srcPath), statement.range));
+                results.push(util_1.util.createLocation(util_1.util.pathToUri(file.srcPath), statement.range));
             }
         };
         file.parser.ast.walk((0, visitors_1.createVisitor)({
@@ -1325,98 +1396,6 @@ class BrsFile {
         });
         return results;
     }
-    getHover(position) {
-        const fence = (code) => util_1.util.mdFence(code, 'brightscript');
-        //get the token at the position
-        let token = this.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
-        {
-            //get the function scope for this position (if exists)
-            let functionScope = this.getFunctionScopeAtPosition(position);
-            if (functionScope) {
-                //find any variable with this name
-                for (const varDeclaration of functionScope.variableDeclarations) {
-                    //we found a variable declaration with this token text!
-                    if (varDeclaration.name.toLowerCase() === lowerTokenText) {
-                        let typeText;
-                        if ((0, reflection_1.isFunctionType)(varDeclaration.type)) {
-                            typeText = varDeclaration.type.toString();
-                        }
-                        else {
-                            typeText = `${varDeclaration.name} as ${varDeclaration.type.toString()}`;
-                        }
-                        return {
-                            range: token.range,
-                            //append the variable name to the front for scope
-                            contents: fence(typeText)
-                        };
-                    }
-                }
-                for (const labelStatement of functionScope.labelStatements) {
-                    if (labelStatement.name.toLocaleLowerCase() === lowerTokenText) {
-                        return {
-                            range: token.range,
-                            contents: fence(`${labelStatement.name}: label`)
-                        };
-                    }
-                }
-            }
-        }
-        //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(callable)
-                    };
-                }
-            }
-        }
-    }
-    /**
-     * Build a hover documentation for a callable.
-     */
-    getCallableDocumentation(callable) {
-        var _a;
-        const comments = [];
-        const tokens = callable.file.parser.tokens;
-        const idx = 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;
-            }
-        }
-        let result = util_1.util.mdFence(callable.type.toString(), '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) {
@@ -1487,11 +1466,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, util_1.util.createRangeFromPositions(func.functionType.range.start, func.body.range.start)).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 };
     }
@@ -1547,7 +1526,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));
                         }
                     }
                 }), {
@@ -1622,7 +1601,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