brighterscript 1.0.0-alpha.27 → 1.0.0-alpha.28

package/dist/parser/Statement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.ExitWhileStatement = exports.ExitForStatement = exports.CommentStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = void 0;
+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.ExitWhileStatement = exports.ExitForStatement = exports.ExpressionStatement = exports.Block = exports.AssignmentStatement = exports.Body = exports.EmptyStatement = void 0;
 const TokenKind_1 = require("../lexer/TokenKind");
 const Expression_1 = require("./Expression");
 const util_1 = require("../util");
@@ -22,10 +22,9 @@ const TypedFunctionType_1 = require("../types/TypedFunctionType");
 const ArrayType_1 = require("../types/ArrayType");
 class EmptyStatement extends AstNode_2.Statement {
     constructor(options) {
-        var _a;
         super();
         this.kind = AstNode_1.AstNodeKind.EmptyStatement;
-        this.range = (_a = options === null || options === void 0 ? void 0 : options.range) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+        this.range = undefined;
     }
     transpile(state) {
         return [];
@@ -53,6 +52,7 @@ class Body extends AstNode_2.Statement {
         return util_1.util.createBoundingRange(...((_a = this.statements) !== null && _a !== void 0 ? _a : []));
     }
     transpile(state) {
+        var _a, _b, _c, _d;
         let result = [];
         for (let i = 0; i < this.statements.length; i++) {
             let statement = this.statements[i];
@@ -62,20 +62,20 @@ class Body extends AstNode_2.Statement {
                 //this is the first statement. do nothing related to spacing and newlines
                 //if comment is on same line as prior sibling
             }
-            else if ((0, reflection_1.isCommentStatement)(statement) && previousStatement && statement.range.start.line === previousStatement.range.end.line) {
+            else if (util_1.util.hasLeadingComments(statement) && previousStatement && ((_c = (_b = (_a = util_1.util.getLeadingComments(statement)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.range) === null || _c === void 0 ? void 0 : _c.start.line) === ((_d = previousStatement.range) === null || _d === void 0 ? void 0 : _d.end.line)) {
                 result.push(' ');
                 //add double newline if this is a comment, and next is a function
             }
-            else if ((0, reflection_1.isCommentStatement)(statement) && nextStatement && (0, 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 ((0, reflection_1.isFunctionStatement)(statement) && previousStatement && !((0, 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));
         }
@@ -129,7 +129,7 @@ class AssignmentStatement extends AstNode_2.Statement {
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_1.InternalWalkMode.walkExpressions) {
-            //TODO: Walk TypeExpression. We need to decide how to implement types on assignments
+            (0, visitors_1.walk)(this, 'typeExpression', visitor, options);
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
@@ -141,6 +141,10 @@ class AssignmentStatement extends AstNode_2.Statement {
         (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({ name: this.tokens.name.text, type: variableType, data: options.data, range: this.tokens.name.range, kind: this.kind }));
         return variableType;
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.name.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
 }
 exports.AssignmentStatement = AssignmentStatement;
 class Block extends AstNode_2.Statement {
@@ -158,9 +162,10 @@ class Block extends AstNode_2.Statement {
         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 ((0, reflection_1.isCommentStatement)(statement) &&
-                (util_1.util.linesTouch(state.lineage[0], statement) || util_1.util.linesTouch(previousStatement, statement))) {
+            if (util_1.util.isLeadingCommentOnSameLine(state.lineage[0], statement) ||
+                util_1.util.isLeadingCommentOnSameLine(previousStatement, statement)) {
                 results.push(' ');
                 //is not a comment
             }
@@ -198,47 +203,11 @@ class ExpressionStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
     }
-}
-exports.ExpressionStatement = ExpressionStatement;
-class CommentStatement extends AstNode_2.Statement {
-    constructor(options) {
-        var _a;
-        super();
-        this.kind = AstNode_1.AstNodeKind.CommentStatement;
-        this.visitMode = visitors_1.InternalWalkMode.visitStatements | visitors_1.InternalWalkMode.visitExpressions;
-        this.tokens = {
-            comments: options.comments
-        };
-        if (((_a = this.tokens.comments) === null || _a === void 0 ? void 0 : _a.length) > 0) {
-            this.range = util_1.util.createBoundingRange(...this.tokens.comments);
-        }
-    }
-    get text() {
-        return this.tokens.comments.map(x => x.text).join('\n');
-    }
-    transpile(state) {
-        let result = [];
-        for (let i = 0; i < this.tokens.comments.length; i++) {
-            let comment = this.tokens.comments[i];
-            if (i > 0) {
-                result.push(state.indent());
-            }
-            result.push(state.transpileToken(comment));
-            //add newline for all except final comment
-            if (i < this.tokens.comments.length - 1) {
-                result.push('\n');
-            }
-        }
-        return result;
-    }
-    getTypedef(state) {
-        return this.transpile(state);
-    }
-    walk(visitor, options) {
-        //nothing to walk
+    getLeadingTrivia() {
+        return this.expression.getLeadingTrivia();
     }
 }
-exports.CommentStatement = CommentStatement;
+exports.ExpressionStatement = ExpressionStatement;
 class ExitForStatement extends AstNode_2.Statement {
     constructor(options) {
         var _a;
@@ -250,13 +219,15 @@ class ExitForStatement extends AstNode_2.Statement {
         this.range = (_a = this.tokens.exitFor) === null || _a === void 0 ? void 0 : _a.range;
     }
     transpile(state) {
-        return [
-            this.tokens.exitFor ? state.transpileToken(this.tokens.exitFor) : 'exit for'
-        ];
+        return this.tokens.exitFor ? state.transpileToken(this.tokens.exitFor) : ['exit for'];
     }
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.exitFor) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.ExitForStatement = ExitForStatement;
 class ExitWhileStatement extends AstNode_2.Statement {
@@ -270,13 +241,15 @@ class ExitWhileStatement extends AstNode_2.Statement {
         this.range = (_a = this.tokens.exitWhile) === null || _a === void 0 ? void 0 : _a.range;
     }
     transpile(state) {
-        return [
-            this.tokens.exitWhile ? state.transpileToken(this.tokens.exitWhile) : 'exit while'
-        ];
+        return this.tokens.exitWhile ? state.transpileToken(this.tokens.exitWhile) : ['exit while'];
     }
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.exitWhile) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.ExitWhileStatement = ExitWhileStatement;
 class FunctionStatement extends AstNode_2.Statement {
@@ -316,9 +289,12 @@ class FunctionStatement extends AstNode_2.Statement {
         return 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));
@@ -354,7 +330,7 @@ class IfStatement extends AstNode_2.Statement {
         this.range = util_1.util.createBoundingRange(util_1.util.createBoundingRangeFromTokens(this.tokens), this.condition, this.thenBranch, this.elseBranch);
     }
     transpile(state) {
-        var _a;
+        var _a, _b;
         let results = [];
         //if   (already indented by block)
         results.push(state.transpileToken((_a = this.tokens.if) !== null && _a !== void 0 ? _a : (0, creators_1.createToken)(TokenKind_1.TokenKind.If)));
@@ -373,13 +349,10 @@ class IfStatement extends AstNode_2.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) {
+            //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);
@@ -404,17 +377,10 @@ class IfStatement extends AstNode_2.Statement {
                 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) {
@@ -428,6 +394,10 @@ class IfStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'elseBranch', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.if) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.IfStatement = IfStatement;
 class IncrementStatement extends AstNode_2.Statement {
@@ -451,6 +421,10 @@ class IncrementStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.value) === null || _a === void 0 ? void 0 : _a.getLeadingTrivia()) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.IncrementStatement = IncrementStatement;
 /**
@@ -500,6 +474,10 @@ class PrintStatement extends AstNode_2.Statement {
             (0, visitors_1.walkArray)(this.expressions, visitor, options, this, (item) => (0, reflection_1.isExpression)(item));
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.print) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.PrintStatement = PrintStatement;
 class DimStatement extends AstNode_2.Statement {
@@ -533,8 +511,8 @@ class DimStatement extends AstNode_2.Statement {
         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) {
+        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);
         }
     }
@@ -547,6 +525,10 @@ class DimStatement extends AstNode_2.Statement {
         }
         return type;
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.dim) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.DimStatement = DimStatement;
 class GotoStatement extends AstNode_2.Statement {
@@ -569,6 +551,10 @@ class GotoStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.goto) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.GotoStatement = GotoStatement;
 class LabelStatement extends AstNode_2.Statement {
@@ -619,6 +605,10 @@ class ReturnStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.return) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.ReturnStatement = ReturnStatement;
 class EndStatement extends AstNode_2.Statement {
@@ -639,6 +629,10 @@ class EndStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.end) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.EndStatement = EndStatement;
 class StopStatement extends AstNode_2.Statement {
@@ -657,6 +651,10 @@ class StopStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.stop) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.StopStatement = StopStatement;
 class ForStatement extends AstNode_2.Statement {
@@ -693,10 +691,8 @@ class ForStatement extends AstNode_2.Statement {
         state.lineage.unshift(this);
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        // add new line before "end for"
-        result.push('\n');
         //end for
-        result.push(state.indent(), state.transpileToken(this.tokens.endFor, 'end for'));
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endFor, 'end for'));
         return result;
     }
     walk(visitor, options) {
@@ -711,6 +707,10 @@ class ForStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.for) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.ForStatement = ForStatement;
 class ForEachStatement extends AstNode_2.Statement {
@@ -741,10 +741,8 @@ class ForEachStatement extends AstNode_2.Statement {
         state.lineage.unshift(this);
         result.push(...this.body.transpile(state));
         state.lineage.shift();
-        // add new line before "end for"
-        result.push('\n');
         //end for
-        result.push(state.indent(), state.transpileToken(this.tokens.endFor, 'end for'));
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endFor, 'end for'));
         return result;
     }
     walk(visitor, options) {
@@ -755,6 +753,13 @@ class ForEachStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    getType(options) {
+        return this.getSymbolTable().getSymbolType(this.tokens.item.text, options);
+    }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.forEach) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.ForEachStatement = ForEachStatement;
 class WhileStatement extends AstNode_2.Statement {
@@ -779,10 +784,8 @@ class WhileStatement extends AstNode_2.Statement {
         //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, 'end while'));
+        result.push(...state.transpileEndBlockToken(this.body, this.tokens.endWhile, 'end while'));
         return result;
     }
     walk(visitor, options) {
@@ -793,6 +796,10 @@ class WhileStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'body', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.while) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.WhileStatement = WhileStatement;
 class DottedSetStatement extends AstNode_2.Statement {
@@ -844,6 +851,9 @@ class DottedSetStatement extends AstNode_2.Statement {
         }));
         return result;
     }
+    getLeadingTrivia() {
+        return this.obj.getLeadingTrivia();
+    }
 }
 exports.DottedSetStatement = DottedSetStatement;
 class IndexedSetStatement extends AstNode_2.Statement {
@@ -891,6 +901,9 @@ class IndexedSetStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'value', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        return this.obj.getLeadingTrivia();
+    }
 }
 exports.IndexedSetStatement = IndexedSetStatement;
 class LibraryStatement extends AstNode_2.Statement {
@@ -918,6 +931,10 @@ class LibraryStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.library) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.LibraryStatement = LibraryStatement;
 class NamespaceStatement extends AstNode_2.Statement {
@@ -937,9 +954,8 @@ class NamespaceStatement extends AstNode_2.Statement {
         return this.cacheRange();
     }
     cacheRange() {
-        var _a;
         if (!this._range) {
-            this._range = (_a = util_1.util.createBoundingRange(this.tokens.namespace, this.nameExpression, this.body, this.tokens.endNamespace)) !== null && _a !== void 0 ? _a : creators_1.interpolatedRange;
+            this._range = util_1.util.createBoundingRange(this.tokens.namespace, this.nameExpression, this.body, this.tokens.endNamespace);
         }
         return this._range;
     }
@@ -969,11 +985,12 @@ class NamespaceStatement extends AstNode_2.Statement {
         return this.body.transpile(state);
     }
     getTypedef(state) {
-        let result = [
-            'namespace ',
-            ...this.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--;
@@ -996,6 +1013,7 @@ class NamespaceStatement extends AstNode_2.Statement {
 exports.NamespaceStatement = NamespaceStatement;
 class ImportStatement extends AstNode_2.Statement {
     constructor(options) {
+        var _a;
         super();
         this.kind = AstNode_1.AstNodeKind.ImportStatement;
         this.tokens = {
@@ -1006,8 +1024,10 @@ class ImportStatement extends AstNode_2.Statement {
         if (this.tokens.path) {
             //remove quotes
             this.filePath = this.tokens.path.text.replace(/"/g, '');
-            //adjust the range to exclude the quotes
-            this.tokens.path.range = util_1.util.createRange(this.tokens.path.range.start.line, this.tokens.path.range.start.character + 1, this.tokens.path.range.end.line, this.tokens.path.range.end.character - 1);
+            if ((_a = this.tokens.path) === null || _a === void 0 ? void 0 : _a.range) {
+                //adjust the range to exclude the quotes
+                this.tokens.path.range = util_1.util.createRange(this.tokens.path.range.start.line, this.tokens.path.range.start.character + 1, this.tokens.path.range.end.line, this.tokens.path.range.end.character - 1);
+            }
         }
     }
     transpile(state) {
@@ -1035,6 +1055,10 @@ class ImportStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.import) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.ImportStatement = ImportStatement;
 class InterfaceStatement extends AstNode_2.Statement {
@@ -1111,17 +1135,20 @@ class InterfaceStatement extends AstNode_2.Statement {
         return [];
     }
     getTypedef(state) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         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(this.tokens.interface.text, ' ', this.tokens.name.text);
-        const parentInterfaceName = (_b = this.parentInterfaceName) === null || _b === void 0 ? void 0 : _b.getName();
+        const parentInterfaceName = (_c = this.parentInterfaceName) === null || _c === void 0 ? void 0 : _c.getName();
         if (parentInterfaceName) {
             result.push(' extends ', parentInterfaceName);
         }
-        const body = (_c = this.body) !== null && _c !== void 0 ? _c : [];
+        const body = (_d = this.body) !== null && _d !== void 0 ? _d : [];
         if (body.length > 0) {
             state.blockDepth++;
         }
@@ -1202,9 +1229,12 @@ class InterfaceFieldStatement extends AstNode_2.Statement {
         }
     }
     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.isOptional) {
@@ -1266,16 +1296,19 @@ class InterfaceMethodStatement extends AstNode_2.Statement {
         }
     }
     getTypedef(state) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         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.isOptional) {
             result.push(this.tokens.optional.text, ' ');
         }
-        result.push((_c = (_b = this.tokens.functionType) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : 'function', ' ', this.tokens.name.text, '(');
-        const params = (_d = this.params) !== null && _d !== void 0 ? _d : [];
+        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(', ');
@@ -1379,9 +1412,12 @@ class ClassStatement extends AstNode_2.Statement {
         return result;
     }
     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());
         }
         result.push('class ', this.tokens.name.text);
@@ -1573,7 +1609,7 @@ class ClassStatement extends AstNode_2.Statement {
         let result = [];
         const constructorFunction = this.getConstructorFunction();
         const constructorParams = constructorFunction ? constructorFunction.func.parameters : [];
-        result.push(state.sourceNode(this, 'function'), state.sourceNode(this, ' '), state.sourceNode(this.tokens.name, this.getName(Parser_1.ParseMode.BrightScript)), `(`);
+        result.push(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) {
@@ -1711,9 +1747,12 @@ class MethodStatement 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) {
@@ -1736,10 +1775,11 @@ class MethodStatement extends FunctionStatement {
         }
         //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
-                util_1.util.findBeginningVariableExpression(x.expression.callee).tokens.name.text.toLowerCase() === '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) {
@@ -1783,12 +1823,13 @@ class MethodStatement extends FunctionStatement {
      * 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.tokens.name);
-            thisQualifiedName.text = 'm.' + field.tokens.name.text;
+            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,
@@ -1848,21 +1889,24 @@ class FieldStatement extends AstNode_2.Statement {
         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.tokens.name) {
-            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());
             }
             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.tokens.accessModifier) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : 'public', ' ');
+            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((_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.text, ' as ', type.toTypeString());
+            result.push((_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.text, ' as ', type.toTypeString());
         }
         return result;
     }
@@ -1905,6 +1949,10 @@ class TryCatchStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'catchStatement', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.try) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.TryCatchStatement = TryCatchStatement;
 class CatchStatement extends AstNode_2.Statement {
@@ -1932,6 +1980,10 @@ class CatchStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'catchBranch', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.catch) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.CatchStatement = CatchStatement;
 class ThrowStatement extends AstNode_2.Statement {
@@ -1955,7 +2007,7 @@ class ThrowStatement extends AstNode_2.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;
     }
@@ -1964,6 +2016,10 @@ class ThrowStatement extends AstNode_2.Statement {
             (0, visitors_1.walk)(this, 'expression', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.throw) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.ThrowStatement = ThrowStatement;
 class EnumStatement extends AstNode_2.Statement {
@@ -1992,7 +2048,8 @@ class EnumStatement extends AstNode_2.Statement {
         return result;
     }
     getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.enum.leadingTrivia);
+        var _a;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_a = this.tokens.enum) === null || _a === void 0 ? void 0 : _a.leadingTrivia);
     }
     /**
      * Get a map of member names and their values.
@@ -2066,12 +2123,15 @@ class EnumStatement extends AstNode_2.Statement {
         return [];
     }
     getTypedef(state) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         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((_c = (_b = this.tokens.enum) === null || _b === void 0 ? void 0 : _b.text) !== null && _c !== void 0 ? _c : 'enum', ' ', this.tokens.name.text);
+        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) {
@@ -2080,7 +2140,7 @@ class EnumStatement extends AstNode_2.Statement {
             }
         }
         state.blockDepth--;
-        result.push(state.indent(), (_e = (_d = this.tokens.endEnum) === null || _d === void 0 ? void 0 : _d.text) !== null && _e !== void 0 ? _e : 'end enum');
+        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) {
@@ -2126,9 +2186,12 @@ class EnumMemberStatement extends AstNode_2.Statement {
         return [];
     }
     getTypedef(state) {
-        const result = [
-            this.tokens.name.text
-        ];
+        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) {
@@ -2164,7 +2227,8 @@ class ConstStatement extends AstNode_2.Statement {
         return this.tokens.name.text;
     }
     getLeadingTrivia() {
-        return util_1.util.concatAnnotationLeadingTrivia(this, this.tokens.const.leadingTrivia);
+        var _a;
+        return util_1.util.concatAnnotationLeadingTrivia(this, (_a = this.tokens.const) === null || _a === void 0 ? void 0 : _a.leadingTrivia);
     }
     /**
      * The name of the statement WITH its leading namespace (if applicable)
@@ -2192,15 +2256,13 @@ class ConstStatement extends AstNode_2.Statement {
         return [];
     }
     getTypedef(state) {
-        return [
-            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)
-        ];
+        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) {
@@ -2233,6 +2295,10 @@ class ContinueStatement extends AstNode_2.Statement {
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.continue) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.ContinueStatement = ContinueStatement;
 //# sourceMappingURL=Statement.js.map