brighterscript 1.0.0-alpha.4 → 1.0.0-alpha.40

package/dist/parser/Statement.js

@@ -1,36 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ThrowStatement = exports.TryCatchStatement = exports.ClassFieldStatement = exports.ClassMethodStatement = exports.ClassStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = exports.Statement = void 0;
-const lexer_1 = require("../lexer");
+exports.ConditionalCompileConstStatement = exports.ConditionalCompileStatement = exports.AliasStatement = exports.ConditionalCompileErrorStatement = exports.TypecastStatement = exports.ContinueStatement = exports.ConstStatement = exports.EnumMemberStatement = exports.EnumStatement = exports.ThrowStatement = exports.CatchStatement = exports.TryCatchStatement = exports.FieldStatement = exports.MethodStatement = exports.ClassStatement = exports.InterfaceMethodStatement = exports.InterfaceFieldStatement = exports.InterfaceStatement = exports.ImportStatement = exports.NamespaceStatement = exports.LibraryStatement = exports.IndexedSetStatement = exports.DottedSetStatement = exports.WhileStatement = exports.ForEachStatement = exports.ForStatement = exports.StopStatement = exports.EndStatement = exports.ReturnStatement = exports.LabelStatement = exports.GotoStatement = exports.DimStatement = exports.PrintStatement = exports.IncrementStatement = exports.IfStatement = exports.FunctionStatement = exports.ExitStatement = exports.ExpressionStatement = exports.Block = exports.AugmentedAssignmentStatement = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = void 0;
+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");
+const interfaces_1 = require("../interfaces");
 const creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
