brighterscript 1.0.0-alpha.32 → 1.0.0-alpha.34

package/dist/parser/Statement.js

@@ -24,7 +24,7 @@ class EmptyStatement extends AstNode_2.Statement {
     constructor(options) {
         super();
         this.kind = AstNode_1.AstNodeKind.EmptyStatement;
-        this.range = undefined;
+        this.location = undefined;
     }
     transpile(state) {
         return [];
@@ -46,13 +46,13 @@ class Body extends AstNode_2.Statement {
         this.symbolTable = new SymbolTable_1.SymbolTable('Body', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
         this.statements = (_a = options === null || options === void 0 ? void 0 : options.statements) !== null && _a !== void 0 ? _a : [];
     }
-    get range() {
+    get location() {
         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 : []));
+        return util_1.util.createBoundingLocation(...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
     }
     transpile(state) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e, _f;
         let result = [];
         for (let i = 0; i < this.statements.length; i++) {
             let statement = this.statements[i];
@@ -62,7 +62,7 @@ class Body extends AstNode_2.Statement {
                 //this is the first statement. do nothing related to spacing and newlines
                 //if comment is on same line as prior sibling
             }
-            else if (util_1.util.hasLeadingComments(statement) && previousStatement && ((_c = (_b = (_a = util_1.util.getLeadingComments(statement)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.range) === null || _c === void 0 ? void 0 : _c.start.line) === ((_d = previousStatement.range) === null || _d === void 0 ? void 0 : _d.end.line)) {
+            else if (util_1.util.hasLeadingComments(statement) && previousStatement && ((_d = (_c = (_b = (_a = util_1.util.getLeadingComments(statement)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.location) === null || _c === void 0 ? void 0 : _c.range) === null || _d === void 0 ? void 0 : _d.start.line) === ((_f = (_e = previousStatement.location) === null || _e === void 0 ? void 0 : _e.range) === null || _f === void 0 ? void 0 : _f.end.line)) {
                 result.push(' ');
                 //add double newline if this is a comment, and next is a function
             }
@@ -109,7 +109,7 @@ class AssignmentStatement extends AstNode_2.Statement {
             as: options.as
         };
         this.typeExpression = options.typeExpression;
-        this.range = util_1.util.createBoundingRange(util_1.util.createBoundingRangeFromTokens(this.tokens), this.value);
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens), this.value);
     }
     transpile(state) {
         var _a;
@@ -128,16 +128,15 @@ class AssignmentStatement extends AstNode_2.Statement {
         }
     }
     getType(options) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const variableType = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }))) !== null && _b !== void 0 ? _b : this.value.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
         // Note: compound assignments (eg. +=) are internally dealt with via the RHS being a BinaryExpression
         // so this.value will be a BinaryExpression, and BinaryExpressions can figure out their own types
-        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({ name: this.tokens.name.text, type: variableType, data: options.data, range: this.tokens.name.range, astNode: this }));
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({ name: this.tokens.name.text, type: variableType, data: options.data, location: (_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.location, astNode: this }));
         return variableType;
     }
