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

package/dist/parser/Parser.spec.js

@@ -12,7 +12,6 @@ const DiagnosticMessages_1 = require("../DiagnosticMessages");
 const reflection_1 = require("../astUtils/reflection");
 const testHelpers_spec_1 = require("../testHelpers.spec");
 const visitors_1 = require("../astUtils/visitors");
-const SymbolTable_1 = require("../SymbolTable");
 const IntegerType_1 = require("../types/IntegerType");
 const FloatType_1 = require("../types/FloatType");
 const StringType_1 = require("../types/StringType");
@@ -518,17 +517,17 @@ describe('parser', () => {
             });
         });
         describe('comments', () => {
-            it('combines multi-line comments', () => {
+            it('does not include comments', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
                     'line 1
                     'line 2
                     'line 3
                 `);
                 let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
-                (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Error count should be 0');
-                (0, chai_config_spec_1.expect)(statements[0].text).to.equal(`'line 1\n'line 2\n'line 3`);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
+                (0, chai_config_spec_1.expect)(statements.length).to.equal(0);
             });
-            it('does not combile comments separated by newlines', () => {
+            it('does matter if comments separated by newlines', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
                     'line 1
 
@@ -537,11 +536,8 @@ describe('parser', () => {
                     'line 3
                 `);
                 let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
-                (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Error count should be 0');
-                (0, chai_config_spec_1.expect)(statements).to.be.lengthOf(3);
-                (0, chai_config_spec_1.expect)(statements[0].text).to.equal(`'line 1`);
-                (0, chai_config_spec_1.expect)(statements[1].text).to.equal(`'line 2`);
-                (0, chai_config_spec_1.expect)(statements[2].text).to.equal(`'line 3`);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
+                (0, chai_config_spec_1.expect)(statements).to.be.lengthOf(0);
             });
             it('works after print statement', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
@@ -550,10 +546,10 @@ describe('parser', () => {
                     end sub
                 `);
                 let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
-                (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Error count should be 0');
-                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[1].text).to.equal(`'comment 1`);
+                (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
+                (0, chai_config_spec_1.expect)(statements[0].func.body.statements.length).to.equal(1);
             });
-            it('declaration-level', () => {
+            it('declaration-level should be set as leading trivia', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
                     'comment 1
                     function a()
@@ -562,8 +558,7 @@ describe('parser', () => {
                 `);
                 let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
                 (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Error count should be 0');
-                (0, chai_config_spec_1.expect)(statements[0].text).to.equal(`'comment 1`);
-                (0, chai_config_spec_1.expect)(statements[2].text).to.equal(`'comment 2`);
+                (0, chai_config_spec_1.expect)(statements[0].getLeadingTrivia()[2].text).to.equal(`'comment 1`);
             });
             it('works in aa literal as its own statement', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
@@ -582,9 +577,8 @@ describe('parser', () => {
                         DoSomething(name) 'comment 1
                     end sub
                 `);
-                let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
+                let { diagnostics } = Parser_1.Parser.parse(tokens);
                 (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Should have zero diagnostics');
-                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[2].text).to.equal(`'comment 1`);
             });
             it('function', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
@@ -596,10 +590,7 @@ describe('parser', () => {
                 `);
                 let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
                 (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Should have zero diagnostics');
-                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[0].text).to.equal(`'comment 1`);
-                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[1].text).to.equal(`'comment 2`);
-                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[3].text).to.equal(`'comment 3`);
-                (0, chai_config_spec_1.expect)(statements[1].text).to.equal(`'comment 4`);
+                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[0].getLeadingTrivia().filter(x => x.kind === TokenKind_1.TokenKind.Comment).map(x => x.text)).members([`'comment 1`, `'comment 2`]);
             });
             it('if statement`', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
@@ -625,19 +616,13 @@ describe('parser', () => {
                 if ((0, reflection_1.isFunctionStatement)(fnSmt)) {
                     let ifStmt = fnSmt.func.body.statements[0];
                     if ((0, reflection_1.isIfStatement)(ifStmt)) {
-                        expectCommentWithText(ifStmt.thenBranch.statements[0], `'comment 1`);
-                        expectCommentWithText(ifStmt.thenBranch.statements[1], `'comment 2`);
-                        expectCommentWithText(ifStmt.thenBranch.statements[3], `'comment 3`);
+                        expectCommentWithText(ifStmt.thenBranch.statements[0], `'comment 1\n'comment 2`);
                         let elseIfBranch = ifStmt.elseBranch;
                         if ((0, reflection_1.isIfStatement)(elseIfBranch)) {
-                            expectCommentWithText(elseIfBranch.thenBranch.statements[0], `'comment 4`);
-                            expectCommentWithText(elseIfBranch.thenBranch.statements[1], `'comment 5`);
-                            expectCommentWithText(elseIfBranch.thenBranch.statements[3], `'comment 6`);
+                            expectCommentWithText(elseIfBranch.thenBranch.statements[0], `'comment 4\n'comment 5`);
                             let elseBranch = elseIfBranch.elseBranch;
                             if ((0, reflection_1.isBlock)(elseBranch)) {
-                                expectCommentWithText(elseBranch.statements[0], `'comment 7`);
-                                expectCommentWithText(elseBranch.statements[1], `'comment 8`);
-                                expectCommentWithText(elseBranch.statements[3], `'comment 9`);
+                                expectCommentWithText(elseBranch.statements[0], `'comment 7\n'comment 8`);
                             }
                             else {
                                 failStatementType(elseBranch, 'Block');
@@ -646,7 +631,6 @@ describe('parser', () => {
                         else {
                             failStatementType(elseIfBranch, 'If');
                         }
-                        expectCommentWithText(fnSmt.func.body.statements[1], `'comment 10`);
                     }
                     else {
                         failStatementType(ifStmt, 'If');
@@ -669,10 +653,7 @@ describe('parser', () => {
                 let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
                 (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Error count should be zero');
                 let stmt = statements[0].func.body.statements[0];
-                (0, chai_config_spec_1.expect)(stmt.body.statements[0].text).to.equal(`'comment 1`);
-                (0, chai_config_spec_1.expect)(stmt.body.statements[1].text).to.equal(`'comment 2`);
-                (0, chai_config_spec_1.expect)(stmt.body.statements[3].text).to.equal(`'comment 3`);
-                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[1].text).to.equal(`'comment 4`);
+                expectCommentWithText(stmt.body.statements[0], `'comment 1\n'comment 2`);
             });
             it('for', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
@@ -687,10 +668,7 @@ describe('parser', () => {
                 let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
                 (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Error count should be zero');
                 let stmt = statements[0].func.body.statements[0];
-                (0, chai_config_spec_1.expect)(stmt.body.statements[0].text).to.equal(`'comment 1`);
-                (0, chai_config_spec_1.expect)(stmt.body.statements[1].text).to.equal(`'comment 2`);
-                (0, chai_config_spec_1.expect)(stmt.body.statements[3].text).to.equal(`'comment 3`);
-                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[1].text).to.equal(`'comment 4`);
+                expectCommentWithText(stmt.body.statements[0], `'comment 1\n'comment 2`);
             });
             it('for each', () => {
                 let { tokens } = Lexer_1.Lexer.scan(`
@@ -705,10 +683,7 @@ describe('parser', () => {
                 let { diagnostics, statements } = Parser_1.Parser.parse(tokens);
                 (0, chai_config_spec_1.expect)(diagnostics).to.be.lengthOf(0, 'Error count should be zero');
                 let stmt = statements[0].func.body.statements[0];
-                (0, chai_config_spec_1.expect)(stmt.body.statements[0].text).to.equal(`'comment 1`);
-                (0, chai_config_spec_1.expect)(stmt.body.statements[1].text).to.equal(`'comment 2`);
-                (0, chai_config_spec_1.expect)(stmt.body.statements[3].text).to.equal(`'comment 3`);
-                (0, chai_config_spec_1.expect)(statements[0].func.body.statements[1].text).to.equal(`'comment 4`);
+                expectCommentWithText(stmt.body.statements[0], `'comment 1\n'comment 2`);
             });
         });
     });
@@ -1181,7 +1156,7 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isAssignmentStatement)(assignment)).to.be.true;
             (0, chai_config_spec_1.expect)((0, reflection_1.isTypeCastExpression)(assignment.value)).to.be.true;
             (0, chai_config_spec_1.expect)((0, reflection_1.isCallExpression)(assignment.value.obj)).to.be.true;
-            (0, testHelpers_spec_1.expectTypeToBe)(assignment.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }), IntegerType_1.IntegerType);
+            (0, testHelpers_spec_1.expectTypeToBe)(assignment.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }), IntegerType_1.IntegerType);
         });
         it('allows type casts in the middle of expressions', () => {
             var _a;
@@ -1205,7 +1180,7 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isGroupingExpression)(assignment.value.callee.obj)).to.be.true;
             (0, chai_config_spec_1.expect)((0, reflection_1.isTypeCastExpression)(assignment.value.callee.obj.expression)).to.be.true;
             //grouping expression is an integer
-            (0, testHelpers_spec_1.expectTypeToBe)(assignment.value.callee.obj.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }), IntegerType_1.IntegerType);
+            (0, testHelpers_spec_1.expectTypeToBe)(assignment.value.callee.obj.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }), IntegerType_1.IntegerType);
         });
         it('allows type casts in a function call', () => {
             var _a;
@@ -1229,7 +1204,7 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isTypeCastExpression)(fnCall.args[0])).to.be.true;
             let arg = fnCall.args[0];
             //argument type is float
-            (0, testHelpers_spec_1.expectTypeToBe)(arg.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }), FloatType_1.FloatType);
+            (0, testHelpers_spec_1.expectTypeToBe)(arg.getType({ flags: 2 /* SymbolTypeFlag.typetime */ }), FloatType_1.FloatType);
         });
         it('allows multiple type casts', () => {
             var _a;
@@ -1246,7 +1221,7 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isPrintStatement)(print)).to.be.true;
             (0, chai_config_spec_1.expect)((0, reflection_1.isTypeCastExpression)(print.expressions[0])).to.be.true;
             //argument type is float