-/**
- * A BrightScript statement
- */
-class Statement {
-    constructor() {
-        /**
-         * When being considered by the walk visitor, this describes what type of element the current class is.
-         */
-        this.visitMode = visitors_1.InternalWalkMode.visitStatements;
-    }
-}
-exports.Statement = Statement;
-class EmptyStatement extends Statement {
-    constructor(
-    /**
-     * Create a negative range to indicate this is an interpolated location
-     */
-    range = creators_1.interpolatedRange) {
+const AstNode_1 = require("./AstNode");
+const AstNode_2 = require("./AstNode");
+const ClassType_1 = require("../types/ClassType");
+const EnumType_1 = require("../types/EnumType");
+const NamespaceType_1 = require("../types/NamespaceType");
+const InterfaceType_1 = require("../types/InterfaceType");
+const VoidType_1 = require("../types/VoidType");
+const TypedFunctionType_1 = require("../types/TypedFunctionType");
+const ArrayType_1 = require("../types/ArrayType");
+const BrightScriptDocParser_1 = require("./BrightScriptDocParser");
+class EmptyStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.range = range;
+        this.kind = AstNode_1.AstNodeKind.EmptyStatement;
+        this.location = undefined;
     }
     transpile(state) {
         return [];
@@ -38,22 +33,39 @@ class EmptyStatement extends Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    clone() {
+        return this.finalizeClone(new EmptyStatement({
+            range: util_1.util.cloneLocation(this.location)
+        }));
+    }
 }
 exports.EmptyStatement = EmptyStatement;
 /**
  * This is a top-level statement. Consider this the root of the AST
  */
-class Body extends Statement {
-    constructor(statements = []) {
+class Body extends AstNode_2.Statement {
+    constructor(options) {
+        var _a;
         super();
-        this.statements = statements;
+        this.statements = [];
+        this.kind = AstNode_1.AstNodeKind.Body;
+        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() {
-        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));
+    get location() {
+        var _a;
+        if (!this._location) {
+            //this needs to be a getter because the body has its statements pushed to it after being constructed
+            this._location = util_1.util.createBoundingLocation(...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
+        }
+        return this._location;
+    }
+    set location(value) {
+        this._location = value;
     }
     transpile(state) {
-        let result = [];
+        var _a, _b, _c, _d, _e, _f;
+        let result = state.transpileAnnotations(this);
         for (let i = 0; i < this.statements.length; i++) {
             let statement = this.statements[i];
             let previousStatement = this.statements[i - 1];
@@ -62,20 +74,20 @@ class Body extends Statement {
                 //this is the first statement. do nothing related to spacing and newlines
                 //if comment is on same line as prior sibling
             }
-            else if (reflection_1.isCommentStatement(statement) && previousStatement && statement.range.start.line === previousStatement.range.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
             }
-            else if (reflection_1.isCommentStatement(statement) && nextStatement && reflection_1.isFunctionStatement(nextStatement)) {
-                result.push('\n\n');
+            else if (util_1.util.hasLeadingComments(statement) && nextStatement && (0, reflection_1.isFunctionStatement)(nextStatement)) {
+                result.push(state.newline, state.newline);
                 //add double newline if is function not preceeded by a comment
             }
-            else if (reflection_1.isFunctionStatement(statement) && previousStatement && !(reflection_1.isCommentStatement(previousStatement))) {
-                result.push('\n\n');
+            else if ((0, reflection_1.isFunctionStatement)(statement) && previousStatement && !util_1.util.hasLeadingComments(statement)) {
+                result.push(state.newline, state.newline);
             }
             else {
                 //separate statements by a single newline
-                result.push('\n');
+                result.push(state.newline);
             }
             result.push(...statement.transpile(state));
         }
@@ -85,7 +97,7 @@ class Body extends Statement {
         let result = [];
         for (const statement of this.statements) {
             //if the current statement supports generating typedef, call it
-            if ('getTypedef' in statement) {
+            if ((0, reflection_1.isTypedefProvider)(statement)) {
                 result.push(state.indent(), ...statement.getTypedef(state), state.newline);
             }
         }
@@ -93,63 +105,202 @@ class Body extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            for (let i = 0; i < this.statements.length; i++) {
-                visitors_1.walk(this.statements, i, visitor, options, this);
-            }
+            (0, visitors_1.walkArray)(this.statements, visitor, options, this);
         }
     }
+    clone() {
+        var _a;
+        return this.finalizeClone(new Body({
+            statements: (_a = this.statements) === null || _a === void 0 ? void 0 : _a.map(s => s === null || s === void 0 ? void 0 : s.clone())
+        }), ['statements']);
+    }
 }
 exports.Body = Body;
-class AssignmentStatement extends Statement {
-    constructor(name, equals, value, containingFunction) {
+class AssignmentStatement extends AstNode_2.Statement {
+    constructor(options) {
         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.kind = AstNode_1.AstNodeKind.AssignmentStatement;
+        this.value = options.value;
+        this.tokens = {
+            equals: options.equals,
+            name: options.name,
+            as: options.as
+        };
+        this.typeExpression = options.typeExpression;
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens), this.value);
     }
     transpile(state) {
-        var _a, _b;
-        //if the value is a compound assignment, just transpile the expression itself
-        if (lexer_1.CompoundAssignmentOperators.includes((_b = (_a = this.value) === null || _a === void 0 ? void 0 : _a.operator) === null || _b === void 0 ? void 0 : _b.kind)) {
-            return this.value.transpile(state);
-        }
-        else {
-            return [
-                state.transpileToken(this.name),
-                ' ',
-                state.transpileToken(this.equals),
-                ' ',
-                ...this.value.transpile(state)
-            ];
-        }
+        var _a;
+        return [
+            state.transpileToken(this.tokens.name),
+            ' ',
+            state.transpileToken((_a = this.tokens.equals) !== null && _a !== void 0 ? _a : (0, creators_1.createToken)(TokenKind_1.TokenKind.Equal)),
+            ' ',
+            ...this.value.transpile(state)
+        ];
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getType(options) {
+        var _a, _b, _c, _d;
+        const variableTypeFromCode = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { typeChain: undefined }));
+        const docs = BrightScriptDocParser_1.default.parseNode(this);
+        const variableTypeFromDocs = docs === null || docs === void 0 ? void 0 : docs.getTypeTagBscType(options);
+        const variableType = (_b = util_1.util.chooseTypeFromCodeOrDocComment(variableTypeFromCode, variableTypeFromDocs, options)) !== 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, location: (_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.location, astNode: this }));
+        return variableType;
+    }
+    get leadingTrivia() {
+        return this.tokens.name.leadingTrivia;
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new AssignmentStatement({
+            name: util_1.util.cloneToken(this.tokens.name),
+            value: (_a = this.value) === null || _a === void 0 ? void 0 : _a.clone(),
+            as: util_1.util.cloneToken(this.tokens.as),
+            equals: util_1.util.cloneToken(this.tokens.equals),
+            typeExpression: (_b = this.typeExpression) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['value', 'typeExpression']);
+    }
 }
 exports.AssignmentStatement = AssignmentStatement;
-class Block extends Statement {
-    constructor(statements, startingRange) {
+class AugmentedAssignmentStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.AugmentedAssignmentStatement;
+        this.value = options.value;
+        this.tokens = {
+            operator: options.operator
+        };
+        this.item = options.item;
+        this.value = options.value;
+        this.location = util_1.util.createBoundingLocation(this.item, util_1.util.createBoundingLocationFromTokens(this.tokens), this.value);
+    }
+    transpile(state) {
+        return [
+            this.item.transpile(state),
+            ' ',
+            state.transpileToken(this.tokens.operator),
+            ' ',
+            this.value.transpile(state)
+        ];
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'item', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
+        }
+    }
+    getType(options) {
+        const variableType = util_1.util.binaryOperatorResultType(this.item.getType(options), this.tokens.operator, this.value.getType(options));
+        //const variableType = this.typeExpression?.getType({ ...options, typeChain: undefined }) ?? this.value.getType({ ...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
+        // options.typeChain?.push(new TypeChainEntry({ name: this.tokens.name.text, type: variableType, data: options.data, range: this.tokens.name.range, astNode: this }));
+        return variableType;
+    }
+    get leadingTrivia() {
+        return this.item.leadingTrivia;
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new AugmentedAssignmentStatement({
+            item: (_a = this.item) === null || _a === void 0 ? void 0 : _a.clone(),
+            operator: util_1.util.cloneToken(this.tokens.operator),
+            value: (_b = this.value) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['item', 'value']);
+    }
+}
+exports.AugmentedAssignmentStatement = AugmentedAssignmentStatement;
+class Block extends AstNode_2.Statement {
+    constructor(options) {
         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.kind = AstNode_1.AstNodeKind.Block;
+        this.statements = options.statements;
+    }
+    buildLocation() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        if (((_a = this.statements) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+            return util_1.util.createBoundingLocation(...(_b = this.statements) !== null && _b !== void 0 ? _b : []);
+        }
+        let lastBitBefore;
+        let firstBitAfter;
+        if ((0, reflection_1.isFunctionExpression)(this.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.tokens.functionType, this.parent.tokens.leftParen, ...((_c = this.parent.parameters) !== null && _c !== void 0 ? _c : []), this.parent.tokens.rightParen, this.parent.tokens.as, this.parent.returnTypeExpression);
+            firstBitAfter = (_d = this.parent.tokens.endFunctionType) === null || _d === void 0 ? void 0 : _d.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 = (_e = this.parent.tokens.else) === null || _e === void 0 ? void 0 : _e.location;
+                firstBitAfter = (_f = this.parent.tokens.endIf) === null || _f === void 0 ? void 0 : _f.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 = (_g = this.parent.tokens.hashElse) === null || _g === void 0 ? void 0 : _g.location;
+                firstBitAfter = (_h = this.parent.tokens.hashEndIf) === null || _h === void 0 ? void 0 : _h.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 = (_j = this.parent.tokens.endFor) === null || _j === void 0 ? void 0 : _j.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 = (_k = this.parent.tokens.endFor) === null || _k === void 0 ? void 0 : _k.location;
+        }
+        else if ((0, reflection_1.isWhileStatement)(this.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.condition, this.parent.tokens.while);
+            firstBitAfter = (_l = this.parent.tokens.endWhile) === null || _l === void 0 ? void 0 : _l.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)((_m = this.parent) === null || _m === void 0 ? void 0 : _m.parent)) {
+            lastBitBefore = util_1.util.createBoundingLocation(this.parent.tokens.catch, this.parent.exceptionVariableExpression);
+            firstBitAfter = (_o = this.parent.parent.tokens.endTry) === null || _o === void 0 ? void 0 : _o.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, (_p = lastBitBefore.uri) !== null && _p !== void 0 ? _p : firstBitAfter.uri);
+        }
+    }
+    get location() {
+        if (!this._location) {
+            //this needs to be a getter because the body has its statements pushed to it after being constructed
+            this._location = this.buildLocation();
+        }
+        return this._location;
+    }
+    set location(value) {
+        this._location = value;
     }
     transpile(state) {
+        var _a;
         state.blockDepth++;
         let results = [];
         for (let i = 0; i < this.statements.length; i++) {
             let previousStatement = this.statements[i - 1];
             let statement = this.statements[i];
+            //is not a comment
             //if comment is on same line as parent
-            if (reflection_1.isCommentStatement(statement) &&
-                (util_1.util.linesTouch(state.lineage[0], statement) || util_1.util.linesTouch(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
             }
@@ -165,167 +316,196 @@ class Block extends 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) {
-            for (let i = 0; i < this.statements.length; i++) {
-                visitors_1.walk(this.statements, i, visitor, options, this);
-            }
+            (0, visitors_1.walkArray)(this.statements, visitor, options, this);
         }
     }
+    clone() {
+        var _a;
+        return this.finalizeClone(new Block({
+            statements: (_a = this.statements) === null || _a === void 0 ? void 0 : _a.map(s => s === null || s === void 0 ? void 0 : s.clone())
+        }), ['statements']);
+    }
 }
 exports.Block = Block;
-class ExpressionStatement extends Statement {
-    constructor(expression) {
+class ExpressionStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a;
         super();
-        this.expression = expression;
-        this.range = this.expression.range;
+        this.kind = AstNode_1.AstNodeKind.ExpressionStatement;
+        this.expression = options.expression;
+        this.location = (_a = this.expression) === null || _a === void 0 ? void 0 : _a.location;
     }
     transpile(state) {
-        return this.expression.transpile(state);
+        return [
+            state.transpileAnnotations(this),
+            this.expression.transpile(state)
+        ];
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'expression', visitor, options);
-        }
-    }
-}
-exports.ExpressionStatement = ExpressionStatement;
-class CommentStatement extends Statement {
-    constructor(comments) {
-        var _a;
-        super();
-        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);
-        }
-    }
-    get text() {
-        return this.comments.map(x => x.text).join('\n');
-    }
-    transpile(state) {
-        let result = [];
-        for (let i = 0; i < this.comments.length; i++) {
-            let comment = this.comments[i];
-            if (i > 0) {
-                result.push(state.indent());
-            }
-            result.push(state.transpileToken(comment));
-            //add newline for all except final comment
-            if (i < this.comments.length - 1) {
-                result.push('\n');
-            }
+            (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
-        return result;
     }
-    getTypedef(state) {
-        return this.transpile(state);
+    get leadingTrivia() {
+        return this.expression.leadingTrivia;
     }
-    walk(visitor, options) {
-        //nothing to walk
+    clone() {
+        var _a;
+        return this.finalizeClone(new ExpressionStatement({
+            expression: (_a = this.expression) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['expression']);
     }
 }
-exports.CommentStatement = CommentStatement;
-class ExitForStatement extends Statement {
-    constructor(tokens) {
+exports.ExpressionStatement = ExpressionStatement;
+class ExitStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.tokens = tokens;
-        this.range = this.tokens.exitFor.range;
+        this.kind = AstNode_1.AstNodeKind.ExitStatement;
+        this.tokens = {
+            exit: options === null || options === void 0 ? void 0 : options.exit,
+            loopType: options.loopType
+        };
+        this.location = util_1.util.createBoundingLocation(this.tokens.exit, this.tokens.loopType);
     }
     transpile(state) {
+        var _a, _b;
         return [
-            state.transpileToken(this.tokens.exitFor)
+            state.transpileToken(this.tokens.exit, 'exit'),
+            (_b = (_a = this.tokens.loopType) === null || _a === void 0 ? void 0 : _a.leadingWhitespace) !== null && _b !== void 0 ? _b : ' ',
+            state.transpileToken(this.tokens.loopType)
         ];
     }
     walk(visitor, options) {
         //nothing to walk
     }
-}
-exports.ExitForStatement = ExitForStatement;
-class ExitWhileStatement extends Statement {
-    constructor(tokens) {
-        super();
-        this.tokens = tokens;
-        this.range = this.tokens.exitWhile.range;
-    }
-    transpile(state) {
-        return [
-            state.transpileToken(this.tokens.exitWhile)
-        ];
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.exit) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
     }
-    walk(visitor, options) {
-        //nothing to walk
+    clone() {
+        return this.finalizeClone(new ExitStatement({
+            loopType: util_1.util.cloneToken(this.tokens.loopType),
+            exit: util_1.util.cloneToken(this.tokens.exit)
+        }));
     }
 }
-exports.ExitWhileStatement = ExitWhileStatement;
-class FunctionStatement extends Statement {
-    constructor(name, func, namespaceName) {
+exports.ExitStatement = ExitStatement;
+class FunctionStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a, _b;
         super();
-        this.name = name;
-        this.func = func;
-        this.namespaceName = namespaceName;
-        this.range = this.func.range;
+        this.kind = AstNode_1.AstNodeKind.FunctionStatement;
+        this.tokens = {
+            name: options.name
+        };
+        this.func = options.func;
+        if (this.func) {
+            this.func.symbolTable.name += `: '${(_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text}'`;
+        }
+        this.location = (_b = this.func) === null || _b === void 0 ? void 0 : _b.location;
     }
     /**
      * Get the name of this expression based on the parse mode
      */
     getName(parseMode) {
-        if (this.namespaceName) {
+        var _a;
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        if (namespace) {
             let delimiter = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
-            let namespaceName = this.namespaceName.getName(parseMode);
-            return namespaceName + delimiter + this.name.text;
+            let namespaceName = namespace.getName(parseMode);
+            return namespaceName + delimiter + ((_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text);
         }
         else {
-            return this.name.text;
+            return this.tokens.name.text;
         }
     }
+    get leadingTrivia() {
+        return this.func.leadingTrivia;
+    }
     transpile(state) {
         //create a fake token using the full transpiled name
-        let nameToken = Object.assign(Object.assign({}, this.name), { text: this.getName(Parser_1.ParseMode.BrightScript) });
-        return this.func.transpile(state, nameToken);
+        let nameToken = Object.assign(Object.assign({}, this.tokens.name), { text: this.getName(Parser_1.ParseMode.BrightScript) });
+        return [
+            ...state.transpileAnnotations(this),
+            ...this.func.transpile(state, nameToken)
+        ];
     }
     getTypedef(state) {
-        var _a;
+        var _a, _b;
         let result = [];
-        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        for (let annotation of (_b = this.annotations) !== null && _b !== void 0 ? _b : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
-        result.push(...this.func.getTypedef(state, this.name));
+        result.push(...this.func.getTypedef(state));
         return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'func', visitor, options);
+            (0, visitors_1.walk)(this, 'func', visitor, options);
         }
     }
+    getType(options) {
+        const funcExprType = this.func.getType(options);
+        funcExprType.setName(this.getName(Parser_1.ParseMode.BrighterScript));
+        return funcExprType;
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new FunctionStatement({
+            func: (_a = this.func) === null || _a === void 0 ? void 0 : _a.clone(),
+            name: util_1.util.cloneToken(this.tokens.name)
+        }), ['func']);
+    }
 }
 exports.FunctionStatement = FunctionStatement;
-class IfStatement extends Statement {
-    constructor(tokens, condition, thenBranch, elseBranch, isInline) {
-        var _a, _b;
+class IfStatement extends AstNode_2.Statement {
+    constructor(options) {
         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.kind = AstNode_1.AstNodeKind.IfStatement;
+        this.condition = options.condition;
+        this.thenBranch = options.thenBranch;
+        this.elseBranch = options.elseBranch;
+        this.tokens = {
+            if: options.if,
+            then: options.then,
+            else: options.else,
+            endIf: options.endIf
+        };
+        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;
         let results = [];
         //if   (already indented by block)
-        results.push(state.transpileToken(this.tokens.if));
+        results.push(state.transpileToken((_a = this.tokens.if) !== null && _a !== void 0 ? _a : (0, creators_1.createToken)(TokenKind_1.TokenKind.If)));
         results.push(' ');
         //conditions
         results.push(...this.condition.transpile(state));
-        results.push(' ');
         //then
         if (this.tokens.then) {
+            results.push(' ');
             results.push(state.transpileToken(this.tokens.then));
         }
-        else {
-            results.push('then');
-        }
         state.lineage.unshift(this);
         //if statement body
         let thenNodes = this.thenBranch.transpile(state);
@@ -333,20 +513,18 @@ class IfStatement extends Statement {
         if (thenNodes.length > 0) {
             results.push(thenNodes);
         }
-        results.push('\n');
         //else branch
-        if (this.tokens.else) {
-            //else
-            results.push(state.indent(), state.transpileToken(this.tokens.else));
-        }
         if (this.elseBranch) {
-            if (reflection_1.isIfStatement(this.elseBranch)) {
+            //else
+            results.push(...state.transpileEndBlockToken(this.thenBranch, this.tokens.else, 'else'));
+            if ((0, reflection_1.isIfStatement)(this.elseBranch)) {
                 //chained elseif
                 state.lineage.unshift(this.elseBranch);
                 let body = this.elseBranch.transpile(state);
                 state.lineage.shift();
                 if (body.length > 0) {
-                    results.push(' ');
+                    //zero or more spaces between the `else` and the `if`
+                    results.push(this.elseBranch.tokens.if.leadingWhitespace);
                     results.push(...body);
                     // stop here because chained if will transpile the rest
                     return results;
@@ -357,74 +535,104 @@ class IfStatement extends Statement {
             }
             else {
                 //else body
-                state.lineage.unshift(this.elseBranch);
+                state.lineage.unshift(this.tokens.else);
                 let body = this.elseBranch.transpile(state);
                 state.lineage.shift();
                 if (body.length > 0) {
                     results.push(...body);
                 }
-                results.push('\n');
             }
         }
         //end if
-        results.push(state.indent());
-        if (this.tokens.endIf) {
-            results.push(state.transpileToken(this.tokens.endIf));
-        }
-        else {
-            results.push('end if');
-        }
+        results.push(...state.transpileEndBlockToken((_b = this.elseBranch) !== null && _b !== void 0 ? _b : this.thenBranch, this.tokens.endIf, 'end if'));
         return results;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'condition', visitor, options);
+            (0, visitors_1.walk)(this, 'condition', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'thenBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'thenBranch', visitor, options);
         }
         if (this.elseBranch && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'elseBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'elseBranch', visitor, options);
         }
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.if) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    get endTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.endIf) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a, _b, _c;
+        return this.finalizeClone(new IfStatement({
+            if: util_1.util.cloneToken(this.tokens.if),
+            else: util_1.util.cloneToken(this.tokens.else),
+            endIf: util_1.util.cloneToken(this.tokens.endIf),
+            then: util_1.util.cloneToken(this.tokens.then),
+            condition: (_a = this.condition) === null || _a === void 0 ? void 0 : _a.clone(),
+            thenBranch: (_b = this.thenBranch) === null || _b === void 0 ? void 0 : _b.clone(),
+            elseBranch: (_c = this.elseBranch) === null || _c === void 0 ? void 0 : _c.clone()
+        }), ['condition', 'thenBranch', 'elseBranch']);
+    }
 }
 exports.IfStatement = IfStatement;
-class IncrementStatement extends Statement {
-    constructor(value, operator) {
+class IncrementStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.value = value;
-        this.operator = operator;
-        this.range = util_1.util.createRangeFromPositions(this.value.range.start, this.operator.range.end);
+        this.kind = AstNode_1.AstNodeKind.IncrementStatement;
+        this.value = options.value;
+        this.tokens = {
+            operator: options.operator
+        };
+        this.location = util_1.util.createBoundingLocation(this.value, this.tokens.operator);
     }
     transpile(state) {
         return [
             ...this.value.transpile(state),
-            state.transpileToken(this.operator)
+            state.transpileToken(this.tokens.operator)
         ];
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.value) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new IncrementStatement({
+            value: (_a = this.value) === null || _a === void 0 ? void 0 : _a.clone(),
+            operator: util_1.util.cloneToken(this.tokens.operator)
+        }), ['value']);
+    }
 }
 exports.IncrementStatement = IncrementStatement;
 /**
  * Represents a `print` statement within BrightScript.
  */
-class PrintStatement extends Statement {
+class PrintStatement extends AstNode_2.Statement {
     /**
      * Creates a new internal representation of a BrightScript `print` statement.
-     * @param expressions an array of expressions or `PrintSeparator`s to be
-     *                    evaluated and printed.
+     * @param options the options for this statement
+     * @param options.print a print token
+     * @param options.expressions an array of expressions or `PrintSeparator`s to be evaluated and printed.
      */
-    constructor(tokens, expressions) {
+    constructor(options) {
+        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.kind = AstNode_1.AstNodeKind.PrintStatement;
+        this.tokens = {
+            print: options.print
+        };
+        this.expressions = options.expressions;
+        this.location = util_1.util.createBoundingLocation(this.tokens.print, ...((_a = this.expressions) !== null && _a !== void 0 ? _a : []));
     }
     transpile(state) {
         var _a;
@@ -449,33 +657,50 @@ class PrintStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            for (let i = 0; i < this.expressions.length; i++) {
-                //sometimes we have semicolon `Token`s in the expressions list (should probably fix that...), so only emit the actual expressions
-                if (reflection_1.isExpression(this.expressions[i])) {
-                    visitors_1.walk(this.expressions, i, visitor, options, this);
-                }
-            }
+            //sometimes we have semicolon Tokens in the expressions list (should probably fix that...), so only walk the actual expressions
+            (0, visitors_1.walkArray)(this.expressions, visitor, options, this, (item) => (0, reflection_1.isExpression)(item));
         }
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.print) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new PrintStatement({
+            print: util_1.util.cloneToken(this.tokens.print),
+            expressions: (_a = this.expressions) === null || _a === void 0 ? void 0 : _a.map(e => {
+                if ((0, reflection_1.isExpression)(e)) {
+                    return e.clone();
+                }
+                else {
+                    return util_1.util.cloneToken(e);
+                }
+            })
+        }), ['expressions']);
+    }
 }
 exports.PrintStatement = PrintStatement;
-class DimStatement extends Statement {
-    constructor(dimToken, identifier, openingSquare, dimensions, closingSquare) {
-        var _a, _b, _c, _d;
+class DimStatement extends AstNode_2.Statement {
+    constructor(options) {
+        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.kind = AstNode_1.AstNodeKind.DimStatement;
+        this.tokens = {
+            dim: options === null || options === void 0 ? void 0 : options.dim,
+            name: options.name,
+            openingSquare: options.openingSquare,
+            closingSquare: options.closingSquare
+        };
+        this.dimensions = options.dimensions;
+        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 = [
-            state.transpileToken(this.dimToken),
+            state.transpileToken(this.tokens.dim, 'dim'),
             ' ',
-            state.transpileToken(this.identifier),
-            state.transpileToken(this.openingSquare)
+            state.transpileToken(this.tokens.name),
+            state.transpileToken(this.tokens.openingSquare, '[')
         ];
         for (let i = 0; i < this.dimensions.length; i++) {
             if (i > 0) {
@@ -483,28 +708,53 @@ class DimStatement extends Statement {
             }
             result.push(...this.dimensions[i].transpile(state));
         }
-        result.push(state.transpileToken(this.closingSquare));
+        result.push(state.transpileToken(this.tokens.closingSquare, ']'));
         return result;
     }
     walk(visitor, options) {
-        var _a;
-        if (((_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.length) > 0 && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            for (let i = 0; i < this.dimensions.length; i++) {
-                visitors_1.walk(this.dimensions, i, visitor, options, this);
-            }
+        var _a, _b;
+        if (((_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.length) !== undefined && ((_b = this.dimensions) === null || _b === void 0 ? void 0 : _b.length) > 0 && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walkArray)(this.dimensions, visitor, options, this);
+        }
+    }
+    getType(options) {
+        var _a, _b;
+        const numDimensions = (_b = (_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 1;
+        let type = new ArrayType_1.ArrayType();
+        for (let i = 0; i < numDimensions - 1; i++) {
+            type = new ArrayType_1.ArrayType(type);
         }
+        return type;
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.dim) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new DimStatement({
+            dim: util_1.util.cloneToken(this.tokens.dim),
+            name: util_1.util.cloneToken(this.tokens.name),
+            openingSquare: util_1.util.cloneToken(this.tokens.openingSquare),
+            dimensions: (_a = this.dimensions) === null || _a === void 0 ? void 0 : _a.map(e => e === null || e === void 0 ? void 0 : e.clone()),
+            closingSquare: util_1.util.cloneToken(this.tokens.closingSquare)
+        }), ['dimensions']);
     }
 }
 exports.DimStatement = DimStatement;
-class GotoStatement extends Statement {
-    constructor(tokens) {
+class GotoStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.goto.range.start, this.tokens.label.range.end);
+        this.kind = AstNode_1.AstNodeKind.GotoStatement;
+        this.tokens = {
+            goto: options.goto,
+            label: options.label
+        };
+        this.location = util_1.util.createBoundingLocation(this.tokens.goto, this.tokens.label);
     }
     transpile(state) {
         return [
-            state.transpileToken(this.tokens.goto),
+            state.transpileToken(this.tokens.goto, 'goto'),
             ' ',
             state.transpileToken(this.tokens.label)
         ];
@@ -512,36 +762,61 @@ class GotoStatement extends Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.goto) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        return this.finalizeClone(new GotoStatement({
+            goto: util_1.util.cloneToken(this.tokens.goto),
+            label: util_1.util.cloneToken(this.tokens.label)
+        }));
+    }
 }
 exports.GotoStatement = GotoStatement;
-class LabelStatement extends Statement {
-    constructor(tokens) {
+class LabelStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.identifier.range.start, this.tokens.colon.range.end);
+        this.kind = AstNode_1.AstNodeKind.LabelStatement;
+        this.tokens = {
+            name: options.name,
+            colon: options.colon
+        };
+        this.location = util_1.util.createBoundingLocation(this.tokens.name, this.tokens.colon);
+    }
+    get leadingTrivia() {
+        return this.tokens.name.leadingTrivia;
     }
     transpile(state) {
         return [
-            state.transpileToken(this.tokens.identifier),
-            state.transpileToken(this.tokens.colon)
+            state.transpileToken(this.tokens.name),
+            state.transpileToken(this.tokens.colon, ':')
         ];
     }
     walk(visitor, options) {
         //nothing to walk
     }
+    clone() {
+        return this.finalizeClone(new LabelStatement({
+            name: util_1.util.cloneToken(this.tokens.name),
+            colon: util_1.util.cloneToken(this.tokens.colon)
+        }));
+    }
 }
 exports.LabelStatement = LabelStatement;
-class ReturnStatement extends Statement {
-    constructor(tokens, value) {
-        var _a;
+class ReturnStatement extends AstNode_2.Statement {
+    constructor(options) {
         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.kind = AstNode_1.AstNodeKind.ReturnStatement;
+        this.tokens = {
+            return: options === null || options === void 0 ? void 0 : options.return
+        };
+        this.value = options === null || options === void 0 ? void 0 : options.value;
+        this.location = util_1.util.createBoundingLocation(this.tokens.return, this.value);
     }
     transpile(state) {
         let result = [];
-        result.push(state.transpileToken(this.tokens.return));
+        result.push(state.transpileToken(this.tokens.return, 'return'));
         if (this.value) {
             result.push(' ');
             result.push(...this.value.transpile(state));
@@ -550,258 +825,395 @@ class ReturnStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.return) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new ReturnStatement({
+            return: util_1.util.cloneToken(this.tokens.return),
+            value: (_a = this.value) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['value']);
+    }
 }
 exports.ReturnStatement = ReturnStatement;
-class EndStatement extends Statement {
-    constructor(tokens) {
+class EndStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a;
         super();
-        this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.end.range.start, this.tokens.end.range.end);
+        this.kind = AstNode_1.AstNodeKind.EndStatement;
+        this.tokens = {
+            end: options === null || options === void 0 ? void 0 : options.end
+        };
+        this.location = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.location;
     }
     transpile(state) {
         return [
-            state.transpileToken(this.tokens.end)
+            state.transpileToken(this.tokens.end, 'end')
         ];
     }
     walk(visitor, options) {
         //nothing to walk
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        return this.finalizeClone(new EndStatement({
+            end: util_1.util.cloneToken(this.tokens.end)
+        }));
+    }
 }
 exports.EndStatement = EndStatement;
-class StopStatement extends Statement {
-    constructor(tokens) {
+class StopStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a, _b;
         super();
-        this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.stop.range.start, this.tokens.stop.range.end);
+        this.kind = AstNode_1.AstNodeKind.StopStatement;
+        this.tokens = { stop: options === null || options === void 0 ? void 0 : options.stop };
+        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 [
-            state.transpileToken(this.tokens.stop)
+            state.transpileToken(this.tokens.stop, 'stop')
         ];
     }
     walk(visitor, options) {
         //nothing to walk
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.stop) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        return this.finalizeClone(new StopStatement({
+            stop: util_1.util.cloneToken(this.tokens.stop)
+        }));
+    }
 }
 exports.StopStatement = StopStatement;
-class ForStatement extends Statement {
-    constructor(forToken, counterDeclaration, toToken, finalValue, body, endForToken, stepToken, increment) {
-        var _a, _b;
+class ForStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.forToken = forToken;
-        this.counterDeclaration = counterDeclaration;
-        this.toToken = toToken;
-        this.finalValue = finalValue;
-        this.body = body;
-        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.kind = AstNode_1.AstNodeKind.ForStatement;
+        this.tokens = {
+            for: options.for,
+            to: options.to,
+            endFor: options.endFor,
+            step: options.step
+        };
+        this.counterDeclaration = options.counterDeclaration;
+        this.finalValue = options.finalValue;
+        this.body = options.body;
+        this.increment = options.increment;
+        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 = [];
         //for
-        result.push(state.transpileToken(this.forToken), ' ');
+        result.push(state.transpileToken(this.tokens.for, 'for'), ' ');
         //i=1
         result.push(...this.counterDeclaration.transpile(state), ' ');
         //to
-        result.push(state.transpileToken(this.toToken), ' ');
+        result.push(state.transpileToken(this.tokens.to, 'to'), ' ');
         //final value
         result.push(this.finalValue.transpile(state));
         //step
-        if (this.stepToken) {
-            result.push(' ', state.transpileToken(this.stepToken), ' ', this.increment.transpile(state));
+        if (this.increment) {
+            result.push(' ', state.transpileToken(this.tokens.step, 'step'), ' ', this.increment.transpile(state));
         }
         //loop body
         state.lineage.unshift(this);
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        if (this.body.statements.length > 0) {
-            result.push('\n');
-        }
         //end for
-        result.push(state.indent(), state.transpileToken(this.endForToken));
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endFor, 'end for'));
         return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'counterDeclaration', visitor, options);
+            (0, visitors_1.walk)(this, 'counterDeclaration', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'finalValue', visitor, options);
-            visitors_1.walk(this, 'increment', visitor, options);
+            (0, visitors_1.walk)(this, 'finalValue', visitor, options);
+            (0, visitors_1.walk)(this, 'increment', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'body', visitor, options);
+            (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.for) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    get endTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.endFor) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a, _b, _c, _d;
+        return this.finalizeClone(new ForStatement({
+            for: util_1.util.cloneToken(this.tokens.for),
+            counterDeclaration: (_a = this.counterDeclaration) === null || _a === void 0 ? void 0 : _a.clone(),
+            to: util_1.util.cloneToken(this.tokens.to),
+            finalValue: (_b = this.finalValue) === null || _b === void 0 ? void 0 : _b.clone(),
+            body: (_c = this.body) === null || _c === void 0 ? void 0 : _c.clone(),
+            endFor: util_1.util.cloneToken(this.tokens.endFor),
+            step: util_1.util.cloneToken(this.tokens.step),
+            increment: (_d = this.increment) === null || _d === void 0 ? void 0 : _d.clone()
+        }), ['counterDeclaration', 'finalValue', 'body', 'increment']);
+    }
 }
 exports.ForStatement = ForStatement;
-class ForEachStatement extends Statement {
-    constructor(forEachToken, item, inToken, target, body, endForToken) {
-        var _a, _b, _c, _d, _e;
+class ForEachStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.forEachToken = forEachToken;
-        this.item = item;
-        this.inToken = inToken;
-        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.kind = AstNode_1.AstNodeKind.ForEachStatement;
+        this.tokens = {
+            forEach: options.forEach,
+            item: options.item,
+            in: options.in,
+            endFor: options.endFor
+        };
+        this.body = options.body;
+        this.target = options.target;
+        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 = [];
         //for each
-        result.push(state.transpileToken(this.forEachToken), ' ');
+        result.push(state.transpileToken(this.tokens.forEach, 'for each'), ' ');
         //item
-        result.push(state.transpileToken(this.item), ' ');
+        result.push(state.transpileToken(this.tokens.item), ' ');
         //in
-        result.push(state.transpileToken(this.inToken), ' ');
+        result.push(state.transpileToken(this.tokens.in, 'in'), ' ');
         //target
         result.push(...this.target.transpile(state));
         //body
         state.lineage.unshift(this);
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        if (this.body.statements.length > 0) {
-            result.push('\n');
-        }
         //end for
-        result.push(state.indent(), state.transpileToken(this.endForToken));
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endFor, 'end for'));
         return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'target', visitor, options);
+            (0, visitors_1.walk)(this, 'target', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'body', visitor, options);
+            (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    getType(options) {
+        return this.getSymbolTable().getSymbolType(this.tokens.item.text, options);
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.forEach) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    get endTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.endFor) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new ForEachStatement({
+            forEach: util_1.util.cloneToken(this.tokens.forEach),
+            in: util_1.util.cloneToken(this.tokens.in),
+            endFor: util_1.util.cloneToken(this.tokens.endFor),
+            item: util_1.util.cloneToken(this.tokens.item),
+            target: (_a = this.target) === null || _a === void 0 ? void 0 : _a.clone(),
+            body: (_b = this.body) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['target', 'body']);
+    }
 }
 exports.ForEachStatement = ForEachStatement;
-class WhileStatement extends Statement {
-    constructor(tokens, condition, body) {
-        var _a, _b;
+class WhileStatement extends AstNode_2.Statement {
+    constructor(options) {
         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.kind = AstNode_1.AstNodeKind.WhileStatement;
+        this.tokens = {
+            while: options.while,
+            endWhile: options.endWhile
+        };
+        this.body = options.body;
+        this.condition = options.condition;
+        this.location = util_1.util.createBoundingLocation(this.tokens.while, this.condition, this.body, this.tokens.endWhile);
     }
     transpile(state) {
         let result = [];
         //while
-        result.push(state.transpileToken(this.tokens.while), ' ');
+        result.push(state.transpileToken(this.tokens.while, 'while'), ' ');
         //condition
         result.push(...this.condition.transpile(state));
         state.lineage.unshift(this);
         //body
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        //trailing newline only if we have body statements
-        result.push('\n');
         //end while
-        result.push(state.indent(), state.transpileToken(this.tokens.endWhile));
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endWhile, 'end while'));
         return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'condition', visitor, options);
+            (0, visitors_1.walk)(this, 'condition', visitor, options);
         }
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'body', visitor, options);
+            (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.while) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    get endTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.endWhile) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new WhileStatement({
+            while: util_1.util.cloneToken(this.tokens.while),
+            endWhile: util_1.util.cloneToken(this.tokens.endWhile),
+            condition: (_a = this.condition) === null || _a === void 0 ? void 0 : _a.clone(),
+            body: (_b = this.body) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['condition', 'body']);
+    }
 }
 exports.WhileStatement = WhileStatement;
-class DottedSetStatement extends Statement {
-    constructor(obj, name, value) {
+class DottedSetStatement extends AstNode_2.Statement {
+    constructor(options) {
         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.kind = AstNode_1.AstNodeKind.DottedSetStatement;
+        this.tokens = {
+            name: options.name,
+            dot: options.dot,
+            equals: options.equals
+        };
+        this.obj = options.obj;
+        this.value = options.value;
+        this.location = util_1.util.createBoundingLocation(this.obj, this.tokens.dot, this.tokens.name, this.value);
     }
     transpile(state) {
-        var _a, _b;
         //if the value is a compound assignment, don't add the obj, dot, name, or operator...the expression will handle that
-        if (lexer_1.CompoundAssignmentOperators.includes((_b = (_a = this.value) === null || _a === void 0 ? void 0 : _a.operator) === null || _b === void 0 ? void 0 : _b.kind)) {
-            return this.value.transpile(state);
-        }
-        else {
-            return [
-                //object
-                ...this.obj.transpile(state),
-                '.',
-                //name
-                state.transpileToken(this.name),
-                ' = ',
-                //right-hand-side of assignment
-                ...this.value.transpile(state)
-            ];
-        }
+        return [
+            //object
+            ...this.obj.transpile(state),
+            this.tokens.dot ? state.tokenToSourceNode(this.tokens.dot) : '.',
+            //name
+            state.transpileToken(this.tokens.name),
+            ' ',
+            state.transpileToken(this.tokens.equals, '='),
+            ' ',
+            //right-hand-side of assignment
+            ...this.value.transpile(state)
+        ];
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'obj', visitor, options);
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'obj', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getType(options) {
+        var _a, _b, _c, _d, _e;
+        const objType = (_a = this.obj) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const result = objType === null || objType === void 0 ? void 0 : objType.getMemberType((_b = this.tokens.name) === null || _b === void 0 ? void 0 : _b.text, options);
+        (_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,
+            location: (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.location,
+            astNode: this
+        }));
+        return result;
+    }
+    get leadingTrivia() {
+        return this.obj.leadingTrivia;
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new DottedSetStatement({
+            obj: (_a = this.obj) === null || _a === void 0 ? void 0 : _a.clone(),
+            dot: util_1.util.cloneToken(this.tokens.dot),
+            name: util_1.util.cloneToken(this.tokens.name),
+            equals: util_1.util.cloneToken(this.tokens.equals),
+            value: (_b = this.value) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['obj', 'value']);
+    }
 }
 exports.DottedSetStatement = DottedSetStatement;
-class IndexedSetStatement extends Statement {
-    constructor(obj, index, value, openingSquare, closingSquare) {
+class IndexedSetStatement extends AstNode_2.Statement {
+    constructor(options) {
+        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.kind = AstNode_1.AstNodeKind.IndexedSetStatement;
+        this.tokens = {
+            openingSquare: options.openingSquare,
+            closingSquare: options.closingSquare,
+            equals: options.equals
+        };
+        this.obj = options.obj;
+        this.indexes = options.indexes;
+        this.value = options.value;
+        this.location = util_1.util.createBoundingLocation(this.obj, this.tokens.openingSquare, ...(_a = this.indexes) !== null && _a !== void 0 ? _a : [], this.tokens.closingSquare, this.value);
     }
     transpile(state) {
-        var _a, _b;
-        //if the value is a component assignment, don't add the obj, index or operator...the expression will handle that
-        if (lexer_1.CompoundAssignmentOperators.includes((_b = (_a = this.value) === null || _a === void 0 ? void 0 : _a.operator) === null || _b === void 0 ? void 0 : _b.kind)) {
-            return this.value.transpile(state);
-        }
-        else {
-            return [
-                //obj
-                ...this.obj.transpile(state),
-                //   [
-                state.transpileToken(this.openingSquare),
-                //    index
-                ...this.index.transpile(state),
-                //         ]
-                state.transpileToken(this.closingSquare),
-                //           =
-                ' = ',
-                //             value
-                ...this.value.transpile(state)
-            ];
+        var _a;
+        const result = [];
+        result.push(
+        //obj
+        ...this.obj.transpile(state), 
+        //   [
+        state.transpileToken(this.tokens.openingSquare, '['));
+        for (let i = 0; i < this.indexes.length; i++) {
+            //add comma between indexes
+            if (i > 0) {
+                result.push(', ');
+            }
+            let index = this.indexes[i];
+            result.push(...((_a = index === null || index === void 0 ? void 0 : index.transpile(state)) !== null && _a !== void 0 ? _a : []));
         }
+        result.push(state.transpileToken(this.tokens.closingSquare, ']'), ' ', state.transpileToken(this.tokens.equals, '='), ' ', ...this.value.transpile(state));
+        return result;
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'obj', visitor, options);
-            visitors_1.walk(this, 'index', visitor, options);
-            visitors_1.walk(this, 'value', visitor, options);
+            (0, visitors_1.walk)(this, 'obj', visitor, options);
+            (0, visitors_1.walkArray)(this.indexes, visitor, options, this);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    get leadingTrivia() {
+        return this.obj.leadingTrivia;
+    }
+    clone() {
+        var _a, _b, _c;
+        return this.finalizeClone(new IndexedSetStatement({
+            obj: (_a = this.obj) === null || _a === void 0 ? void 0 : _a.clone(),
+            openingSquare: util_1.util.cloneToken(this.tokens.openingSquare),
+            indexes: (_b = this.indexes) === null || _b === void 0 ? void 0 : _b.map(x => x === null || x === void 0 ? void 0 : x.clone()),
+            equals: util_1.util.cloneToken(this.tokens.equals),
+            value: (_c = this.value) === null || _c === void 0 ? void 0 : _c.clone(),
+            closingSquare: util_1.util.cloneToken(this.tokens.closingSquare)
+        }), ['obj', 'indexes', 'value']);
+    }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
-class LibraryStatement extends Statement {
-    constructor(tokens) {
+class LibraryStatement extends AstNode_2.Statement {
+    constructor(options) {
         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.kind = AstNode_1.AstNodeKind.LibraryStatement;
+        this.tokens = {
+            library: options === null || options === void 0 ? void 0 : options.library,
+            filePath: options === null || options === void 0 ? void 0 : options.filePath
+        };
+        this.location = util_1.util.createBoundingLocation(this.tokens.library, this.tokens.filePath);
     }
     transpile(state) {
         let result = [];
@@ -818,38 +1230,87 @@ class LibraryStatement extends Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.library) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new LibraryStatement({
+            library: util_1.util.cloneToken((_a = this.tokens) === null || _a === void 0 ? void 0 : _a.library),
+            filePath: util_1.util.cloneToken((_b = this.tokens) === null || _b === void 0 ? void 0 : _b.filePath)
+        }));
+    }
 }
 exports.LibraryStatement = LibraryStatement;
-class NamespaceStatement extends Statement {
-    constructor(keyword, 
-    //this should technically only be a VariableExpression or DottedGetExpression, but that can be enforced elsewhere
-    nameExpression, body, endKeyword, parentSymbolTable) {
+class NamespaceStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.keyword = keyword;
-        this.nameExpression = nameExpression;
-        this.body = body;
-        this.endKeyword = endKeyword;
-        this.parentSymbolTable = parentSymbolTable;
-        this.name = this.nameExpression.getName(Parser_1.ParseMode.BrighterScript);
-        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);
+        this.kind = AstNode_1.AstNodeKind.NamespaceStatement;
+        this.tokens = {
+            namespace: options.namespace,
+            endNamespace: options.endNamespace
+        };
+        this.nameExpression = options.nameExpression;
+        this.body = options.body;
+        this.symbolTable = new SymbolTable_1.SymbolTable(`NamespaceStatement: '${this.name}'`, () => { var _a; return (_a = this.getRoot()) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+    }
+    /**
+     * The string name for this namespace
+     */
+    get name() {
+        return this.getName(Parser_1.ParseMode.BrighterScript);
+    }
+    get location() {
+        return this.cacheLocation();
+    }
+    cacheLocation() {
+        if (!this._location) {
+            this._location = util_1.util.createBoundingLocation(this.tokens.namespace, this.nameExpression, this.body, this.tokens.endNamespace);
+        }
+        return this._location;
     }
     getName(parseMode) {
-        return this.nameExpression.getName(parseMode);
+        var _a, _b;
+        const sep = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
+        let name = util_1.util.getAllDottedGetPartsAsString(this.nameExpression, parseMode);
+        if (((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === AstNode_1.AstNodeKind.NamespaceStatement) {
+            name = this.parent.parent.getName(parseMode) + sep + name;
+        }
+        return name;
+    }
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.namespace) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+    }
+    get endTrivia() {
+        var _a;
+        return (_a = this.tokens.endNamespace) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+    }
+    getNameParts() {
+        var _a, _b;
+        let parts = util_1.util.getAllDottedGetParts(this.nameExpression);
+        if (((_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === AstNode_1.AstNodeKind.NamespaceStatement) {
+            parts = this.parent.parent.getNameParts().concat(parts);
+        }
+        return parts;
     }
     transpile(state) {
         //namespaces don't actually have any real content, so just transpile their bodies
-        return this.body.transpile(state);
+        return [
+            state.transpileAnnotations(this),
+            state.transpileLeadingComments(this.tokens.namespace),
+            this.body.transpile(state),
+            state.transpileLeadingComments(this.tokens.endNamespace)
+        ];
     }
     getTypedef(state) {
-        let result = [
-            'namespace ',
-            ...this.nameExpression.getName(Parser_1.ParseMode.BrighterScript),
-            state.newline
-        ];
+        var _a;
+        let result = [];
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        result.push('namespace ', ...this.getName(Parser_1.ParseMode.BrighterScript), state.newline);
         state.blockDepth++;
         result.push(...this.body.getTypedef(state));
         state.blockDepth--;
@@ -858,90 +1319,449 @@ class NamespaceStatement extends Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'nameExpression', visitor, options);
+            (0, visitors_1.walk)(this, 'nameExpression', visitor, options);
         }
         if (this.body.statements.length > 0 && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'body', visitor, options);
+            (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    getType(options) {
+        const resultType = new NamespaceType_1.NamespaceType(this.name);
+        return resultType;
+    }
+    clone() {
+        var _a, _b;
+        const clone = this.finalizeClone(new NamespaceStatement({
+            namespace: util_1.util.cloneToken(this.tokens.namespace),
+            nameExpression: (_a = this.nameExpression) === null || _a === void 0 ? void 0 : _a.clone(),
+            body: (_b = this.body) === null || _b === void 0 ? void 0 : _b.clone(),
+            endNamespace: util_1.util.cloneToken(this.tokens.endNamespace)
+        }), ['nameExpression', 'body']);
+        clone.cacheLocation();
+        return clone;
+    }
 }
 exports.NamespaceStatement = NamespaceStatement;
-class ImportStatement extends Statement {
-    constructor(importToken, filePathToken) {
+class ImportStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a, _b;
         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);
-        if (this.filePathToken) {
+        this.kind = AstNode_1.AstNodeKind.ImportStatement;
+        this.tokens = {
+            import: options.import,
+            path: options.path
+        };
+        this.location = util_1.util.createBoundingLocation(this.tokens.import, this.tokens.path);
+        if (this.tokens.path) {
             //remove quotes
-            this.filePath = this.filePathToken.text.replace(/"/g, '');
-            //adjust the range to exclude the quotes
-            this.filePathToken.range = util_1.util.createRange(this.filePathToken.range.start.line, this.filePathToken.range.start.character + 1, this.filePathToken.range.end.line, this.filePathToken.range.end.character - 1);
+            this.filePath = this.tokens.path.text.replace(/"/g, '');
+            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.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);
+            }
         }
     }
     transpile(state) {
         //The xml files are responsible for adding the additional script imports, but
         //add the import statement as a comment just for debugging purposes
         return [
-            `'`,
-            state.transpileToken(this.importToken),
+            state.transpileToken(this.tokens.import, 'import', true),
             ' ',
-            state.transpileToken(this.filePathToken)
+            state.transpileToken(this.tokens.path)
         ];
     }
     /**
      * Get the typedef for this statement
      */
     getTypedef(state) {
+        var _a, _b;
         return [
-            this.importToken.text,
+            (_b = (_a = this.tokens.import) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : 'import',
             ' ',
             //replace any `.bs` extension with `.brs`
-            this.filePathToken.text.replace(/\.bs"?$/i, '.brs"')
+            this.tokens.path.text.replace(/\.bs"?$/i, '.brs"')
         ];
     }
     walk(visitor, options) {
         //nothing to walk
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.import) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        return this.finalizeClone(new ImportStatement({
+            import: util_1.util.cloneToken(this.tokens.import),
+            path: util_1.util.cloneToken(this.tokens.path)
+        }));
+    }
 }
 exports.ImportStatement = ImportStatement;
-class ClassStatement extends Statement {
-    constructor(classKeyword, 
+class InterfaceStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a;
+        super();
+        this.kind = AstNode_1.AstNodeKind.InterfaceStatement;
+        this.tokens = {};
+        this.tokens = {
+            interface: options.interface,
+            name: options.name,
+            extends: options.extends,
+            endInterface: options.endInterface
+        };
+        this.parentInterfaceName = options.parentInterfaceName;
+        this.body = options.body;
+        this.location = util_1.util.createBoundingLocation(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...(_a = this.body) !== null && _a !== void 0 ? _a : [], this.tokens.endInterface);
+    }
+    get fields() {
+        return this.body.filter(x => (0, reflection_1.isInterfaceFieldStatement)(x));
+    }
+    get methods() {
+        return this.body.filter(x => (0, reflection_1.isInterfaceMethodStatement)(x));
+    }
+    hasParentInterface() {
+        return !!this.parentInterfaceName;
+    }
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.interface) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+    }
+    get endTrivia() {
+        var _a;
+        return (_a = this.tokens.endInterface) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+    }
     /**
-     * The name of the class (without namespace prefix)
+     * The name of the interface WITH its leading namespace (if applicable)
      */
-    name, body, end, extendsKeyword, parentClassName, namespaceName) {
-        var _a, _b, _c;
+    get fullName() {
+        var _a;
+        const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+        if (name) {
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            if (namespace) {
+                let namespaceName = namespace.getName(Parser_1.ParseMode.BrighterScript);
+                return `${namespaceName}.${name}`;
+            }
+            else {
+                return name;
+            }
+        }
+        else {
+            //return undefined which will allow outside callers to know that this interface doesn't have a name
+            return undefined;
+        }
+    }
+    /**
+     * The name of the interface (without the namespace prefix)
+     */
+    get name() {
+        var _a;
+        return (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+    }
+    /**
+     * Get the name of this expression based on the parse mode
+     */
+    getName(parseMode) {
+        const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+        if (namespace) {
+            let delimiter = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
+            let namespaceName = namespace.getName(parseMode);
+            return namespaceName + delimiter + this.name;
+        }
+        else {
+            return this.name;
+        }
+    }
+    transpile(state) {
+        //interfaces should completely disappear at runtime
+        return [
+            state.transpileLeadingComments(this.tokens.interface)
+        ];
+    }
+    getTypedef(state) {
+        var _a, _b, _c, _d;
+        const result = [];
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        for (let annotation of (_b = this.annotations) !== null && _b !== void 0 ? _b : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        result.push(this.tokens.interface.text, ' ', this.tokens.name.text);
+        const parentInterfaceName = (_c = this.parentInterfaceName) === null || _c === void 0 ? void 0 : _c.getName();
+        if (parentInterfaceName) {
+            result.push(' extends ', parentInterfaceName);
+        }
+        const body = (_d = this.body) !== null && _d !== void 0 ? _d : [];
+        if (body.length > 0) {
+            state.blockDepth++;
+        }
+        for (const statement of body) {
+            if ((0, reflection_1.isInterfaceMethodStatement)(statement) || (0, reflection_1.isInterfaceFieldStatement)(statement)) {
+                result.push(state.newline, state.indent(), ...statement.getTypedef(state));
+            }
+            else {
+                result.push(state.newline, state.indent(), ...statement.transpile(state));
+            }
+        }
+        if (body.length > 0) {
+            state.blockDepth--;
+        }
+        result.push(state.newline, state.indent(), 'end interface', state.newline);
+        return result;
+    }
+    walk(visitor, options) {
+        //visitor-less walk function to do parent linking
+        (0, visitors_1.walk)(this, 'parentInterfaceName', null, options);
+        if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            (0, visitors_1.walkArray)(this.body, visitor, options, this);
+        }
+    }
+    getType(options) {
+        var _a, _b, _c, _d;
+        const superIface = (_a = this.parentInterfaceName) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const resultType = new InterfaceType_1.InterfaceType(this.getName(Parser_1.ParseMode.BrighterScript), superIface);
+        for (const statement of this.methods) {
+            const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
+            const flag = statement.isOptional ? 1 /* SymbolTypeFlag.runtime */ | 4 /* SymbolTypeFlag.optional */ : 1 /* SymbolTypeFlag.runtime */;
+            resultType.addMember((_b = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _b === void 0 ? void 0 : _b.text, { definingNode: statement }, memberType, flag);
+        }
+        for (const statement of this.fields) {
+            const memberType = statement === null || statement === void 0 ? void 0 : statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); // no typechain info needed
+            const flag = statement.isOptional ? 1 /* SymbolTypeFlag.runtime */ | 4 /* SymbolTypeFlag.optional */ : 1 /* SymbolTypeFlag.runtime */;
+            resultType.addMember((_c = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement, isInstance: true }, memberType, flag);
+        }
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry({
+            name: this.getName(Parser_1.ParseMode.BrighterScript),
+            type: resultType,
+            data: options.data,
+            astNode: this
+        }));
+        return resultType;
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new InterfaceStatement({
+            interface: util_1.util.cloneToken(this.tokens.interface),
+            name: util_1.util.cloneToken(this.tokens.name),
+            extends: util_1.util.cloneToken(this.tokens.extends),
+            parentInterfaceName: (_a = this.parentInterfaceName) === null || _a === void 0 ? void 0 : _a.clone(),
+            body: (_b = this.body) === null || _b === void 0 ? void 0 : _b.map(x => x === null || x === void 0 ? void 0 : x.clone()),
+            endInterface: util_1.util.cloneToken(this.tokens.endInterface)
+        }), ['parentInterfaceName', 'body']);
+    }
+}
+exports.InterfaceStatement = InterfaceStatement;
+class InterfaceFieldStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.classKeyword = classKeyword;
-        this.name = name;
-        this.body = body;
-        this.end = end;
-        this.extendsKeyword = extendsKeyword;
-        this.parentClassName = parentClassName;
-        this.namespaceName = namespaceName;
+        this.kind = AstNode_1.AstNodeKind.InterfaceFieldStatement;
+        this.tokens = {
+            optional: options.optional,
+            name: options.name,
+            as: options.as
+        };
+        this.typeExpression = options.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.');
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        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;
+    }
+    get isOptional() {
+        return !!this.tokens.optional;
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
+        }
+    }
+    getTypedef(state) {
+        var _a, _b;
+        const result = [];
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        for (let annotation of (_b = this.annotations) !== null && _b !== void 0 ? _b : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        if (this.isOptional) {
+            result.push(this.tokens.optional.text, ' ');
+        }
+        result.push(this.tokens.name.text);
+        if (this.typeExpression) {
+            result.push(' as ', ...this.typeExpression.getTypedef(state));
+        }
+        return result;
+    }
+    getType(options) {
+        var _a, _b;
+        return (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(options)) !== null && _b !== void 0 ? _b : DynamicType_1.DynamicType.instance;
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new InterfaceFieldStatement({
+            name: util_1.util.cloneToken(this.tokens.name),
+            as: util_1.util.cloneToken(this.tokens.as),
+            typeExpression: (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.clone(),
+            optional: util_1.util.cloneToken(this.tokens.optional)
+        }));
+    }
+}
+exports.InterfaceFieldStatement = InterfaceFieldStatement;
+//TODO: there is much that is similar with this and FunctionExpression.
+//It would be nice to refactor this so there is less duplicated code
+class InterfaceMethodStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a;
+        super();
+        this.kind = AstNode_1.AstNodeKind.InterfaceMethodStatement;
+        this.tokens = {
+            optional: options.optional,
+            functionType: options.functionType,
+            name: options.name,
+            leftParen: options.leftParen,
+            rightParen: options.rightParen,
+            as: options.as
+        };
+        this.params = (_a = options.params) !== null && _a !== void 0 ? _a : [];
+        this.returnTypeExpression = options.returnTypeExpression;
+    }
+    transpile(state) {
+        throw new Error('Method not implemented.');
+    }
+    get location() {
+        var _a;
+        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.
+     */
+    getName(parseMode) {
+        return this.tokens.name.text;
+    }
+    get isOptional() {
+        return !!this.tokens.optional;
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        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) {
+            (0, visitors_1.walk)(this, 'returnTypeExpression', visitor, options);
+        }
+    }
+    getTypedef(state) {
+        var _a, _b, _c, _d, _e;
+        const result = [];
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        for (let annotation of (_b = this.annotations) !== null && _b !== void 0 ? _b : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        if (this.isOptional) {
+            result.push(this.tokens.optional.text, ' ');
+        }
+        result.push((_d = (_c = this.tokens.functionType) === null || _c === void 0 ? void 0 : _c.text) !== null && _d !== void 0 ? _d : 'function', ' ', this.tokens.name.text, '(');
+        const params = (_e = this.params) !== null && _e !== void 0 ? _e : [];
+        for (let i = 0; i < params.length; i++) {
+            if (i > 0) {
+                result.push(', ');
+            }
+            const param = params[i];
+            result.push(param.tokens.name.text);
+            if (param.typeExpression) {
+                result.push(' as ', ...param.typeExpression.getTypedef(state));
+            }
+        }
+        result.push(')');
+        if (this.returnTypeExpression) {
+            result.push(' as ', ...this.returnTypeExpression.getTypedef(state));
+        }
+        return result;
+    }
+    getType(options) {
+        var _a, _b, _c, _d;
+        //if there's a defined return type, use that
+        let returnType = (_a = this.returnTypeExpression) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const isSub = ((_b = this.tokens.functionType) === null || _b === void 0 ? void 0 : _b.kind) === TokenKind_1.TokenKind.Sub || !returnType;
+        //if we don't have a return type and this is a sub, set the return type to `void`. else use `dynamic`
+        if (!returnType) {
+            returnType = isSub ? VoidType_1.VoidType.instance : DynamicType_1.DynamicType.instance;
+        }
+        const resultType = new TypedFunctionType_1.TypedFunctionType(returnType);
+        resultType.isSub = isSub;
+        for (let param of this.params) {
+            resultType.addParameter(param.tokens.name.text, param.getType(options), !!param.defaultValue);
+        }
+        if (options.typeChain) {
+            // need Interface type for type chain
+            (_c = this.parent) === null || _c === void 0 ? void 0 : _c.getType(options);
+        }
+        let funcName = this.getName(Parser_1.ParseMode.BrighterScript);
+        resultType.setName(funcName);
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry({ name: resultType.name, type: resultType, data: options.data, astNode: this }));
+        return resultType;
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new InterfaceMethodStatement({
+            optional: util_1.util.cloneToken(this.tokens.optional),
+            functionType: util_1.util.cloneToken(this.tokens.functionType),
+            name: util_1.util.cloneToken(this.tokens.name),
+            leftParen: util_1.util.cloneToken(this.tokens.leftParen),
+            params: (_a = this.params) === null || _a === void 0 ? void 0 : _a.map(p => p === null || p === void 0 ? void 0 : p.clone()),
+            rightParen: util_1.util.cloneToken(this.tokens.rightParen),
+            as: util_1.util.cloneToken(this.tokens.as),
+            returnTypeExpression: (_b = this.returnTypeExpression) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['params']);
+    }
+}
+exports.InterfaceMethodStatement = InterfaceMethodStatement;
+class ClassStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a, _b, _c, _d, _e;
+        super();
+        this.kind = AstNode_1.AstNodeKind.ClassStatement;
         this.memberMap = {};
         this.methods = [];
         this.fields = [];
-        this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
+        this.body = (_a = options.body) !== null && _a !== void 0 ? _a : [];
+        this.tokens = {
+            name: options.name,
+            class: options.class,
+            endClass: options.endClass,
+            extends: options.extends
+        };
+        this.parentClassName = options.parentClassName;
+        this.symbolTable = new SymbolTable_1.SymbolTable(`ClassStatement: '${(_b = this.tokens.name) === null || _b === void 0 ? void 0 : _b.text}'`, () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
         for (let statement of this.body) {
-            if (reflection_1.isClassMethodStatement(statement)) {
+            if ((0, reflection_1.isMethodStatement)(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.tokens.name) === null || _c === void 0 ? void 0 : _c.text.toLowerCase()] = statement;
             }
-            else if (reflection_1.isClassFieldStatement(statement)) {
+            else if ((0, reflection_1.isFieldStatement)(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.tokens.name) === null || _d === void 0 ? void 0 : _d.text.toLowerCase()] = statement;
             }
         }
-        this.range = util_1.util.createRangeFromPositions(this.classKeyword.range.start, this.end.range.end);
+        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;
-        const name = (_a = this.name) === null || _a === void 0 ? void 0 : _a.text;
+        const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
         if (name) {
-            if (this.namespaceName) {
-                let namespaceName = this.namespaceName.getName(parseMode);
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            if (namespace) {
+                let namespaceName = namespace.getName(parseMode);
                 let separator = parseMode === Parser_1.ParseMode.BrighterScript ? '.' : '_';
                 return namespaceName + separator + name;
             }
@@ -954,6 +1774,14 @@ class ClassStatement extends Statement {
             return undefined;
         }
     }
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.class) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+    }
+    get endTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.endClass) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
     transpile(state) {
         let result = [];
         //make the builder
@@ -966,18 +1794,34 @@ class ClassStatement extends Statement {
     getTypedef(state) {
         var _a, _b;
         const result = [];
-        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        for (let annotation of (_b = this.annotations) !== null && _b !== void 0 ? _b : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
-        result.push('class ', this.name.text);
-        if (this.extendsKeyword && this.parentClassName) {
-            const fqName = util_1.util.getFullyQualifiedClassName(this.parentClassName.getName(Parser_1.ParseMode.BrighterScript), (_b = this.namespaceName) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript));
+        result.push('class ', this.tokens.name.text);
+        if (this.parentClassName) {
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            const fqName = util_1.util.getFullyQualifiedClassName(this.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript));
             result.push(` extends ${fqName}`);
         }
         result.push(state.newline);
         state.blockDepth++;
-        for (const member of this.body) {
-            if ('getTypedef' in member) {
+        let body = this.body;
+        //inject an empty "new" method if missing
+        if (!this.getConstructorFunction()) {
+            const constructor = (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub);
+            constructor.parent = this;
+            //walk the constructor to set up parent links
+            constructor.link();
+            body = [
+                constructor,
+                ...this.body
+            ];
+        }
+        for (const member of body) {
+            if ((0, reflection_1.isTypedefProvider)(member)) {
                 result.push(state.indent(), ...member.getTypedef(state), state.newline);
             }
         }
@@ -991,20 +1835,27 @@ class ClassStatement extends Statement {
      * The base class is index 0, its child is index 1, and so on.
      */
     getParentClassIndex(state) {
-        var _a, _b;
+        var _a;
         let myIndex = 0;
         let stmt = this;
         while (stmt) {
             if (stmt.parentClassName) {
+                const namespace = stmt.findAncestor(reflection_1.isNamespaceStatement);
                 //find the parent class
-                stmt = (_b = state.file.getClassFileLink(stmt.parentClassName.getName(Parser_1.ParseMode.BrighterScript), (_a = stmt.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))) === null || _b === void 0 ? void 0 : _b.item;
+                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
                 myIndex++;
             }
             else {
                 break;
             }
         }
-        return myIndex - 1;
+        const result = myIndex - 1;
+        if (result >= 0) {
+            return result;
+        }
+        else {
+            return null;
+        }
     }
     hasParentClass() {
         return !!this.parentClassName;
@@ -1014,12 +1865,13 @@ class ClassStatement extends Statement {
      * This will return an empty array if no ancestors were found
      */
     getAncestors(state) {
-        var _a, _b;
+        var _a;
         let ancestors = [];
         let stmt = this;
         while (stmt) {
             if (stmt.parentClassName) {
-                stmt = (_b = state.file.getClassFileLink(stmt.parentClassName.getName(Parser_1.ParseMode.BrighterScript), (_a = this.namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript))) === null || _b === void 0 ? void 0 : _b.item;
+                const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+                stmt = (_a = state.file.getClassFileLink(stmt.parentClassName.getName(), namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) === null || _a === void 0 ? void 0 : _a.item;
                 ancestors.push(stmt);
             }
             else {
@@ -1034,27 +1886,20 @@ class ClassStatement extends Statement {
         }
         return `__${name}_builder`;
     }
+    getConstructorType() {
+        var _a, _b;
+        const constructorType = (_b = (_a = this.getConstructorFunction()) === null || _a === void 0 ? void 0 : _a.getType({ flags: 1 /* SymbolTypeFlag.runtime */ })) !== null && _b !== void 0 ? _b : new TypedFunctionType_1.TypedFunctionType(null);
+        constructorType.returnType = this.getType({ flags: 1 /* SymbolTypeFlag.runtime */ });
+        return constructorType;
+    }
     /**
      * Get the constructor function for this class (if exists), or undefined if not exist
      */
     getConstructorFunction() {
-        var _a, _b;
-        for (let key in this.memberMap) {
-            let member = this.memberMap[key];
-            if (((_b = (_a = member.name) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'new') {
-                return member;
-            }
-        }
-    }
-    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 this.body.find((stmt) => {
+            var _a, _b;
+            return ((_b = (_a = stmt === null || stmt === void 0 ? void 0 : stmt.tokens.name) === null || _a === void 0 ? void 0 : _a.text) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'new';
+        });
     }
     /**
      * Determine if the specified field was declared in one of the ancestor classes
@@ -1074,7 +1919,6 @@ class ClassStatement extends Statement {
      * without instantiating the parent constructor at that point in time.
      */
     getTranspiledBuilder(state) {
-        var _a;
         let result = [];
         result.push(`function ${this.getBuilderName(this.getName(Parser_1.ParseMode.BrightScript))}()\n`);
         state.blockDepth++;
@@ -1086,7 +1930,8 @@ class ClassStatement extends Statement {
         let ancestors = this.getAncestors(state);
         //construct parent class or empty object
         if (ancestors[0]) {
-            let fullyQualifiedClassName = util_1.util.getFullyQualifiedClassName(ancestors[0].getName(Parser_1.ParseMode.BrighterScript), (_a = ancestors[0].namespaceName) === null || _a === void 0 ? void 0 : _a.getName(Parser_1.ParseMode.BrighterScript));
+            const ancestorNamespace = ancestors[0].findAncestor(reflection_1.isNamespaceStatement);
+            let fullyQualifiedClassName = util_1.util.getFullyQualifiedClassName(ancestors[0].getName(Parser_1.ParseMode.BrighterScript), ancestorNamespace === null || ancestorNamespace === void 0 ? void 0 : ancestorNamespace.getName(Parser_1.ParseMode.BrighterScript));
             result.push('instance = ', this.getBuilderName(fullyQualifiedClassName), '()');
         }
         else {
@@ -1095,29 +1940,38 @@ class ClassStatement extends Statement {
         }
         result.push(state.newline, state.indent());
         let parentClassIndex = this.getParentClassIndex(state);
-        //create empty `new` function if class is missing it (simplifies transpile logic)
+        let body = this.body;
+        //inject an empty "new" method if missing
         if (!this.getConstructorFunction()) {
-            this.memberMap.new = this.getEmptyNewFunction();
-            this.body = [this.memberMap.new, ...this.body];
+            body = [
+                (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub),
+                ...this.body
+            ];
         }
-        for (let statement of this.body) {
+        for (let statement of body) {
             //is field statement
-            if (reflection_1.isClassFieldStatement(statement)) {
+            if ((0, reflection_1.isFieldStatement)(statement)) {
                 //do nothing with class fields in this situation, they are handled elsewhere
                 continue;
                 //methods
             }
-            else if (reflection_1.isClassMethodStatement(statement)) {
+            else if ((0, reflection_1.isMethodStatement)(statement)) {
                 //store overridden parent methods as super{parentIndex}_{methodName}
                 if (
                 //is override method
-                statement.override ||
+                statement.tokens.override ||
                     //is constructor function in child class
-                    (statement.name.text.toLowerCase() === 'new' && ancestors[0])) {
-                    result.push(`instance.super${parentClassIndex}_${statement.name.text} = instance.${statement.name.text}`, state.newline, state.indent());
+                    (statement.tokens.name.text.toLowerCase() === 'new' && ancestors[0])) {
+                    result.push(`instance.super${parentClassIndex}_${statement.tokens.name.text} = instance.${statement.tokens.name.text}`, state.newline, state.indent());
                 }
                 state.classStatement = this;
-                result.push('instance.', state.transpileToken(statement.name), ' = ', ...statement.transpile(state), state.newline, state.indent());
+                state.skipLeadingComments = true;
+                //add leading comments
+                if (statement.leadingTrivia.filter(token => token.kind === TokenKind_1.TokenKind.Comment).length > 0) {
+                    result.push(...state.transpileComments(statement.leadingTrivia), state.indent());
+                }
+                result.push('instance.', state.transpileToken(statement.tokens.name), ' = ', ...statement.transpile(state), state.newline, state.indent());
+                state.skipLeadingComments = false;
                 delete state.classStatement;
             }
             else {
@@ -1138,10 +1992,10 @@ class ClassStatement extends Statement {
      * This invokes the builder, gets an instance of the class, then invokes the "new" function on that class.
      */
     getTranspiledClassFunction(state) {
-        let result = [];
+        let result = state.transpileAnnotations(this);
         const constructorFunction = this.getConstructorFunction();
         const constructorParams = constructorFunction ? constructorFunction.func.parameters : [];
-        result.push(state.sourceNode(this.classKeyword, 'function'), state.sourceNode(this.classKeyword, ' '), state.sourceNode(this.name, this.getName(Parser_1.ParseMode.BrightScript)), `(`);
+        result.push(state.transpileLeadingComments(this.tokens.class), state.sourceNode(this.tokens.class, 'function'), state.sourceNode(this.tokens.class, ' '), state.sourceNode(this.tokens.name, this.getName(Parser_1.ParseMode.BrightScript)), `(`);
         let i = 0;
         for (let param of constructorParams) {
             if (i > 0) {
@@ -1162,7 +2016,7 @@ class ClassStatement extends Statement {
             if (i > 0) {
                 result.push(', ');
             }
-            result.push(state.transpileToken(param.name));
+            result.push(state.transpileToken(param.tokens.name));
             i++;
         }
         result.push(')', '\n');
@@ -1174,24 +2028,92 @@ class ClassStatement extends Statement {
         return result;
     }
     walk(visitor, options) {
+        //visitor-less walk function to do parent linking
+        (0, visitors_1.walk)(this, 'parentClassName', null, options);
         if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            for (let i = 0; i < this.body.length; i++) {
-                visitors_1.walk(this.body, i, visitor, options, this);
+            (0, visitors_1.walkArray)(this.body, visitor, options, this);
+        }
+    }
+    getType(options) {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const superClass = (_a = this.parentClassName) === null || _a === void 0 ? void 0 : _a.getType(options);
+        const resultType = new ClassType_1.ClassType(this.getName(Parser_1.ParseMode.BrighterScript), superClass);
+        for (const statement of this.methods) {
+            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
+            let flag = 1 /* SymbolTypeFlag.runtime */;
+            if (((_b = statement.accessModifier) === null || _b === void 0 ? void 0 : _b.kind) === TokenKind_1.TokenKind.Private) {
+                flag |= 8 /* SymbolTypeFlag.private */;
+            }
+            if (((_c = statement.accessModifier) === null || _c === void 0 ? void 0 : _c.kind) === TokenKind_1.TokenKind.Protected) {
+                flag |= 16 /* SymbolTypeFlag.protected */;
+            }
+            resultType.addMember((_d = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _d === void 0 ? void 0 : _d.text, { definingNode: statement }, funcType, flag);
+        }
+        for (const statement of this.fields) {
+            const fieldType = statement.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })); //no typechain needed
+            let flag = 1 /* SymbolTypeFlag.runtime */;
+            if (statement.isOptional) {
+                flag |= 4 /* SymbolTypeFlag.optional */;
             }
+            if (((_e = statement.tokens.accessModifier) === null || _e === void 0 ? void 0 : _e.kind) === TokenKind_1.TokenKind.Private) {
+                flag |= 8 /* SymbolTypeFlag.private */;
+            }
+            if (((_f = statement.tokens.accessModifier) === null || _f === void 0 ? void 0 : _f.kind) === TokenKind_1.TokenKind.Protected) {
+                flag |= 16 /* SymbolTypeFlag.protected */;
+            }
+            resultType.addMember((_g = statement === null || statement === void 0 ? void 0 : statement.tokens.name) === null || _g === void 0 ? void 0 : _g.text, { definingNode: statement, isInstance: true }, fieldType, flag);
         }
+        (_h = options.typeChain) === null || _h === void 0 ? void 0 : _h.push(new interfaces_1.TypeChainEntry({ name: resultType.name, type: resultType, data: options.data, astNode: this }));
+        return resultType;
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new ClassStatement({
+            class: util_1.util.cloneToken(this.tokens.class),
+            name: util_1.util.cloneToken(this.tokens.name),
+            body: (_a = this.body) === null || _a === void 0 ? void 0 : _a.map(x => x === null || x === void 0 ? void 0 : x.clone()),
+            endClass: util_1.util.cloneToken(this.tokens.endClass),
+            extends: util_1.util.cloneToken(this.tokens.extends),
+            parentClassName: (_b = this.parentClassName) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['body', 'parentClassName']);
     }
 }
 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);
+const accessModifiers = [
+    TokenKind_1.TokenKind.Public,
+    TokenKind_1.TokenKind.Protected,
+    TokenKind_1.TokenKind.Private
+];
+class MethodStatement extends FunctionStatement {
+    constructor(options) {
+        super(options);
+        this.kind = AstNode_1.AstNodeKind.MethodStatement;
+        this.modifiers = [];
+        if (options.modifiers) {
+            if (Array.isArray(options.modifiers)) {
+                this.modifiers.push(...options.modifiers);
+            }
+            else {
+                this.modifiers.push(options.modifiers);
+            }
+        }
+        this.tokens = Object.assign(Object.assign({}, this.tokens), { override: options.override });
+        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));
+    }
+    /**
+     * Get the name of this method.
+     */
+    getName(parseMode) {
+        return this.tokens.name.text;
+    }
+    get leadingTrivia() {
+        return this.func.leadingTrivia;
     }
     transpile(state) {
-        if (this.name.text.toLowerCase() === 'new') {
+        if (this.tokens.name.text.toLowerCase() === 'new') {
             this.ensureSuperConstructorCall(state);
             //TODO we need to undo this at the bottom of this method
             this.injectFieldInitializersForConstructor(state);
@@ -1199,18 +2121,18 @@ class ClassMethodStatement extends FunctionStatement {
         //TODO - remove type information from these methods because that doesn't work
         //convert the `super` calls into the proper methods
         const parentClassIndex = state.classStatement.getParentClassIndex(state);
-        const visitor = visitors_1.createVisitor({
+        const visitor = (0, visitors_1.createVisitor)({
             VariableExpression: e => {
-                if (e.name.text.toLocaleLowerCase() === 'super') {
-                    e.name.text = `m.super${parentClassIndex}_new`;
+                if (e.tokens.name.text.toLocaleLowerCase() === 'super') {
+                    state.editor.setProperty(e.tokens.name, 'text', `m.super${parentClassIndex}_new`);
                 }
             },
             DottedGetExpression: e => {
                 const beginningVariable = util_1.util.findBeginningVariableExpression(e);
                 const lowerName = beginningVariable === null || beginningVariable === void 0 ? void 0 : beginningVariable.getName(Parser_1.ParseMode.BrighterScript).toLowerCase();
                 if (lowerName === 'super') {
-                    beginningVariable.name.text = 'm';
-                    e.name.text = `super${parentClassIndex}_${e.name.text}`;
+                    state.editor.setProperty(beginningVariable.tokens.name, 'text', 'm');
+                    state.editor.setProperty(e.tokens.name, 'text', `super${parentClassIndex}_${e.tokens.name.text}`);
                 }
             }
         });
@@ -1222,18 +2144,21 @@ class ClassMethodStatement extends FunctionStatement {
         return this.func.transpile(state);
     }
     getTypedef(state) {
-        var _a;
+        var _a, _b;
         const result = [];
-        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        for (let annotation of (_b = this.annotations) !== null && _b !== void 0 ? _b : []) {
             result.push(...annotation.getTypedef(state), state.newline, state.indent());
         }
         if (this.accessModifier) {
             result.push(this.accessModifier.text, ' ');
         }
-        if (this.override) {
+        if (this.tokens.override) {
             result.push('override ');
         }
-        result.push(...this.func.getTypedef(state, this.name));
+        result.push(...this.func.getTypedef(state));
         return result;
     }
     /**
@@ -1245,163 +2170,279 @@ class ClassMethodStatement extends FunctionStatement {
         if (state.classStatement.getAncestors(state).length === 0) {
             return;
         }
-        //if the first statement is a call to super, quit here
-        let firstStatement = this.func.body.statements[0];
-        if (
-        //is a call statement
-        reflection_1.isExpressionStatement(firstStatement) && reflection_1.isCallExpression(firstStatement.expression) &&
-            //is a call to super
-            util_1.util.findBeginningVariableExpression(firstStatement === null || firstStatement === void 0 ? void 0 : firstStatement.expression.callee).name.text.toLowerCase() === 'super') {
+        //check whether any calls to super exist
+        let containsSuperCall = this.func.body.statements.findIndex((x) => {
+            var _a;
+            //is a call statement
+            return (0, reflection_1.isExpressionStatement)(x) && (0, reflection_1.isCallExpression)(x.expression) &&
+                //is a call to super
+                ((_a = util_1.util.findBeginningVariableExpression(x.expression.callee).tokens.name) === null || _a === void 0 ? void 0 : _a.text.toLowerCase()) === 'super';
+        }) !== -1;
+        //if a call to super exists, quit here
+        if (containsSuperCall) {
             return;
         }
-        //this is a child class, and the first statement isn't a call to super. Inject one
-        this.func.body.statements.unshift(new ExpressionStatement(new Expression_1.CallExpression(new Expression_1.VariableExpression({
-            kind: lexer_1.TokenKind.Identifier,
-            text: 'super',
-            isReserved: false,
-            range: state.classStatement.name.range,
-            leadingWhitespace: ''
-        }, null), {
-            kind: lexer_1.TokenKind.LeftParen,
-            text: '(',
-            isReserved: false,
-            range: state.classStatement.name.range,
-            leadingWhitespace: ''
-        }, {
-            kind: lexer_1.TokenKind.RightParen,
-            text: ')',
-            isReserved: false,
-            range: state.classStatement.name.range,
-            leadingWhitespace: ''
-        }, [], null)));
+        //this is a child class, and the constructor doesn't contain a call to super. Inject one
+        const superCall = new ExpressionStatement({
+            expression: new Expression_1.CallExpression({
+                callee: new Expression_1.VariableExpression({
+                    name: {
+                        kind: TokenKind_1.TokenKind.Identifier,
+                        text: 'super',
+                        isReserved: false,
+                        location: state.classStatement.tokens.name.location,
+                        leadingWhitespace: '',
+                        leadingTrivia: []
+                    }
+                }),
+                openingParen: {
+                    kind: TokenKind_1.TokenKind.LeftParen,
+                    text: '(',
+                    isReserved: false,
+                    location: state.classStatement.tokens.name.location,
+                    leadingWhitespace: '',
+                    leadingTrivia: []
+                },
+                closingParen: {
+                    kind: TokenKind_1.TokenKind.RightParen,
+                    text: ')',
+                    isReserved: false,
+                    location: state.classStatement.tokens.name.location,
+                    leadingWhitespace: '',
+                    leadingTrivia: []
+                },
+                args: []
+            })
+        });
+        state.editor.arrayUnshift(this.func.body.statements, superCall);
     }
     /**
      * Inject field initializers at the top of the `new` function (after any present `super()` call)
      */
     injectFieldInitializersForConstructor(state) {
+        var _a;
         let startingIndex = state.classStatement.hasParentClass() ? 1 : 0;
         let newStatements = [];
         //insert the field initializers in order
         for (let field of state.classStatement.fields) {
-            let thisQualifiedName = Object.assign({}, field.name);
-            thisQualifiedName.text = 'm.' + field.name.text;
-            if (field.initialValue) {
-                newStatements.push(new AssignmentStatement(thisQualifiedName, field.equal, field.initialValue, this.func));
-            }
-            else {
-                //if there is no initial value, set the initial value to `invalid`
-                newStatements.push(new AssignmentStatement(thisQualifiedName, creators_1.createToken(lexer_1.TokenKind.Equal, '=', field.name.range), creators_1.createInvalidLiteral('invalid', field.name.range), this.func));
-            }
-        }
-        this.func.body.statements.splice(startingIndex, 0, ...newStatements);
+            let thisQualifiedName = Object.assign({}, field.tokens.name);
+            thisQualifiedName.text = 'm.' + ((_a = field.tokens.name) === null || _a === void 0 ? void 0 : _a.text);
+            const fieldAssignment = field.initialValue
+                ? new AssignmentStatement({
+                    equals: field.tokens.equals,
+                    name: thisQualifiedName,
+                    value: field.initialValue
+                })
+                : new AssignmentStatement({
+                    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.location)
+                });
+            // Add parent so namespace lookups work
+            fieldAssignment.parent = state.classStatement;
+            newStatements.push(fieldAssignment);
+        }
+        state.editor.arraySplice(this.func.body.statements, startingIndex, 0, ...newStatements);
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'func', visitor, options);
+            (0, visitors_1.walk)(this, 'func', visitor, options);
         }
     }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new MethodStatement({
+            modifiers: (_a = this.modifiers) === null || _a === void 0 ? void 0 : _a.map(m => util_1.util.cloneToken(m)),
+            name: util_1.util.cloneToken(this.tokens.name),
+            func: (_b = this.func) === null || _b === void 0 ? void 0 : _b.clone(),
+            override: util_1.util.cloneToken(this.tokens.override)
+        }), ['func']);
+    }
 }
-exports.ClassMethodStatement = ClassMethodStatement;
-class ClassFieldStatement extends Statement {
-    constructor(accessModifier, name, as, type, equal, initialValue) {
-        var _a, _b, _c, _d;
+exports.MethodStatement = MethodStatement;
+class FieldStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.accessModifier = accessModifier;
-        this.name = name;
-        this.as = as;
-        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.kind = AstNode_1.AstNodeKind.FieldStatement;
+        this.tokens = {
+            accessModifier: options.accessModifier,
+            name: options.name,
+            as: options.as,
+            equals: options.equals,
+            optional: options.optional
+        };
+        this.typeExpression = options.typeExpression;
+        this.initialValue = options.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.
      * Defaults to `DynamicType`
      */
-    getType() {
-        if (this.type) {
-            return util_1.util.tokenToBscType(this.type);
-        }
-        else if (reflection_1.isLiteralExpression(this.initialValue)) {
-            return this.initialValue.type;
-        }
-        else {
-            return new DynamicType_1.DynamicType();
-        }
+    getType(options) {
+        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;
+    }
+    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;
     }
     transpile(state) {
         throw new Error('transpile not implemented for ' + Object.getPrototypeOf(this).constructor.name);
     }
     getTypedef(state) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         const result = [];
-        if (this.name) {
-            for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+        if (this.tokens.name) {
+            for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+                result.push(comment.text, state.newline, state.indent());
+            }
+            for (let annotation of (_b = this.annotations) !== null && _b !== void 0 ? _b : []) {
                 result.push(...annotation.getTypedef(state), state.newline, state.indent());
             }
-            let type = this.getType();
-            if (reflection_1.isInvalidType(type) || reflection_1.isVoidType(type)) {
+            let type = this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
+            if ((0, reflection_1.isInvalidType)(type) || (0, reflection_1.isVoidType)(type)) {
                 type = new DynamicType_1.DynamicType();
             }
-            result.push((_c = (_b = this.accessModifier) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : 'public', ' ', (_d = this.name) === null || _d === void 0 ? void 0 : _d.text, ' as ', type.toTypeString());
+            result.push((_d = (_c = this.tokens.accessModifier) === null || _c === void 0 ? void 0 : _c.text) !== null && _d !== void 0 ? _d : 'public', ' ');
+            if (this.isOptional) {
+                result.push(this.tokens.optional.text, ' ');
+            }
+            result.push((_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.text, ' as ', type.toTypeString());
         }
         return result;
     }
     walk(visitor, options) {
-        if (this.initialValue && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'initialValue', visitor, options);
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
+            (0, visitors_1.walk)(this, 'initialValue', visitor, options);
         }
     }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new FieldStatement({
+            accessModifier: util_1.util.cloneToken(this.tokens.accessModifier),
+            name: util_1.util.cloneToken(this.tokens.name),
+            as: util_1.util.cloneToken(this.tokens.as),
+            typeExpression: (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.clone(),
+            equals: util_1.util.cloneToken(this.tokens.equals),
+            initialValue: (_b = this.initialValue) === null || _b === void 0 ? void 0 : _b.clone(),
+            optional: util_1.util.cloneToken(this.tokens.optional)
+        }), ['initialValue']);
+    }
 }
-exports.ClassFieldStatement = ClassFieldStatement;
-class TryCatchStatement extends Statement {
-    constructor(tryToken, tryBranch, catchToken, exceptionVariable, catchBranch, endTryToken) {
+exports.FieldStatement = FieldStatement;
+class TryCatchStatement extends AstNode_2.Statement {
+    constructor(options) {
         super();
-        this.tryToken = tryToken;
-        this.tryBranch = tryBranch;
-        this.catchToken = catchToken;
-        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.kind = AstNode_1.AstNodeKind.TryCatchStatement;
+        this.tokens = {
+            try: options.try,
+            endTry: options.endTry
+        };
+        this.tryBranch = options.tryBranch;
+        this.catchStatement = options.catchStatement;
+        this.location = util_1.util.createBoundingLocation(this.tokens.try, this.tryBranch, this.catchStatement, this.tokens.endTry);
     }
     transpile(state) {
+        var _a, _b;
         return [
-            state.transpileToken(this.tryToken),
+            state.transpileToken(this.tokens.try, 'try'),
             ...this.tryBranch.transpile(state),
             state.newline,
             state.indent(),
-            state.transpileToken(this.catchToken),
-            ' ',
-            state.transpileToken(this.exceptionVariable),
-            ...this.catchBranch.transpile(state),
+            ...((_b = (_a = this.catchStatement) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : ['catch']),
             state.newline,
             state.indent(),
-            state.transpileToken(this.endTryToken)
+            state.transpileToken(this.tokens.endTry, 'end try')
         ];
     }
     walk(visitor, options) {
         if (this.tryBranch && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
-            visitors_1.walk(this, 'tryBranch', visitor, options);
-            visitors_1.walk(this, 'catchBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'tryBranch', visitor, options);
+            (0, visitors_1.walk)(this, 'catchStatement', visitor, options);
         }
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.try) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    get endTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.endTry) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new TryCatchStatement({
+            try: util_1.util.cloneToken(this.tokens.try),
+            endTry: util_1.util.cloneToken(this.tokens.endTry),
+            tryBranch: (_a = this.tryBranch) === null || _a === void 0 ? void 0 : _a.clone(),
+            catchStatement: (_b = this.catchStatement) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['tryBranch', 'catchStatement']);
+    }
 }
 exports.TryCatchStatement = TryCatchStatement;
-class ThrowStatement extends Statement {
-    constructor(throwToken, expression) {
-        var _a;
+class CatchStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.CatchStatement;
+        this.tokens = {
+            catch: options === null || options === void 0 ? void 0 : options.catch
+        };
+        this.exceptionVariableExpression = options === null || options === void 0 ? void 0 : options.exceptionVariableExpression;
+        this.catchBranch = options === null || options === void 0 ? void 0 : options.catchBranch;
+        this.location = util_1.util.createBoundingLocation(this.tokens.catch, this.exceptionVariableExpression, this.catchBranch);
+    }
+    transpile(state) {
+        var _a, _b, _c, _d, _e;
+        return [
+            state.transpileToken(this.tokens.catch, 'catch'),
+            ' ',
+            (_b = (_a = this.exceptionVariableExpression) === null || _a === void 0 ? void 0 : _a.transpile(state)) !== null && _b !== void 0 ? _b : [
+                //use the variable named `e` if it doesn't exist in this function body. otherwise use '__bsc_error' just to make sure we're out of the way
+                ((_c = this.getSymbolTable()) === null || _c === void 0 ? void 0 : _c.hasSymbol('e', 1 /* SymbolTypeFlag.runtime */))
+                    ? '__bsc_error'
+                    : 'e'
+            ],
+            ...((_e = (_d = this.catchBranch) === null || _d === void 0 ? void 0 : _d.transpile(state)) !== null && _e !== void 0 ? _e : [])
+        ];
+    }
+    walk(visitor, options) {
+        if (this.catchBranch && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            (0, visitors_1.walk)(this, 'catchBranch', visitor, options);
+        }
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.catch) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new CatchStatement({
+            catch: util_1.util.cloneToken(this.tokens.catch),
+            exceptionVariableExpression: (_a = this.exceptionVariableExpression) === null || _a === void 0 ? void 0 : _a.clone(),
+            catchBranch: (_b = this.catchBranch) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['catchBranch']);
+    }
+}
+exports.CatchStatement = CatchStatement;
+class ThrowStatement extends AstNode_2.Statement {
+    constructor(options) {
         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.kind = AstNode_1.AstNodeKind.ThrowStatement;
+        this.tokens = {
+            throw: options.throw
+        };
+        this.expression = options.expression;
+        this.location = util_1.util.createBoundingLocation(this.tokens.throw, this.expression);
     }
     transpile(state) {
         const result = [
-            state.transpileToken(this.throwToken),
+            state.transpileToken(this.tokens.throw, 'throw'),
             ' '
         ];
         //if we have an expression, transpile it
@@ -1410,15 +2451,618 @@ class ThrowStatement extends Statement {
             //no expression found. Rather than emit syntax errors, provide a generic error message
         }
         else {
-            result.push('"An error has occurred"');
+            result.push('"User-specified exception"');
         }
         return result;
     }
     walk(visitor, options) {
         if (this.expression && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'expression', visitor, options);
+            (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
     }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.throw) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new ThrowStatement({
+            throw: util_1.util.cloneToken(this.tokens.throw),
+            expression: (_a = this.expression) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['expression']);
+    }
 }
 exports.ThrowStatement = ThrowStatement;
+class EnumStatement extends AstNode_2.Statement {
+    constructor(options) {
+        var _a;
+        super();
+        this.kind = AstNode_1.AstNodeKind.EnumStatement;
+        this.tokens = {
+            enum: options.enum,
+            name: options.name,
+            endEnum: options.endEnum
+        };
+        this.symbolTable = new SymbolTable_1.SymbolTable('Enum');
+        this.body = (_a = options.body) !== null && _a !== void 0 ? _a : [];
+    }
+    get location() {
+        return util_1.util.createBoundingLocation(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum);
+    }
+    getMembers() {
+        const result = [];
+        for (const statement of this.body) {
+            if ((0, reflection_1.isEnumMemberStatement)(statement)) {
+                result.push(statement);
+            }
+        }
+        return result;
+    }
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.enum) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+    }
+    get endTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.endEnum) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    /**
+     * Get a map of member names and their values.
+     * All values are stored as their AST LiteralExpression representation (i.e. string enum values include the wrapping quotes)
+     */
+    getMemberValueMap() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        const result = new Map();
+        const members = this.getMembers();
+        let currentIntValue = 0;
+        for (const member of members) {
+            //if there is no value, assume an integer and increment the int counter
+            if (!member.value) {
+                result.set((_a = member.name) === null || _a === void 0 ? void 0 : _a.toLowerCase(), currentIntValue.toString());
+                currentIntValue++;
+                //if explicit integer value, use it and increment the int counter
+            }
+            else if ((0, reflection_1.isLiteralExpression)(member.value) && member.value.tokens.value.kind === TokenKind_1.TokenKind.IntegerLiteral) {
+                //try parsing as integer literal, then as hex integer literal.
+                let tokenIntValue = (_b = util_1.util.parseInt(member.value.tokens.value.text)) !== null && _b !== void 0 ? _b : util_1.util.parseInt(member.value.tokens.value.text.replace(/&h/i, '0x'));
+                if (tokenIntValue !== undefined) {
+                    currentIntValue = tokenIntValue;
+                    currentIntValue++;
+                }
+                result.set((_c = member.name) === null || _c === void 0 ? void 0 : _c.toLowerCase(), member.value.tokens.value.text);
+                //simple unary expressions (like `-1`)
+            }
+            else if ((0, reflection_1.isUnaryExpression)(member.value) && (0, reflection_1.isLiteralExpression)(member.value.right)) {
+                result.set((_d = member.name) === null || _d === void 0 ? void 0 : _d.toLowerCase(), member.value.tokens.operator.text + member.value.right.tokens.value.text);
+                //all other values
+            }
+            else {
+                result.set((_e = member.name) === null || _e === void 0 ? void 0 : _e.toLowerCase(), (_j = (_h = (_g = (_f = member.value) === null || _f === void 0 ? void 0 : _f.tokens) === null || _g === void 0 ? void 0 : _g.value) === null || _h === void 0 ? void 0 : _h.text) !== null && _j !== void 0 ? _j : 'invalid');
+            }
+        }
+        return result;
+    }
+    getMemberValue(name) {
+        return this.getMemberValueMap().get(name.toLowerCase());
+    }
+    /**
+     * The name of the enum (without the namespace prefix)
+     */
+    get name() {
+        var _a;
+        return (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+    }
+    /**
+     * The name of the enum WITH its leading namespace (if applicable)
+     */
+    get fullName() {
+        var _a;
+        const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+        if (name) {
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            if (namespace) {
+                let namespaceName = namespace.getName(Parser_1.ParseMode.BrighterScript);
+                return `${namespaceName}.${name}`;
+            }
+            else {
+                return name;
+            }
+        }
+        else {
+            //return undefined which will allow outside callers to know that this doesn't have a name
+            return undefined;
+        }
+    }
+    transpile(state) {
+        //enum declarations don't exist at runtime, so just transpile comments and trivia
+        return [
+            state.transpileAnnotations(this),
+            state.transpileLeadingComments(this.tokens.enum)
+        ];
+    }
+    getTypedef(state) {
+        var _a, _b, _c, _d, _e, _f;
+        const result = [];
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        for (let annotation of (_b = this.annotations) !== null && _b !== void 0 ? _b : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        result.push((_d = (_c = this.tokens.enum) === null || _c === void 0 ? void 0 : _c.text) !== null && _d !== void 0 ? _d : 'enum', ' ', this.tokens.name.text);
+        result.push(state.newline);
+        state.blockDepth++;
+        for (const member of this.body) {
+            if ((0, reflection_1.isTypedefProvider)(member)) {
+                result.push(state.indent(), ...member.getTypedef(state), state.newline);
+            }
+        }
+        state.blockDepth--;
+        result.push(state.indent(), (_f = (_e = this.tokens.endEnum) === null || _e === void 0 ? void 0 : _e.text) !== null && _f !== void 0 ? _f : 'end enum');
+        return result;
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            (0, visitors_1.walkArray)(this.body, visitor, options, this);
+        }
+    }
+    getType(options) {
+        var _a, _b, _c;
+        const members = this.getMembers();
+        const resultType = new EnumType_1.EnumType(this.fullName, (_a = members[0]) === null || _a === void 0 ? void 0 : _a.getType(options).underlyingType);
+        resultType.pushMemberProvider(() => this.getSymbolTable());
+        for (const statement of members) {
+            resultType.addMember((_c = (_b = statement === null || statement === void 0 ? void 0 : statement.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text, { definingNode: statement }, statement.getType(options), 1 /* SymbolTypeFlag.runtime */);
+        }
+        return resultType;
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new EnumStatement({
+            enum: util_1.util.cloneToken(this.tokens.enum),
+            name: util_1.util.cloneToken(this.tokens.name),
+            endEnum: util_1.util.cloneToken(this.tokens.endEnum),
+            body: (_a = this.body) === null || _a === void 0 ? void 0 : _a.map(x => x === null || x === void 0 ? void 0 : x.clone())
+        }), ['body']);
+    }
+}
+exports.EnumStatement = EnumStatement;
+class EnumMemberStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.EnumMemberStatement;
+        this.tokens = {
+            name: options.name,
+            equals: options.equals
+        };
+        this.value = options.value;
+    }
+    get location() {
+        return util_1.util.createBoundingLocation(this.tokens.name, this.tokens.equals, this.value);
+    }
+    /**
+     * The name of the member
+     */
+    get name() {
+        return this.tokens.name.text;
+    }
+    get leadingTrivia() {
+        return this.tokens.name.leadingTrivia;
+    }
+    transpile(state) {
+        return [];
+    }
+    getTypedef(state) {
+        var _a;
+        const result = [];
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        result.push(this.tokens.name.text);
+        if (this.tokens.equals) {
+            result.push(' ', this.tokens.equals.text, ' ');
+            if (this.value) {
+                result.push(...this.value.transpile(state));
+            }
+        }
+        return result;
+    }
+    walk(visitor, options) {
+        if (this.value && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'value', visitor, options);
+        }
+    }
+    getType(options) {
+        var _a, _b, _c, _d;
+        return new EnumType_1.EnumMemberType((_a = this.parent) === null || _a === void 0 ? void 0 : _a.fullName, (_c = (_b = this.tokens) === null || _b === void 0 ? void 0 : _b.name) === null || _c === void 0 ? void 0 : _c.text, (_d = this.value) === null || _d === void 0 ? void 0 : _d.getType(options));
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new EnumMemberStatement({
+            name: util_1.util.cloneToken(this.tokens.name),
+            equals: util_1.util.cloneToken(this.tokens.equals),
+            value: (_a = this.value) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['value']);
+    }
+}
+exports.EnumMemberStatement = EnumMemberStatement;
+class ConstStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.ConstStatement;
+        this.tokens = {
+            const: options.const,
+            name: options.name,
+            equals: options.equals
+        };
+        this.value = options.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;
+    }
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.const) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+    }
+    /**
+     * The name of the statement WITH its leading namespace (if applicable)
+     */
+    get fullName() {
+        var _a;
+        const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+        if (name) {
+            const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
+            if (namespace) {
+                let namespaceName = namespace.getName(Parser_1.ParseMode.BrighterScript);
+                return `${namespaceName}.${name}`;
+            }
+            else {
+                return name;
+            }
+        }
+        else {
+            //return undefined which will allow outside callers to know that this doesn't have a name
+            return undefined;
+        }
+    }
+    transpile(state) {
+        //const declarations don't exist at runtime, so just transpile comments and trivia
+        return [
+            state.transpileAnnotations(this),
+            state.transpileLeadingComments(this.tokens.const)
+        ];
+    }
+    getTypedef(state) {
+        var _a;
+        const result = [];
+        for (let comment of (_a = util_1.util.getLeadingComments(this)) !== null && _a !== void 0 ? _a : []) {
+            result.push(comment.text, state.newline, state.indent());
+        }
+        result.push(this.tokens.const ? state.tokenToSourceNode(this.tokens.const) : 'const', ' ', state.tokenToSourceNode(this.tokens.name), ' ', this.tokens.equals ? state.tokenToSourceNode(this.tokens.equals) : '=', ' ', ...this.value.transpile(state));
+        return result;
+    }
+    walk(visitor, options) {
+        if (this.value && options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'value', visitor, options);
+        }
+    }
+    getType(options) {
+        return this.value.getType(options);
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new ConstStatement({
+            const: util_1.util.cloneToken(this.tokens.const),
+            name: util_1.util.cloneToken(this.tokens.name),
+            equals: util_1.util.cloneToken(this.tokens.equals),
+            value: (_a = this.value) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['value']);
+    }
+}
+exports.ConstStatement = ConstStatement;
+class ContinueStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.ContinueStatement;
+        this.tokens = {
+            continue: options.continue,
+            loopType: options.loopType
+        };
+        this.location = util_1.util.createBoundingLocation(this.tokens.continue, this.tokens.loopType);
+    }
+    transpile(state) {
+        var _a, _b, _c, _d, _e;
+        return [
+            state.sourceNode(this.tokens.continue, (_b = (_a = this.tokens.continue) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : 'continue'),
+            (_d = (_c = this.tokens.loopType) === null || _c === void 0 ? void 0 : _c.leadingWhitespace) !== null && _d !== void 0 ? _d : ' ',
+            state.sourceNode(this.tokens.continue, (_e = this.tokens.loopType) === null || _e === void 0 ? void 0 : _e.text)
+        ];
+    }
+    walk(visitor, options) {
+        //nothing to walk
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.continue) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        return this.finalizeClone(new ContinueStatement({
+            continue: util_1.util.cloneToken(this.tokens.continue),
+            loopType: util_1.util.cloneToken(this.tokens.loopType)
+        }));
+    }
+}
+exports.ContinueStatement = ContinueStatement;
+class TypecastStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.TypecastStatement;
+        this.tokens = {
+            typecast: options.typecast
+        };
+        this.typecastExpression = options.typecastExpression;
+        this.location = util_1.util.createBoundingLocation(this.tokens.typecast, this.typecastExpression);
+    }
+    transpile(state) {
+        //the typecast statement is a comment just for debugging purposes
+        return [
+            state.transpileToken(this.tokens.typecast, 'typecast', true),
+            ' ',
+            this.typecastExpression.obj.transpile(state),
+            ' ',
+            state.transpileToken(this.typecastExpression.tokens.as, 'as'),
+            ' ',
+            this.typecastExpression.typeExpression.transpile(state)
+        ];
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'typecastExpression', visitor, options);
+        }
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.typecast) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    getType(options) {
+        return this.typecastExpression.getType(options);
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new TypecastStatement({
+            typecast: util_1.util.cloneToken(this.tokens.typecast),
+            typecastExpression: (_a = this.typecastExpression) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['typecastExpression']);
+    }
+}
+exports.TypecastStatement = TypecastStatement;
+class ConditionalCompileErrorStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.ConditionalCompileErrorStatement;
+        this.tokens = {
+            hashError: options.hashError,
+            message: options.message
+        };
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens));
+    }
+    transpile(state) {
+        return [
+            state.transpileToken(this.tokens.hashError, '#error'),
+            ' ',
+            state.transpileToken(this.tokens.message)
+        ];
+    }
+    walk(visitor, options) {
+        // nothing to walk
+    }
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.hashError.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
+    clone() {
+        return this.finalizeClone(new ConditionalCompileErrorStatement({
+            hashError: util_1.util.cloneToken(this.tokens.hashError),
+            message: util_1.util.cloneToken(this.tokens.message)
+        }));
+    }
+}
+exports.ConditionalCompileErrorStatement = ConditionalCompileErrorStatement;
+class AliasStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.AliasStatement;
+        this.tokens = {
+            alias: options.alias,
+            name: options.name,
+            equals: options.equals
+        };
+        this.value = options.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
+        return [
+            state.transpileToken(this.tokens.alias, 'alias', true),
+            ' ',
+            state.transpileToken(this.tokens.name),
+            ' ',
+            state.transpileToken(this.tokens.equals, '='),
+            ' ',
+            this.value.transpile(state)
+        ];
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
+            (0, visitors_1.walk)(this, 'value', visitor, options);
+        }
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.alias) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    getType(options) {
+        return this.value.getType(options);
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new AliasStatement({
+            alias: util_1.util.cloneToken(this.tokens.alias),
+            name: util_1.util.cloneToken(this.tokens.name),
+            equals: util_1.util.cloneToken(this.tokens.equals),
+            value: (_a = this.value) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['value']);
+    }
+}
+exports.AliasStatement = AliasStatement;
+class ConditionalCompileStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.ConditionalCompileStatement;
+        this.thenBranch = options.thenBranch;
+        this.elseBranch = options.elseBranch;
+        this.tokens = {
+            hashIf: options.hashIf,
+            not: options.not,
+            condition: options.condition,
+            hashElse: options.hashElse,
+            hashEndIf: options.hashEndIf
+        };
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens), this.thenBranch, this.elseBranch);
+    }
+    transpile(state) {
+        var _a, _b, _c;
+        let results = [];
+        //if   (already indented by block)
+        if (!state.conditionalCompileStatement) {
+            // only transpile the #if in the case when we're not in a conditionalCompileStatement already
+            results.push(state.transpileToken((_a = this.tokens.hashIf) !== null && _a !== void 0 ? _a : (0, creators_1.createToken)(TokenKind_1.TokenKind.HashIf)));
+        }
+        results.push(' ');
+        //conditions
+        if (this.tokens.not) {
+            results.push('not');
+            results.push(' ');
+        }
+        results.push(state.transpileToken(this.tokens.condition));
+        state.lineage.unshift(this);
+        //if statement body
+        let thenNodes = this.thenBranch.transpile(state);
+        state.lineage.shift();
+        if (thenNodes.length > 0) {
+            results.push(thenNodes);
+        }
+        //else branch
+        if (this.elseBranch) {
+            const elseIsCC = (0, reflection_1.isConditionalCompileStatement)(this.elseBranch);
+            const endBlockToken = elseIsCC ? (_b = this.elseBranch.tokens.hashIf) !== null && _b !== void 0 ? _b : (0, creators_1.createToken)(TokenKind_1.TokenKind.HashElseIf) : this.tokens.hashElse;
+            //else
+            results.push(...state.transpileEndBlockToken(this.thenBranch, endBlockToken, (0, creators_1.createToken)(TokenKind_1.TokenKind.HashElse).text));
+            if (elseIsCC) {
+                //chained else if
+                state.lineage.unshift(this.elseBranch);
+                // transpile following #if with knowledge of current
+                const existingCCStmt = state.conditionalCompileStatement;
+                state.conditionalCompileStatement = this;
+                let body = this.elseBranch.transpile(state);
+                state.conditionalCompileStatement = existingCCStmt;
+                state.lineage.shift();
+                if (body.length > 0) {
+                    //zero or more spaces between the `else` and the `if`
+                    results.push(...body);
+                    // stop here because chained if will transpile the rest
+                    return results;
+                }
+                else {
+                    results.push('\n');
+                }
+            }
+            else {
+                //else body
+                state.lineage.unshift(this.tokens.hashElse);
+                let body = this.elseBranch.transpile(state);
+                state.lineage.shift();
+                if (body.length > 0) {
+                    results.push(...body);
+                }
+            }
+        }
+        //end if
+        results.push(...state.transpileEndBlockToken((_c = this.elseBranch) !== null && _c !== void 0 ? _c : this.thenBranch, this.tokens.hashEndIf, '#end if'));
+        return results;
+    }
+    walk(visitor, options) {
+        var _a;
+        if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            const bsConsts = (_a = options.bsConsts) !== null && _a !== void 0 ? _a : this.getBsConsts();
+            let conditionTrue = bsConsts === null || bsConsts === void 0 ? void 0 : bsConsts.get(this.tokens.condition.text.toLowerCase());
+            if (this.tokens.not) {
+                // flips the boolean value
+                conditionTrue = !conditionTrue;
+            }
+            const walkFalseBlocks = options.walkMode & visitors_1.InternalWalkMode.visitFalseConditionalCompilationBlocks;
+            if (conditionTrue || walkFalseBlocks) {
+                (0, visitors_1.walk)(this, 'thenBranch', visitor, options);
+            }
+            if (this.elseBranch && (!conditionTrue || walkFalseBlocks)) {
+                (0, visitors_1.walk)(this, 'elseBranch', visitor, options);
+            }
+        }
+    }
+    get leadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.hashIf) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
+    clone() {
+        var _a, _b;
+        return this.finalizeClone(new ConditionalCompileStatement({
+            hashIf: util_1.util.cloneToken(this.tokens.hashIf),
+            not: util_1.util.cloneToken(this.tokens.not),
+            condition: util_1.util.cloneToken(this.tokens.condition),
+            hashElse: util_1.util.cloneToken(this.tokens.hashElse),
+            hashEndIf: util_1.util.cloneToken(this.tokens.hashEndIf),
+            thenBranch: (_a = this.thenBranch) === null || _a === void 0 ? void 0 : _a.clone(),
+            elseBranch: (_b = this.elseBranch) === null || _b === void 0 ? void 0 : _b.clone()
+        }), ['thenBranch', 'elseBranch']);
+    }
+}
+exports.ConditionalCompileStatement = ConditionalCompileStatement;
+class ConditionalCompileConstStatement extends AstNode_2.Statement {
+    constructor(options) {
+        super();
+        this.kind = AstNode_1.AstNodeKind.ConditionalCompileConstStatement;
+        this.tokens = {
+            hashConst: options.hashConst
+        };
+        this.assignment = options.assignment;
+        this.location = util_1.util.createBoundingLocation(util_1.util.createBoundingLocationFromTokens(this.tokens), this.assignment);
+    }
+    transpile(state) {
+        return [
+            state.transpileToken(this.tokens.hashConst, '#const'),
+            ' ',
+            state.transpileToken(this.assignment.tokens.name),
+            ' ',
+            state.transpileToken(this.assignment.tokens.equals, '='),
+            ' ',
+            ...this.assignment.value.transpile(state)
+        ];
+    }
+    walk(visitor, options) {
+        // nothing to walk
+    }
+    get leadingTrivia() {
+        var _a;
+        return (_a = this.tokens.hashConst.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
+    clone() {
+        var _a;
+        return this.finalizeClone(new ConditionalCompileConstStatement({
+            hashConst: util_1.util.cloneToken(this.tokens.hashConst),
+            assignment: (_a = this.assignment) === null || _a === void 0 ? void 0 : _a.clone()
+        }), ['assignment']);
+    }
+}
+exports.ConditionalCompileConstStatement = ConditionalCompileConstStatement;
 //# sourceMappingURL=Statement.js.map