brighterscript 0.61.3 → 0.63.0

package/dist/parser/Statement.d.ts

@@ -295,7 +295,8 @@ export declare class DottedSetStatement extends Statement {
     readonly obj: Expression;
     readonly name: Identifier;
     readonly value: Expression;
-    constructor(obj: Expression, name: Identifier, value: Expression);
+    readonly dot?: Token;
+    constructor(obj: Expression, name: Identifier, value: Expression, dot?: Token);
     readonly range: Range;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
@@ -394,7 +395,7 @@ export declare class InterfaceFieldStatement extends Statement implements Typede
     type: BscType;
     transpile(state: BrsTranspileState): TranspileResult;
     constructor(nameToken: Identifier, asToken: Token, typeToken: Token, type: BscType);
-    get range(): Range;
+    range: Range;
     tokens: {
         name: Identifier;
         as: Token;
@@ -550,7 +551,7 @@ export declare class TryCatchStatement extends Statement {
         try: Token;
         endTry?: Token;
     }, tryBranch?: Block, catchStatement?: CatchStatement);
-    get range(): Range;
+    readonly range: Range;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
 }
@@ -563,7 +564,7 @@ export declare class CatchStatement extends Statement {
     constructor(tokens: {
         catch: Token;
     }, exceptionVariable?: Identifier, catchBranch?: Block);
-    get range(): Range;
+    range: Range;
     transpile(state: BrsTranspileState): TranspileResult;
     walk(visitor: WalkVisitor, options: WalkOptions): void;
 }
@@ -662,7 +663,7 @@ export declare class ContinueStatement extends Statement {
         continue: Token;
         loopType: Token;
     });
-    get range(): Range;
+    range: Range;
     transpile(state: BrsTranspileState): (string | SourceNode)[];
     walk(visitor: WalkVisitor, options: WalkOptions): void;
 }

package/dist/parser/Statement.js

@@ -4,7 +4,6 @@ exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
 const util_1 = require("../util");
-const vscode_languageserver_1 = require("vscode-languageserver");
 const Parser_1 = require("./Parser");
 const visitors_1 = require("../astUtils/visitors");
 const reflection_1 = require("../astUtils/reflection");
