brighterscript 1.0.0-alpha.26 → 1.0.0-alpha.28

package/dist/parser/Expression.js

@@ -11,17 +11,17 @@ const reflection_1 = require("../astUtils/reflection");
 const interfaces_1 = require("../interfaces");
 const VoidType_1 = require("../types/VoidType");
 const DynamicType_1 = require("../types/DynamicType");
-const SymbolTable_1 = require("../SymbolTable");
-const TypedFunctionType_1 = require("../types/TypedFunctionType");
 const AstNode_1 = require("./AstNode");
-const SymbolTable_2 = require("../SymbolTable");
+const SymbolTable_1 = require("../SymbolTable");
 const source_map_1 = require("source-map");
 const StringType_1 = require("../types/StringType");
 const ReferenceType_1 = require("../types/ReferenceType");
 const UnionType_1 = require("../types/UnionType");
-const types_1 = require("../types");
+const ArrayType_1 = require("../types/ArrayType");
 const AssociativeArrayType_1 = require("../types/AssociativeArrayType");
 const creators_1 = require("../astUtils/creators");
+const types_1 = require("../types");
+const FunctionType_1 = require("../types/FunctionType");
 class BinaryExpression extends AstNode_1.Expression {
     constructor(options) {
         super();
@@ -50,7 +50,7 @@ class BinaryExpression extends AstNode_1.Expression {
     }
     getType(options) {
         const operatorKind = this.tokens.operator.kind;
-        if (options.flags & SymbolTable_1.SymbolTypeFlag.typetime) {
+        if (options.flags & 2 /* SymbolTypeFlag.typetime */) {
             // eslint-disable-next-line @typescript-eslint/switch-exhaustiveness-check
             switch (operatorKind) {
                 case TokenKind_1.TokenKind.Or:
@@ -58,11 +58,14 @@ class BinaryExpression extends AstNode_1.Expression {
                 //TODO: Intersection Types?, eg. case TokenKind.And:
             }
         }
-        else if (options.flags & SymbolTable_1.SymbolTypeFlag.runtime) {
+        else if (options.flags & 1 /* SymbolTypeFlag.runtime */) {
             return util_1.default.binaryOperatorResultType(this.left.getType(options), this.tokens.operator, this.right.getType(options));
         }
         return DynamicType_1.DynamicType.instance;
     }
+    getLeadingTrivia() {
+        return this.left.getLeadingTrivia();
+    }
 }
 exports.BinaryExpression = BinaryExpression;
 class CallExpression extends AstNode_1.Expression {
@@ -119,11 +122,14 @@ class CallExpression extends AstNode_1.Expression {
         if ((0, reflection_1.isCallableType)(calleeType) && (!(0, reflection_1.isReferenceType)(calleeType.returnType) || ((_a = calleeType.returnType) === null || _a === void 0 ? void 0 : _a.isResolvable()))) {
             return calleeType.returnType;
         }
-        if (!(0, reflection_1.isReferenceType)(calleeType) && ((_b = calleeType.returnType) === null || _b === void 0 ? void 0 : _b.isResolvable())) {
+        if (!(0, reflection_1.isReferenceType)(calleeType) && ((_b = calleeType === null || calleeType === void 0 ? void 0 : calleeType.returnType) === null || _b === void 0 ? void 0 : _b.isResolvable())) {
             return calleeType.returnType;
         }
         return new ReferenceType_1.TypePropertyReferenceType(calleeType, 'returnType');
     }
+    getLeadingTrivia() {
+        return this.callee.getLeadingTrivia();
+    }
 }
 exports.CallExpression = CallExpression;
 CallExpression.MaximumArguments = 32;
@@ -132,11 +138,6 @@ class FunctionExpression extends AstNode_1.Expression {
         var _a;
         super();
         this.kind = AstNode_1.AstNodeKind.FunctionExpression;
-        /**
-         * The list of function calls that are declared within this function scope. This excludes CallExpressions
-         * declared in child functions
-         */
-        this.callExpressions = [];
         this.tokens = {
             functionType: options.functionType,
             leftParen: options.leftParen,
@@ -149,9 +150,9 @@ class FunctionExpression extends AstNode_1.Expression {
         this.returnTypeExpression = options.returnTypeExpression;
         //if there's a body, and it doesn't have a SymbolTable, assign one
         if (this.body && !this.body.symbolTable) {
-            this.body.symbolTable = new SymbolTable_2.SymbolTable(`Function Body`);
+            this.body.symbolTable = new SymbolTable_1.SymbolTable(`Block`, () => this.getSymbolTable());
         }
-        this.symbolTable = new SymbolTable_2.SymbolTable('FunctionExpression', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
+        this.symbolTable = new SymbolTable_1.SymbolTable('FunctionExpression', () => { var _a; return (_a = this.parent) === null || _a === void 0 ? void 0 : _a.getSymbolTable(); });
     }
     getLeadingTrivia() {
         var _a, _b;
@@ -165,7 +166,7 @@ class FunctionExpression extends AstNode_1.Expression {
         return util_1.default.createBoundingRange(this.tokens.functionType, this.tokens.leftParen, ...this.parameters, this.tokens.rightParen, this.tokens.as, this.returnTypeExpression, this.tokens.endFunctionType);
     }
     transpile(state, name, includeBody = true) {
-        var _a;
+        var _a, _b, _c;
         let results = [];
         //'function'|'sub'
         results.push(state.transpileToken(this.tokens.functionType, 'function'));
@@ -195,15 +196,16 @@ class FunctionExpression extends AstNode_1.Expression {
             //return type
             ...this.returnTypeExpression.transpile(state));
         }
+        let hasBody = false;
         if (includeBody) {
             state.lineage.unshift(this);
             let body = this.body.transpile(state);
+            hasBody = body.length > 0;
             state.lineage.shift();
             results.push(...body);
         }
-        results.push('\n');
-        //'end sub'|'end function'
-        results.push(state.indent(), state.transpileToken(this.tokens.endFunctionType, `end ${(_a = this.tokens.functionType) !== null && _a !== void 0 ? _a : 'function'}`));
+        const lastLocatable = hasBody ? this.body : (_b = (_a = this.returnTypeExpression) !== null && _a !== void 0 ? _a : this.tokens.leftParen) !== null && _b !== void 0 ? _b : this.tokens.functionType;
+        results.push(...state.transpileEndBlockToken(lastLocatable, this.tokens.endFunctionType, `end ${(_c = this.tokens.functionType) !== null && _c !== void 0 ? _c : 'function'}`));
         return results;
     }
     getTypedef(state) {
@@ -258,7 +260,7 @@ class FunctionExpression extends AstNode_1.Expression {
         if (!returnType) {
             returnType = isSub ? VoidType_1.VoidType.instance : DynamicType_1.DynamicType.instance;
         }
-        const resultType = new TypedFunctionType_1.TypedFunctionType(returnType);
+        const resultType = new types_1.TypedFunctionType(returnType);
         resultType.isSub = isSub;
         for (let param of this.parameters) {
             resultType.addParameter(param.tokens.name.text, param.getType(Object.assign(Object.assign({}, options), { typeChain: undefined })), !!param.defaultValue);
@@ -278,7 +280,7 @@ class FunctionExpression extends AstNode_1.Expression {
         if (funcName) {
             resultType.setName(funcName);
         }
-        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry(funcName, resultType, options.data, this.range));
+        (_d = options.typeChain) === null || _d === void 0 ? void 0 : _d.push(new interfaces_1.TypeChainEntry({ name: funcName, type: resultType, data: options.data, range: this.range, kind: this.kind }));
         return resultType;
     }
 }
@@ -297,8 +299,8 @@ class FunctionParameterExpression extends AstNode_1.Expression {
     }
     getType(options) {
         var _a, _b, _c, _d, _e;
-        const paramType = (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime, typeChain: undefined }))) !== null && _b !== void 0 ? _b : (_c = this.defaultValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime, typeChain: undefined }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
-        (_e = options.typeChain) === null || _e === void 0 ? void 0 : _e.push(new interfaces_1.TypeChainEntry(this.tokens.name.text, paramType, options.data, this.range));
+        const paramType = (_d = (_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getType(Object.assign(Object.assign({}, options), { flags: 2 /* SymbolTypeFlag.typetime */, typeChain: undefined }))) !== null && _b !== void 0 ? _b : (_c = this.defaultValue) === null || _c === void 0 ? void 0 : _c.getType(Object.assign(Object.assign({}, options), { flags: 1 /* SymbolTypeFlag.runtime */, typeChain: undefined }))) !== null && _d !== void 0 ? _d : DynamicType_1.DynamicType.instance;
+        (_e = options.typeChain) === null || _e === void 0 ? void 0 : _e.push(new interfaces_1.TypeChainEntry({ name: this.tokens.name.text, type: paramType, data: options.data, range: this.range, kind: this.kind }));
         return paramType;
     }
     get range() {
@@ -326,20 +328,19 @@ class FunctionParameterExpression extends AstNode_1.Expression {
     }
     getTypedef(state) {
         var _a, _b;
-        return [
-            //name
-            this.tokens.name.text,
-            //default value
-            ...(this.defaultValue ? [
-                ' = ',
-                ...this.defaultValue.transpile(state)
-            ] : []),
-            //type declaration
-            ...(this.typeExpression ? [
-                ' as ',
-                ...((_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getTypedef(state)) !== null && _b !== void 0 ? _b : [''])
-            ] : [])
-        ];
+        const results = [this.tokens.name.text];
+        if (this.defaultValue) {
+            results.push(' = ', ...this.defaultValue.transpile(state));
+        }
+        if (this.tokens.as) {
+            results.push(' as ');
+            // TODO: Is this conditional needed? Will typeToken always exist
+            // so long as `asToken` exists?
+            if (this.typeExpression) {
+                results.push(...((_b = (_a = this.typeExpression) === null || _a === void 0 ? void 0 : _a.getTypedef(state)) !== null && _b !== void 0 ? _b : ['']));
+            }
+        }
+        return results;
     }
     walk(visitor, options) {
         // eslint-disable-next-line no-bitwise
@@ -348,6 +349,10 @@ class FunctionParameterExpression extends AstNode_1.Expression {
             (0, visitors_2.walk)(this, 'typeExpression', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.name.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
 }
 exports.FunctionParameterExpression = FunctionParameterExpression;
 class DottedGetExpression extends AstNode_1.Expression {
@@ -384,10 +389,22 @@ class DottedGetExpression extends AstNode_1.Expression {
     getType(options) {
         var _a, _b, _c, _d, _e, _f;
         const objType = (_a = this.obj) === null || _a === void 0 ? void 0 : _a.getType(options);
-        const result = objType === null || objType === void 0 ? void 0 : objType.getMemberType((_b = this.tokens.name) === null || _b === void 0 ? void 0 : _b.text, options);
-        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry((_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.text, result, options.data, (_f = (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : this.range));
-        if (result || options.flags & SymbolTable_1.SymbolTypeFlag.typetime) {
-            // All types should be known at typetime
+        let result = objType === null || objType === void 0 ? void 0 : objType.getMemberType((_b = this.tokens.name) === null || _b === void 0 ? void 0 : _b.text, options);
+        if (util_1.default.isClassUsedAsFunction(result, this, options)) {
+            // treat this class constructor as a function
+            result = FunctionType_1.FunctionType.instance;
+        }
+        (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({
+            name: (_d = this.tokens.name) === null || _d === void 0 ? void 0 : _d.text,
+            type: result,
+            data: options.data,
+            range: (_f = (_e = this.tokens.name) === null || _e === void 0 ? void 0 : _e.range) !== null && _f !== void 0 ? _f : this.range,
+            kind: this.kind
+        }));
+        if (result ||
+            options.flags & 2 /* SymbolTypeFlag.typetime */ ||
+            ((0, reflection_1.isPrimitiveType)(objType) || (0, reflection_1.isCallableType)(objType))) {
+            // All types should be known at typeTime, or the obj is well known
             return result;
         }
         // It is possible at runtime that a value has been added dynamically to an object, or something
@@ -397,6 +414,9 @@ class DottedGetExpression extends AstNode_1.Expression {
     getName(parseMode) {
         return util_1.default.getAllDottedGetPartsAsString(this, parseMode);
     }
+    getLeadingTrivia() {
+        return this.obj.getLeadingTrivia();
+    }
 }
 exports.DottedGetExpression = DottedGetExpression;
 class XmlAttributeGetExpression extends AstNode_1.Expression {
@@ -419,6 +439,9 @@ class XmlAttributeGetExpression extends AstNode_1.Expression {
             (0, visitors_2.walk)(this, 'obj', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        return this.obj.getLeadingTrivia();
+    }
 }
 exports.XmlAttributeGetExpression = XmlAttributeGetExpression;
 class IndexedGetExpression extends AstNode_1.Expression {
@@ -463,6 +486,9 @@ class IndexedGetExpression extends AstNode_1.Expression {
         }
         return super.getType(options);
     }
+    getLeadingTrivia() {
+        return this.obj.getLeadingTrivia();
+    }
 }
 exports.IndexedGetExpression = IndexedGetExpression;
 class GroupingExpression extends AstNode_1.Expression {
@@ -494,6 +520,10 @@ class GroupingExpression extends AstNode_1.Expression {
     getType(options) {
         return this.expression.getType(options);
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.leftParen) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.GroupingExpression = GroupingExpression;
 class LiteralExpression extends AstNode_1.Expression {
@@ -527,12 +557,16 @@ class LiteralExpression extends AstNode_1.Expression {
             text = this.tokens.value.text;
         }
         return [
-            state.sourceNode(this, text)
+            state.transpileToken(Object.assign(Object.assign({}, this.tokens.value), { text: text }))
         ];
     }
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.value.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
 }
 exports.LiteralExpression = LiteralExpression;
 /**
@@ -568,6 +602,7 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
         this.range = util_1.default.createBoundingRange(this.tokens.open, ...this.elements, this.tokens.close);
     }
     transpile(state) {
+        var _a;
         let result = [];
         result.push(state.transpileToken(this.tokens.open, '['));
         let hasChildren = this.elements.length > 0;
@@ -575,32 +610,18 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
         for (let i = 0; i < this.elements.length; i++) {
             let previousElement = this.elements[i - 1];
             let element = this.elements[i];
-            if ((0, reflection_1.isCommentStatement)(element)) {
-                //if the comment is on the same line as opening square or previous statement, don't add newline
-                if (util_1.default.linesTouch(this.tokens.open, element) || util_1.default.linesTouch(previousElement, element)) {
-                    result.push(' ');
-                }
-                else {
-                    result.push('\n', state.indent());
-                }
-                state.lineage.unshift(this);
-                result.push(element.transpile(state));
-                state.lineage.shift();
+            if (util_1.default.isLeadingCommentOnSameLine(previousElement !== null && previousElement !== void 0 ? previousElement : this.tokens.open, element)) {
+                result.push(' ');
             }
             else {
-                result.push('\n');
-                result.push(state.indent(), ...element.transpile(state));
+                result.push('\n', state.indent());
             }
+            result.push(...element.transpile(state));
         }
         state.blockDepth--;
         //add a newline between open and close if there are elements
-        if (hasChildren) {
-            result.push('\n');
-            result.push(state.indent());
-        }
-        if (this.tokens.close) {
-            result.push(state.transpileToken(this.tokens.close));
-        }
+        const lastLocatable = (_a = this.elements[this.elements.length - 1]) !== null && _a !== void 0 ? _a : this.tokens.open;
+        result.push(...state.transpileEndBlockToken(lastLocatable, this.tokens.close, ']', hasChildren));
         return result;
     }
     walk(visitor, options) {
@@ -609,8 +630,12 @@ class ArrayLiteralExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        const innerTypes = this.elements.filter(x => !(0, reflection_1.isCommentStatement)(x)).map(expr => expr.getType(options));
-        return new types_1.ArrayType(...innerTypes);
+        const innerTypes = this.elements.map(expr => expr.getType(options));
+        return new ArrayType_1.ArrayType(...innerTypes);
+    }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.open.leadingTrivia) !== null && _a !== void 0 ? _a : [];
     }
 }
 exports.ArrayLiteralExpression = ArrayLiteralExpression;
@@ -636,6 +661,10 @@ class AAMemberExpression extends AstNode_1.Expression {
     getType(options) {
         return this.value.getType(options);
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.key.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
 }
 exports.AAMemberExpression = AAMemberExpression;
 class AALiteralExpression extends AstNode_1.Expression {
@@ -650,12 +679,13 @@ class AALiteralExpression extends AstNode_1.Expression {
         this.range = util_1.default.createBoundingRange(this.tokens.open, ...this.elements, this.tokens.close);
     }
     transpile(state) {
+        var _a;
         let result = [];
         //open curly
         result.push(state.transpileToken(this.tokens.open, '{'));
         let hasChildren = this.elements.length > 0;
         //add newline if the object has children and the first child isn't a comment starting on the same line as opening curly
-        if (hasChildren && ((0, reflection_1.isCommentStatement)(this.elements[0]) === false || !util_1.default.linesTouch(this.elements[0], this.tokens.open))) {
+        if (hasChildren && !util_1.default.isLeadingCommentOnSameLine(this.tokens.open, this.elements[0])) {
             result.push('\n');
         }
         state.blockDepth++;
@@ -664,41 +694,29 @@ class AALiteralExpression extends AstNode_1.Expression {
             let previousElement = this.elements[i - 1];
             let nextElement = this.elements[i + 1];
             //don't indent if comment is same-line
-            if ((0, reflection_1.isCommentStatement)(element) &&
-                (util_1.default.linesTouch(this.tokens.open, element) || util_1.default.linesTouch(previousElement, element))) {
+            if (util_1.default.isLeadingCommentOnSameLine(this.tokens.open, element) ||
+                util_1.default.isLeadingCommentOnSameLine(previousElement, element)) {
                 result.push(' ');
-                //indent line
             }
             else {
+                //indent line
                 result.push(state.indent());
             }
-            //render comments
-            if ((0, reflection_1.isCommentStatement)(element)) {
-                result.push(...element.transpile(state));
-            }
-            else {
-                //key
-                result.push(state.transpileToken(element.tokens.key));
-                //colon
-                result.push(state.transpileToken(element.tokens.colon, ':'), ' ');
-                //value
-                result.push(...element.value.transpile(state));
-            }
+            //key
+            result.push(state.transpileToken(element.tokens.key));
+            //colon
+            result.push(state.transpileToken(element.tokens.colon, ':'), ' ');
+            //value
+            result.push(...element.value.transpile(state));
             //if next element is a same-line comment, skip the newline
-            if (nextElement && (0, reflection_1.isCommentStatement)(nextElement) && nextElement.range.start.line === element.range.start.line) {
+            if (nextElement && !util_1.default.isLeadingCommentOnSameLine(element, nextElement)) {
                 //add a newline between statements
-            }
-            else {
                 result.push('\n');
             }
         }
         state.blockDepth--;
-        //only indent the closing curly if we have children
-        if (hasChildren) {
-            result.push(state.indent());
-        }
-        //close curly
-        result.push(state.transpileToken(this.tokens.close, '}'));
+        const lastElement = (_a = this.elements[this.elements.length - 1]) !== null && _a !== void 0 ? _a : this.tokens.open;
+        result.push(...state.transpileEndBlockToken(lastElement, this.tokens.close, '}', hasChildren));
         return result;
     }
     walk(visitor, options) {
@@ -708,13 +726,18 @@ class AALiteralExpression extends AstNode_1.Expression {
     }
     getType(options) {
         const resultType = new AssociativeArrayType_1.AssociativeArrayType();
+        resultType.addBuiltInInterfaces();
         for (const element of this.elements) {
             if ((0, reflection_1.isAAMemberExpression)(element)) {
-                resultType.addMember(element.tokens.key.text, { definingNode: element }, element.getType(options), SymbolTable_1.SymbolTypeFlag.runtime);
+                resultType.addMember(element.tokens.key.text, { definingNode: element }, element.getType(options), 1 /* SymbolTypeFlag.runtime */);
             }
         }
         return resultType;
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.open.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
 }
 exports.AALiteralExpression = AALiteralExpression;
 class UnaryExpression extends AstNode_1.Expression {
@@ -752,6 +775,10 @@ class UnaryExpression extends AstNode_1.Expression {
     getType(options) {
         return util_1.default.unaryOperatorResultType(this.tokens.operator, this.right.getType(options));
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.operator.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
 }
 exports.UnaryExpression = UnaryExpression;
 class VariableExpression extends AstNode_1.Expression {
@@ -771,7 +798,7 @@ class VariableExpression extends AstNode_1.Expression {
         let result = [];
         const namespace = this.findAncestor(reflection_1.isNamespaceStatement);
         //if the callee is the name of a known namespace function
-        if (state.file.calleeIsKnownNamespaceFunction(this, namespace === null || namespace === void 0 ? void 0 : namespace.getName(Parser_1.ParseMode.BrighterScript))) {
+        if (namespace && state.file.calleeIsKnownNamespaceFunction(this, namespace.getName(Parser_1.ParseMode.BrighterScript))) {
             result.push(state.sourceNode(this, [
                 namespace.getName(Parser_1.ParseMode.BrightScript),
                 '_',
@@ -794,10 +821,17 @@ class VariableExpression extends AstNode_1.Expression {
         if (!resultType) {
             const symbolTable = this.getSymbolTable();
             resultType = symbolTable === null || symbolTable === void 0 ? void 0 : symbolTable.getSymbolType(nameKey, Object.assign(Object.assign({}, options), { fullName: nameKey, tableProvider: () => this.getSymbolTable() }));
+            if (util_1.default.isClassUsedAsFunction(resultType, this, options)) {
+                resultType = FunctionType_1.FunctionType.instance;
+            }
         }
-        (_a = options.typeChain) === null || _a === void 0 ? void 0 : _a.push(new interfaces_1.TypeChainEntry(nameKey, resultType, options.data, this.range));
+        (_a = options.typeChain) === null || _a === void 0 ? void 0 : _a.push(new interfaces_1.TypeChainEntry({ name: nameKey, type: resultType, data: options.data, range: this.range, kind: this.kind }));
         return resultType;
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.name.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
 }
 exports.VariableExpression = VariableExpression;
 class SourceLiteralExpression extends AstNode_1.Expression {
@@ -828,7 +862,7 @@ class SourceLiteralExpression extends AstNode_1.Expression {
         return index;
     }
     getFunctionName(state, parseMode) {
-        let func = state.file.getFunctionScopeAtPosition(this.tokens.value.range.start).func;
+        let func = this.findAncestor(reflection_1.isFunctionExpression);
         let nameParts = [];
         let parentFunction;
         while ((parentFunction = func.findAncestor(reflection_1.isFunctionExpression))) {
@@ -840,6 +874,19 @@ class SourceLiteralExpression extends AstNode_1.Expression {
         nameParts.unshift(func.functionStatement.getName(parseMode));
         return nameParts.join('$');
     }
+    /**
+     * Get the line number from our token or from the closest ancestor that has a range
+     */
+    getClosestLineNumber() {
+        let node = this;
+        while (node) {
+            if (node.range) {
+                return node.range.start.line + 1;
+            }
+            node = node.parent;
+        }
+        return -1;
+    }
     transpile(state) {
         let text;
         switch (this.tokens.value.kind) {
@@ -848,7 +895,8 @@ class SourceLiteralExpression extends AstNode_1.Expression {
                 text = `"${pathUrl.substring(0, 4)}" + "${pathUrl.substring(4)}"`;
                 break;
             case TokenKind_1.TokenKind.SourceLineNumLiteral:
-                text = `${this.tokens.value.range.start.line + 1}`;
+                //TODO find first parent that has range, or default to -1
+                text = `${this.getClosestLineNumber()}`;
                 break;
             case TokenKind_1.TokenKind.FunctionNameLiteral:
                 text = `"${this.getFunctionName(state, Parser_1.ParseMode.BrightScript)}"`;
@@ -858,7 +906,8 @@ class SourceLiteralExpression extends AstNode_1.Expression {
                 break;
             case TokenKind_1.TokenKind.SourceLocationLiteral:
                 const locationUrl = fileUrl(state.srcPath);
-                text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.tokens.value.range.start.line + 1}"`;
+                //TODO find first parent that has range, or default to -1
+                text = `"${locationUrl.substring(0, 4)}" + "${locationUrl.substring(4)}:${this.getClosestLineNumber()}"`;
                 break;
             case TokenKind_1.TokenKind.PkgPathLiteral:
                 text = `"${util_1.default.sanitizePkgPath(state.file.pkgPath)}"`;
@@ -879,6 +928,10 @@ class SourceLiteralExpression extends AstNode_1.Expression {
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.value.leadingTrivia) !== null && _a !== void 0 ? _a : [];
+    }
 }
 exports.SourceLiteralExpression = SourceLiteralExpression;
 /**
@@ -918,7 +971,19 @@ class NewExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return this.call.getType(options);
+        const result = this.call.getType(options);
+        if (options.typeChain) {
+            // modify last typechain entry to show it is a new ...()
+            const lastEntry = options.typeChain[options.typeChain.length - 1];
+            if (lastEntry) {
+                lastEntry.kind = this.kind;
+            }
+        }
+        return result;
+    }
+    getLeadingTrivia() {
+        var _a;
+        return (_a = this.tokens.new.leadingTrivia) !== null && _a !== void 0 ? _a : [];
     }
 }
 exports.NewExpression = NewExpression;
@@ -972,11 +1037,17 @@ class CallfuncExpression extends AstNode_1.Expression {
         let result = DynamicType_1.DynamicType.instance;
         // a little hacky here with checking options.ignoreCall because callFuncExpression has the method name
         // It's nicer for CallExpression, because it's a call on any expression.
-        const calleeType = this.callee.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.runtime }));
+        const calleeType = this.callee.getType(Object.assign(Object.assign({}, options), { flags: 1 /* SymbolTypeFlag.runtime */ }));
         if ((0, reflection_1.isComponentType)(calleeType) || (0, reflection_1.isReferenceType)(calleeType)) {
             const funcType = (_b = (_a = calleeType).getCallFuncType) === null || _b === void 0 ? void 0 : _b.call(_a, this.tokens.methodName.text, options);
             if (funcType) {
-                (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry(this.tokens.methodName.text, funcType, options.data, this.tokens.methodName.range, (0, creators_1.createToken)(TokenKind_1.TokenKind.Callfunc)));
+                (_c = options.typeChain) === null || _c === void 0 ? void 0 : _c.push(new interfaces_1.TypeChainEntry({
+                    name: this.tokens.methodName.text,
+                    type: funcType,
+                    data: options.data, range: this.tokens.methodName.range,
+                    separatorToken: (0, creators_1.createToken)(TokenKind_1.TokenKind.Callfunc),
+                    kind: this.kind
+                }));
                 if (options.ignoreCall) {
                     result = funcType;
                 }
@@ -994,6 +1065,9 @@ class CallfuncExpression extends AstNode_1.Expression {
         }
         return result;
     }
+    getLeadingTrivia() {
+        return this.callee.getLeadingTrivia();
+    }
 }
 exports.CallfuncExpression = CallfuncExpression;
 /**
@@ -1169,8 +1243,8 @@ class AnnotationExpression extends AstNode_1.Expression {
         return this.call.args.map(e => expressionToValue(e, strict));
     }
     getLeadingTrivia() {
-        var _a;
-        return (_a = this.tokens.at) === null || _a === void 0 ? void 0 : _a.leadingTrivia;
+        var _a, _b;
+        return (_b = (_a = this.tokens.at) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
     }
     transpile(state) {
         return [];
@@ -1204,8 +1278,9 @@ class TernaryExpression extends AstNode_1.Expression {
     transpile(state) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         let result = [];
-        let consequentInfo = util_1.default.getExpressionInfo(this.consequent);
-        let alternateInfo = util_1.default.getExpressionInfo(this.alternate);
+        const file = state.file;
+        let consequentInfo = util_1.default.getExpressionInfo(this.consequent, file);
+        let alternateInfo = util_1.default.getExpressionInfo(this.alternate, file);
         //get all unique variable names used in the consequent and alternate, and sort them alphabetically so the output is consistent
         let allUniqueVarNames = [...new Set([...consequentInfo.uniqueVarNames, ...alternateInfo.uniqueVarNames])].sort();
         let mutatingExpressions = [
@@ -1216,9 +1291,9 @@ class TernaryExpression extends AstNode_1.Expression {
             result.push(state.sourceNode(this.tokens.questionMark, 
             //write all the scope variables as parameters.
             //TODO handle when there are more than 31 parameters
-            `(function(__bsCondition, ${allUniqueVarNames.join(', ')})`), state.newline, 
+            `(function(${['__bsCondition', ...allUniqueVarNames].join(', ')})`), state.newline, 
             //double indent so our `end function` line is still indented one at the end
-            state.indent(2), state.sourceNode(this.test, `if __bsCondition then`), state.newline, state.indent(1), state.sourceNode((_a = this.consequent) !== null && _a !== void 0 ? _a : this.tokens.questionMark, 'return '), ...(_c = (_b = this.consequent) === null || _b === void 0 ? void 0 : _b.transpile(state)) !== null && _c !== void 0 ? _c : [state.sourceNode(this.tokens.questionMark, 'invalid')], state.newline, state.indent(-1), state.sourceNode((_d = this.consequent) !== null && _d !== void 0 ? _d : this.tokens.questionMark, 'else'), state.newline, state.indent(1), state.sourceNode((_e = this.consequent) !== null && _e !== void 0 ? _e : this.tokens.questionMark, 'return '), ...(_g = (_f = this.alternate) === null || _f === void 0 ? void 0 : _f.transpile(state)) !== null && _g !== void 0 ? _g : [state.sourceNode((_h = this.consequent) !== null && _h !== void 0 ? _h : this.tokens.questionMark, 'invalid')], state.newline, state.indent(-1), state.sourceNode(this.tokens.questionMark, 'end if'), state.newline, state.indent(-1), state.sourceNode(this.tokens.questionMark, 'end function)('), ...this.test.transpile(state), state.sourceNode(this.tokens.questionMark, `, ${allUniqueVarNames.join(', ')})`));
+            state.indent(2), state.sourceNode(this.test, `if __bsCondition then`), state.newline, state.indent(1), state.sourceNode((_a = this.consequent) !== null && _a !== void 0 ? _a : this.tokens.questionMark, 'return '), ...(_c = (_b = this.consequent) === null || _b === void 0 ? void 0 : _b.transpile(state)) !== null && _c !== void 0 ? _c : [state.sourceNode(this.tokens.questionMark, 'invalid')], state.newline, state.indent(-1), state.sourceNode((_d = this.consequent) !== null && _d !== void 0 ? _d : this.tokens.questionMark, 'else'), state.newline, state.indent(1), state.sourceNode((_e = this.consequent) !== null && _e !== void 0 ? _e : this.tokens.questionMark, 'return '), ...(_g = (_f = this.alternate) === null || _f === void 0 ? void 0 : _f.transpile(state)) !== null && _g !== void 0 ? _g : [state.sourceNode((_h = this.consequent) !== null && _h !== void 0 ? _h : this.tokens.questionMark, 'invalid')], state.newline, state.indent(-1), state.sourceNode(this.tokens.questionMark, 'end if'), state.newline, state.indent(-1), state.sourceNode(this.tokens.questionMark, 'end function)('), ...this.test.transpile(state), state.sourceNode(this.tokens.questionMark, `${['', ...allUniqueVarNames].join(', ')})`));
             state.blockDepth--;
         }
         else {
@@ -1233,6 +1308,9 @@ class TernaryExpression extends AstNode_1.Expression {
             (0, visitors_2.walk)(this, 'alternate', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        return this.test.getLeadingTrivia();
+    }
 }
 exports.TernaryExpression = TernaryExpression;
 class NullCoalescingExpression extends AstNode_1.Expression {
@@ -1248,8 +1326,8 @@ class NullCoalescingExpression extends AstNode_1.Expression {
     }
     transpile(state) {
         let result = [];
-        let consequentInfo = util_1.default.getExpressionInfo(this.consequent);
-        let alternateInfo = util_1.default.getExpressionInfo(this.alternate);
+        let consequentInfo = util_1.default.getExpressionInfo(this.consequent, state.file);
+        let alternateInfo = util_1.default.getExpressionInfo(this.alternate, state.file);
         //get all unique variable names used in the consequent and alternate, and sort them alphabetically so the output is consistent
         let allUniqueVarNames = [...new Set([...consequentInfo.uniqueVarNames, ...alternateInfo.uniqueVarNames])].sort();
         let hasMutatingExpression = [
@@ -1278,6 +1356,9 @@ class NullCoalescingExpression extends AstNode_1.Expression {
             (0, visitors_2.walk)(this, 'alternate', visitor, options);
         }
     }
+    getLeadingTrivia() {
+        return this.consequent.getLeadingTrivia();
+    }
 }
 exports.NullCoalescingExpression = NullCoalescingExpression;
 class RegexLiteralExpression extends AstNode_1.Expression {
@@ -1319,6 +1400,10 @@ class RegexLiteralExpression extends AstNode_1.Expression {
     walk(visitor, options) {
         //nothing to walk
     }
+    getLeadingTrivia() {
+        var _a, _b;
+        return (_b = (_a = this.tokens.regexLiteral) === null || _a === void 0 ? void 0 : _a.leadingTrivia) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.RegexLiteralExpression = RegexLiteralExpression;
 function expressionToValue(expr, strict) {
@@ -1340,14 +1425,11 @@ function expressionToValue(expr, strict) {
     }
     if ((0, reflection_1.isArrayLiteralExpression)(expr)) {
         return expr.elements
-            .filter(e => !(0, reflection_1.isCommentStatement)(e))
             .map(e => expressionToValue(e, strict));
     }
     if ((0, reflection_1.isAALiteralExpression)(expr)) {
         return expr.elements.reduce((acc, e) => {
-            if (!(0, reflection_1.isCommentStatement)(e)) {
-                acc[e.tokens.key.text] = expressionToValue(e.value, strict);
-            }
+            acc[e.tokens.key.text] = expressionToValue(e.value, strict);
             return acc;
         }, {});
     }
@@ -1370,7 +1452,7 @@ class TypeExpression extends AstNode_1.Expression {
         this.range = (_a = this.expression) === null || _a === void 0 ? void 0 : _a.range;
     }
     transpile(state) {
-        return [this.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }).toTypeString()];
+        return [this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }).toTypeString()];
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
@@ -1378,7 +1460,7 @@ class TypeExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return this.expression.getType(Object.assign(Object.assign({}, options), { flags: SymbolTable_1.SymbolTypeFlag.typetime }));
+        return this.expression.getType(Object.assign(Object.assign({}, options), { flags: 2 /* SymbolTypeFlag.typetime */ }));
     }
     getTypedef(state) {
         // TypeDefs should pass through any valid type names
@@ -1415,7 +1497,15 @@ class TypeCastExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return this.typeExpression.getType(options);
+        const result = this.typeExpression.getType(options);
+        if (options.typeChain) {
+            // modify last typechain entry to show it is a typecast
+            const lastEntry = options.typeChain[options.typeChain.length - 1];
+            if (lastEntry) {
+                lastEntry.kind = this.kind;
+            }
+        }
+        return result;
     }
 }
 exports.TypeCastExpression = TypeCastExpression;
@@ -1431,7 +1521,7 @@ class TypedArrayExpression extends AstNode_1.Expression {
         this.range = util_1.default.createBoundingRange(this.innerType, this.tokens.leftBracket, this.tokens.rightBracket);
     }
     transpile(state) {
-        return [this.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }).toTypeString()];
+        return [this.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }).toTypeString()];
     }
     walk(visitor, options) {
         if (options.walkMode & visitors_2.InternalWalkMode.walkExpressions) {
@@ -1439,7 +1529,7 @@ class TypedArrayExpression extends AstNode_1.Expression {
         }
     }
     getType(options) {
-        return new types_1.ArrayType(this.innerType.getType(options));
+        return new ArrayType_1.ArrayType(this.innerType.getType(options));
     }
 }
 exports.TypedArrayExpression = TypedArrayExpression;