brighterscript 1.0.0-alpha.15 → 1.0.0-alpha.16

package/dist/parser/Statement.js

@@ -4,7 +4,6 @@ exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = e
 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");
@@ -46,12 +45,10 @@ exports.EmptyStatement = EmptyStatement;
  */
 class Body extends Statement {
     constructor(statements = []) {
+        var _a;
         super();
         this.statements = statements;
-    }
-    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));
+        this.range = (_a = util_1.util.createBoundingRange(...this.statements)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -103,12 +100,13 @@ class Body extends Statement {
 exports.Body = Body;
 class AssignmentStatement extends Statement {
     constructor(name, equals, value, containingFunction) {
+        var _a;
         super();
         this.name = name;
         this.equals = equals;
         this.value = value;
         this.containingFunction = containingFunction;
-        this.range = util_1.util.createRangeFromPositions(this.name.range.start, this.value.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.name, this.equals, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         var _a, _b;
@@ -135,12 +133,11 @@ class AssignmentStatement extends Statement {
 exports.AssignmentStatement = AssignmentStatement;
 class Block extends Statement {
     constructor(statements, startingRange) {
+        var _a;
         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 = (_a = util_1.util.createBoundingRange({ range: this.startingRange }, ...statements)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         state.blockDepth++;
@@ -177,9 +174,10 @@ class Block extends Statement {
 exports.Block = Block;
 class ExpressionStatement extends Statement {
     constructor(expression) {
+        var _a, _b;
         super();
         this.expression = expression;
-        this.range = this.expression.range;
+        this.range = (_b = (_a = this.expression) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
     }
     transpile(state) {
         return this.expression.transpile(state);
@@ -196,10 +194,8 @@ class CommentStatement extends Statement {
         var _a;
         super();
         this.comments = comments;
+        this.range = (_a = util_1.util.createBoundingRange(...this.comments)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
         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);
-        }
     }
     get text() {
         return this.comments.map(x => x.text).join('\n');
@@ -229,9 +225,10 @@ class CommentStatement extends Statement {
 exports.CommentStatement = CommentStatement;
 class ExitForStatement extends Statement {
     constructor(tokens) {
+        var _a, _b, _c;
         super();
         this.tokens = tokens;
-        this.range = this.tokens.exitFor.range;
+        this.range = (_c = (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.exitFor) === null || _b === void 0 ? void 0 : _b.range) !== null && _c !== void 0 ? _c : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -245,9 +242,10 @@ class ExitForStatement extends Statement {
 exports.ExitForStatement = ExitForStatement;
 class ExitWhileStatement extends Statement {
     constructor(tokens) {
+        var _a, _b, _c;
         super();
         this.tokens = tokens;
-        this.range = this.tokens.exitWhile.range;
+        this.range = (_c = (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.exitWhile) === null || _b === void 0 ? void 0 : _b.range) !== null && _c !== void 0 ? _c : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -265,7 +263,16 @@ class FunctionStatement extends Statement {
         this.name = name;
         this.func = func;
         this.namespaceName = namespaceName;
-        this.range = this.func.range;
+    }
+    get range() {
+        return this.cacheRange();
+    }
+    cacheRange() {
+        var _a, _b;
+        if (!this._range) {
+            this._range = (_b = (_a = this.func) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : this.name.range;
+        }
+        return this._range;
     }
     /**
      * Get the name of this expression based on the parse mode
@@ -303,14 +310,14 @@ class FunctionStatement extends Statement {
 exports.FunctionStatement = FunctionStatement;
 class IfStatement extends Statement {
     constructor(tokens, condition, thenBranch, elseBranch, isInline) {
-        var _a, _b;
+        var _a;
         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 = (_a = util_1.util.createBoundingRange(this.tokens.if, this.condition, this.tokens.then, this.thenBranch, this.tokens.else, this.elseBranch, this.tokens.endIf)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let results = [];
@@ -392,10 +399,11 @@ class IfStatement extends Statement {
 exports.IfStatement = IfStatement;
 class IncrementStatement extends Statement {
     constructor(value, operator) {
+        var _a;
         super();
         this.value = value;
         this.operator = operator;
-        this.range = util_1.util.createRangeFromPositions(this.value.range.start, this.operator.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.value, this.operator)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -420,12 +428,11 @@ class PrintStatement extends Statement {
      *                    evaluated and printed.
      */
     constructor(tokens, expressions) {
+        var _a;
         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 = (_a = util_1.util.createBoundingRange(this.tokens.print, ...this.expressions)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         var _a;
@@ -462,14 +469,14 @@ class PrintStatement extends Statement {
 exports.PrintStatement = PrintStatement;
 class DimStatement extends Statement {
     constructor(dimToken, identifier, openingSquare, dimensions, closingSquare) {
-        var _a, _b, _c, _d;
+        var _a;
         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 = (_a = util_1.util.createBoundingRange(this.dimToken, this.identifier, this.openingSquare, ...this.dimensions, this.closingSquare)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [
@@ -499,9 +506,10 @@ class DimStatement extends Statement {
 exports.DimStatement = DimStatement;
 class GotoStatement extends Statement {
     constructor(tokens) {
+        var _a;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.goto.range.start, this.tokens.label.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.goto, this.tokens.label)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -517,9 +525,10 @@ class GotoStatement extends Statement {
 exports.GotoStatement = GotoStatement;
 class LabelStatement extends Statement {
     constructor(tokens) {
+        var _a;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.identifier.range.start, this.tokens.colon.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.identifier, this.tokens.colon)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -538,7 +547,7 @@ class ReturnStatement extends Statement {
         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 = (_a = util_1.util.createBoundingRange(this.tokens.return, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -558,9 +567,10 @@ class ReturnStatement extends Statement {
 exports.ReturnStatement = ReturnStatement;
 class EndStatement extends Statement {
     constructor(tokens) {
+        var _a, _b;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.end.range.start, this.tokens.end.range.end);
+        this.range = (_b = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -574,9 +584,10 @@ class EndStatement extends Statement {
 exports.EndStatement = EndStatement;
 class StopStatement extends Statement {
     constructor(tokens) {
+        var _a, _b;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.stop.range.start, this.tokens.stop.range.end);
+        this.range = (_b = (_a = this.tokens.stop) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -590,7 +601,7 @@ class StopStatement extends Statement {
 exports.StopStatement = StopStatement;
 class ForStatement extends Statement {
     constructor(forToken, counterDeclaration, toToken, finalValue, body, endForToken, stepToken, increment) {
-        var _a, _b;
+        var _a;
         super();
         this.forToken = forToken;
         this.counterDeclaration = counterDeclaration;
@@ -600,8 +611,7 @@ class ForStatement extends 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 = (_a = util_1.util.createBoundingRange(this.forToken, this.counterDeclaration, this.toToken, this.finalValue, this.body, this.stepToken, this.increment, this.endForToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -621,9 +631,8 @@ class ForStatement extends Statement {
         state.lineage.unshift(this);
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        if (this.body.statements.length > 0) {
-            result.push('\n');
-        }
+        // add new line before "end for"
+        result.push('\n');
         //end for
         result.push(state.indent(), state.transpileToken(this.endForToken));
         return result;
@@ -644,7 +653,7 @@ class ForStatement extends Statement {
 exports.ForStatement = ForStatement;
 class ForEachStatement extends Statement {
     constructor(forEachToken, item, inToken, target, body, endForToken) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         super();
         this.forEachToken = forEachToken;
         this.item = item;
@@ -652,7 +661,7 @@ class ForEachStatement extends Statement {
         this.target = target;
         this.body = body;
         this.endForToken = endForToken;
-        this.range = util_1.util.createRangeFromPositions(this.forEachToken.range.start, ((_e = (_d = (_c = (_b = (_a = this.endForToken) !== null && _a !== void 0 ? _a : this.body) !== null && _b !== void 0 ? _b : this.target) !== null && _c !== void 0 ? _c : this.inToken) !== null && _d !== void 0 ? _d : this.item) !== null && _e !== void 0 ? _e : this.forEachToken).range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.forEachToken, this.item, this.inToken, this.target, this.body, this.endForToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -668,9 +677,8 @@ class ForEachStatement extends Statement {
         state.lineage.unshift(this);
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        if (this.body.statements.length > 0) {
-            result.push('\n');
-        }
+        // add new line before "end for"
+        result.push('\n');
         //end for
         result.push(state.indent(), state.transpileToken(this.endForToken));
         return result;
@@ -687,13 +695,12 @@ class ForEachStatement extends Statement {
 exports.ForEachStatement = ForEachStatement;
 class WhileStatement extends Statement {
     constructor(tokens, condition, body) {
-        var _a, _b;
+        var _a;
         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 = (_a = util_1.util.createBoundingRange(this.tokens.while, this.condition, this.body, this.tokens.endWhile)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -722,12 +729,15 @@ class WhileStatement extends Statement {
 }
 exports.WhileStatement = WhileStatement;
 class DottedSetStatement extends Statement {
-    constructor(obj, name, value) {
+    constructor(obj, name, value, dot, operator) {
+        var _a;
         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.operator = operator;
+        this.range = (_a = util_1.util.createBoundingRange(this.obj, this.dot, this.name, this.operator, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         var _a, _b;
@@ -757,14 +767,16 @@ class DottedSetStatement extends Statement {
 }
 exports.DottedSetStatement = DottedSetStatement;
 class IndexedSetStatement extends Statement {
-    constructor(obj, index, value, openingSquare, closingSquare) {
+    constructor(obj, index, value, openingSquare, closingSquare, operator) {
+        var _a;
         super();
         this.obj = obj;
         this.index = index;
         this.value = value;
         this.openingSquare = openingSquare;
         this.closingSquare = closingSquare;
-        this.range = util_1.util.createRangeFromPositions(this.obj.range.start, this.value.range.end);
+        this.operator = operator;
+        this.range = (_a = util_1.util.createBoundingRange(this.obj, this.openingSquare, this.index, this.closingSquare, this.operator, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         var _a, _b;
@@ -800,9 +812,10 @@ class IndexedSetStatement extends Statement {
 exports.IndexedSetStatement = IndexedSetStatement;
 class LibraryStatement extends Statement {
     constructor(tokens) {
+        var _a;
         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 = (_a = util_1.util.createBoundingRange(this.tokens.library, this.tokens.filePath)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -835,8 +848,14 @@ class NamespaceStatement extends Statement {
         this.symbolTable = new SymbolTable_1.SymbolTable(parentSymbolTable);
     }
     get range() {
-        var _a, _b, _c;
-        return util_1.util.createRangeFromPositions(this.keyword.range.start, ((_c = (_b = (_a = this.endKeyword) !== null && _a !== void 0 ? _a : this.body) !== null && _b !== void 0 ? _b : this.nameExpression) !== null && _c !== void 0 ? _c : this.keyword).range.end);
+        return this.cacheRange();
+    }
+    cacheRange() {
+        var _a;
+        if (!this._range) {
+            this._range = (_a = util_1.util.createBoundingRange(this.keyword, this.nameExpression, this.body, this.endKeyword)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        }
+        return this._range;
     }
     getName(parseMode) {
         return this.nameExpression.getName(parseMode);
@@ -869,10 +888,11 @@ class NamespaceStatement extends Statement {
 exports.NamespaceStatement = NamespaceStatement;
 class ImportStatement extends Statement {
     constructor(importToken, filePathToken) {
+        var _a;
         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 = (_a = util_1.util.createBoundingRange(this.importToken, this.filePathToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
         if (this.filePathToken) {
             //remove quotes
             this.filePath = this.filePathToken.text.replace(/"/g, '');
@@ -908,6 +928,7 @@ class ImportStatement extends Statement {
 exports.ImportStatement = ImportStatement;
 class InterfaceStatement extends Statement {
     constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken, namespaceName) {
+        var _a;
         super();
         this.parentInterfaceName = parentInterfaceName;
         this.body = body;
@@ -917,6 +938,7 @@ class InterfaceStatement extends Statement {
         this.tokens.name = name;
         this.tokens.extends = extendsToken;
         this.tokens.endInterface = endInterfaceToken;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...this.body, this.tokens.endInterface)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     get fields() {
         return this.body.filter(x => (0, reflection_1.isInterfaceFieldStatement)(x));
@@ -995,20 +1017,18 @@ class InterfaceStatement extends Statement {
 exports.InterfaceStatement = InterfaceStatement;
 class InterfaceFieldStatement extends Statement {
     constructor(nameToken, asToken, typeToken, type) {
+        var _a;
         super();
         this.type = type;
         this.tokens = {};
         this.tokens.name = nameToken;
         this.tokens.as = asToken;
         this.tokens.type = typeToken;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.tokens.type)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     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;
     }
@@ -1031,6 +1051,7 @@ class InterfaceFieldStatement extends Statement {
 exports.InterfaceFieldStatement = InterfaceFieldStatement;
 class InterfaceMethodStatement extends Statement {
     constructor(functionTypeToken, nameToken, leftParen, params, rightParen, asToken, returnTypeToken, returnType) {
+        var _a;
         super();
         this.params = params;
         this.returnType = returnType;
@@ -1041,13 +1062,7 @@ class InterfaceMethodStatement extends Statement {
         this.tokens.rightParen = rightParen;
         this.tokens.as = asToken;
         this.tokens.returnType = returnTypeToken;
-    }
-    transpile(state) {
-        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);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.tokens.leftParen, ...this.params, this.tokens.rightParen, this.tokens.as, this.tokens.returnType)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     walk(visitor, options) {
         //nothing to walk
@@ -1076,6 +1091,9 @@ class InterfaceMethodStatement extends Statement {
         }
         return result;
     }
+    transpile(state) {
+        throw new Error('Method not implemented.');
+    }
 }
 exports.InterfaceMethodStatement = InterfaceMethodStatement;
 class ClassStatement extends Statement {
@@ -1084,7 +1102,7 @@ class ClassStatement extends Statement {
      * The name of the class (without namespace prefix)
      */
     name, body, end, extendsKeyword, parentClassName, namespaceName, currentSymbolTable) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         super();
         this.classKeyword = classKeyword;
         this.name = name;
@@ -1101,15 +1119,15 @@ class ClassStatement extends Statement {
         this.fields = [];
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
         this.symbolTable.setParent(currentSymbolTable);
-        this.range = util_1.util.createRangeFromPositions(this.classKeyword.range.start, this.end.range.end);
+        this.range = (_b = util_1.util.createBoundingRange(this.classKeyword, this.name, this.extendsKeyword, this.parentClassName, ...this.body, this.end)) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
         for (let statement of this.body) {
             if ((0, reflection_1.isClassMethodStatement)(statement)) {
                 this.methods.push(statement);
-                this.memberMap[(_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text.toLowerCase()] = statement;
+                this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
             }
             else if ((0, reflection_1.isClassFieldStatement)(statement)) {
                 this.fields.push(statement);
-                this.memberMap[(_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
+                this.memberMap[(_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text.toLowerCase()] = statement;
             }
         }
     }
@@ -1275,14 +1293,7 @@ class ClassStatement extends Statement {
         }
     }
     getEmptyNewFunction() {
-        let stmt = Parser_1.Parser.parse(`
-            class UtilClass
-                sub new()
-                end sub
-            end class
-        `, { mode: Parser_1.ParseMode.BrighterScript }).statements[0].memberMap.new;
-        //TODO make locations point to 0,0 (might not matter?)
-        return stmt;
+        return (0, creators_1.createClassMethodStatement)('new', TokenKind_1.TokenKind.Sub);
     }
     /**
      * Determine if the specified field was declared in one of the ancestor classes
@@ -1412,11 +1423,19 @@ class ClassStatement extends Statement {
 exports.ClassStatement = ClassStatement;
 class ClassMethodStatement extends FunctionStatement {
     constructor(accessModifier, name, func, override) {
-        var _a;
         super(name, func, undefined);
         this.accessModifier = accessModifier;
         this.override = override;
-        this.range = util_1.util.createRangeFromPositions(((_a = this.accessModifier) !== null && _a !== void 0 ? _a : this.func).range.start, this.func.range.end);
+    }
+    get range() {
+        return this.cacheRange();
+    }
+    cacheRange() {
+        var _a, _b;
+        if (!this._range) {
+            this._range = (_b = util_1.util.createBoundingRange(this.accessModifier, this.override, (_a = this.func) !== null && _a !== void 0 ? _a : this.name)) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
+        }
+        return this._range;
     }
     transpile(state) {
         if (this.name.text.toLowerCase() === 'new') {
@@ -1532,7 +1551,7 @@ class ClassMethodStatement extends FunctionStatement {
 exports.ClassMethodStatement = ClassMethodStatement;
 class ClassFieldStatement extends Statement {
     constructor(accessModifier, name, as, type, equal, initialValue, namespaceName) {
-        var _a, _b, _c, _d;
+        var _a;
         super();
         this.accessModifier = accessModifier;
         this.name = name;
@@ -1541,7 +1560,7 @@ class ClassFieldStatement extends Statement {
         this.equal = equal;
         this.initialValue = initialValue;
         this.namespaceName = namespaceName;
-        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 = (_a = util_1.util.createBoundingRange(this.accessModifier, this.name, this.as, this.type, this.equal, this.initialValue)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
@@ -1585,6 +1604,7 @@ class ClassFieldStatement extends Statement {
 exports.ClassFieldStatement = ClassFieldStatement;
 class TryCatchStatement extends Statement {
     constructor(tryToken, tryBranch, catchToken, exceptionVariable, catchBranch, endTryToken) {
+        var _a;
         super();
         this.tryToken = tryToken;
         this.tryBranch = tryBranch;
@@ -1592,10 +1612,7 @@ class TryCatchStatement extends Statement {
         this.exceptionVariable = exceptionVariable;
         this.catchBranch = catchBranch;
         this.endTryToken = endTryToken;
-    }
-    get range() {
-        var _a, _b, _c, _d, _e;
-        return util_1.util.createRangeFromPositions(this.tryToken.range.start, ((_e = (_d = (_c = (_b = (_a = this.endTryToken) !== null && _a !== void 0 ? _a : this.catchBranch) !== null && _b !== void 0 ? _b : this.exceptionVariable) !== null && _c !== void 0 ? _c : this.catchToken) !== null && _d !== void 0 ? _d : this.tryBranch) !== null && _e !== void 0 ? _e : this.tryToken).range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tryToken, this.tryBranch, this.catchToken, this.exceptionVariable, this.catchBranch, this.endTryToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -1626,7 +1643,7 @@ class ThrowStatement extends Statement {
         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 = (_a = util_1.util.createBoundingRange(this.throwToken, this.expression)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         const result = [
@@ -1652,16 +1669,13 @@ class ThrowStatement extends Statement {
 exports.ThrowStatement = ThrowStatement;
 class EnumStatement extends Statement {
     constructor(tokens, body, namespaceName) {
-        var _a;
+        var _a, _b;
         super();
         this.tokens = tokens;
         this.body = body;
         this.namespaceName = namespaceName;
-        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);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.body = (_b = this.body) !== null && _b !== void 0 ? _b : [];
     }
     getMembers() {
         const result = [];
@@ -1767,9 +1781,11 @@ class EnumStatement extends Statement {
 exports.EnumStatement = EnumStatement;
 class EnumMemberStatement extends Statement {
     constructor(tokens, value) {
+        var _a;
         super();
         this.tokens = tokens;
         this.value = value;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.equal, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     /**
      * The name of the member
@@ -1777,10 +1793,6 @@ class EnumMemberStatement extends Statement {
     get name() {
         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);
-    }
     transpile(state) {
         return [];
     }