brighterscript 1.0.0-alpha.24 → 1.0.0-alpha.26

package/dist/bscPlugin/BscPlugin.js

@@ -4,15 +4,27 @@ exports.BscPlugin = void 0;
 const reflection_1 = require("../astUtils/reflection");
 const CodeActionsProcessor_1 = require("./codeActions/CodeActionsProcessor");
 const CompletionsProcessor_1 = require("./completions/CompletionsProcessor");
+const DefinitionProvider_1 = require("./definition/DefinitionProvider");
 const HoverProcessor_1 = require("./hover/HoverProcessor");
 const BrsFileSemanticTokensProcessor_1 = require("./semanticTokens/BrsFileSemanticTokensProcessor");
-const BrsFilePreTranspileProcessor_1 = require("./transpile/BrsFilePreTranspileProcessor");
 const BrsFileValidator_1 = require("./validation/BrsFileValidator");
+const ProgramValidator_1 = require("./validation/ProgramValidator");
 const ScopeValidator_1 = require("./validation/ScopeValidator");
+const XmlFileValidator_1 = require("./validation/XmlFileValidator");
+const BslibManager_1 = require("./serialize/BslibManager");
+const BrsFileTranspileProcessor_1 = require("./transpile/BrsFileTranspileProcessor");
+const XmlFilePreTranspileProcessor_1 = require("./transpile/XmlFilePreTranspileProcessor");
+const FileWriter_1 = require("./FileWriter");
+const FileProvider_1 = require("./fileProviders/FileProvider");
+const FileSerializer_1 = require("./serialize/FileSerializer");
 class BscPlugin {
     constructor() {
         this.name = 'BscPlugin';
         this.scopeValidator = new ScopeValidator_1.ScopeValidator();
+        this.bslibManager = new BslibManager_1.BslibManager();
+    }
+    afterProvideFile(event) {
+        new FileProvider_1.FileProvider(event).process();
     }
     onGetCodeActions(event) {
         new CodeActionsProcessor_1.CodeActionsProcessor(event).process();
@@ -23,6 +35,9 @@ class BscPlugin {
     provideCompletions(event) {
         new CompletionsProcessor_1.CompletionsProcessor(event).process();
     }
+    provideDefinition(event) {
+        new DefinitionProvider_1.DefinitionProvider(event).process();
+    }
     onGetSemanticTokens(event) {
         if ((0, reflection_1.isBrsFile)(event.file)) {
             return new BrsFileSemanticTokensProcessor_1.BrsFileSemanticTokensProcessor(event).process();
@@ -32,18 +47,37 @@ class BscPlugin {
         if ((0, reflection_1.isBrsFile)(event.file)) {
             return new BrsFileValidator_1.BrsFileValidator(event).process();
         }
+        else if ((0, reflection_1.isXmlFile)(event.file)) {
+            return new XmlFileValidator_1.XmlFileValidator(event).process();
+        }
     }
     onScopeValidate(event) {
         this.scopeValidator.processEvent(event);
     }
     afterProgramValidate(event) {
+        new ProgramValidator_1.ProgramValidator(event).process();
         //release memory once the validation cycle has finished
         this.scopeValidator.reset();
     }
-    beforeFileTranspile(event) {
+    beforeBuildProgram(event) {
+        this.bslibManager.addBslibFileIfMissing(event);
+    }
+    /**
+     * Do transpiling-related work after all plugins had a chance to operate on the files
+     */
+    prepareFile(event) {
         if ((0, reflection_1.isBrsFile)(event.file)) {
-            return new BrsFilePreTranspileProcessor_1.BrsFilePreTranspileProcessor(event).process();
+            return new BrsFileTranspileProcessor_1.BrsFilePreTranspileProcessor(event).process();
         }
+        else if ((0, reflection_1.isXmlFile)(event.file)) {
+            return new XmlFilePreTranspileProcessor_1.XmlFilePreTranspileProcessor(event).process();
+        }
+    }
+    afterSerializeFile(event) {
+        new FileSerializer_1.FileSerializer(event).process();
+    }
+    async writeFile(event) {
+        await new FileWriter_1.FileWriter(event).process();
     }
 }
 exports.BscPlugin = BscPlugin;

package/dist/bscPlugin/BscPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"BscPlugin.js","sourceRoot":"","sources":["../../src/bscPlugin/BscPlugin.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AAEnD,6EAA0E;AAC1E,6EAA0E;AAC1E,2DAAwD;AACxD,oGAAiG;AACjG,2FAAwF;AACxF,oEAAiE;AACjE,gEAA6D;AAE7D,MAAa,SAAS;IAAtB;QACW,SAAI,GAAG,WAAW,CAAC;QA0BlB,mBAAc,GAAG,IAAI,+BAAc,EAAE,CAAC;IAgBlD,CAAC;IAxCU,gBAAgB,CAAC,KAA4B;QAChD,IAAI,2CAAoB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,CAAC;IAEM,YAAY,CAAC,KAAwB;QACxC,OAAO,IAAI,+BAAc,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/C,CAAC;IAEM,kBAAkB,CAAC,KAA8B;QACpD,IAAI,2CAAoB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,CAAC;IAEM,mBAAmB,CAAC,KAA+B;QACtD,IAAI,IAAA,sBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAI,+DAA8B,CAAC,KAAY,CAAC,CAAC,OAAO,EAAE,CAAC;SACrE;IACL,CAAC;IAEM,cAAc,CAAC,KAA0B;QAC5C,IAAI,IAAA,sBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAI,mCAAgB,CAAC,KAAY,CAAC,CAAC,OAAO,EAAE,CAAC;SACvD;IACL,CAAC;IAIM,eAAe,CAAC,KAA2B;QAC9C,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IAEM,oBAAoB,CAAC,KAAgC;QACxD,uDAAuD;QACvD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAEM,mBAAmB,CAAC,KAA+B;QACtD,IAAI,IAAA,sBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAI,2DAA4B,CAAC,KAAY,CAAC,CAAC,OAAO,EAAE,CAAC;SACnE;IACL,CAAC;CACJ;AA3CD,8BA2CC"}
+{"version":3,"file":"BscPlugin.js","sourceRoot":"","sources":["../../src/bscPlugin/BscPlugin.ts"],"names":[],"mappings":";;;AAAA,uDAA8D;AAE9D,6EAA0E;AAC1E,6EAA0E;AAC1E,wEAAqE;AACrE,2DAAwD;AACxD,oGAAiG;AACjG,oEAAiE;AACjE,oEAAiE;AACjE,gEAA6D;AAC7D,oEAAiE;AACjE,2DAAwD;AACxD,qFAAqF;AACrF,2FAAwF;AAGxF,6CAA0C;AAC1C,+DAA4D;AAC5D,+DAA4D;AAE5D,MAAa,SAAS;IAAtB;QACW,SAAI,GAAG,WAAW,CAAC;QAoClB,mBAAc,GAAG,IAAI,+BAAc,EAAE,CAAC;QAetC,iBAAY,GAAG,IAAI,2BAAY,EAAE,CAAC;IAqB9C,CAAC;IAtEU,gBAAgB,CAAC,KAAuB;QAC3C,IAAI,2BAAY,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IACtC,CAAC;IAEM,gBAAgB,CAAC,KAA4B;QAChD,IAAI,2CAAoB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,CAAC;IAEM,YAAY,CAAC,KAAwB;QACxC,OAAO,IAAI,+BAAc,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC/C,CAAC;IAEM,kBAAkB,CAAC,KAA8B;QACpD,IAAI,2CAAoB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC9C,CAAC;IAEM,iBAAiB,CAAC,KAA6B;QAClD,IAAI,uCAAkB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5C,CAAC;IAEM,mBAAmB,CAAC,KAA+B;QACtD,IAAI,IAAA,sBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAI,+DAA8B,CAAC,KAAY,CAAC,CAAC,OAAO,EAAE,CAAC;SACrE;IACL,CAAC;IAEM,cAAc,CAAC,KAA0B;QAC5C,IAAI,IAAA,sBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAI,mCAAgB,CAAC,KAAqC,CAAC,CAAC,OAAO,EAAE,CAAC;SAChF;aAAM,IAAI,IAAA,sBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC9B,OAAO,IAAI,mCAAgB,CAAC,KAAqC,CAAC,CAAC,OAAO,EAAE,CAAC;SAChF;IACL,CAAC;IAIM,eAAe,CAAC,KAA2B;QAC9C,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC5C,CAAC;IAEM,oBAAoB,CAAC,KAAgC;QACxD,IAAI,mCAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;QACtC,uDAAuD;QACvD,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAEM,kBAAkB,CAAC,KAA8B;QACpD,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAGD;;OAEG;IACI,WAAW,CAAC,KAAyB;QACxC,IAAI,IAAA,sBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAI,wDAA4B,CAAC,KAAoC,CAAC,CAAC,OAAO,EAAE,CAAC;SAC3F;aAAM,IAAI,IAAA,sBAAS,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC9B,OAAO,IAAI,2DAA4B,CAAC,KAAoC,CAAC,CAAC,OAAO,EAAE,CAAC;SAC3F;IACL,CAAC;IAEM,kBAAkB,CAAC,KAA8B;QACpD,IAAI,+BAAc,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IACxC,CAAC;IAEM,KAAK,CAAC,SAAS,CAAC,KAAqB;QACxC,MAAM,IAAI,uBAAU,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC;IAC1C,CAAC;CAEJ;AAzED,8BAyEC"}

package/dist/bscPlugin/CallExpressionInfo.d.ts

@@ -0,0 +1,36 @@
+import type { Expression } from '../parser/AstNode';
+import type { CallExpression, CallfuncExpression, NewExpression } from '../parser/Expression';
+import type { ClassStatement } from '../parser/Statement';
+import type { BrsFile } from '../files/BrsFile';
+import type { Position } from 'vscode-languageserver-protocol';
+import type { NamespaceContainer } from '../interfaces';
+export declare enum CallExpressionType {
+    namespaceCall = "namespaceCall",
+    call = "call",
+    callFunc = "callFunc",
+    constructorCall = "constructorCall",
+    myClassCall = "myClassCall",
+    otherClassCall = "otherClassCall",
+    unknown = "unknown"
+}
+export declare class CallExpressionInfo {
+    expression?: Expression;
+    callExpression?: CallExpression | CallfuncExpression;
+    type: CallExpressionType;
+    file: BrsFile;
+    myClass: ClassStatement;
+    namespace?: NamespaceContainer;
+    dotPart: string;
+    name: string;
+    isCallingMethodOnMyClass: boolean;
+    newExpression: NewExpression;
+    parameterIndex: number;
+    private position;
+    constructor(file: BrsFile, position: Position);
+    private process;
+    isPositionBetweenParentheses(): boolean;
+    ascertainCallExpression(): CallExpression | CallfuncExpression;
+    ascertainType(): CallExpressionType;
+    private getNamespace;
+    private getParameterIndex;
+}

package/dist/bscPlugin/CallExpressionInfo.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CallExpressionInfo = exports.CallExpressionType = void 0;
+const reflection_1 = require("../astUtils/reflection");
+const util_1 = require("../util");
+const Parser_1 = require("../parser/Parser");
+var CallExpressionType;
+(function (CallExpressionType) {
+    CallExpressionType["namespaceCall"] = "namespaceCall";
+    CallExpressionType["call"] = "call";
+    CallExpressionType["callFunc"] = "callFunc";
+    CallExpressionType["constructorCall"] = "constructorCall";
+    CallExpressionType["myClassCall"] = "myClassCall";
+    CallExpressionType["otherClassCall"] = "otherClassCall";
+    CallExpressionType["unknown"] = "unknown";
+})(CallExpressionType = exports.CallExpressionType || (exports.CallExpressionType = {}));
+//Util Class, for extracting info about an expression, which can be used in the IDE
+class CallExpressionInfo {
+    constructor(file, position) {
+        this.expression = file.ast.findChildAtPosition(position);
+        this.file = file;
+        this.position = position;
+        this.process();
+    }
+    process() {
+        this.callExpression = this.ascertainCallExpression();
+        let callExpression = this.callExpression;
+        if (!callExpression) {
+            this.type = CallExpressionType.unknown;
+            return;
+        }
+        if (!this.isPositionBetweenParentheses()) {
+            return;
+        }
+        this.isCallingMethodOnMyClass = false;
+        if ((0, reflection_1.isNewExpression)(callExpression.parent)) {
+            this.name = callExpression.parent.className.getName(Parser_1.ParseMode.BrighterScript);
+            this.newExpression = callExpression.parent;
+        }
+        if ((0, reflection_1.isCallfuncExpression)(callExpression)) {
+            this.name = callExpression.tokens.methodName.text;
+        }
+        else if ((0, reflection_1.isVariableExpression)(callExpression.callee)) {
+            this.name = callExpression.callee.tokens.name.text;
+        }
+        else if ((0, reflection_1.isVariableExpression)(callExpression)) {
+            this.name = callExpression.tokens.name.text;
+        }
+        else if ((0, reflection_1.isDottedGetExpression)(callExpression.callee)) {
+            this.name = callExpression.callee.tokens.name.text;
+            if ((0, reflection_1.isDottedGetExpression)(callExpression.callee) && (0, reflection_1.isVariableExpression)(callExpression.callee.obj)) {
+                this.isCallingMethodOnMyClass = callExpression.callee.obj.tokens.name.text === 'm';
+            }
+            else {
+                let parts = util_1.util.getAllDottedGetParts(callExpression.callee);
+                parts.splice((parts === null || parts === void 0 ? void 0 : parts.length) - 1, 1);
+                this.dotPart = parts.map(x => x.text).join('.');
+                this.namespace = this.getNamespace();
+            }
+        }
+        this.myClass = this.expression.findAncestor(reflection_1.isClassStatement);
+        this.type = this.ascertainType();
+        this.parameterIndex = this.getParameterIndex();
+    }
+    isPositionBetweenParentheses() {
+        let boundingRange = util_1.util.createBoundingRange(this.callExpression.tokens.openingParen, this.callExpression.tokens.closingParen);
+        return util_1.util.rangeContains(boundingRange, this.position);
+    }
+    ascertainCallExpression() {
+        let expression = this.expression;
+        function isCallFuncOrCallExpression(expression) {
+            return (0, reflection_1.isCallfuncExpression)(expression) || (0, reflection_1.isCallExpression)(expression);
+        }
+        let callExpression = expression === null || expression === void 0 ? void 0 : expression.findAncestor(isCallFuncOrCallExpression);
+        if (callExpression && callExpression.callee === expression) {
+            //this expression is the NAME of a CallExpression
+            callExpression = expression.parent.findAncestor(isCallFuncOrCallExpression);
+        }
+        else if ((0, reflection_1.isDottedGetExpression)(expression.parent) && expression.parent.parent === callExpression) {
+            callExpression = callExpression.findAncestor(isCallFuncOrCallExpression);
+        }
+        if (!callExpression && (0, reflection_1.isCallExpression)(expression)) {
+            //let's check to see if we are in a space, in the args of a valid CallExpression
+            let boundingRange = util_1.util.createBoundingRange(expression.tokens.openingParen, expression.tokens.closingParen);
+            if (util_1.util.rangeContains(boundingRange, this.position)) {
+                callExpression = expression;
+            }
+        }
+        return callExpression;
+    }
+    ascertainType() {
+        if (this.name) {
+            //General case, for function calls
+            if (this.newExpression) {
+                return CallExpressionType.constructorCall;
+            }
+            else if (this.isCallingMethodOnMyClass && this.myClass) {
+                return CallExpressionType.myClassCall;
+            }
+            else if (!this.namespace && (0, reflection_1.isDottedGetExpression)(this.callExpression)) {
+                return CallExpressionType.otherClassCall;
+            }
+            else if ((0, reflection_1.isCallfuncExpression)(this.callExpression)) {
+                return CallExpressionType.callFunc;
+            }
+            else if (this.namespace) {
+                return CallExpressionType.namespaceCall;
+            }
+            else {
+                return CallExpressionType.call;
+            }
+        }
+        return CallExpressionType.unknown;
+    }
+    getNamespace() {
+        let scope = this.file.program.getFirstScopeForFile(this.file);
+        return scope.namespaceLookup.get(this.dotPart);
+    }
+    getParameterIndex() {
+        for (let i = this.callExpression.args.length - 1; i > -1; i--) {
+            let argExpression = this.callExpression.args[i];
+            let comparison = util_1.util.comparePositionToRange(this.position, argExpression.range);
+            if (comparison >= 0) {
+                return i + comparison;
+            }
+        }
+        return 0;
+    }
+}
+exports.CallExpressionInfo = CallExpressionInfo;
+//# sourceMappingURL=CallExpressionInfo.js.map

package/dist/bscPlugin/CallExpressionInfo.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CallExpressionInfo.js","sourceRoot":"","sources":["../../src/bscPlugin/CallExpressionInfo.ts"],"names":[],"mappings":"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"}

package/dist/bscPlugin/FileWriter.d.ts

@@ -0,0 +1,6 @@
+import type { WriteFileEvent } from '../interfaces';
+export declare class FileWriter {
+    private event;
+    constructor(event: WriteFileEvent);
+    process(): Promise<void>;
+}

package/dist/bscPlugin/FileWriter.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileWriter = void 0;
+const fsExtra = require("fs-extra");
+class FileWriter {
+    constructor(event) {
+        this.event = event;
+    }
+    async process() {
+        //if no plugin has handled this file yet, we will handle it
+        if (!this.event.processedFiles.has(this.event.file)) {
+            if (this.event.file.data) {
+                //write the file to disk
+                await fsExtra.outputFile(this.event.outputPath, this.event.file.data);
+                this.event.processedFiles.add(this.event.file);
+            }
+            else {
+                console.warn(`Missing file data for: "${this.event.file.pkgPath}"`);
+            }
+        }
+    }
+}
+exports.FileWriter = FileWriter;
+//# sourceMappingURL=FileWriter.js.map

package/dist/bscPlugin/FileWriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"FileWriter.js","sourceRoot":"","sources":["../../src/bscPlugin/FileWriter.ts"],"names":[],"mappings":";;;AACA,oCAAoC;AAEpC,MAAa,UAAU;IACnB,YACY,KAAqB;QAArB,UAAK,GAAL,KAAK,CAAgB;IAC7B,CAAC;IAEE,KAAK,CAAC,OAAO;QAChB,2DAA2D;QAC3D,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YACjD,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE;gBACtB,wBAAwB;gBACxB,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACtE,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aAClD;iBAAM;gBACH,OAAO,CAAC,IAAI,CAAC,2BAA2B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;aACvE;SACJ;IACL,CAAC;CACJ;AAjBD,gCAiBC"}

package/dist/bscPlugin/SignatureHelpUtil.d.ts

@@ -0,0 +1,10 @@
+import type { Statement } from '../parser/AstNode';
+import type { ClassStatement } from '../parser/Statement';
+import type { SignatureInfoObj } from '../Program';
+import type { CallExpressionInfo } from './CallExpressionInfo';
+import type { FileLink } from '../interfaces';
+export declare class SignatureHelpUtil {
+    getSignatureHelpItems(callExpressionInfo: CallExpressionInfo): SignatureInfoObj[];
+    getSignatureHelpForStatement(fileLink: FileLink<Statement>, namespaceName?: string): SignatureInfoObj;
+    getClassSignatureHelp(fileLink: FileLink<ClassStatement>): SignatureInfoObj | undefined;
+}

package/dist/bscPlugin/SignatureHelpUtil.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SignatureHelpUtil = void 0;
+const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
+const reflection_1 = require("../astUtils/reflection");
+const TokenKind_1 = require("../lexer/TokenKind");
+const Parser_1 = require("../parser/Parser");
+const CallExpressionInfo_1 = require("./CallExpressionInfo");
+const util_1 = require("../util");
+class SignatureHelpUtil {
+    getSignatureHelpItems(callExpressionInfo) {
+        let signatureHelpItems = [];
+        let file = callExpressionInfo.file;
+        let dotPart = callExpressionInfo.dotPart;
+        let name = callExpressionInfo.name;
+        let results = new Map();
+        switch (callExpressionInfo.type) {
+            case CallExpressionInfo_1.CallExpressionType.namespaceCall:
+                signatureHelpItems = file.program.getStatementsByName(name, file, dotPart).map((fileLink) => this.getSignatureHelpForStatement(fileLink, dotPart));
+                break;
+            case CallExpressionInfo_1.CallExpressionType.myClassCall:
+                let statement = file.getClassMethod(callExpressionInfo.myClass, name, true);
+                if (statement) {
+                    signatureHelpItems = [this.getSignatureHelpForStatement({ item: statement, file: file })];
+                }
+                break;
+            case CallExpressionInfo_1.CallExpressionType.otherClassCall:
+                signatureHelpItems = file.program.getStatementsByName(name, file).filter((fileLink) => (0, reflection_1.isClassStatement)(fileLink.item.parent)).map((fileLink) => this.getSignatureHelpForStatement(fileLink));
+                break;
+            case CallExpressionInfo_1.CallExpressionType.callFunc:
+                // must be from some call func interface method
+                signatureHelpItems = [];
+                for (const scope of file.program.getScopes().filter((s) => (0, reflection_1.isXmlScope)(s))) {
+                    signatureHelpItems.push(...file.program.getStatementsForXmlFile(scope, name).map((fileLink) => this.getSignatureHelpForStatement(fileLink)));
+                }
+                break;
+            case CallExpressionInfo_1.CallExpressionType.call:
+                signatureHelpItems = file.program.getStatementsByName(name, file).map((fileLink) => this.getSignatureHelpForStatement(fileLink));
+                break;
+            case CallExpressionInfo_1.CallExpressionType.constructorCall:
+                let classItem = file.getClassFileLink(dotPart ? `${dotPart}.${name}` : name);
+                let constructorSignatureHelp = this.getClassSignatureHelp(classItem);
+                if (constructorSignatureHelp) {
+                    signatureHelpItems.push(constructorSignatureHelp);
+                }
+                break;
+            default:
+        }
+        for (let sigHelp of signatureHelpItems) {
+            if (!results.has[sigHelp.key]) {
+                sigHelp.index = callExpressionInfo.parameterIndex;
+                results.set(sigHelp.key, sigHelp);
+            }
+        }
+        return [...results.values()];
+    }
+    getSignatureHelpForStatement(fileLink, namespaceName) {
+        var _a;
+        let statement = fileLink.item;
+        let file = fileLink.file;
+        if (!(0, reflection_1.isFunctionStatement)(statement) && !(0, reflection_1.isMethodStatement)(statement)) {
+            return undefined;
+        }
+        const func = statement.func;
+        const funcStartPosition = func.range.start;
+        // Get function comments in reverse order
+        let currentToken = file.getTokenAt(funcStartPosition);
+        let functionComments = [];
+        while (currentToken) {
+            currentToken = file.getPreviousToken(currentToken);
+            if (!currentToken) {
+                break;
+            }
+            if (currentToken.range.start.line + 1 < funcStartPosition.line) {
+                if (functionComments.length === 0) {
+                    break;
+                }
+            }
+            const kind = currentToken.kind;
+            if (kind === TokenKind_1.TokenKind.Comment) {
+                // Strip off common leading characters to make it easier to read
+                const commentText = currentToken.text.replace(/^[' *\/]+/, '');
+                functionComments.unshift(commentText);
+            }
+            else if (kind === TokenKind_1.TokenKind.Newline) {
+                if (functionComments.length === 0) {
+                    continue;
+                }
+                // if we already had a new line as the last token then exit out
+                if (functionComments[0] === currentToken.text) {
+                    break;
+                }
+                functionComments.unshift(currentToken.text);
+            }
+            else {
+                break;
+            }
+        }
+        const documentation = functionComments.join('').trim();
+        const lines = util_1.util.splitIntoLines(file.fileContents);
+        let key = statement.tokens.name.text + documentation;
+        const params = [];
+        for (const param of func.parameters) {
+            params.push(vscode_languageserver_protocol_1.ParameterInformation.create(param.tokens.name.text));
+            key += param.tokens.name.text;
+        }
+        let label = util_1.util.getTextForRange(lines, util_1.util.createRangeFromPositions((_a = func.tokens.functionType) === null || _a === void 0 ? void 0 : _a.range.start, func.body.range.start)).trim();
+        if (namespaceName) {
+            label = label.replace(/^(sub | function )/gim, `$1${namespaceName}.`);
+        }
+        const signature = vscode_languageserver_protocol_1.SignatureInformation.create(label, documentation, ...params);
+        const index = 1;
+        return { key: key, signature: signature, index: index };
+    }
+    getClassSignatureHelp(fileLink) {
+        let file = fileLink.file;
+        let classStatement = fileLink.item;
+        const classConstructor = file.getClassMethod(classStatement, 'new');
+        let sigHelp = classConstructor ? this.getSignatureHelpForStatement({ item: classConstructor, file: file }) : undefined;
+        let className = classStatement.getName(Parser_1.ParseMode.BrighterScript);
+        if (sigHelp) {
+            sigHelp.key = className;
+            sigHelp.signature.label = sigHelp.signature.label.replace(/(function|sub) new/, sigHelp.key);
+        }
+        else {
+            sigHelp = {
+                key: className,
+                signature: vscode_languageserver_protocol_1.SignatureInformation.create(`${className}()`, ''),
+                index: 0
+            };
+        }
+        return sigHelp;
+    }
+}
+exports.SignatureHelpUtil = SignatureHelpUtil;
+//# sourceMappingURL=SignatureHelpUtil.js.map

package/dist/bscPlugin/SignatureHelpUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SignatureHelpUtil.js","sourceRoot":"","sources":["../../src/bscPlugin/SignatureHelpUtil.ts"],"names":[],"mappings":"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"}

package/dist/bscPlugin/codeActions/CodeActionsProcessor.js

@@ -6,6 +6,7 @@ const CodeActionUtil_1 = require("../../CodeActionUtil");
 const DiagnosticMessages_1 = require("../../DiagnosticMessages");
 const Parser_1 = require("../../parser/Parser");
 const util_1 = require("../../util");
+const reflection_1 = require("../../astUtils/reflection");
 class CodeActionsProcessor {
     constructor(event) {
         this.event = event;
@@ -28,19 +29,21 @@ class CodeActionsProcessor {
      * Generic import suggestion function. Shouldn't be called directly from the main loop, but instead called by more specific diagnostic handlers
      */
     suggestImports(diagnostic, key, files) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         //skip if we already have this suggestion
-        if (this.suggestedImports.has(key)) {
+        if (this.suggestedImports.has(key) || !(0, reflection_1.isBrsFile)(this.event.file)) {
             return;
         }
         this.suggestedImports.add(key);
-        const importStatements = this.event.file.parser.references.importStatements;
+        // eslint-disable-next-line @typescript-eslint/dot-notation
+        const importStatements = this.event.file['_cachedLookups'].importStatements;
         //find the position of the first import statement, or the top of the file if there is none
-        const insertPosition = (_c = (_b = (_a = importStatements[importStatements.length - 1]) === null || _a === void 0 ? void 0 : _a.importToken.range) === null || _b === void 0 ? void 0 : _b.start) !== null && _c !== void 0 ? _c : util_1.util.createPosition(0, 0);
+        const insertPosition = (_d = (_c = (_b = (_a = importStatements[importStatements.length - 1]) === null || _a === void 0 ? void 0 : _a.tokens.import) === null || _b === void 0 ? void 0 : _b.range) === null || _c === void 0 ? void 0 : _c.start) !== null && _d !== void 0 ? _d : util_1.util.createPosition(0, 0);
         //find all files that reference this function
         for (const file of files) {
+            const destPath = util_1.util.sanitizePkgPath(file.destPath);
             this.event.codeActions.push(CodeActionUtil_1.codeActionUtil.createCodeAction({
-                title: `import "${file.pkgPath}"`,
+                title: `import "${destPath}"`,
                 diagnostics: [diagnostic],
                 isPreferred: false,
                 kind: vscode_languageserver_1.CodeActionKind.QuickFix,
@@ -48,7 +51,7 @@ class CodeActionsProcessor {
                         type: 'insert',
                         filePath: this.event.file.srcPath,
                         position: insertPosition,
-                        newText: `import "${file.pkgPath}"\n`
+                        newText: `import "${destPath}"\n`
                     }]
             }));
         }
@@ -61,10 +64,10 @@ class CodeActionsProcessor {
         }
         const lowerName = ((_a = diagnostic.data.fullName) !== null && _a !== void 0 ? _a : diagnostic.data.name).toLowerCase();
         this.suggestImports(diagnostic, lowerName, [
-            ...this.event.file.program.findFilesForFunction(lowerName),
-            ...this.event.file.program.findFilesForClass(lowerName),
-            ...this.event.file.program.findFilesForNamespace(lowerName),
-            ...this.event.file.program.findFilesForEnum(lowerName)
+            ...this.event.program.findFilesForFunction(lowerName),
+            ...this.event.program.findFilesForClass(lowerName),
+            ...this.event.program.findFilesForNamespace(lowerName),
+            ...this.event.program.findFilesForEnum(lowerName)
         ]);
     }
     suggestClassImports(diagnostic) {
@@ -73,14 +76,14 @@ class CodeActionsProcessor {
             return;
         }
         const lowerClassName = diagnostic.data.className.toLowerCase();
-        this.suggestImports(diagnostic, lowerClassName, this.event.file.program.findFilesForClass(lowerClassName));
+        this.suggestImports(diagnostic, lowerClassName, this.event.program.findFilesForClass(lowerClassName));
     }
     addMissingExtends(diagnostic) {
         var _a;
         const srcPath = this.event.file.srcPath;
-        const { component } = this.event.file.parser.ast;
+        const { componentElement } = this.event.file.parser.ast;
         //inject new attribute after the final attribute, or after the `<component` if there are no attributes
-        const pos = ((_a = component.attributes[component.attributes.length - 1]) !== null && _a !== void 0 ? _a : component.tokens.startTagOpen).range.end;
+        const pos = ((_a = componentElement.attributes[componentElement.attributes.length - 1]) !== null && _a !== void 0 ? _a : componentElement.tokens.startTagName).range.end;
         this.event.codeActions.push(CodeActionUtil_1.codeActionUtil.createCodeAction({
             title: `Extend "Group"`,
             diagnostics: [diagnostic],

package/dist/bscPlugin/codeActions/CodeActionsProcessor.js.map

@@ -1 +1 @@
-{"version":3,"file":"CodeActionsProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/codeActions/CodeActionsProcessor.ts"],"names":[],"mappings":";;;AACA,iEAAuD;AACvD,yDAAsD;AAEtD,iEAA6D;AAI7D,gDAAgD;AAChD,qCAAkC;AAElC,MAAa,oBAAoB;IAC7B,YACW,KAA4B;QAA5B,UAAK,GAAL,KAAK,CAAuB;QAiB/B,qBAAgB,GAAG,IAAI,GAAG,EAAU,CAAC;IAd7C,CAAC;IAEM,OAAO;QACV,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;YAC7C,IAAI,UAAU,CAAC,IAAI,KAAK,sCAAiB,CAAC,cAAc,EAAE;gBACtD,IAAI,CAAC,qBAAqB,CAAC,UAAiB,CAAC,CAAC;aACjD;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,sCAAiB,CAAC,oBAAoB,EAAE;gBACnE,IAAI,CAAC,mBAAmB,CAAC,UAAiB,CAAC,CAAC;aAC/C;iBAAM,IAAI,UAAU,CAAC,IAAI,KAAK,sCAAiB,CAAC,mCAAmC,EAAE;gBAClF,IAAI,CAAC,iBAAiB,CAAC,UAAiB,CAAC,CAAC;aAC7C;SACJ;IACL,CAAC;IAID;;OAEG;IACK,cAAc,CAAC,UAAsB,EAAE,GAAW,EAAE,KAAgB;;QACxE,yCAAyC;QACzC,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAChC,OAAO;SACV;QAED,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC/B,MAAM,gBAAgB,GAAI,IAAI,CAAC,KAAK,CAAC,IAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,gBAAgB,CAAC;QACzF,0FAA0F;QAC1F,MAAM,cAAc,GAAG,MAAA,MAAA,MAAA,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,WAAW,CAAC,KAAK,0CAAE,KAAK,mCAAI,WAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAE5H,6CAA6C;QAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CACvB,+BAAc,CAAC,gBAAgB,CAAC;gBAC5B,KAAK,EAAE,WAAW,IAAI,CAAC,OAAO,GAAG;gBACjC,WAAW,EAAE,CAAC,UAAU,CAAC;gBACzB,WAAW,EAAE,KAAK;gBAClB,IAAI,EAAE,sCAAc,CAAC,QAAQ;gBAC7B,OAAO,EAAE,CAAC;wBACN,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO;wBACjC,QAAQ,EAAE,cAAc;wBACxB,OAAO,EAAE,WAAW,IAAI,CAAC,OAAO,KAAK;qBACxC,CAAC;aACL,CAAC,CACL,CAAC;SACL;IACL,CAAC;IAEO,qBAAqB,CAAC,UAAmD;;QAC7E,mCAAmC;QACnC,IAAK,UAAU,CAAC,IAAgB,CAAC,SAAS,KAAK,kBAAS,CAAC,cAAc,EAAE;YACrE,OAAO;SACV;QACD,MAAM,SAAS,GAAG,CAAC,MAAA,UAAU,CAAC,IAAI,CAAC,QAAQ,mCAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;QAEnF,IAAI,CAAC,cAAc,CACf,UAAU,EACV,SAAS,EACT;YACI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,SAAS,CAAC;YAC1D,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,SAAS,CAAC;YACvD,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,SAAS,CAAC;YAC3D,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC;SACzD,CACJ,CAAC;IACN,CAAC;IAEO,mBAAmB,CAAC,UAAyD;QACjF,mCAAmC;QACnC,IAAK,UAAU,CAAC,IAAgB,CAAC,SAAS,KAAK,kBAAS,CAAC,cAAc,EAAE;YACrE,OAAO;SACV;QACD,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;QAC/D,IAAI,CAAC,cAAc,CACf,UAAU,EACV,cAAc,EACd,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAC5D,CAAC;IACN,CAAC;IAEO,iBAAiB,CAAC,UAAwE;;QAC9F,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC;QACxC,MAAM,EAAE,SAAS,EAAE,GAAI,IAAI,CAAC,KAAK,CAAC,IAAgB,CAAC,MAAM,CAAC,GAAG,CAAC;QAC9D,sGAAsG;QACtG,MAAM,GAAG,GAAG,CAAC,MAAA,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,mCAAI,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC;QAC/G,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CACvB,+BAAc,CAAC,gBAAgB,CAAC;YAC5B,KAAK,EAAE,gBAAgB;YACvB,WAAW,EAAE,CAAC,UAAU,CAAC;YACzB,WAAW,EAAE,IAAI;YACjB,IAAI,EAAE,sCAAc,CAAC,QAAQ;YAC7B,OAAO,EAAE,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,OAAO;oBACjB,QAAQ,EAAE,GAAG;oBACb,OAAO,EAAE,kBAAkB;iBAC9B,CAAC;SACL,CAAC,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CACvB,+BAAc,CAAC,gBAAgB,CAAC;YAC5B,KAAK,EAAE,eAAe;YACtB,WAAW,EAAE,CAAC,UAAU,CAAC;YACzB,IAAI,EAAE,sCAAc,CAAC,QAAQ;YAC7B,OAAO,EAAE,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,OAAO;oBACjB,QAAQ,EAAE,GAAG;oBACb,OAAO,EAAE,iBAAiB;iBAC7B,CAAC;SACL,CAAC,CACL,CAAC;QACF,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CACvB,+BAAc,CAAC,gBAAgB,CAAC;YAC5B,KAAK,EAAE,sBAAsB;YAC7B,WAAW,EAAE,CAAC,UAAU,CAAC;YACzB,IAAI,EAAE,sCAAc,CAAC,QAAQ;YAC7B,OAAO,EAAE,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,OAAO;oBACjB,QAAQ,EAAE,GAAG;oBACb,OAAO,EAAE,wBAAwB;iBACpC,CAAC;SACL,CAAC,CACL,CAAC;IACN,CAAC;CACJ;AApID,oDAoIC"}
+{"version":3,"file":"CodeActionsProcessor.js","sourceRoot":"","sources":["../../../src/bscPlugin/codeActions/CodeActionsProcessor.ts"],"names":[],"mappings":"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"}