-            (0, testHelpers_spec_1.expectTypeToBe)(print.expressions[0].getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime }), StringType_1.StringType);
+            (0, testHelpers_spec_1.expectTypeToBe)(print.expressions[0].getType({ flags: 2 /* SymbolTypeFlag.typetime */ }), StringType_1.StringType);
         });
         it('flags invalid type cast syntax - multiple as', () => {
             var _a;
@@ -1331,7 +1306,7 @@ describe('parser', () => {
                 end sub
             `, Parser_1.ParseMode.BrighterScript);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
-            const paramType = statements[0].func.parameters[0].getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+            const paramType = statements[0].func.parameters[0].getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
             (0, testHelpers_spec_1.expectTypeToBe)(paramType, types_1.ArrayType);
             (0, testHelpers_spec_1.expectTypeToBe)(paramType.defaultType, StringType_1.StringType);
         });
@@ -1342,7 +1317,7 @@ describe('parser', () => {
                 end sub
             `, Parser_1.ParseMode.BrighterScript);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
-            const paramType = statements[0].func.parameters[0].getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+            const paramType = statements[0].func.parameters[0].getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
             (0, testHelpers_spec_1.expectTypeToBe)(paramType, types_1.ArrayType);
             (0, testHelpers_spec_1.expectTypeToBe)(paramType.defaultType, types_1.ArrayType);
             (0, testHelpers_spec_1.expectTypeToBe)(paramType.defaultType.defaultType, StringType_1.StringType);
@@ -1354,7 +1329,7 @@ describe('parser', () => {
                 end function
             `, Parser_1.ParseMode.BrighterScript);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
-            const paramType = statements[0].func.returnTypeExpression.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+            const paramType = statements[0].func.returnTypeExpression.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
             (0, testHelpers_spec_1.expectTypeToBe)(paramType, types_1.ArrayType);
             (0, testHelpers_spec_1.expectTypeToBe)(paramType.defaultType, IntegerType_1.IntegerType);
         });
@@ -1365,7 +1340,7 @@ describe('parser', () => {
                 end sub
             `, Parser_1.ParseMode.BrighterScript);
             (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
-            const paramType = statements[0].func.parameters[0].getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+            const paramType = statements[0].func.parameters[0].getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
             (0, testHelpers_spec_1.expectTypeToBe)(paramType, types_1.UnionType);
             (0, chai_config_spec_1.expect)(paramType.toString().includes('Array<string>')).to.be.true;
             (0, chai_config_spec_1.expect)(paramType.toString().includes('Array<integer>')).to.be.true;
@@ -1408,9 +1383,9 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isInterfaceStatement)(statements[0])).to.be.true;
             const iface = statements[0];
             iface.fields.forEach(f => (0, chai_config_spec_1.expect)(f.isOptional).to.be.true);
-            const ifaceType = iface.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+            const ifaceType = iface.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
             // eslint-disable-next-line no-bitwise
-            ifaceType.getMemberTable().getAllSymbols(SymbolTable_1.SymbolTypeFlag.runtime).forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & SymbolTable_1.SymbolTypeFlag.optional).to.eq(SymbolTable_1.SymbolTypeFlag.optional));
+            ifaceType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */).forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & 4 /* SymbolTypeFlag.optional */).to.eq(4 /* SymbolTypeFlag.optional */));
         });
         it('allows fields named optional', () => {
             let { statements, diagnostics } = parse(`
@@ -1424,11 +1399,11 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isInterfaceStatement)(statements[0])).to.be.true;
             const iface = statements[0];
             iface.fields.forEach(f => (0, chai_config_spec_1.expect)(f.isOptional).to.be.false);
-            const ifaceType = iface.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
-            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTable_1.SymbolTypeFlag.runtime);
+            const ifaceType = iface.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */);
             (0, chai_config_spec_1.expect)(iFaceMembers.length).to.eq(2);
             // eslint-disable-next-line no-bitwise
-            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & SymbolTable_1.SymbolTypeFlag.optional).to.eq(0));
+            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & 4 /* SymbolTypeFlag.optional */).to.eq(0));
         });
         it('allows fields named optional that are also optional', () => {
             let { statements, diagnostics } = parse(`
@@ -1441,11 +1416,11 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isInterfaceStatement)(statements[0])).to.be.true;
             const iface = statements[0];
             iface.fields.forEach(f => (0, chai_config_spec_1.expect)(f.isOptional).to.be.true);
-            const ifaceType = iface.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
-            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTable_1.SymbolTypeFlag.runtime);
+            const ifaceType = iface.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */);
             (0, chai_config_spec_1.expect)(iFaceMembers.length).to.eq(1);
             // eslint-disable-next-line no-bitwise
