brighterscript 1.0.0-alpha.41 → 1.0.0-alpha.42

package/dist/parser/Parser.spec.js

@@ -45,6 +45,22 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)((_e = (_d = (_c = (_b = parser.ast.statements[0]) === null || _b === void 0 ? void 0 : _b.func) === null || _c === void 0 ? void 0 : _c.body) === null || _d === void 0 ? void 0 : _d.statements[0]) === null || _e === void 0 ? void 0 : _e.expression).to.be.instanceof(Expression_1.CallfuncExpression);
         });
     });
+    it('flags function names with invalid characters', () => {
+        const { diagnostics } = Parser_1.Parser.parse(`
+            function alpha$() : end function
+            function beta%() : end function
+            function charlie!() : end function
+            function delta#() : end function
+            function echo&() : end function
+        `);
+        (0, testHelpers_spec_1.expectDiagnostics)(diagnostics, [
+            DiagnosticMessages_1.DiagnosticMessages.invalidIdentifier('alpha$', '$'),
+            DiagnosticMessages_1.DiagnosticMessages.invalidIdentifier('beta%', '%'),
+            DiagnosticMessages_1.DiagnosticMessages.invalidIdentifier('charlie!', '!'),
+            DiagnosticMessages_1.DiagnosticMessages.invalidIdentifier('delta#', '#'),
+            DiagnosticMessages_1.DiagnosticMessages.invalidIdentifier('echo&', '&')
+        ]);
+    });
     describe('optional chaining operator', () => {
         function getExpression(text, options) {
             const parser = parse(text, options === null || options === void 0 ? void 0 : options.parseMode);
@@ -148,7 +164,7 @@ describe('parser', () => {
                     return "6c5cdf1"
                 end functionasdf
             `).diagnostics;
-            (0, chai_config_spec_1.expect)((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).to.exist.and.to.eql(DiagnosticMessages_1.DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression().message);
+            (0, chai_config_spec_1.expect)((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).to.exist.and.to.eql(DiagnosticMessages_1.DiagnosticMessages.expectedStatement().message);
             (0, chai_config_spec_1.expect)((_b = diagnostics[0]) === null || _b === void 0 ? void 0 : _b.location.range).to.eql(vscode_languageserver_1.Range.create(3, 20, 3, 32));
         });
     });
@@ -195,11 +211,92 @@ describe('parser', () => {
             const parser = parse(`
                 sub test(param1 as unknownType)
                 end sub
-            `);
+            `, Parser_1.ParseMode.BrighterScript);
             // type validation happens at scope validation, not at the parser
             (0, testHelpers_spec_1.expectZeroDiagnostics)(parser);
             (0, chai_config_spec_1.expect)((0, reflection_1.isFunctionStatement)(parser.ast.statements[0])).to.be.true;
         });
+        it('does not scrap the entire function when encountering unknown parameter type in brightscript mode', () => {
+            const parser = parse(`
+                sub test(param1 as unknownType)
+                end sub
+            `, Parser_1.ParseMode.BrightScript);
+            // type validation happens at scope validation, not at the parser
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(parser, DiagnosticMessages_1.DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types'));
+            (0, chai_config_spec_1.expect)((0, reflection_1.isFunctionStatement)(parser.ast.statements[0])).to.be.true;
+        });
+        it('adds diagnostics when missing end for statements', () => {
+            let parser = parse(`
+                sub test1(x)
+                    for each item in x
+                        print item
+                 end sub
+            `, Parser_1.ParseMode.BrightScript);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(parser, [
+                DiagnosticMessages_1.DiagnosticMessages.expectedEndForOrNextToTerminateForLoop('for each')
+            ]);
+            parser = parse(`
+                sub test2()
+                    for i = 0 to 10
+                        print i
+                 end sub
+            `, Parser_1.ParseMode.BrightScript);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(parser, [
+                DiagnosticMessages_1.DiagnosticMessages.expectedEndForOrNextToTerminateForLoop('for')
+            ]);
+            parser = parse(`
+                sub test3(x )
+                    for each item in x
+                        print item
+                    next
+
+                    for i = 0 to 10
+                        print i
+                    next ' next works the same as "end for"
+                 end sub
+            `, Parser_1.ParseMode.BrightScript);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(parser);
+        });
+        it('does not allow return type as invalid', () => {
+            let parser = parse(`
+                function test(x) as invalid
+                    return invalid
+                 end function
+            `, Parser_1.ParseMode.BrighterScript);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(parser, [
+                DiagnosticMessages_1.DiagnosticMessages.expectedIdentifier('as').message
+            ]);
+        });
+        it('does not allow param type as invalid', () => {
+            let parser = parse(`
+                function test(x as invalid)
+                    return invalid
+                 end function
+            `, Parser_1.ParseMode.BrighterScript);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(parser, [
+                DiagnosticMessages_1.DiagnosticMessages.expectedIdentifier('as').message
+            ]);
+        });
+        it('validates when theres a fraction hex', () => {
+            let parser = parse(`
+                function test()
+                    x = &HFF.01234
+                    return x
+                end function
+            `);
+            (0, testHelpers_spec_1.expectDiagnostics)(parser, [
+                DiagnosticMessages_1.DiagnosticMessages.expectedStatement(),
+                DiagnosticMessages_1.DiagnosticMessages.expectedNewlineOrColon()
+            ]);
+        });
+        it('allows print statement with hex followed by dot <number>', () => {
+            let parser = parse(`
+                function test()
+                    print  &HFF.01234
+                end function
+            `);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(parser);
+        });
         describe('namespace', () => {
             it('allows namespaces declared inside other namespaces', () => {
                 const parser = parse(`
@@ -261,7 +358,7 @@ describe('parser', () => {
                         namespace
                         end namespace
                     `, Parser_1.ParseMode.BrighterScript);
-                (0, chai_config_spec_1.expect)((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.expectedIdentifierAfterKeyword('namespace').message);
+                (0, chai_config_spec_1.expect)((_a = diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).to.equal(DiagnosticMessages_1.DiagnosticMessages.expectedIdentifier('namespace').message);
             });
             it('recovers after missing `end namespace`', () => {
                 var _a, _b, _c;
@@ -342,7 +439,7 @@ describe('parser', () => {
                 function log() as UNKNOWN_TYPE
                 end function
             `, Parser_1.ParseMode.BrightScript);
-            (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics); // type validation happens at scope validation step
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types').message); // type validation happens at scope validation step
             (0, chai_config_spec_1.expect)(ast.statements[0]).to.exist;
         });
         it('unknown function type is not a problem in Brighterscript mode', () => {
@@ -350,7 +447,7 @@ describe('parser', () => {
                 function log() as UNKNOWN_TYPE
                 end function
             `, Parser_1.ParseMode.BrighterScript);
-            (0, chai_config_spec_1.expect)(diagnostics.length).to.equal(0);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
             (0, chai_config_spec_1.expect)(ast.statements[0]).to.exist;
         });
         it('allows namespaced function type in Brighterscript mode', () => {
@@ -369,12 +466,12 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)(diagnostics.length).to.equal(0);
             (0, chai_config_spec_1.expect)(ast.statements[0]).to.exist;
         });
-        it('does not cause any diagnostics when custom parameter types are used in Brightscript Mode', () => {
+        it('does cause diagnostics when custom parameter types are used in Brightscript Mode', () => {
             let { diagnostics } = parse(`
                 sub foo(value as UNKNOWN_TYPE)
                 end sub
             `, Parser_1.ParseMode.BrightScript);
-            (0, chai_config_spec_1.expect)(diagnostics.length).to.equal(0);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types').message);
         });
         it('allows custom namespaced parameter types in BrighterscriptMode', () => {
             let { ast, diagnostics } = parse(`
@@ -427,7 +524,7 @@ describe('parser', () => {
             let { tokens } = Lexer_1.Lexer.scan(`print a.`);
             let { ast, diagnostics } = Parser_1.Parser.parse(tokens);
             let printStatement = ast.statements[0];
-            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.expectedPropertyNameAfterPeriod());
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.expectedIdentifier());
             (0, chai_config_spec_1.expect)(printStatement).to.be.instanceof(Statement_1.PrintStatement);
             (0, chai_config_spec_1.expect)(printStatement.expressions[0]).to.be.instanceof(Expression_1.VariableExpression);
         });
@@ -435,7 +532,7 @@ describe('parser', () => {
             let { tokens } = Lexer_1.Lexer.scan(`print a.b.`);
             let { ast, diagnostics } = Parser_1.Parser.parse(tokens);
             let printStatement = ast.statements[0];
-            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.expectedPropertyNameAfterPeriod());
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.expectedIdentifier());
             (0, chai_config_spec_1.expect)(printStatement).to.be.instanceof(Statement_1.PrintStatement);
             (0, chai_config_spec_1.expect)(printStatement.expressions[0]).to.be.instanceof(Expression_1.DottedGetExpression);
         });
@@ -452,7 +549,7 @@ describe('parser', () => {
                     end namespace
                 `);
                 let { ast, diagnostics } = Parser_1.Parser.parse(tokens);
-                (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression());
+                (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.expectedStatement());
                 let stmt = ast.statements[0].func.body.statements[0];
                 (0, chai_config_spec_1.expect)((0, reflection_1.isExpressionStatement)(stmt)).to.be.true;
                 (0, chai_config_spec_1.expect)((0, reflection_1.isVariableExpression)((stmt).expression)).to.be.true;
@@ -526,12 +623,24 @@ describe('parser', () => {
                     end function
                 `);
                 let { ast, diagnostics } = Parser_1.Parser.parse(tokens);
-                (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression());
+                (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, DiagnosticMessages_1.DiagnosticMessages.expectedStatement());
                 for (const stmt of ast.statements[0].func.body.statements) {
                     (0, chai_config_spec_1.expect)((0, reflection_1.isExpressionStatement)(stmt)).to.be.true;
                     (0, chai_config_spec_1.expect)((0, reflection_1.isBinaryExpression)((stmt).expression)).to.be.true;
                 }
             });
+            it('adds callfunc expressions', () => {
+                var _a;
+                let parser = parse(`
+                    sub foo(thing)
+                        thing@.
+                    end sub
+                `, Parser_1.ParseMode.BrighterScript);
+                (0, chai_config_spec_1.expect)((_a = parser.diagnostics[0]) === null || _a === void 0 ? void 0 : _a.message).to.exist;
+                let body = parser.ast.statements[0].func.body;
+                let callFunc = body.findChild(reflection_1.isCallfuncExpression);
+                (0, chai_config_spec_1.expect)(callFunc).to.exist;
+            });
         });
         describe('comments', () => {
             it('does not include comments', () => {
@@ -1284,7 +1393,7 @@ describe('parser', () => {
                     print param
                 end sub
             `, Parser_1.ParseMode.BrightScript);
-            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(parser.diagnostics, [DiagnosticMessages_1.DiagnosticMessages.expectedStatementOrFunctionCallButReceivedExpression()]);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(parser.diagnostics, [DiagnosticMessages_1.DiagnosticMessages.expectedStatement()]);
         });
         it('allows union types in parameters', () => {
             let { diagnostics } = parse(`
@@ -1968,7 +2077,7 @@ describe('parser', () => {
                 end sub
             `, Parser_1.ParseMode.BrighterScript, { debug: true });
             (0, testHelpers_spec_1.expectDiagnostics)(diagnostics, [
-                DiagnosticMessages_1.DiagnosticMessages.expectedEndIfToCloseIfStatement({ line: 3, character: 20 }).message,
+                DiagnosticMessages_1.DiagnosticMessages.expectedTerminator('end if', 'if').message,
                 DiagnosticMessages_1.DiagnosticMessages.unexpectedToken('end if').message
             ]);
         });
@@ -2042,7 +2151,7 @@ describe('parser', () => {
                     #const test
                 `, Parser_1.ParseMode.BrighterScript);
                 (0, testHelpers_spec_1.expectDiagnostics)(diagnostics, [
-                    DiagnosticMessages_1.DiagnosticMessages.expectedOperatorAfterIdentifier([TokenKind_1.TokenKind.Equal], 'test').message
+                    DiagnosticMessages_1.DiagnosticMessages.expectedOperator([TokenKind_1.TokenKind.Equal], 'test').message
                 ]);
             });
             it('has diagnostic if invalid operator', () => {
@@ -2050,7 +2159,7 @@ describe('parser', () => {
                     #const test += other
                 `, Parser_1.ParseMode.BrighterScript);
                 (0, testHelpers_spec_1.expectDiagnostics)(diagnostics, [
-                    DiagnosticMessages_1.DiagnosticMessages.expectedOperatorAfterIdentifier([TokenKind_1.TokenKind.Equal], 'test').message
+                    DiagnosticMessages_1.DiagnosticMessages.expectedOperator([TokenKind_1.TokenKind.Equal], 'test').message
                 ]);
             });
             it('has diagnostic if invalid lhs', () => {
@@ -2192,6 +2301,80 @@ describe('parser', () => {
             (0, chai_config_spec_1.expect)(exitStmt.tokens.loopType.text).to.eq('for');
         });
     });
+    describe('custom types', () => {
+        it('built-in interface param types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as roAssociativeArray)
+                    print foo.x
+                end sub
+            `, Parser_1.ParseMode.BrightScript);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, [
+                DiagnosticMessages_1.DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')
+            ]);
+        });
+        it('built-in interface types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(foo) as roAssociativeArray
+                    return foo.x
+                end function
+            `, Parser_1.ParseMode.BrightScript);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, [
+                DiagnosticMessages_1.DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')
+            ]);
+        });
+        it('custom param types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as Whatever)
+                    print foo.x
+                end sub
+            `, Parser_1.ParseMode.BrightScript);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, [
+                DiagnosticMessages_1.DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')
+            ]);
+        });
+        it('custom return types disallowed in brightscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(foo) as Whatever
+                    return foo.x
+                end function
+            `, Parser_1.ParseMode.BrightScript);
+            (0, testHelpers_spec_1.expectDiagnosticsIncludes)(diagnostics, [
+                DiagnosticMessages_1.DiagnosticMessages.bsFeatureNotSupportedInBrsFiles('custom types')
+            ]);
+        });
+        it('built-in interface param types allowed in brighterscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as roAssociativeArray)
+                    print foo.x
+                end sub
+            `, Parser_1.ParseMode.BrighterScript);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
+        });
+        it('built-in interface types allowed in brighterscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(foo) as roAssociativeArray
+                    return foo.x
+                end function
+            `, Parser_1.ParseMode.BrighterScript);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
+        });
+        it('custom param types allowed in brighterscript mode', () => {
+            let { diagnostics } = parse(`
+                sub test(foo as Whatever)
+                    print foo.x
+                end sub
+            `, Parser_1.ParseMode.BrighterScript);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
+        });
+        it('custom return types allowed in brighterscript mode', () => {
+            let { diagnostics } = parse(`
+                function test(foo) as Whatever
+                    return foo.x
+                end function
+            `, Parser_1.ParseMode.BrighterScript);
+            (0, testHelpers_spec_1.expectZeroDiagnostics)(diagnostics);
+        });
+    });
 });
 function parse(text, mode, bsConsts = {}) {
     let { tokens } = Lexer_1.Lexer.scan(text);