@@ -39,8 +38,9 @@ class Body extends AstNode_1.Statement {
         this.symbolTable = new SymbolTable_1.SymbolTable('Body', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
     get range() {
-        var _a, _b, _c, _d;
-        return util_1.util.createRangeFromPositions((_b = (_a = this.statements[0]) === null || _a === void 0 ? void 0 : _a.range.start) !== null && _b !== void 0 ? _b : vscode_languageserver_1.Position.create(0, 0), (_d = (_c = this.statements[this.statements.length - 1]) === null || _c === void 0 ? void 0 : _c.range.end) !== null && _d !== void 0 ? _d : vscode_languageserver_1.Position.create(0, 0));
+        var _a;
+        //this needs to be a getter because the body has its statements pushed to it after being constructed
+        return util_1.util.createBoundingRange(...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
     }
     transpile(state) {
         let result = [];
@@ -94,7 +94,7 @@ class AssignmentStatement extends AstNode_1.Statement {
         this.equals = equals;
         this.name = name;
         this.value = value;
-        this.range = util_1.util.createRangeFromPositions(this.name.range.start, this.value.range.end);
+        this.range = util_1.util.createBoundingRange(name, equals, value);
     }
     /**
      * Get the name of the wrapping namespace (if it exists)
@@ -131,9 +131,7 @@ class Block extends AstNode_1.Statement {
         super();
         this.statements = statements;
         this.startingRange = startingRange;
-        this.range = util_1.util.createRangeFromPositions(this.startingRange.start, this.statements.length
-            ? this.statements[this.statements.length - 1].range.end
-            : this.startingRange.start);
+        this.range = util_1.util.createBoundingRange({ range: this.startingRange }, ...(statements !== null && statements !== void 0 ? statements : []));
     }
     transpile(state) {
         state.blockDepth++;
@@ -189,7 +187,7 @@ class CommentStatement extends AstNode_1.Statement {
         this.comments = comments;
         this.visitMode = visitors_1.InternalWalkMode.visitStatements | visitors_1.InternalWalkMode.visitExpressions;
         if (((_a = this.comments) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            this.range = util_1.util.createRangeFromPositions(this.comments[0].range.start, this.comments[this.comments.length - 1].range.end);
+            this.range = util_1.util.createBoundingRange(...this.comments);
         }
     }
     get text() {
@@ -303,14 +301,13 @@ class FunctionStatement extends AstNode_1.Statement {
 exports.FunctionStatement = FunctionStatement;
 class IfStatement extends AstNode_1.Statement {
     constructor(tokens, condition, thenBranch, elseBranch, isInline) {
-        var _a, _b;
         super();
         this.tokens = tokens;
         this.condition = condition;
         this.thenBranch = thenBranch;
         this.elseBranch = elseBranch;
         this.isInline = isInline;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.if.range.start, ((_b = (_a = this.tokens.endIf) !== null && _a !== void 0 ? _a : this.elseBranch) !== null && _b !== void 0 ? _b : this.thenBranch).range.end);
+        this.range = util_1.util.createBoundingRange(tokens.if, condition, tokens.then, thenBranch, tokens.else, elseBranch, tokens.endIf);
     }
     transpile(state) {
         let results = [];
@@ -393,7 +390,7 @@ class IncrementStatement extends AstNode_1.Statement {
         super();
         this.value = value;
         this.operator = operator;
-        this.range = util_1.util.createRangeFromPositions(this.value.range.start, this.operator.range.end);
+        this.range = util_1.util.createBoundingRange(value, operator);
     }
     transpile(state) {
         return [
@@ -422,9 +419,7 @@ class PrintStatement extends AstNode_1.Statement {
         super();
         this.tokens = tokens;
         this.expressions = expressions;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.print.range.start, this.expressions.length
-            ? this.expressions[this.expressions.length - 1].range.end
-            : this.tokens.print.range.end);
+        this.range = util_1.util.createBoundingRange(tokens.print, ...(expressions !== null && expressions !== void 0 ? expressions : []));
     }
     transpile(state) {
         var _a;
@@ -457,14 +452,13 @@ class PrintStatement extends AstNode_1.Statement {
 exports.PrintStatement = PrintStatement;
 class DimStatement extends AstNode_1.Statement {
     constructor(dimToken, identifier, openingSquare, dimensions, closingSquare) {
-        var _a, _b, _c, _d;
         super();
         this.dimToken = dimToken;
         this.identifier = identifier;
         this.openingSquare = openingSquare;
         this.dimensions = dimensions;
         this.closingSquare = closingSquare;
-        this.range = util_1.util.createRangeFromPositions(this.dimToken.range.start, ((_d = (_c = (_b = (_a = this.closingSquare) !== null && _a !== void 0 ? _a : this.dimensions[this.dimensions.length - 1]) !== null && _b !== void 0 ? _b : this.openingSquare) !== null && _c !== void 0 ? _c : this.identifier) !== null && _d !== void 0 ? _d : this.dimToken).range.end);
+        this.range = util_1.util.createBoundingRange(dimToken, identifier, openingSquare, ...(dimensions !== null && dimensions !== void 0 ? dimensions : []), closingSquare);
     }
     transpile(state) {
         let result = [
@@ -494,7 +488,7 @@ class GotoStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.goto.range.start, this.tokens.label.range.end);
+        this.range = util_1.util.createBoundingRange(tokens.goto, tokens.label);
     }
     transpile(state) {
         return [
@@ -512,7 +506,7 @@ class LabelStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.identifier.range.start, this.tokens.colon.range.end);
+        this.range = util_1.util.createBoundingRange(tokens.identifier, tokens.colon);
     }
     transpile(state) {
         return [
@@ -527,11 +521,10 @@ class LabelStatement extends AstNode_1.Statement {
 exports.LabelStatement = LabelStatement;
 class ReturnStatement extends AstNode_1.Statement {
     constructor(tokens, value) {
-        var _a;
         super();
         this.tokens = tokens;
         this.value = value;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.return.range.start, ((_a = this.value) === null || _a === void 0 ? void 0 : _a.range.end) || this.tokens.return.range.end);
+        this.range = util_1.util.createBoundingRange(tokens.return, value);
     }
     transpile(state) {
         let result = [];
@@ -553,7 +546,7 @@ class EndStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.end.range.start, this.tokens.end.range.end);
+        this.range = tokens.end.range;
     }
     transpile(state) {
         return [
@@ -567,9 +560,10 @@ class EndStatement extends AstNode_1.Statement {
 exports.EndStatement = EndStatement;
 class StopStatement extends AstNode_1.Statement {
     constructor(tokens) {
+        var _a;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.stop.range.start, this.tokens.stop.range.end);
+        this.range = (_a = tokens === null || tokens === void 0 ? void 0 : tokens.stop) === null || _a === void 0 ? void 0 : _a.range;
     }
     transpile(state) {
         return [
@@ -583,7 +577,6 @@ class StopStatement extends AstNode_1.Statement {
 exports.StopStatement = StopStatement;
 class ForStatement extends AstNode_1.Statement {
     constructor(forToken, counterDeclaration, toToken, finalValue, body, endForToken, stepToken, increment) {
-        var _a, _b;
         super();
         this.forToken = forToken;
         this.counterDeclaration = counterDeclaration;
@@ -593,8 +586,7 @@ class ForStatement extends AstNode_1.Statement {
         this.endForToken = endForToken;
         this.stepToken = stepToken;
         this.increment = increment;
-        const lastRange = (_b = (_a = this.endForToken) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : body.range;
-        this.range = util_1.util.createRangeFromPositions(this.forToken.range.start, lastRange.end);
+        this.range = util_1.util.createBoundingRange(forToken, counterDeclaration, toToken, finalValue, stepToken, increment, body, endForToken);
     }
     transpile(state) {
         let result = [];
@@ -636,14 +628,12 @@ class ForStatement extends AstNode_1.Statement {
 exports.ForStatement = ForStatement;
 class ForEachStatement extends AstNode_1.Statement {
     constructor(tokens, item, target, body) {
-        var _a, _b;
         super();
         this.tokens = tokens;
         this.item = item;
         this.target = target;
         this.body = body;
-        const lastRange = (_b = (_a = this.tokens.endFor) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : body.range;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.forEach.range.start, lastRange.end);
+        this.range = util_1.util.createBoundingRange(tokens.forEach, item, tokens.in, target, body, tokens.endFor);
     }
     transpile(state) {
         let result = [];
@@ -677,13 +667,11 @@ class ForEachStatement extends AstNode_1.Statement {
 exports.ForEachStatement = ForEachStatement;
 class WhileStatement extends AstNode_1.Statement {
     constructor(tokens, condition, body) {
-        var _a, _b;
         super();
         this.tokens = tokens;
         this.condition = condition;
         this.body = body;
-        const lastRange = (_b = (_a = this.tokens.endWhile) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : body.range;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.while.range.start, lastRange.end);
+        this.range = util_1.util.createBoundingRange(tokens.while, condition, body, tokens.endWhile);
     }
     transpile(state) {
         let result = [];
@@ -712,12 +700,13 @@ class WhileStatement extends AstNode_1.Statement {
 }
 exports.WhileStatement = WhileStatement;
 class DottedSetStatement extends AstNode_1.Statement {
-    constructor(obj, name, value) {
+    constructor(obj, name, value, dot) {
         super();
         this.obj = obj;
         this.name = name;
         this.value = value;
-        this.range = util_1.util.createRangeFromPositions(this.obj.range.start, this.value.range.end);
+        this.dot = dot;
+        this.range = util_1.util.createBoundingRange(obj, dot, name, value);
     }
     transpile(state) {
         var _a, _b;
@@ -729,7 +718,7 @@ class DottedSetStatement extends AstNode_1.Statement {
             return [
                 //object
                 ...this.obj.transpile(state),
-                '.',
+                this.dot ? state.tokenToSourceNode(this.dot) : '.',
                 //name
                 state.transpileToken(this.name),
                 ' = ',
@@ -754,7 +743,7 @@ class IndexedSetStatement extends AstNode_1.Statement {
         this.value = value;
         this.openingSquare = openingSquare;
         this.closingSquare = closingSquare;
-        this.range = util_1.util.createRangeFromPositions(this.obj.range.start, this.value.range.end);
+        this.range = util_1.util.createBoundingRange(obj, openingSquare, index, closingSquare, value);
     }
     transpile(state) {
         var _a, _b;
@@ -792,7 +781,7 @@ class LibraryStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.library.range.start, this.tokens.filePath ? this.tokens.filePath.range.end : this.tokens.library.range.end);
+        this.range = util_1.util.createBoundingRange(this.tokens.library, this.tokens.filePath);
     }
     transpile(state) {
         let result = [];
@@ -873,7 +862,7 @@ class ImportStatement extends AstNode_1.Statement {
         super();
         this.importToken = importToken;
         this.filePathToken = filePathToken;
-        this.range = util_1.util.createRangeFromPositions(importToken.range.start, (filePathToken !== null && filePathToken !== void 0 ? filePathToken : importToken).range.end);
+        this.range = util_1.util.createBoundingRange(importToken, filePathToken);
         if (this.filePathToken) {
             //remove quotes
             this.filePath = this.filePathToken.text.replace(/"/g, '');
@@ -1025,14 +1014,11 @@ class InterfaceFieldStatement extends AstNode_1.Statement {
         this.tokens.name = nameToken;
         this.tokens.as = asToken;
         this.tokens.type = typeToken;
+        this.range = util_1.util.createBoundingRange(nameToken, asToken, typeToken);
     }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
-    get range() {
-        var _a, _b;
-        return util_1.util.createRangeFromPositions(this.tokens.name.range.start, ((_b = (_a = this.tokens.type) !== null && _a !== void 0 ? _a : this.tokens.as) !== null && _b !== void 0 ? _b : this.tokens.name).range.end);
-    }
     get name() {
         return this.tokens.name.text;
     }
@@ -1070,8 +1056,8 @@ class InterfaceMethodStatement extends AstNode_1.Statement {
         throw new Error('Method not implemented.');
     }
     get range() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        return util_1.util.createRangeFromPositions(this.tokens.name.range.start, ((_h = (_g = (_f = (_c = (_b = (_a = this.tokens.returnType) !== null && _a !== void 0 ? _a : this.tokens.as) !== null && _b !== void 0 ? _b : this.tokens.rightParen) !== null && _c !== void 0 ? _c : (_d = this.params) === null || _d === void 0 ? void 0 : _d[((_e = this.params) === null || _e === void 0 ? void 0 : _e.length) - 1]) !== null && _f !== void 0 ? _f : this.tokens.leftParen) !== null && _g !== void 0 ? _g : this.tokens.name) !== null && _h !== void 0 ? _h : this.tokens.functionType).range.end);
+        var _a;
+        return util_1.util.createBoundingRange(this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.tokens.returnType);
     }
     walk(visitor, options) {
         //nothing to walk
@@ -1130,7 +1116,7 @@ class ClassStatement extends AstNode_1.Statement {
                 this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
             }
         }
-        this.range = util_1.util.createRangeFromPositions(this.classKeyword.range.start, this.end.range.end);
+        this.range = util_1.util.createBoundingRange(classKeyword, name, extendsKeyword, parentClassName, ...(body !== null && body !== void 0 ? body : []), end);
     }
     /**
      * Get the name of the wrapping namespace (if it exists)
@@ -1405,7 +1391,6 @@ const accessModifiers = [
 ];
 class MethodStatement extends FunctionStatement {
     constructor(modifiers, name, func, override) {
-        var _a;
         super(name, func);
         this.override = override;
         this.modifiers = [];
@@ -1417,7 +1402,7 @@ class MethodStatement extends FunctionStatement {
                 this.modifiers.push(modifiers);
             }
         }
-        this.range = util_1.util.createRangeFromPositions(((_a = this.accessModifier) !== null && _a !== void 0 ? _a : this.func).range.start, this.func.range.end);
+        this.range = util_1.util.createBoundingRange(...(this.modifiers), override, func);
     }
     get accessModifier() {
         return this.modifiers.find(x => accessModifiers.includes(x.kind));
@@ -1550,7 +1535,6 @@ class ClassMethodStatement extends MethodStatement {
 exports.ClassMethodStatement = ClassMethodStatement;
 class FieldStatement extends AstNode_1.Statement {
     constructor(accessModifier, name, as, type, equal, initialValue) {
-        var _a, _b, _c, _d;
         super();
         this.accessModifier = accessModifier;
         this.name = name;
@@ -1558,7 +1542,7 @@ class FieldStatement extends AstNode_1.Statement {
         this.type = type;
         this.equal = equal;
         this.initialValue = initialValue;
-        this.range = util_1.util.createRangeFromPositions(((_a = this.accessModifier) !== null && _a !== void 0 ? _a : this.name).range.start, ((_d = (_c = (_b = this.initialValue) !== null && _b !== void 0 ? _b : this.type) !== null && _c !== void 0 ? _c : this.as) !== null && _d !== void 0 ? _d : this.name).range.end);
+        this.range = util_1.util.createBoundingRange(accessModifier, name, as, type, equal, initialValue);
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
@@ -1612,10 +1596,7 @@ class TryCatchStatement extends AstNode_1.Statement {
         this.tokens = tokens;
         this.tryBranch = tryBranch;
         this.catchStatement = catchStatement;
-    }
-    get range() {
-        var _a, _b, _c;
-        return util_1.util.createRangeFromPositions(this.tokens.try.range.start, ((_c = (_b = (_a = this.tokens.endTry) !== null && _a !== void 0 ? _a : this.catchStatement) !== null && _b !== void 0 ? _b : this.tryBranch) !== null && _c !== void 0 ? _c : this.tokens.try).range.end);
+        this.range = util_1.util.createBoundingRange(tokens.try, tryBranch, catchStatement, tokens.endTry);
     }
     transpile(state) {
         var _a, _b;
@@ -1644,10 +1625,7 @@ class CatchStatement extends AstNode_1.Statement {
         this.tokens = tokens;
         this.exceptionVariable = exceptionVariable;
         this.catchBranch = catchBranch;
-    }
-    get range() {
-        var _a, _b;
-        return util_1.util.createRangeFromPositions(this.tokens.catch.range.start, ((_b = (_a = this.catchBranch) !== null && _a !== void 0 ? _a : this.exceptionVariable) !== null && _b !== void 0 ? _b : this.tokens.catch).range.end);
+        this.range = util_1.util.createBoundingRange(tokens.catch, exceptionVariable, catchBranch);
     }
     transpile(state) {
         var _a, _b, _c, _d;
@@ -1667,11 +1645,10 @@ class CatchStatement extends AstNode_1.Statement {
 exports.CatchStatement = CatchStatement;
 class ThrowStatement extends AstNode_1.Statement {
     constructor(throwToken, expression) {
-        var _a;
         super();
         this.throwToken = throwToken;
         this.expression = expression;
-        this.range = util_1.util.createRangeFromPositions(this.throwToken.range.start, ((_a = this.expression) !== null && _a !== void 0 ? _a : this.throwToken).range.end);
+        this.range = util_1.util.createBoundingRange(throwToken, expression);
     }
     transpile(state) {
         const result = [
@@ -1704,8 +1681,7 @@ class EnumStatement extends AstNode_1.Statement {
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
     }
     get range() {
-        var _a, _b, _c;
-        return util_1.util.createRangeFromPositions((_a = this.tokens.enum.range.start) !== null && _a !== void 0 ? _a : vscode_languageserver_1.Position.create(0, 0), ((_c = (_b = this.tokens.endEnum) !== null && _b !== void 0 ? _b : this.tokens.name) !== null && _c !== void 0 ? _c : this.tokens.enum).range.end);
+        return util_1.util.createBoundingRange(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum);
     }
     /**
      * Get the name of the wrapping namespace (if it exists)
@@ -1833,8 +1809,7 @@ class EnumMemberStatement extends AstNode_1.Statement {
         return this.tokens.name.text;
     }
     get range() {
-        var _a, _b, _c, _d, _e;
-        return util_1.util.createRangeFromPositions((_c = ((_b = (_a = this.tokens.name) !== null && _a !== void 0 ? _a : this.tokens.equal) !== null && _b !== void 0 ? _b : this.value).range.start) !== null && _c !== void 0 ? _c : vscode_languageserver_1.Position.create(0, 0), ((_e = (_d = this.value) !== null && _d !== void 0 ? _d : this.tokens.equal) !== null && _e !== void 0 ? _e : this.tokens.name).range.end);
+        return util_1.util.createBoundingRange(this.tokens.name, this.tokens.equal, this.value);
     }
     transpile(state) {
         return [];
@@ -1915,9 +1890,7 @@ class ContinueStatement extends AstNode_1.Statement {
     constructor(tokens) {
         super();
         this.tokens = tokens;
-    }
-    get range() {
-        return this.tokens.continue.range;
+        this.range = util_1.util.createBoundingRange(tokens.continue, tokens.loopType);
     }
     transpile(state) {
         var _a, _b, _c, _d, _e;