-            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & SymbolTable_1.SymbolTypeFlag.optional).to.eq(SymbolTable_1.SymbolTypeFlag.optional));
+            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & 4 /* SymbolTypeFlag.optional */).to.eq(4 /* SymbolTypeFlag.optional */));
         });
         it('allows optional methods', () => {
             let { statements, diagnostics } = parse(`
@@ -1460,9 +1435,9 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isInterfaceStatement)(statements[0])).to.be.true;
             const iface = statements[0];
             iface.methods.forEach(m => (0, chai_config_spec_1.expect)(m.isOptional).to.equal(true));
-            const ifaceType = iface.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
+            const ifaceType = iface.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
             // eslint-disable-next-line no-bitwise
-            ifaceType.getMemberTable().getAllSymbols(SymbolTable_1.SymbolTypeFlag.runtime).forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & SymbolTable_1.SymbolTypeFlag.optional).to.eq(SymbolTable_1.SymbolTypeFlag.optional));
+            ifaceType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */).forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & 4 /* SymbolTypeFlag.optional */).to.eq(4 /* SymbolTypeFlag.optional */));
         });
         it('allows fields named `as` that are also optional', () => {
             let { statements, diagnostics } = parse(`
@@ -1475,11 +1450,11 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isInterfaceStatement)(statements[0])).to.be.true;
             const iface = statements[0];
             iface.fields.forEach(f => (0, chai_config_spec_1.expect)(f.isOptional).to.be.true);
-            const ifaceType = iface.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
-            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTable_1.SymbolTypeFlag.runtime);
+            const ifaceType = iface.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */);
             (0, chai_config_spec_1.expect)(iFaceMembers.length).to.eq(1);
             // eslint-disable-next-line no-bitwise