-    getLeadingTrivia() {
-        var _a;
-        return (_a = this.tokens.name.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    get leadingTrivia() {
+        return this.tokens.name.leadingTrivia;
     }
 }
 exports.AssignmentStatement = AssignmentStatement;
@@ -151,7 +150,7 @@ class AugmentedAssignmentStatement extends AstNode_2.Statement {
         };
         this.item = options.item;
         this.value = options.value;
-        this.range = util_1.util.createBoundingRange(this.item, util_1.util.createBoundingRangeFromTokens(this.tokens), this.value);
+        this.location = util_1.util.createBoundingLocation(this.item, util_1.util.createBoundingLocationFromTokens(this.tokens), this.value);
     }
     transpile(state) {
         return [
@@ -176,21 +175,74 @@ class AugmentedAssignmentStatement extends AstNode_2.Statement {
         // options.typeChain?.push(new TypeChainEntry({ name: this.tokens.name.text, type: variableType, data: options.data, range: this.tokens.name.range, astNode: this }));
         return variableType;
     }
-    getLeadingTrivia() {
-        return this.item.getLeadingTrivia();
+    get leadingTrivia() {
+        return this.item.leadingTrivia;
     }
 }
 exports.AugmentedAssignmentStatement = AugmentedAssignmentStatement;
 class Block extends AstNode_2.Statement {
     constructor(options) {
-        var _a;
         super();
         this.kind = AstNode_1.AstNodeKind.Block;
         this.statements = options.statements;
-        this.startingRange = options.startingRange;
-        this.range = util_1.util.createBoundingRange(this.startingRange, ...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
+    }
+    get location() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        if (this.statements.length > 0) {
+            return util_1.util.createBoundingLocation(...this.statements);
+        }
+        let lastBitBefore;
+        let firstBitAfter;
+        if ((0, reflection_1.isFunctionExpression)(this.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.tokens.functionType, this.parent.tokens.leftParen, ...((_a = this.parent.parameters) !== null && _a !== void 0 ? _a : []), this.parent.tokens.rightParen, this.parent.tokens.as, this.parent.returnTypeExpression);
+            firstBitAfter = (_b = this.parent.tokens.endFunctionType) === null || _b === void 0 ? void 0 : _b.location;
+        }
+        else if ((0, reflection_1.isIfStatement)(this.parent)) {
+            if (this.parent.thenBranch === this) {
+                lastBitBefore = util_1.util.createBoundingLocation(this.parent.tokens.then, this.parent.condition);
+                firstBitAfter = util_1.util.createBoundingLocation(this.parent.tokens.else, this.parent.elseBranch, this.parent.tokens.endIf);
+            }
+            else if (this.parent.elseBranch === this) {
+                lastBitBefore = (_c = this.parent.tokens.else) === null || _c === void 0 ? void 0 : _c.location;
+                firstBitAfter = (_d = this.parent.tokens.endIf) === null || _d === void 0 ? void 0 : _d.location;
+            }
+        }
+        else if ((0, reflection_1.isConditionalCompileStatement)(this.parent)) {
+            if (this.parent.thenBranch === this) {
+                lastBitBefore = util_1.util.createBoundingLocation(this.parent.tokens.condition, this.parent.tokens.not, this.parent.tokens.hashIf);
+                firstBitAfter = util_1.util.createBoundingLocation(this.parent.tokens.hashElse, this.parent.elseBranch, this.parent.tokens.hashEndIf);
+            }
+            else if (this.parent.elseBranch === this) {
+                lastBitBefore = (_e = this.parent.tokens.hashElse) === null || _e === void 0 ? void 0 : _e.location;
+                firstBitAfter = (_f = this.parent.tokens.hashEndIf) === null || _f === void 0 ? void 0 : _f.location;
+            }
+        }
+        else if ((0, reflection_1.isForStatement)(this.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.increment, this.parent.tokens.step, this.parent.finalValue, this.parent.tokens.to, this.parent.counterDeclaration, this.parent.tokens.for);
+            firstBitAfter = (_g = this.parent.tokens.endFor) === null || _g === void 0 ? void 0 : _g.location;
+        }
+        else if ((0, reflection_1.isForEachStatement)(this.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.target, this.parent.tokens.in, this.parent.tokens.item, this.parent.tokens.forEach);
+            firstBitAfter = (_h = this.parent.tokens.endFor) === null || _h === void 0 ? void 0 : _h.location;
+        }
+        else if ((0, reflection_1.isWhileStatement)(this.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.condition, this.parent.tokens.while);
+            firstBitAfter = (_j = this.parent.tokens.endWhile) === null || _j === void 0 ? void 0 : _j.location;
+        }
+        else if ((0, reflection_1.isTryCatchStatement)(this.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.tokens.try);
+            firstBitAfter = util_1.util.createBoundingLocation(this.parent.tokens.endTry, this.parent.catchStatement);
+        }
+        else if ((0, reflection_1.isCatchStatement)(this.parent) && (0, reflection_1.isTryCatchStatement)((_k = this.parent) === null || _k === void 0 ? void 0 : _k.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.tokens.catch, this.parent.tokens.exceptionVariable);
+            firstBitAfter = (_l = this.parent.parent.tokens.endTry) === null || _l === void 0 ? void 0 : _l.location;
+        }
+        if ((lastBitBefore === null || lastBitBefore === void 0 ? void 0 : lastBitBefore.range) && (firstBitAfter === null || firstBitAfter === void 0 ? void 0 : firstBitAfter.range)) {
+            return util_1.util.createLocation(lastBitBefore.range.end.line, lastBitBefore.range.end.character, firstBitAfter.range.start.line, firstBitAfter.range.start.character, (_m = lastBitBefore.uri) !== null && _m !== void 0 ? _m : firstBitAfter.uri);
+        }
     }
     transpile(state) {
+        var _a;
         state.blockDepth++;
         let results = [];
         for (let i = 0; i < this.statements.length; i++) {
@@ -198,8 +250,8 @@ class Block extends AstNode_2.Statement {
             let statement = this.statements[i];
             //is not a comment
             //if comment is on same line as parent
-            if (util_1.util.isLeadingCommentOnSameLine(state.lineage[0], statement) ||
-                util_1.util.isLeadingCommentOnSameLine(previousStatement, statement)) {
+            if (util_1.util.isLeadingCommentOnSameLine((_a = state.lineage[0]) === null || _a === void 0 ? void 0 : _a.location, statement) ||
+                util_1.util.isLeadingCommentOnSameLine(previousStatement === null || previousStatement === void 0 ? void 0 : previousStatement.location, statement)) {
                 results.push(' ');
                 //is not a comment
             }
@@ -215,6 +267,10 @@ class Block extends AstNode_2.Statement {
         state.blockDepth--;
         return results;
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.statements[0]) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
             (0, visitors_1.walkArray)(this.statements, visitor, options, this);
@@ -227,7 +283,7 @@ class ExpressionStatement extends AstNode_2.Statement {
         super();
         this.kind = AstNode_1.AstNodeKind.ExpressionStatement;
         this.expression = options.expression;
-        this.range = this.expression.range;
+        this.location = this.expression.location;
     }
     transpile(state) {
         return this.expression.transpile(state);
@@ -237,8 +293,8 @@ class ExpressionStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
     }
-    getLeadingTrivia() {
-        return this.expression.getLeadingTrivia();
+    get leadingTrivia() {
+        return this.expression.leadingTrivia;
     }
 }
 exports.ExpressionStatement = ExpressionStatement;
@@ -250,7 +306,7 @@ class ExitForStatement extends AstNode_2.Statement {
         this.tokens = {
             exitFor: options === null || options === void 0 ? void 0 : options.exitFor
         };
-        this.range = (_a = this.tokens.exitFor) === null || _a === void 0 ? void 0 : _a.range;
+        this.location = (_a = this.tokens.exitFor) === null || _a === void 0 ? void 0 : _a.location;
     }
     transpile(state) {
         return this.tokens.exitFor ? state.transpileToken(this.tokens.exitFor) : ['exit for'];
@@ -258,9 +314,9 @@ class ExitForStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
-    getLeadingTrivia() {
-        var _a, _b;
-        return (_b = (_a = this.tokens.exitFor) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.exitFor) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
 }
 exports.ExitForStatement = ExitForStatement;
@@ -272,7 +328,7 @@ class ExitWhileStatement extends AstNode_2.Statement {
         this.tokens = {
             exitWhile: options === null || options === void 0 ? void 0 : options.exitWhile
         };
-        this.range = (_a = this.tokens.exitWhile) === null || _a === void 0 ? void 0 : _a.range;
+        this.location = (_a = this.tokens.exitWhile) === null || _a === void 0 ? void 0 : _a.location;
     }
     transpile(state) {
         return this.tokens.exitWhile ? state.transpileToken(this.tokens.exitWhile) : ['exit while'];
@@ -280,9 +336,9 @@ class ExitWhileStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
-    getLeadingTrivia() {
-        var _a, _b;
-        return (_b = (_a = this.tokens.exitWhile) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.exitWhile) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
 }
 exports.ExitWhileStatement = ExitWhileStatement;
@@ -297,7 +353,7 @@ class FunctionStatement extends AstNode_2.Statement {
         this.func = options.func;
         this.func.symbolTable.name += `: '${(_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text}'`;
         this.func.functionStatement = this;
-        this.range = this.func.range;
+        this.location = this.func.location;
     }
     /**
      * Get the name of this expression based on the parse mode
@@ -314,8 +370,8 @@ class FunctionStatement extends AstNode_2.Statement {
             return this.tokens.name.text;
         }
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.func.getLeadingTrivia());
+    get leadingTrivia() {
+        return this.func.leadingTrivia;
     }
     transpile(state) {
         //create a fake token using the full transpiled name
@@ -353,14 +409,24 @@ class IfStatement extends AstNode_2.Statement {
         this.condition = options.condition;
         this.thenBranch = options.thenBranch;
         this.elseBranch = options.elseBranch;
-        this.isInline = options.isInline;
         this.tokens = {
             if: options.if,
             then: options.then,
             else: options.else,
             endIf: options.endIf
         };
-        this.range = util_1.util.createBoundingRange(util_1.util.createBoundingRangeFromTokens(this.tokens), this.condition, this.thenBranch, this.elseBranch);
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens), this.condition, this.thenBranch, this.elseBranch);
+    }
+    get isInline() {
+        var _a, _b, _c, _d;
+        const allLeadingTrivia = [
+            ...this.thenBranch.leadingTrivia,
+            ...this.thenBranch.statements.map(s => s.leadingTrivia).flat(),
+            ...((_b = (_a = this.tokens.else) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : []),
+            ...((_d = (_c = this.tokens.endIf) === null || _c === void 0 ? void 0 : _c.leadingTrivia) !== null && _d !== void 0 ? _d : [])
+        ];
+        const hasNewline = allLeadingTrivia.find(t => t.kind === TokenKind_1.TokenKind.Newline);
+        return !hasNewline;
     }
     transpile(state) {
         var _a, _b;
@@ -427,11 +493,11 @@ class IfStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'elseBranch', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.if) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
-    getEndTrivia() {
+    get endTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.endIf) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -445,7 +511,7 @@ class IncrementStatement extends AstNode_2.Statement {
         this.tokens = {
             operator: options.operator
         };
-        this.range = util_1.util.createBoundingRange(this.value, this.tokens.operator);
+        this.location = util_1.util.createBoundingLocation(this.value, this.tokens.operator);
     }
     transpile(state) {
         return [
@@ -458,9 +524,9 @@ class IncrementStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
-        return (_b = (_a = this.value) === null || _a === void 0 ? void 0 : _a.getLeadingTrivia()) !== null && _b !== void 0 ? _b : [];
+        return (_b = (_a = this.value) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
 }
 exports.IncrementStatement = IncrementStatement;
@@ -482,7 +548,7 @@ class PrintStatement extends AstNode_2.Statement {
             print: options.print
         };
         this.expressions = options.expressions;
-        this.range = util_1.util.createBoundingRange(this.tokens.print, ...((_a = this.expressions) !== null && _a !== void 0 ? _a : []));
+        this.location = util_1.util.createBoundingLocation(this.tokens.print, ...((_a = this.expressions) !== null && _a !== void 0 ? _a : []));
     }
     transpile(state) {
         var _a;
@@ -511,7 +577,7 @@ class PrintStatement extends AstNode_2.Statement {
             (0, visitors_1.walkArray)(this.expressions, visitor, options, this, (item) => (0, reflection_1.isExpression)(item));
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.print) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -529,7 +595,7 @@ class DimStatement extends AstNode_2.Statement {
             closingSquare: options.closingSquare
         };
         this.dimensions = options.dimensions;
-        this.range = util_1.util.createBoundingRange(options.dim, options.name, options.openingSquare, ...((_a = this.dimensions) !== null && _a !== void 0 ? _a : []), options.closingSquare);
+        this.location = util_1.util.createBoundingLocation(options.dim, options.name, options.openingSquare, ...((_a = this.dimensions) !== null && _a !== void 0 ? _a : []), options.closingSquare);
     }
     transpile(state) {
         let result = [
@@ -562,7 +628,7 @@ class DimStatement extends AstNode_2.Statement {
         }
         return type;
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.dim) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -576,7 +642,7 @@ class GotoStatement extends AstNode_2.Statement {
             goto: options.goto,
             label: options.label
         };
-        this.range = util_1.util.createBoundingRange(this.tokens.goto, this.tokens.label);
+        this.location = util_1.util.createBoundingLocation(this.tokens.goto, this.tokens.label);
     }
     transpile(state) {
         return [
@@ -588,7 +654,7 @@ class GotoStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.goto) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -602,10 +668,10 @@ class LabelStatement extends AstNode_2.Statement {
             name: options.name,
             colon: options.colon
         };
-        this.range = util_1.util.createBoundingRange(this.tokens.name, this.tokens.colon);
+        this.location = util_1.util.createBoundingLocation(this.tokens.name, this.tokens.colon);
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.name.leadingTrivia);
+    get leadingTrivia() {
+        return this.tokens.name.leadingTrivia;
     }
     transpile(state) {
         return [
@@ -626,7 +692,7 @@ class ReturnStatement extends AstNode_2.Statement {
             return: options === null || options === void 0 ? void 0 : options.return
         };
         this.value = options === null || options === void 0 ? void 0 : options.value;
-        this.range = util_1.util.createBoundingRange(this.tokens.return, this.value);
+        this.location = util_1.util.createBoundingLocation(this.tokens.return, this.value);
     }
     transpile(state) {
         let result = [];
@@ -642,7 +708,7 @@ class ReturnStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.return) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -656,7 +722,7 @@ class EndStatement extends AstNode_2.Statement {
         this.tokens = {
             end: options === null || options === void 0 ? void 0 : options.end
         };
-        this.range = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.range;
+        this.location = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.location;
     }
     transpile(state) {
         return [
@@ -666,7 +732,7 @@ class EndStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -678,7 +744,7 @@ class StopStatement extends AstNode_2.Statement {
         super();
         this.kind = AstNode_1.AstNodeKind.StopStatement;
         this.tokens = { stop: options === null || options === void 0 ? void 0 : options.stop };
-        this.range = (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.stop) === null || _b === void 0 ? void 0 : _b.range;
+        this.location = (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.stop) === null || _b === void 0 ? void 0 : _b.location;
     }
     transpile(state) {
         return [
@@ -688,7 +754,7 @@ class StopStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.stop) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -708,7 +774,7 @@ class ForStatement extends AstNode_2.Statement {
         this.finalValue = options.finalValue;
         this.body = options.body;
         this.increment = options.increment;
-        this.range = util_1.util.createBoundingRange(this.tokens.for, this.counterDeclaration, this.tokens.to, this.finalValue, this.tokens.step, this.increment, this.body, this.tokens.endFor);
+        this.location = util_1.util.createBoundingLocation(this.tokens.for, this.counterDeclaration, this.tokens.to, this.finalValue, this.tokens.step, this.increment, this.body, this.tokens.endFor);
     }
     transpile(state) {
         let result = [];
@@ -744,11 +810,11 @@ class ForStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.for) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
-    getEndTrivia() {
+    get endTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.endFor) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -766,7 +832,7 @@ class ForEachStatement extends AstNode_2.Statement {
         };
         this.body = options.body;
         this.target = options.target;
-        this.range = util_1.util.createBoundingRange(this.tokens.forEach, this.tokens.item, this.tokens.in, this.target, this.body, this.tokens.endFor);
+        this.location = util_1.util.createBoundingLocation(this.tokens.forEach, this.tokens.item, this.tokens.in, this.target, this.body, this.tokens.endFor);
     }
     transpile(state) {
         let result = [];
@@ -797,11 +863,11 @@ class ForEachStatement extends AstNode_2.Statement {
     getType(options) {
         return this.getSymbolTable().getSymbolType(this.tokens.item.text, options);
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.forEach) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
-    getEndTrivia() {
+    get endTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.endFor) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -817,7 +883,7 @@ class WhileStatement extends AstNode_2.Statement {
         };
         this.body = options.body;
         this.condition = options.condition;
-        this.range = util_1.util.createBoundingRange(this.tokens.while, this.condition, this.body, this.tokens.endWhile);
+        this.location = util_1.util.createBoundingLocation(this.tokens.while, this.condition, this.body, this.tokens.endWhile);
     }
     transpile(state) {
         let result = [];
@@ -841,11 +907,11 @@ class WhileStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.while) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
-    getEndTrivia() {
+    get endTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.endWhile) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -862,7 +928,7 @@ class DottedSetStatement extends AstNode_2.Statement {
         };
         this.obj = options.obj;
         this.value = options.value;
-        this.range = util_1.util.createBoundingRange(this.obj, this.tokens.dot, this.tokens.name, this.value);
+        this.location = util_1.util.createBoundingLocation(this.obj, this.tokens.dot, this.tokens.name, this.value);
     }
     transpile(state) {
         //if the value is a compound assignment, don't add the obj, dot, name, or operator...the expression will handle that
@@ -892,13 +958,13 @@ class DottedSetStatement extends AstNode_2.Statement {
         (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({
             name: (_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.text,
             type: result, data: options.data,
-            range: (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.range,
+            location: (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.location,
             astNode: this
         }));
         return result;
     }
-    getLeadingTrivia() {
-        return this.obj.getLeadingTrivia();
+    get leadingTrivia() {
+        return this.obj.leadingTrivia;
     }
 }
 exports.DottedSetStatement = DottedSetStatement;
@@ -914,7 +980,7 @@ class IndexedSetStatement extends AstNode_2.Statement {
         this.obj = options.obj;
         this.indexes = options.indexes;
         this.value = options.value;
-        this.range = util_1.util.createBoundingRange(this.obj, this.tokens.openingSquare, ...this.indexes, this.tokens.closingSquare, this.value);
+        this.location = util_1.util.createBoundingLocation(this.obj, this.tokens.openingSquare, ...this.indexes, this.tokens.closingSquare, this.value);
     }
     transpile(state) {
         var _a;
@@ -942,8 +1008,8 @@ class IndexedSetStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
-    getLeadingTrivia() {
-        return this.obj.getLeadingTrivia();
+    get leadingTrivia() {
+        return this.obj.leadingTrivia;
     }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
@@ -955,7 +1021,7 @@ class LibraryStatement extends AstNode_2.Statement {
             library: options.library,
             filePath: options.filePath
         };
-        this.range = util_1.util.createBoundingRange(this.tokens.library, this.tokens.filePath);
+        this.location = util_1.util.createBoundingLocation(this.tokens.library, this.tokens.filePath);
     }
     transpile(state) {
         let result = [];
@@ -972,7 +1038,7 @@ class LibraryStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.library) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -991,14 +1057,14 @@ class NamespaceStatement extends AstNode_2.Statement {
         this.name = this.getName(Parser_1.ParseMode.BrighterScript);
         this.symbolTable = new SymbolTable_1.SymbolTable(`NamespaceStatement: '${this.name}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
-    get range() {
-        return this.cacheRange();
+    get location() {
+        return this.cacheLocation();
     }
-    cacheRange() {
-        if (!this._range) {
-            this._range = util_1.util.createBoundingRange(this.tokens.namespace, this.nameExpression, this.body, this.tokens.endNamespace);
+    cacheLocation() {
+        if (!this._location) {
+            this._location = util_1.util.createBoundingLocation(this.tokens.namespace, this.nameExpression, this.body, this.tokens.endNamespace);
         }
-        return this._range;
+        return this._location;
     }
     getName(parseMode) {
         var _a, _b;
@@ -1009,13 +1075,13 @@ class NamespaceStatement extends AstNode_2.Statement {
         }
         return name;
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_a = this.tokens.namespace) === null || _a === void 0 ? void 0 : _a.leadingTrivia);
+        return (_a = this.tokens.namespace) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
-    getEndTrivia() {
-        var _a, _b;
-        return (_b = (_a = this.tokens.endNamespace) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    get endTrivia() {
+        var _a;
+        return (_a = this.tokens.endNamespace) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
     getNameParts() {
         var _a, _b;
@@ -1062,20 +1128,20 @@ class NamespaceStatement extends AstNode_2.Statement {
 exports.NamespaceStatement = NamespaceStatement;
 class ImportStatement extends AstNode_2.Statement {
     constructor(options) {
-        var _a;
+        var _a, _b;
         super();
         this.kind = AstNode_1.AstNodeKind.ImportStatement;
         this.tokens = {
             import: options.import,
             path: options.path
         };
-        this.range = util_1.util.createBoundingRange(this.tokens.import, this.tokens.path);
+        this.location = util_1.util.createBoundingLocation(this.tokens.import, this.tokens.path);
         if (this.tokens.path) {
             //remove quotes
             this.filePath = this.tokens.path.text.replace(/"/g, '');
-            if ((_a = this.tokens.path) === null || _a === void 0 ? void 0 : _a.range) {
+            if ((_b = (_a = this.tokens.path) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.range) {
                 //adjust the range to exclude the quotes
-                this.tokens.path.range = util_1.util.createRange(this.tokens.path.range.start.line, this.tokens.path.range.start.character + 1, this.tokens.path.range.end.line, this.tokens.path.range.end.character - 1);
+                this.tokens.path.location = util_1.util.createLocation(this.tokens.path.location.range.start.line, this.tokens.path.location.range.start.character + 1, this.tokens.path.location.range.end.line, this.tokens.path.location.range.end.character - 1, this.tokens.path.location.uri);
             }
         }
     }
@@ -1103,7 +1169,7 @@ class ImportStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.import) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -1122,7 +1188,7 @@ class InterfaceStatement extends AstNode_2.Statement {
         };
         this.parentInterfaceName = options.parentInterfaceName;
         this.body = options.body;
-        this.range = util_1.util.createBoundingRange(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...this.body, this.tokens.endInterface);
+        this.location = util_1.util.createBoundingLocation(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...this.body, this.tokens.endInterface);
     }
     get fields() {
         return this.body.filter(x => (0, reflection_1.isInterfaceFieldStatement)(x));
@@ -1133,13 +1199,13 @@ class InterfaceStatement extends AstNode_2.Statement {
     hasParentInterface() {
         return !!this.parentInterfaceName;
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_a = this.tokens.interface) === null || _a === void 0 ? void 0 : _a.leadingTrivia);
+        return (_a = this.tokens.interface) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
-    getEndTrivia() {
-        var _a, _b;
-        return (_b = (_a = this.tokens.endInterface) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    get endTrivia() {
+        var _a;
+        return (_a = this.tokens.endInterface) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
     /**
      * The name of the interface WITH its leading namespace (if applicable)
@@ -1262,14 +1328,14 @@ class InterfaceFieldStatement extends AstNode_2.Statement {
             as: options.as
         };
         this.typeExpression = options.typeExpression;
-        this.range = util_1.util.createBoundingRange(this.tokens.optional, this.tokens.name, this.tokens.as, this.typeExpression);
+        this.location = util_1.util.createBoundingLocation(this.tokens.optional, this.tokens.name, this.tokens.as, this.typeExpression);
     }
     transpile(state) {
         throw new Error('Method not implemented.');
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.name.leadingTrivia);
+        return (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.name.leadingTrivia;
     }
     get name() {
         return this.tokens.name.text;
@@ -1327,9 +1393,9 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
     transpile(state) {
         throw new Error('Method not implemented.');
     }
-    get range() {
+    get location() {
         var _a;
-        return util_1.util.createBoundingRange(this.tokens.optional, this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.returnTypeExpression);
+        return util_1.util.createBoundingLocation(this.tokens.optional, this.tokens.functionType, this.tokens.name, this.tokens.leftParen, ...((_a = this.params) !== null && _a !== void 0 ? _a : []), this.tokens.rightParen, this.tokens.as, this.returnTypeExpression);
     }
     /**
      * Get the name of this method.
@@ -1340,9 +1406,9 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
     get isOptional() {
         return !!this.tokens.optional;
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.functionType.leadingTrivia);
+        return (_b = (_a = this.tokens.optional) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : this.tokens.functionType.leadingTrivia;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
@@ -1431,7 +1497,7 @@ class ClassStatement extends AstNode_2.Statement {
                 this.memberMap[(_d = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _d === void 0 ? void 0 : _d.text.toLowerCase()] = statement;
             }
         }
-        this.range = util_1.util.createBoundingRange(this.parentClassName, ...((_e = this.body) !== null && _e !== void 0 ? _e : []), util_1.util.createBoundingRangeFromTokens(this.tokens));
+        this.location = util_1.util.createBoundingLocation(this.parentClassName, ...((_e = this.body) !== null && _e !== void 0 ? _e : []), util_1.util.createBoundingLocationFromTokens(this.tokens));
     }
     getName(parseMode) {
         var _a;
@@ -1452,11 +1518,11 @@ class ClassStatement extends AstNode_2.Statement {
             return undefined;
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_a = this.tokens.class) === null || _a === void 0 ? void 0 : _a.leadingTrivia);
+        return (_a = this.tokens.class) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
-    getEndTrivia() {
+    get endTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.endClass) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -1759,7 +1825,7 @@ class MethodStatement extends FunctionStatement {
             }
         }
         this.tokens = Object.assign(Object.assign({}, this.tokens), { override: options.override });
-        this.range = util_1.util.createBoundingRange(...(this.modifiers), util_1.util.createBoundingRangeFromTokens(this.tokens), this.func);
+        this.location = util_1.util.createBoundingLocation(...(this.modifiers), util_1.util.createBoundingLocationFromTokens(this.tokens), this.func);
     }
     get accessModifier() {
         return this.modifiers.find(x => accessModifiers.includes(x.kind));
@@ -1770,8 +1836,8 @@ class MethodStatement extends FunctionStatement {
     getName(parseMode) {
         return this.tokens.name.text;
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.func.getLeadingTrivia());
+    get leadingTrivia() {
+        return this.func.leadingTrivia;
     }
     transpile(state) {
         if (this.tokens.name.text.toLowerCase() === 'new') {
@@ -1851,7 +1917,7 @@ class MethodStatement extends FunctionStatement {
                         kind: TokenKind_1.TokenKind.Identifier,
                         text: 'super',
                         isReserved: false,
-                        range: state.classStatement.tokens.name.range,
+                        location: state.classStatement.tokens.name.location,
                         leadingWhitespace: '',
                         leadingTrivia: []
                     }
@@ -1860,7 +1926,7 @@ class MethodStatement extends FunctionStatement {
                     kind: TokenKind_1.TokenKind.LeftParen,
                     text: '(',
                     isReserved: false,
-                    range: state.classStatement.tokens.name.range,
+                    location: state.classStatement.tokens.name.location,
                     leadingWhitespace: '',
                     leadingTrivia: []
                 },
@@ -1868,7 +1934,7 @@ class MethodStatement extends FunctionStatement {
                     kind: TokenKind_1.TokenKind.RightParen,
                     text: ')',
                     isReserved: false,
-                    range: state.classStatement.tokens.name.range,
+                    location: state.classStatement.tokens.name.location,
                     leadingWhitespace: '',
                     leadingTrivia: []
                 },
@@ -1895,10 +1961,10 @@ class MethodStatement extends FunctionStatement {
                     value: field.initialValue
                 })
                 : new AssignmentStatement({
-                    equals: (0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', field.tokens.name.range),
+                    equals: (0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', field.tokens.name.location),
                     name: thisQualifiedName,
                     //if there is no initial value, set the initial value to `invalid`
-                    value: (0, creators_1.createInvalidLiteral)('invalid', field.tokens.name.range)
+                    value: (0, creators_1.createInvalidLiteral)('invalid', field.tokens.name.location)
                 });
             // Add parent so namespace lookups work
             fieldAssignment.parent = state.classStatement;
@@ -1926,7 +1992,7 @@ class FieldStatement extends AstNode_2.Statement {
         };
         this.typeExpression = options.typeExpression;
         this.initialValue = options.initialValue;
-        this.range = util_1.util.createBoundingRange(util_1.util.createBoundingRangeFromTokens(this.tokens), this.typeExpression, this.initialValue);
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens), this.typeExpression, this.initialValue);
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
@@ -1936,9 +2002,9 @@ class FieldStatement extends AstNode_2.Statement {
         var _a, _b, _c, _d;
         return (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: 2 /* SymbolTypeFlag.typetime */ }))) !== null && _b !== void 0 ? _b : (_c = this.initialValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: 1 /* SymbolTypeFlag.runtime */ }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
     }
-    getLeadingTrivia() {
-        var _a, _b, _c, _d, _e, _f;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_f = (_d = (_b = (_a = this.tokens.accessModifier) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : (_c = this.tokens.optional) === null || _c === void 0 ? void 0 : _c.leadingTrivia) !== null && _d !== void 0 ? _d : (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.leadingTrivia) !== null && _f !== void 0 ? _f : []);
+    get leadingTrivia() {
+        var _a, _b, _c, _d;
+        return (_d = (_b = (_a = this.tokens.accessModifier) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : (_c = this.tokens.optional) === null || _c === void 0 ? void 0 : _c.leadingTrivia) !== null && _d !== void 0 ? _d : this.tokens.name.leadingTrivia;
     }
     get isOptional() {
         return !!this.tokens.optional;
@@ -1986,7 +2052,7 @@ class TryCatchStatement extends AstNode_2.Statement {
         };
         this.tryBranch = options.tryBranch;
         this.catchStatement = options.catchStatement;
-        this.range = util_1.util.createBoundingRange(this.tokens.try, this.tryBranch, this.catchStatement, this.tokens.endTry);
+        this.location = util_1.util.createBoundingLocation(this.tokens.try, this.tryBranch, this.catchStatement, this.tokens.endTry);
     }
     transpile(state) {
         var _a, _b;
@@ -2007,11 +2073,11 @@ class TryCatchStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'catchStatement', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.try) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
-    getEndTrivia() {
+    get endTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.endTry) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -2026,7 +2092,7 @@ class CatchStatement extends AstNode_2.Statement {
             exceptionVariable: options === null || options === void 0 ? void 0 : options.exceptionVariable
         };
         this.catchBranch = options === null || options === void 0 ? void 0 : options.catchBranch;
-        this.range = util_1.util.createBoundingRange(this.tokens.catch, this.tokens.exceptionVariable, this.catchBranch);
+        this.location = util_1.util.createBoundingLocation(this.tokens.catch, this.tokens.exceptionVariable, this.catchBranch);
     }
     transpile(state) {
         var _a, _b, _c, _d;
@@ -2042,7 +2108,7 @@ class CatchStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'catchBranch', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.catch) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -2056,7 +2122,7 @@ class ThrowStatement extends AstNode_2.Statement {
             throw: options.throw
         };
         this.expression = options.expression;
-        this.range = util_1.util.createBoundingRange(this.tokens.throw, this.expression);
+        this.location = util_1.util.createBoundingLocation(this.tokens.throw, this.expression);
     }
     transpile(state) {
         const result = [
@@ -2078,7 +2144,7 @@ class ThrowStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.throw) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -2097,8 +2163,8 @@ class EnumStatement extends AstNode_2.Statement {
         this.symbolTable = new SymbolTable_1.SymbolTable('Enum');
         this.body = (_a = options.body) !== null && _a !== void 0 ? _a : [];
     }
-    get range() {
-        return util_1.util.createBoundingRange(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum);
+    get location() {
+        return util_1.util.createBoundingLocation(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum);
     }
     getMembers() {
         const result = [];
@@ -2109,11 +2175,11 @@ class EnumStatement extends AstNode_2.Statement {
         }
         return result;
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_a = this.tokens.enum) === null || _a === void 0 ? void 0 : _a.leadingTrivia);
+        return (_a = this.tokens.enum) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
-    getEndTrivia() {
+    get endTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.endEnum) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -2238,8 +2304,8 @@ class EnumMemberStatement extends AstNode_2.Statement {
         };
         this.value = options.value;
     }
-    get range() {
-        return util_1.util.createBoundingRange(this.tokens.name, this.tokens.equals, this.value);
+    get location() {
+        return util_1.util.createBoundingLocation(this.tokens.name, this.tokens.equals, this.value);
     }
     /**
      * The name of the member
@@ -2247,8 +2313,8 @@ class EnumMemberStatement extends AstNode_2.Statement {
     get name() {
         return this.tokens.name.text;
     }
-    getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.name.leadingTrivia);
+    get leadingTrivia() {
+        return this.tokens.name.leadingTrivia;
     }
     transpile(state) {
         return [];
@@ -2289,14 +2355,14 @@ class ConstStatement extends AstNode_2.Statement {
             equals: options.equals
         };
         this.value = options.value;
-        this.range = util_1.util.createBoundingRange(this.tokens.const, this.tokens.name, this.tokens.equals, this.value);
+        this.location = util_1.util.createBoundingLocation(this.tokens.const, this.tokens.name, this.tokens.equals, this.value);
     }
     get name() {
         return this.tokens.name.text;
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a;
-        return util_1.util.concatAnnotationLeadingTrivia(this, (_a = this.tokens.const) === null || _a === void 0 ? void 0 : _a.leadingTrivia);
+        return (_a = this.tokens.const) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
     /**
      * The name of the statement WITH its leading namespace (if applicable)
@@ -2350,7 +2416,7 @@ class ContinueStatement extends AstNode_2.Statement {
             continue: options.continue,
             loopType: options.loopType
         };
-        this.range = util_1.util.createBoundingRange(this.tokens.continue, this.tokens.loopType);
+        this.location = util_1.util.createBoundingLocation(this.tokens.continue, this.tokens.loopType);
     }
     transpile(state) {
         var _a, _b, _c, _d, _e;
@@ -2363,7 +2429,7 @@ class ContinueStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.continue) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -2377,7 +2443,7 @@ class TypecastStatement extends AstNode_2.Statement {
             typecast: options.typecast
         };
         this.typecastExpression = options.typecastExpression;
-        this.range = util_1.util.createBoundingRange(this.tokens.typecast, this.typecastExpression);
+        this.location = util_1.util.createBoundingLocation(this.tokens.typecast, this.typecastExpression);
     }
     transpile(state) {
         //the typecast statement is a comment just for debugging purposes
@@ -2396,7 +2462,7 @@ class TypecastStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'typecastExpression', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.typecast) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -2413,7 +2479,7 @@ class ConditionalCompileErrorStatement extends AstNode_2.Statement {
             hashError: options.hashError,
             message: options.message
         };
-        this.range = util_1.util.createBoundingRange(util_1.util.createBoundingRangeFromTokens(this.tokens));
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens));
     }
     transpile(state) {
         return [
@@ -2425,7 +2491,7 @@ class ConditionalCompileErrorStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         // nothing to walk
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a;
         return (_a = this.tokens.hashError.leadingTrivia) !== null && _a !== void 0 ? _a : [];
     }
@@ -2441,7 +2507,7 @@ class AliasStatement extends AstNode_2.Statement {
             equals: options.equals
         };
         this.value = options.value;
-        this.range = util_1.util.createBoundingRange(this.tokens.alias, this.tokens.name, this.tokens.equals, this.value);
+        this.location = util_1.util.createBoundingLocation(this.tokens.alias, this.tokens.name, this.tokens.equals, this.value);
     }
     transpile(state) {
         //the alias statement is a comment just for debugging purposes
@@ -2460,7 +2526,7 @@ class AliasStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.alias) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -2482,7 +2548,7 @@ class ConditionalCompileStatement extends AstNode_2.Statement {
             hashElse: options.hashElse,
             hashEndIf: options.hashEndIf
         };
-        this.range = util_1.util.createBoundingRange(util_1.util.createBoundingRangeFromTokens(this.tokens), this.thenBranch, this.elseBranch);
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens), this.thenBranch, this.elseBranch);
     }
     transpile(state) {
         var _a, _b, _c;
@@ -2563,7 +2629,7 @@ class ConditionalCompileStatement extends AstNode_2.Statement {
             }
         }
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a, _b;
         return (_b = (_a = this.tokens.hashIf) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
@@ -2577,7 +2643,7 @@ class ConditionalCompileConstStatement extends AstNode_2.Statement {
             hashConst: options.hashConst
         };
         this.assignment = options.assignment;
-        this.range = util_1.util.createBoundingRange(util_1.util.createBoundingRangeFromTokens(this.tokens), this.assignment);
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens), this.assignment);
     }
     transpile(state) {
         return [
@@ -2593,7 +2659,7 @@ class ConditionalCompileConstStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         // nothing to walk
     }
-    getLeadingTrivia() {
+    get leadingTrivia() {
         var _a;
         return (_a = this.tokens.hashConst.leadingTrivia) !== null && _a !== void 0 ? _a : [];
     }