brighterscript 1.0.0-alpha.2 → 1.0.0-alpha.22

package/dist/parser/Statement.js

@@ -1,16 +1,19 @@
 "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.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.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = exports.Statement = 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 creators_1 = require("../astUtils/creators");
 const DynamicType_1 = require("../types/DynamicType");
 const SymbolTable_1 = require("../SymbolTable");
+const CustomType_1 = require("../types/CustomType");
+const InterfaceType_1 = require("../types/InterfaceType");
+const EnumType_1 = require("../types/EnumType");
+const FunctionType_1 = require("../types/FunctionType");
 /**
  * A BrightScript statement
  */
@@ -45,12 +48,10 @@ exports.EmptyStatement = EmptyStatement;
  */
 class Body extends Statement {
     constructor(statements = []) {
+        var _a;
         super();
         this.statements = statements;
-    }
-    get range() {
-        var _a, _b, _c, _d;
-        return util_1.util.createRangeFromPositions((_b = (_a = this.statements[0]) === null || _a === void 0 ? void 0 : _a.range.start) !== null && _b !== void 0 ? _b : vscode_languageserver_1.Position.create(0, 0), (_d = (_c = this.statements[this.statements.length - 1]) === null || _c === void 0 ? void 0 : _c.range.end) !== null && _d !== void 0 ? _d : vscode_languageserver_1.Position.create(0, 0));
+        this.range = (_a = util_1.util.createBoundingRange(...this.statements)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -62,15 +63,15 @@ 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 ((0, reflection_1.isCommentStatement)(statement) && previousStatement && statement.range.start.line === previousStatement.range.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)) {
+            else if ((0, reflection_1.isCommentStatement)(statement) && nextStatement && (0, reflection_1.isFunctionStatement)(nextStatement)) {
                 result.push('\n\n');
                 //add double newline if is function not preceeded by a comment
             }
-            else if (reflection_1.isFunctionStatement(statement) && previousStatement && !(reflection_1.isCommentStatement(previousStatement))) {
+            else if ((0, reflection_1.isFunctionStatement)(statement) && previousStatement && !((0, reflection_1.isCommentStatement)(previousStatement))) {
                 result.push('\n\n');
             }
             else {
@@ -85,7 +86,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,26 +94,25 @@ 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);
         }
     }
 }
 exports.Body = Body;
 class AssignmentStatement extends Statement {
     constructor(name, equals, value, containingFunction) {
+        var _a;
         super();
         this.name = name;
         this.equals = equals;
         this.value = value;
         this.containingFunction = containingFunction;
-        this.range = util_1.util.createRangeFromPositions(this.name.range.start, this.value.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.name, this.equals, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         var _a, _b;
         //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)) {
+        if (TokenKind_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 {
@@ -127,19 +127,18 @@ class AssignmentStatement 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);
         }
     }
 }
 exports.AssignmentStatement = AssignmentStatement;
 class Block extends Statement {
     constructor(statements, startingRange) {
+        var _a;
         super();
         this.statements = statements;
         this.startingRange = startingRange;
-        this.range = util_1.util.createRangeFromPositions(this.startingRange.start, this.statements.length
-            ? this.statements[this.statements.length - 1].range.end
-            : this.startingRange.start);
+        this.range = (_a = util_1.util.createBoundingRange({ range: this.startingRange }, ...statements)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         state.blockDepth++;
@@ -148,7 +147,7 @@ class Block extends Statement {
             let previousStatement = this.statements[i - 1];
             let statement = this.statements[i];
             //if comment is on same line as parent
-            if (reflection_1.isCommentStatement(statement) &&
+            if ((0, reflection_1.isCommentStatement)(statement) &&
                 (util_1.util.linesTouch(state.lineage[0], statement) || util_1.util.linesTouch(previousStatement, statement))) {
                 results.push(' ');
                 //is not a comment
@@ -167,25 +166,24 @@ class Block 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);
         }
     }
 }
 exports.Block = Block;
 class ExpressionStatement extends Statement {
     constructor(expression) {
+        var _a, _b;
         super();
         this.expression = expression;
-        this.range = this.expression.range;
+        this.range = (_b = (_a = this.expression) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
     }
     transpile(state) {
         return this.expression.transpile(state);
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            visitors_1.walk(this, 'expression', visitor, options);
+            (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
     }
 }
@@ -195,10 +193,8 @@ class CommentStatement extends Statement {
         var _a;
         super();
         this.comments = comments;
+        this.range = (_a = util_1.util.createBoundingRange(...this.comments)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
         this.visitMode = visitors_1.InternalWalkMode.visitStatements | visitors_1.InternalWalkMode.visitExpressions;
-        if (((_a = this.comments) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            this.range = util_1.util.createRangeFromPositions(this.comments[0].range.start, this.comments[this.comments.length - 1].range.end);
-        }
     }
     get text() {
         return this.comments.map(x => x.text).join('\n');
@@ -228,9 +224,10 @@ class CommentStatement extends Statement {
 exports.CommentStatement = CommentStatement;
 class ExitForStatement extends Statement {
     constructor(tokens) {
+        var _a, _b, _c;
         super();
         this.tokens = tokens;
-        this.range = this.tokens.exitFor.range;
+        this.range = (_c = (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.exitFor) === null || _b === void 0 ? void 0 : _b.range) !== null && _c !== void 0 ? _c : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -244,9 +241,10 @@ class ExitForStatement extends Statement {
 exports.ExitForStatement = ExitForStatement;
 class ExitWhileStatement extends Statement {
     constructor(tokens) {
+        var _a, _b, _c;
         super();
         this.tokens = tokens;
-        this.range = this.tokens.exitWhile.range;
+        this.range = (_c = (_b = (_a = this.tokens) === null || _a === void 0 ? void 0 : _a.exitWhile) === null || _b === void 0 ? void 0 : _b.range) !== null && _c !== void 0 ? _c : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -264,7 +262,16 @@ class FunctionStatement extends Statement {
         this.name = name;
         this.func = func;
         this.namespaceName = namespaceName;
-        this.range = this.func.range;
+    }
+    get range() {
+        return this.cacheRange();
+    }
+    cacheRange() {
+        var _a, _b;
+        if (!this._range) {
+            this._range = (_b = (_a = this.func) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : this.name.range;
+        }
+        return this._range;
     }
     /**
      * Get the name of this expression based on the parse mode
@@ -295,21 +302,21 @@ class FunctionStatement extends Statement {
     }
     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);
         }
     }
 }
 exports.FunctionStatement = FunctionStatement;
 class IfStatement extends Statement {
     constructor(tokens, condition, thenBranch, elseBranch, isInline) {
-        var _a, _b;
+        var _a;
         super();
         this.tokens = tokens;
         this.condition = condition;
         this.thenBranch = thenBranch;
         this.elseBranch = elseBranch;
         this.isInline = isInline;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.if.range.start, ((_b = (_a = this.tokens.endIf) !== null && _a !== void 0 ? _a : this.elseBranch) !== null && _b !== void 0 ? _b : this.thenBranch).range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.if, this.condition, this.tokens.then, this.thenBranch, this.tokens.else, this.elseBranch, this.tokens.endIf)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let results = [];
@@ -318,14 +325,11 @@ class IfStatement extends Statement {
         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);
@@ -340,13 +344,14 @@ class IfStatement extends Statement {
             results.push(state.indent(), state.transpileToken(this.tokens.else));
         }
         if (this.elseBranch) {
-            if (reflection_1.isIfStatement(this.elseBranch)) {
+            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;
@@ -378,23 +383,24 @@ class IfStatement extends Statement {
     }
     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);
         }
     }
 }
 exports.IfStatement = IfStatement;
 class IncrementStatement extends Statement {
     constructor(value, operator) {
+        var _a;
         super();
         this.value = value;
         this.operator = operator;
-        this.range = util_1.util.createRangeFromPositions(this.value.range.start, this.operator.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.value, this.operator)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -404,7 +410,7 @@ class IncrementStatement 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);
         }
     }
 }
@@ -419,12 +425,11 @@ class PrintStatement extends Statement {
      *                    evaluated and printed.
      */
     constructor(tokens, expressions) {
+        var _a;
         super();
         this.tokens = tokens;
         this.expressions = expressions;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.print.range.start, this.expressions.length
-            ? this.expressions[this.expressions.length - 1].range.end
-            : this.tokens.print.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.print, ...this.expressions)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         var _a;
@@ -449,26 +454,22 @@ 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));
         }
     }
 }
 exports.PrintStatement = PrintStatement;
 class DimStatement extends Statement {
     constructor(dimToken, identifier, openingSquare, dimensions, closingSquare) {
-        var _a, _b, _c, _d;
+        var _a;
         super();
         this.dimToken = dimToken;
         this.identifier = identifier;
         this.openingSquare = openingSquare;
         this.dimensions = dimensions;
         this.closingSquare = closingSquare;
-        this.range = util_1.util.createRangeFromPositions(this.dimToken.range.start, ((_d = (_c = (_b = (_a = this.closingSquare) !== null && _a !== void 0 ? _a : this.dimensions[this.dimensions.length - 1]) !== null && _b !== void 0 ? _b : this.openingSquare) !== null && _c !== void 0 ? _c : this.identifier) !== null && _d !== void 0 ? _d : this.dimToken).range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.dimToken, this.identifier, this.openingSquare, ...this.dimensions, this.closingSquare)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [
@@ -489,18 +490,17 @@ class DimStatement extends Statement {
     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);
-            }
+            (0, visitors_1.walkArray)(this.dimensions, visitor, options, this);
         }
     }
 }
 exports.DimStatement = DimStatement;
 class GotoStatement extends Statement {
     constructor(tokens) {
+        var _a;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.goto.range.start, this.tokens.label.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.goto, this.tokens.label)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -516,9 +516,10 @@ class GotoStatement extends Statement {
 exports.GotoStatement = GotoStatement;
 class LabelStatement extends Statement {
     constructor(tokens) {
+        var _a;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.identifier.range.start, this.tokens.colon.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.identifier, this.tokens.colon)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -537,7 +538,7 @@ class ReturnStatement extends Statement {
         super();
         this.tokens = tokens;
         this.value = value;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.return.range.start, ((_a = this.value) === null || _a === void 0 ? void 0 : _a.range.end) || this.tokens.return.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.return, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -550,16 +551,17 @@ 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);
         }
     }
 }
 exports.ReturnStatement = ReturnStatement;
 class EndStatement extends Statement {
     constructor(tokens) {
+        var _a, _b;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.end.range.start, this.tokens.end.range.end);
+        this.range = (_b = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -573,9 +575,10 @@ class EndStatement extends Statement {
 exports.EndStatement = EndStatement;
 class StopStatement extends Statement {
     constructor(tokens) {
+        var _a, _b;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.stop.range.start, this.tokens.stop.range.end);
+        this.range = (_b = (_a = this.tokens.stop) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
     }
     transpile(state) {
         return [
@@ -589,7 +592,7 @@ class StopStatement extends Statement {
 exports.StopStatement = StopStatement;
 class ForStatement extends Statement {
     constructor(forToken, counterDeclaration, toToken, finalValue, body, endForToken, stepToken, increment) {
-        var _a, _b;
+        var _a;
         super();
         this.forToken = forToken;
         this.counterDeclaration = counterDeclaration;
@@ -599,8 +602,7 @@ class ForStatement extends Statement {
         this.endForToken = endForToken;
         this.stepToken = stepToken;
         this.increment = increment;
-        const lastRange = (_b = (_a = this.endForToken) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : body.range;
-        this.range = util_1.util.createRangeFromPositions(this.forToken.range.start, lastRange.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.forToken, this.counterDeclaration, this.toToken, this.finalValue, this.body, this.stepToken, this.increment, this.endForToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -620,30 +622,29 @@ class ForStatement extends Statement {
         state.lineage.unshift(this);
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        if (this.body.statements.length > 0) {
-            result.push('\n');
-        }
+        // add new line before "end for"
+        result.push('\n');
         //end for
         result.push(state.indent(), state.transpileToken(this.endForToken));
         return result;
     }
     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);
         }
     }
 }
 exports.ForStatement = ForStatement;
 class ForEachStatement extends Statement {
     constructor(forEachToken, item, inToken, target, body, endForToken) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         super();
         this.forEachToken = forEachToken;
         this.item = item;
@@ -651,7 +652,7 @@ class ForEachStatement extends Statement {
         this.target = target;
         this.body = body;
         this.endForToken = endForToken;
-        this.range = util_1.util.createRangeFromPositions(this.forEachToken.range.start, ((_e = (_d = (_c = (_b = (_a = this.endForToken) !== null && _a !== void 0 ? _a : this.body) !== null && _b !== void 0 ? _b : this.target) !== null && _c !== void 0 ? _c : this.inToken) !== null && _d !== void 0 ? _d : this.item) !== null && _e !== void 0 ? _e : this.forEachToken).range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.forEachToken, this.item, this.inToken, this.target, this.body, this.endForToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -667,32 +668,30 @@ class ForEachStatement extends Statement {
         state.lineage.unshift(this);
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        if (this.body.statements.length > 0) {
-            result.push('\n');
-        }
+        // add new line before "end for"
+        result.push('\n');
         //end for
         result.push(state.indent(), state.transpileToken(this.endForToken));
         return result;
     }
     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);
         }
     }
 }
 exports.ForEachStatement = ForEachStatement;
 class WhileStatement extends Statement {
     constructor(tokens, condition, body) {
-        var _a, _b;
+        var _a;
         super();
         this.tokens = tokens;
         this.condition = condition;
         this.body = body;
-        const lastRange = (_b = (_a = this.tokens.endWhile) === null || _a === void 0 ? void 0 : _a.range) !== null && _b !== void 0 ? _b : body.range;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.while.range.start, lastRange.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.while, this.condition, this.body, this.tokens.endWhile)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -712,26 +711,29 @@ class WhileStatement extends Statement {
     }
     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);
         }
     }
 }
 exports.WhileStatement = WhileStatement;
 class DottedSetStatement extends Statement {
-    constructor(obj, name, value) {
+    constructor(obj, name, value, dot, operator) {
+        var _a;
         super();
         this.obj = obj;
         this.name = name;
         this.value = value;
-        this.range = util_1.util.createRangeFromPositions(this.obj.range.start, this.value.range.end);
+        this.dot = dot;
+        this.operator = operator;
+        this.range = (_a = util_1.util.createBoundingRange(this.obj, this.dot, this.name, this.operator, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         var _a, _b;
         //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)) {
+        if (TokenKind_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 {
@@ -749,26 +751,28 @@ class DottedSetStatement extends Statement {
     }
     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);
         }
     }
 }
 exports.DottedSetStatement = DottedSetStatement;
 class IndexedSetStatement extends Statement {
-    constructor(obj, index, value, openingSquare, closingSquare) {
+    constructor(obj, index, value, openingSquare, closingSquare, operator) {
+        var _a;
         super();
         this.obj = obj;
         this.index = index;
         this.value = value;
         this.openingSquare = openingSquare;
         this.closingSquare = closingSquare;
-        this.range = util_1.util.createRangeFromPositions(this.obj.range.start, this.value.range.end);
+        this.operator = operator;
+        this.range = (_a = util_1.util.createBoundingRange(this.obj, this.openingSquare, this.index, this.closingSquare, this.operator, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         var _a, _b;
         //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)) {
+        if (TokenKind_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 {
@@ -790,18 +794,19 @@ class IndexedSetStatement extends Statement {
     }
     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.walk)(this, 'index', visitor, options);
+            (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
 class LibraryStatement extends Statement {
     constructor(tokens) {
+        var _a;
         super();
         this.tokens = tokens;
-        this.range = util_1.util.createRangeFromPositions(this.tokens.library.range.start, this.tokens.filePath ? this.tokens.filePath.range.end : this.tokens.library.range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.library, this.tokens.filePath)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         let result = [];
@@ -834,8 +839,14 @@ class NamespaceStatement extends Statement {
         this.symbolTable = new SymbolTable_1.SymbolTable(parentSymbolTable);
     }
     get range() {
-        var _a, _b, _c;
-        return util_1.util.createRangeFromPositions(this.keyword.range.start, ((_c = (_b = (_a = this.endKeyword) !== null && _a !== void 0 ? _a : this.body) !== null && _b !== void 0 ? _b : this.nameExpression) !== null && _c !== void 0 ? _c : this.keyword).range.end);
+        return this.cacheRange();
+    }
+    cacheRange() {
+        var _a;
+        if (!this._range) {
+            this._range = (_a = util_1.util.createBoundingRange(this.keyword, this.nameExpression, this.body, this.endKeyword)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        }
+        return this._range;
     }
     getName(parseMode) {
         return this.nameExpression.getName(parseMode);
@@ -858,20 +869,21 @@ 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);
         }
     }
 }
 exports.NamespaceStatement = NamespaceStatement;
 class ImportStatement extends Statement {
     constructor(importToken, filePathToken) {
+        var _a;
         super();
         this.importToken = importToken;
         this.filePathToken = filePathToken;
-        this.range = util_1.util.createRangeFromPositions(importToken.range.start, (filePathToken !== null && filePathToken !== void 0 ? filePathToken : importToken).range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.importToken, this.filePathToken)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
         if (this.filePathToken) {
             //remove quotes
             this.filePath = this.filePathToken.text.replace(/"/g, '');
@@ -905,13 +917,196 @@ class ImportStatement extends Statement {
     }
 }
 exports.ImportStatement = ImportStatement;
+class InterfaceStatement extends Statement {
+    constructor(interfaceToken, name, extendsToken, parentInterfaceName, body, endInterfaceToken, namespaceName) {
+        var _a, _b, _c;
+        super();
+        this.name = name;
+        this.parentInterfaceName = parentInterfaceName;
+        this.body = body;
+        this.namespaceName = namespaceName;
+        this.memberTable = new SymbolTable_1.SymbolTable();
+        this.tokens = {};
+        this.memberMap = {};
+        this.methods = [];
+        this.fields = [];
+        this.tokens.interface = interfaceToken;
+        this.tokens.name = name;
+        this.tokens.extends = extendsToken;
+        this.tokens.endInterface = endInterfaceToken;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.interface, this.tokens.name, this.tokens.extends, this.parentInterfaceName, ...this.body, this.tokens.endInterface)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        for (let statement of this.body) {
+            if ((0, reflection_1.isInterfaceMethodStatement)(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;
+            }
+            else if ((0, reflection_1.isInterfaceFieldStatement)(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;
+            }
+        }
+    }
+    buildSymbolTable(parentIface) {
+        var _a, _b;
+        this.memberTable.clear();
+        if (parentIface) {
+            this.memberTable.setParent(parentIface === null || parentIface === void 0 ? void 0 : parentIface.memberTable);
+        }
+        for (const statement of this.methods) {
+            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getFunctionType();
+            this.memberTable.addSymbol((_a = statement === null || statement === void 0 ? void 0 : statement.name) === null || _a === void 0 ? void 0 : _a.text, statement === null || statement === void 0 ? void 0 : statement.range, funcType);
+        }
+        for (const statement of this.fields) {
+            this.memberTable.addSymbol((_b = statement === null || statement === void 0 ? void 0 : statement.name) === null || _b === void 0 ? void 0 : _b.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType());
+        }
+    }
+    hasParent() {
+        return !!this.parentInterfaceName;
+    }
+    getParentName() {
+        return !!this.parentInterfaceName;
+    }
+    /**
+     * Gets an array of possible parent interface names, taking into account the namespace this interface was created under
+     * @returns array of possible parent interface names
+     */
+    getPossibleFullParentNames() {
+        var _a;
+        if (!this.hasParent()) {
+            return [];
+        }
+        if (((_a = this.parentInterfaceName) === null || _a === void 0 ? void 0 : _a.getNameParts().length) > 1) {
+            // The specified parent interface already has a dot, so it must already reference a namespace
+            return [this.parentInterfaceName.getName()];
+        }
+        const names = [];
+        if (this.namespaceName) {
+            // We're under a namespace, so the full parent name MIGHT be with this namespace too
+            names.push(this.namespaceName.getName() + '.' + this.parentInterfaceName.getName());
+        }
+        names.push(this.parentInterfaceName.getName());
+        return names;
+    }
+    getThisBscType() {
+        return new InterfaceType_1.InterfaceType(this.getName(Parser_1.ParseMode.BrighterScript), this.memberTable);
+    }
+    /**
+     * The name of the interface WITH its leading namespace (if applicable)
+     */
+    getName(parseMode) {
+        var _a;
+        const name = (_a = this.tokens.name) === null || _a === void 0 ? void 0 : _a.text;
+        if (name) {
+            if (this.namespaceName) {
+                let namespaceName = this.namespaceName.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;
+        }
+    }
+    transpile(state) {
+        //interfaces should completely disappear at runtime
+        return [];
+    }
+    getTypedef(state) {
+        var _a, _b, _c;
+        const result = [];
+        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        result.push(this.tokens.interface.text, ' ', this.tokens.name.text);
+        const parentInterfaceName = (_b = this.parentInterfaceName) === null || _b === void 0 ? void 0 : _b.getName(Parser_1.ParseMode.BrighterScript);
+        if (parentInterfaceName) {
+            result.push(' extends ', parentInterfaceName);
+        }
+        const body = (_c = this.body) !== null && _c !== void 0 ? _c : [];
+        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) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            (0, visitors_1.walkArray)(this.body, visitor, options, this);
+        }
+    }
+}
+exports.InterfaceStatement = InterfaceStatement;
+class InterfaceFieldStatement extends Statement {
+    constructor(nameToken, asToken, type, namespaceName) {
+        var _a;
+        super();
+        this.type = type;
+        this.namespaceName = namespaceName;
+        this.tokens = {};
+        this.tokens.name = nameToken;
+        this.tokens.as = asToken;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.as, this.type)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+    }
+    transpile(state) {
+        throw new Error('Method not implemented.');
+    }
+    getType() {
+        var _a;
+        return (_a = this.type) === null || _a === void 0 ? void 0 : _a.type;
+    }
+    get name() {
+        return this.tokens.name;
+    }
+    walk(visitor, options) {
+        //nothing to walk
+    }
+    getTypedef(state) {
+        var _a;
+        const result = [];
+        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        result.push(this.tokens.name.text);
+        if (this.tokens.as && this.type) {
+            result.push(' as ', ...this.type.transpile(state));
+        }
+        return result;
+    }
+}
+exports.InterfaceFieldStatement = InterfaceFieldStatement;
+class InterfaceMethodStatement extends FunctionStatement {
+    transpile(state) {
+        throw new Error('Method not implemented.');
+    }
+    constructor(name, func) {
+        super(name, func, undefined);
+    }
+    walk(visitor, options) {
+        //nothing to walk
+    }
+}
+exports.InterfaceMethodStatement = InterfaceMethodStatement;
 class ClassStatement extends Statement {
     constructor(classKeyword, 
     /**
      * The name of the class (without namespace prefix)
      */
-    name, body, end, extendsKeyword, parentClassName, namespaceName) {
-        var _a, _b, _c;
+    name, body, end, extendsKeyword, parentClassName, namespaceName, currentSymbolTable) {
+        var _a, _b, _c, _d;
         super();
         this.classKeyword = classKeyword;
         this.name = name;
@@ -920,21 +1115,25 @@ class ClassStatement extends Statement {
         this.extendsKeyword = extendsKeyword;
         this.parentClassName = parentClassName;
         this.namespaceName = namespaceName;
+        this.currentSymbolTable = currentSymbolTable;
+        this.symbolTable = new SymbolTable_1.SymbolTable();
+        this.memberTable = new SymbolTable_1.SymbolTable();
         this.memberMap = {};
         this.methods = [];
         this.fields = [];
         this.body = (_a = this.body) !== null && _a !== void 0 ? _a : [];
+        this.symbolTable.setParent(currentSymbolTable);
+        this.range = (_b = util_1.util.createBoundingRange(this.classKeyword, this.name, this.extendsKeyword, this.parentClassName, ...this.body, this.end)) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
         for (let statement of this.body) {
-            if (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.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.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);
     }
     getName(parseMode) {
         var _a;
@@ -954,6 +1153,36 @@ class ClassStatement extends Statement {
             return undefined;
         }
     }
+    getThisBscType() {
+        return new CustomType_1.CustomType(this.getName(Parser_1.ParseMode.BrighterScript), this.memberTable);
+    }
+    getConstructorFunctionType() {
+        var _a, _b;
+        const constructFunc = this.getConstructorFunction();
+        const constructorFuncType = (_b = (_a = constructFunc === null || constructFunc === void 0 ? void 0 : constructFunc.func) === null || _a === void 0 ? void 0 : _a.getFunctionType()) !== null && _b !== void 0 ? _b : new FunctionType_1.FunctionType();
+        constructorFuncType.setName(this.getName(Parser_1.ParseMode.BrighterScript));
+        constructorFuncType.isNew = true;
+        return constructorFuncType;
+    }
+    buildSymbolTable(parentClass) {
+        var _a, _b, _c, _d, _e;
+        this.symbolTable.clear();
+        this.symbolTable.addSymbol('m', (_a = this.name) === null || _a === void 0 ? void 0 : _a.range, this.getThisBscType());
+        this.memberTable.clear();
+        if ((0, reflection_1.isClassStatement)(parentClass)) {
+            this.symbolTable.addSymbol('super', (_b = this.parentClassName) === null || _b === void 0 ? void 0 : _b.range, parentClass.getConstructorFunctionType());
+            this.memberTable.setParent(parentClass === null || parentClass === void 0 ? void 0 : parentClass.memberTable);
+        }
+        for (const statement of this.methods) {
+            statement === null || statement === void 0 ? void 0 : statement.func.symbolTable.setParent(this.symbolTable);
+            const funcType = statement === null || statement === void 0 ? void 0 : statement.func.getFunctionType();
+            funcType.setName(this.getName(Parser_1.ParseMode.BrighterScript) + '.' + ((_c = statement === null || statement === void 0 ? void 0 : statement.name) === null || _c === void 0 ? void 0 : _c.text));
+            this.memberTable.addSymbol((_d = statement === null || statement === void 0 ? void 0 : statement.name) === null || _d === void 0 ? void 0 : _d.text, statement === null || statement === void 0 ? void 0 : statement.range, funcType);
+        }
+        for (const statement of this.fields) {
+            this.memberTable.addSymbol((_e = statement === null || statement === void 0 ? void 0 : statement.name) === null || _e === void 0 ? void 0 : _e.text, statement === null || statement === void 0 ? void 0 : statement.range, statement.getType());
+        }
+    }
     transpile(state) {
         let result = [];
         //make the builder
@@ -976,8 +1205,16 @@ class ClassStatement extends Statement {
         }
         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()) {
+            body = [
+                (0, creators_1.createMethodStatement)('new', TokenKind_1.TokenKind.Sub),
+                ...this.body
+            ];
+        }
+        for (const member of body) {
+            if ((0, reflection_1.isTypedefProvider)(member)) {
                 result.push(state.indent(), ...member.getTypedef(state), state.newline);
             }
         }
@@ -1004,11 +1241,38 @@ class ClassStatement extends Statement {
                 break;
             }
         }
-        return myIndex - 1;
+        const result = myIndex - 1;
+        if (result >= 0) {
+            return result;
+        }
+        else {
+            return null;
+        }
     }
-    hasParentClass() {
+    hasParent() {
         return !!this.parentClassName;
     }
+    /**
+     * Gets an array of possible parent class names, taking into account the namespace this class was created under
+     * @returns array of possible parent class names
+     */
+    getPossibleFullParentNames() {
+        var _a;
+        if (!this.hasParent()) {
+            return [];
+        }
+        if (((_a = this.parentClassName) === null || _a === void 0 ? void 0 : _a.getNameParts().length) > 1) {
+            // The specified parent class already has a dot, so it must already reference a namespace
+            return [this.parentClassName.getName()];
+        }
+        const names = [];
+        if (this.namespaceName) {
+            // We're under a namespace, so the full parent name MIGHT be with this namespace too
+            names.push(this.namespaceName.getName() + '.' + this.parentClassName.getName());
+        }
+        names.push(this.parentClassName.getName());
+        return names;
+    }
     /**
      * Get all ancestor classes, in closest-to-furthest order (i.e. 0 is parent, 1 is grandparent, etc...).
      * This will return an empty array if no ancestors were found
@@ -1038,23 +1302,10 @@ class ClassStatement extends Statement {
      * 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.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
@@ -1095,19 +1346,22 @@ 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
@@ -1175,20 +1429,42 @@ class ClassStatement extends Statement {
     }
     walk(visitor, 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);
         }
     }
 }
 exports.ClassStatement = ClassStatement;
-class ClassMethodStatement extends FunctionStatement {
-    constructor(accessModifier, name, func, override) {
-        var _a;
+const accessModifiers = [
+    TokenKind_1.TokenKind.Public,
+    TokenKind_1.TokenKind.Protected,
+    TokenKind_1.TokenKind.Private
+];
+class MethodStatement extends FunctionStatement {
+    constructor(modifiers, name, func, override) {
         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);
+        this.modifiers = [];
+        if (modifiers) {
+            if (Array.isArray(modifiers)) {
+                this.modifiers.push(...modifiers);
+            }
+            else {
+                this.modifiers.push(modifiers);
+            }
+        }
+    }
+    get accessModifier() {
+        return this.modifiers.find(x => accessModifiers.includes(x.kind));
+    }
+    get range() {
+        return this.cacheRange();
+    }
+    cacheRange() {
+        var _a, _b;
+        if (!this._range) {
+            this._range = (_b = util_1.util.createBoundingRange(this.accessModifier, this.override, (_a = this.func) !== null && _a !== void 0 ? _a : this.name)) !== null && _b !== void 0 ? _b : creators_1.interpolatedRange;
+        }
+        return this._range;
     }
     transpile(state) {
         if (this.name.text.toLowerCase() === 'new') {
@@ -1199,10 +1475,10 @@ 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`;
+                    state.editor.setProperty(e.name, 'text', `m.super${parentClassIndex}_new`);
                 }
             },
             DottedGetExpression: e => {
@@ -1210,7 +1486,7 @@ class ClassMethodStatement extends FunctionStatement {
                 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(e.name, 'text', `super${parentClassIndex}_${e.name.text}`);
                 }
             }
         });
@@ -1249,37 +1525,38 @@ class ClassMethodStatement extends FunctionStatement {
         let firstStatement = this.func.body.statements[0];
         if (
         //is a call statement
-        reflection_1.isExpressionStatement(firstStatement) && reflection_1.isCallExpression(firstStatement.expression) &&
+        (0, reflection_1.isExpressionStatement)(firstStatement) && (0, 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') {
             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,
+        const superCall = new ExpressionStatement(new Expression_1.CallExpression(new Expression_1.VariableExpression({
+            kind: TokenKind_1.TokenKind.Identifier,
             text: 'super',
             isReserved: false,
             range: state.classStatement.name.range,
             leadingWhitespace: ''
         }, null), {
-            kind: lexer_1.TokenKind.LeftParen,
+            kind: TokenKind_1.TokenKind.LeftParen,
             text: '(',
             isReserved: false,
             range: state.classStatement.name.range,
             leadingWhitespace: ''
         }, {
-            kind: lexer_1.TokenKind.RightParen,
+            kind: TokenKind_1.TokenKind.RightParen,
             text: ')',
             isReserved: false,
             range: state.classStatement.name.range,
             leadingWhitespace: ''
-        }, [], null)));
+        }, [], null));
+        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) {
-        let startingIndex = state.classStatement.hasParentClass() ? 1 : 0;
+        let startingIndex = state.classStatement.hasParent() ? 1 : 0;
         let newStatements = [];
         //insert the field initializers in order
         for (let field of state.classStatement.fields) {
@@ -1290,21 +1567,21 @@ class ClassMethodStatement extends FunctionStatement {
             }
             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));
+                newStatements.push(new AssignmentStatement(thisQualifiedName, (0, creators_1.createToken)(TokenKind_1.TokenKind.Equal, '=', field.name.range), (0, creators_1.createInvalidLiteral)('invalid', field.name.range), this.func));
             }
         }
-        this.func.body.statements.splice(startingIndex, 0, ...newStatements);
+        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);
         }
     }
 }
-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 Statement {
+    constructor(accessModifier, name, as, type, equal, initialValue, namespaceName) {
+        var _a;
         super();
         this.accessModifier = accessModifier;
         this.name = name;
@@ -1312,17 +1589,18 @@ class ClassFieldStatement extends Statement {
         this.type = type;
         this.equal = equal;
         this.initialValue = initialValue;
-        this.range = util_1.util.createRangeFromPositions(((_a = this.accessModifier) !== null && _a !== void 0 ? _a : this.name).range.start, ((_d = (_c = (_b = this.initialValue) !== null && _b !== void 0 ? _b : this.type) !== null && _c !== void 0 ? _c : this.as) !== null && _d !== void 0 ? _d : this.name).range.end);
+        this.namespaceName = namespaceName;
+        this.range = (_a = util_1.util.createBoundingRange(this.accessModifier, this.name, this.as, this.type, this.equal, this.initialValue)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     /**
      * Derive a ValueKind from the type token, or the initial value.
      * Defaults to `DynamicType`
      */
-    getType() {
+    getType(parseMode = Parser_1.ParseMode.BrighterScript) {
         if (this.type) {
-            return util_1.util.tokenToBscType(this.type);
+            return this.type.type;
         }
-        else if (reflection_1.isLiteralExpression(this.initialValue)) {
+        else if ((0, reflection_1.isLiteralExpression)(this.initialValue)) {
             return this.initialValue.type;
         }
         else {
@@ -1339,8 +1617,8 @@ class ClassFieldStatement extends Statement {
             for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
                 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(Parser_1.ParseMode.BrightScript);
+            if (!type || (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());
@@ -1348,56 +1626,77 @@ class ClassFieldStatement extends Statement {
         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, 'type', visitor, options);
+            (0, visitors_1.walk)(this, 'initialValue', visitor, options);
         }
     }
 }
-exports.ClassFieldStatement = ClassFieldStatement;
+exports.FieldStatement = FieldStatement;
 class TryCatchStatement extends Statement {
-    constructor(tryToken, tryBranch, catchToken, exceptionVariable, catchBranch, endTryToken) {
+    constructor(tokens, tryBranch, catchStatement) {
+        var _a;
         super();
-        this.tryToken = tryToken;
+        this.tokens = tokens;
         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.catchStatement = catchStatement;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.try, this.tryBranch, this.catchStatement, this.tokens.endTry)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
+        var _a, _b;
         return [
-            state.transpileToken(this.tryToken),
+            state.transpileToken(this.tokens.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)
         ];
     }
     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);
         }
     }
 }
 exports.TryCatchStatement = TryCatchStatement;
+class CatchStatement extends Statement {
+    constructor(tokens, exceptionVariable, catchBranch) {
+        super();
+        this.tokens = tokens;
+        this.exceptionVariable = exceptionVariable;
+        this.catchBranch = catchBranch;
+    }
+    get range() {
+        var _a, _b;
+        return util_1.util.createRangeFromPositions(this.tokens.catch.range.start, ((_b = (_a = this.catchBranch) !== null && _a !== void 0 ? _a : this.exceptionVariable) !== null && _b !== void 0 ? _b : this.tokens.catch).range.end);
+    }
+    transpile(state) {
+        var _a, _b, _c, _d;
+        return [
+            state.transpileToken(this.tokens.catch),
+            ' ',
+            (_b = (_a = this.exceptionVariable) === null || _a === void 0 ? void 0 : _a.text) !== null && _b !== void 0 ? _b : 'e',
+            ...((_d = (_c = this.catchBranch) === null || _c === void 0 ? void 0 : _c.transpile(state)) !== null && _d !== void 0 ? _d : [])
+        ];
+    }
+    walk(visitor, options) {
+        if (this.catchBranch && options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            (0, visitors_1.walk)(this, 'catchBranch', visitor, options);
+        }
+    }
+}
+exports.CatchStatement = CatchStatement;
 class ThrowStatement extends Statement {
     constructor(throwToken, expression) {
         var _a;
         super();
         this.throwToken = throwToken;
         this.expression = expression;
-        this.range = util_1.util.createRangeFromPositions(this.throwToken.range.start, ((_a = this.expression) !== null && _a !== void 0 ? _a : this.throwToken).range.end);
+        this.range = (_a = util_1.util.createBoundingRange(this.throwToken, this.expression)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
     }
     transpile(state) {
         const result = [
@@ -1416,9 +1715,165 @@ class ThrowStatement extends Statement {
     }
     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);
         }
     }
 }
 exports.ThrowStatement = ThrowStatement;
+class EnumStatement extends Statement {
+    constructor(tokens, body, namespaceName) {
+        var _a, _b;
+        super();
+        this.tokens = tokens;
+        this.body = body;
+        this.namespaceName = namespaceName;
+        this.symbolTable = new SymbolTable_1.SymbolTable();
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.enum, this.tokens.name, ...this.body, this.tokens.endEnum)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.body = (_b = this.body) !== null && _b !== void 0 ? _b : [];
+    }
+    getMembers() {
+        const result = [];
+        for (const statement of this.body) {
+            if ((0, reflection_1.isEnumMemberStatement)(statement)) {
+                result.push(statement);
+            }
+        }
+        return result;
+    }
+    /**
+     * 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;
+        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.token.kind === TokenKind_1.TokenKind.IntegerLiteral) {
+                //try parsing as integer literal, then as hex integer literal.
+                let tokenIntValue = (_b = util_1.util.parseInt(member.value.token.text)) !== null && _b !== void 0 ? _b : util_1.util.parseInt(member.value.token.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.token.text);
+                //all other values
+            }
+            else {
+                result.set((_d = member.name) === null || _d === void 0 ? void 0 : _d.toLowerCase(), (_g = (_f = (_e = member.value) === null || _e === void 0 ? void 0 : _e.token) === null || _f === void 0 ? void 0 : _f.text) !== null && _g !== void 0 ? _g : 'invalid');
+            }
+        }
+        return result;
+    }
+    getMemberValue(name) {
+        return this.getMemberValueMap().get(name.toLowerCase());
+    }
+    buildSymbolTable() {
+        this.symbolTable.clear();
+        for (const member of this.getMembers()) {
+            this.symbolTable.addSymbol(member === null || member === void 0 ? void 0 : member.name, member === null || member === void 0 ? void 0 : member.range, new EnumType_1.EnumMemberType(this.fullName, member === null || member === void 0 ? void 0 : member.name));
+        }
+    }
+    /**
+     * 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) {
+            if (this.namespaceName) {
+                let namespaceName = this.namespaceName.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;
+        }
+    }
+    getThisBscType() {
+        return new EnumType_1.EnumType(this.fullName, this.symbolTable);
+    }
+    transpile(state) {
+        //enum declarations do not exist at runtime, so don't transpile anything...
+        return [];
+    }
+    getTypedef(state) {
+        var _a, _b, _c;
+        const result = [];
+        for (let annotation of (_a = this.annotations) !== null && _a !== void 0 ? _a : []) {
+            result.push(...annotation.getTypedef(state), state.newline, state.indent());
+        }
+        result.push((_b = this.tokens.enum.text) !== null && _b !== void 0 ? _b : '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(), (_c = this.tokens.endEnum.text) !== null && _c !== void 0 ? _c : 'end enum');
+        return result;
+    }
+    walk(visitor, options) {
+        if (options.walkMode & visitors_1.InternalWalkMode.walkStatements) {
+            (0, visitors_1.walkArray)(this.body, visitor, options, this);
+        }
+    }
+}
+exports.EnumStatement = EnumStatement;
+class EnumMemberStatement extends Statement {
+    constructor(tokens, value) {
+        var _a;
+        super();
+        this.tokens = tokens;
+        this.value = value;
+        this.range = (_a = util_1.util.createBoundingRange(this.tokens.name, this.tokens.equal, this.value)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+    }
+    /**
+     * The name of the member
+     */
+    get name() {
+        return this.tokens.name.text;
+    }
+    transpile(state) {
+        return [];
+    }
+    getTypedef(state) {
+        const result = [
+            this.tokens.name.text
+        ];
+        if (this.tokens.equal) {
+            result.push(' ', this.tokens.equal.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);
+        }
+    }
+}
+exports.EnumMemberStatement = EnumMemberStatement;
 //# sourceMappingURL=Statement.js.map