-            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & SymbolTable_1.SymbolTypeFlag.optional).to.eq(SymbolTable_1.SymbolTypeFlag.optional));
+            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & 4 /* SymbolTypeFlag.optional */).to.eq(4 /* SymbolTypeFlag.optional */));
         });
         it('allows fields named `as` that are also typed', () => {
             let { statements, diagnostics } = parse(`
@@ -1492,11 +1467,11 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isInterfaceStatement)(statements[0])).to.be.true;
             const iface = statements[0];
             iface.fields.forEach(f => (0, chai_config_spec_1.expect)(f.isOptional).to.be.true);
-            const ifaceType = iface.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
-            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTable_1.SymbolTypeFlag.runtime);
+            const ifaceType = iface.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */);
             (0, chai_config_spec_1.expect)(iFaceMembers.length).to.eq(1);
             // eslint-disable-next-line no-bitwise
-            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & SymbolTable_1.SymbolTypeFlag.optional).to.eq(SymbolTable_1.SymbolTypeFlag.optional));
+            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & 4 /* SymbolTypeFlag.optional */).to.eq(4 /* SymbolTypeFlag.optional */));
         });
         it('allows fields named `optional` that are also typed', () => {
             let { statements, diagnostics } = parse(`
@@ -1509,11 +1484,11 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((0, reflection_1.isInterfaceStatement)(statements[0])).to.be.true;
             const iface = statements[0];
             iface.fields.forEach(f => (0, chai_config_spec_1.expect)(f.isOptional).to.be.false);
-            const ifaceType = iface.getType({ flags: SymbolTable_1.SymbolTypeFlag.typetime });
-            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(SymbolTable_1.SymbolTypeFlag.runtime);
+            const ifaceType = iface.getType({ flags: 2 /* SymbolTypeFlag.typetime */ });
+            const iFaceMembers = ifaceType.getMemberTable().getAllSymbols(1 /* SymbolTypeFlag.runtime */);
             (0, chai_config_spec_1.expect)(iFaceMembers.length).to.eq(1);
             // eslint-disable-next-line no-bitwise
-            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & SymbolTable_1.SymbolTypeFlag.optional).to.eq(0));
+            iFaceMembers.forEach(sym => (0, chai_config_spec_1.expect)(sym.flags & 4 /* SymbolTypeFlag.optional */).to.eq(0));
         });
     });
     describe('leadingTrivia', () => {
@@ -1753,8 +1728,9 @@ function rangeToArray(range) {
 }
 exports.rangeToArray = rangeToArray;
 function expectCommentWithText(stat, text) {
-    if ((0, reflection_1.isCommentStatement)(stat)) {
-        (0, chai_config_spec_1.expect)(stat.text).to.equal(text);
+    const trivia = stat.getLeadingTrivia();
+    if (trivia) {
+        (0, chai_config_spec_1.expect)(trivia.filter(tok => tok.kind === TokenKind_1.TokenKind.Comment).map(t => t.text).join('\n')).to.equal(text);
     }
     else {
         failStatementType(stat, 'Comment');