brighterscript 0.52.3 → 0.54.0

package/dist/files/BrsFile.spec.js

@@ -1330,7 +1330,7 @@ describe('BrsFile', () => {
             `);
             program.validate();
             (0, testHelpers_spec_1.expectDiagnostics)(program, [
-                DiagnosticMessages_1.DiagnosticMessages.callToUnknownFunction('DoesNotExist', 'source')
+                DiagnosticMessages_1.DiagnosticMessages.cannotFindName('DoesNotExist')
             ]);
         });
         it('finds arguments with variable values', () => {
@@ -1503,6 +1503,32 @@ describe('BrsFile', () => {
             (0, chai_1.expect)(file.functionScopes[1].range).to.eql(vscode_languageserver_1.Range.create(2, 30, 4, 32));
         });
     });
+    it('handles mixed case `then` partions of conditionals', () => {
+        let mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            sub Main()
+                if true then
+                    print "works"
+                end if
+            end sub
+        `);
+        (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
+        mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            sub Main()
+                if true Then
+                    print "works"
+                end if
+            end sub
+        `);
+        (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
+        mainFile = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
+            sub Main()
+                if true THEN
+                    print "works"
+                end if
+            end sub
+        `);
+        (0, chai_1.expect)(mainFile.getDiagnostics()).to.be.lengthOf(0);
+    });
     describe('getHover', () => {
         it('works for param types', () => {
             let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
@@ -1513,11 +1539,11 @@ describe('BrsFile', () => {
                 end sub
             `);
             //hover over the `name = 1` line
-            let hover = file.getHover(vscode_languageserver_1.Position.create(2, 24));
+            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 24))[0];
             (0, chai_1.expect)(hover).to.exist;
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 24));
             //hover over the `name` parameter declaration
-            hover = file.getHover(vscode_languageserver_1.Position.create(1, 34));
+            hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(1, 34))[0];
             (0, chai_1.expect)(hover).to.exist;
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(1, 32, 1, 36));
         });
@@ -1530,9 +1556,9 @@ describe('BrsFile', () => {
                 end sub
             `);
             //hover over the `as`
-            (0, chai_1.expect)(file.getHover(vscode_languageserver_1.Position.create(1, 31))).not.to.exist;
+            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(1, 31))).to.be.empty;
             //hover over the `string`
-            (0, chai_1.expect)(file.getHover(vscode_languageserver_1.Position.create(1, 36))).not.to.exist;
+            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(1, 36))).to.be.empty;
         });
         it('finds declared function', () => {
             let file = program.setFile({ src: `${rootDir}/source/main.brs`, dest: 'source/main.brs' }, `
@@ -1542,7 +1568,7 @@ describe('BrsFile', () => {
                     shoeSize = 10
                 end function
             `);
-            let hover = file.getHover(vscode_languageserver_1.Position.create(1, 28));
+            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(1, 28))[0];
             (0, chai_1.expect)(hover).to.exist;
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(1, 25, 1, 29));
             (0, chai_1.expect)(hover.contents).to.equal([
@@ -1561,7 +1587,7 @@ describe('BrsFile', () => {
                 end function
             end namespace
             `);
-            let hover = file.getHover(vscode_languageserver_1.Position.create(2, 28));
+            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 28))[0];
             (0, chai_1.expect)(hover).to.exist;
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 25, 2, 29));
             (0, chai_1.expect)(hover.contents).to.equal([
@@ -1579,7 +1605,7 @@ describe('BrsFile', () => {
                     sayMyName()
                 end sub
             `);
-            let hover = file.getHover(vscode_languageserver_1.Position.create(5, 24));
+            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(5, 24))[0];
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(5, 20, 5, 29));
             (0, chai_1.expect)(hover.contents).to.equal([
                 '```brightscript',
@@ -1587,25 +1613,25 @@ describe('BrsFile', () => {
                 '```'
             ].join('\n'));
         });
-        it('does not crash when hovering on built-in functions', async () => {
+        it('does not crash when hovering on built-in functions', () => {
             let file = program.setFile('source/main.brs', `
                 function doUcase(text)
                     return ucase(text)
                 end function
             `);
-            (0, chai_1.expect)((await program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 30))).contents).to.equal([
+            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 30))[0].contents).to.equal([
                 '```brightscript',
                 'function UCase(s as string) as string',
                 '```'
             ].join('\n'));
         });
-        it('does not crash when hovering on object method call', async () => {
+        it('does not crash when hovering on object method call', () => {
             let file = program.setFile('source/main.brs', `
                 function getInstr(url, text)
                     return url.instr(text)
                 end function
             `);
-            (0, chai_1.expect)((await program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 35))).contents).to.equal([
+            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 35))[0].contents).to.equal([
                 '```brightscript',
                 //TODO this really shouldn't be returning the global function, but it does...so make sure it doesn't crash right now.
                 'function Instr(start as integer, text as string, substring as string) as integer',
@@ -1622,7 +1648,7 @@ describe('BrsFile', () => {
 
                 end sub
             `);
-            let hover = file.getHover(vscode_languageserver_1.Position.create(2, 25));
+            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(2, 25))[0];
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 29));
             (0, chai_1.expect)(hover.contents).to.equal([
                 '```brightscript',
@@ -1642,7 +1668,7 @@ describe('BrsFile', () => {
                 end sub
                 end namespace
             `);
-            let hover = file.getHover(vscode_languageserver_1.Position.create(3, 25));
+            let hover = program.getHover(file.srcPath, vscode_languageserver_1.Position.create(3, 25))[0];
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(3, 20, 3, 29));
             (0, chai_1.expect)(hover.contents).to.equal([
                 '```brightscript',
@@ -1665,7 +1691,7 @@ describe('BrsFile', () => {
 
                 end sub
             `);
-            let hover = mainFile.getHover(vscode_languageserver_1.Position.create(2, 25));
+            let hover = program.getHover(mainFile.srcPath, vscode_languageserver_1.Position.create(2, 25))[0];
             (0, chai_1.expect)(hover).to.exist;
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 20, 2, 29));
             (0, chai_1.expect)(hover.contents).to.equal([
@@ -1690,7 +1716,7 @@ describe('BrsFile', () => {
                     end sub
                 end namespace
             `);
-            let hover = mainFile.getHover(vscode_languageserver_1.Position.create(2, 34));
+            let hover = program.getHover(mainFile.srcPath, vscode_languageserver_1.Position.create(2, 34))[0];
             (0, chai_1.expect)(hover).to.exist;
             (0, chai_1.expect)(hover.range).to.eql(vscode_languageserver_1.Range.create(2, 28, 2, 37));
             (0, chai_1.expect)(hover.contents).to.equal([
@@ -1699,7 +1725,7 @@ describe('BrsFile', () => {
                 '```'
             ].join('\n'));
         });
-        it('includes markdown comments in hover.', async () => {
+        it('includes markdown comments in hover.', () => {
             let rootDir = process.cwd();
             program = new Program_1.Program({
                 rootDir: rootDir
@@ -1721,7 +1747,7 @@ describe('BrsFile', () => {
                 end sub
             `);
             //hover over log("hello")
-            (0, chai_1.expect)((await program.getHover(file.srcPath, vscode_languageserver_1.Position.create(5, 22))).contents).to.equal([
+            (0, chai_1.expect)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(5, 22))[0].contents).to.equal([
                 '```brightscript',
                 'sub log(message as string) as void',
                 '```',
@@ -1732,7 +1758,7 @@ describe('BrsFile', () => {
                 ''
             ].join('\n'));
             //hover over sub ma|in()
-            (0, chai_1.expect)((0, testHelpers_spec_1.trim)((await program.getHover(file.srcPath, vscode_languageserver_1.Position.create(4, 22))).contents.toString())).to.equal((0, testHelpers_spec_1.trim) `
+            (0, chai_1.expect)((0, testHelpers_spec_1.trim)(program.getHover(file.srcPath, vscode_languageserver_1.Position.create(4, 22))[0].contents.toString())).to.equal((0, testHelpers_spec_1.trim) `
                 \`\`\`brightscript
                 sub main() as void
                 \`\`\`
@@ -1809,49 +1835,56 @@ describe('BrsFile', () => {
         });
         it('transpiles if statement keywords as provided', () => {
             const code = `
-                If True Then
-                    Print True
-                Else If True Then
-                    print True
-                Else If False Then
-                    Print False
-                Else
-                    Print False
-                End If
+                sub main()
+                    If True Then
+                        Print True
+                    Else If True Then
+                        print True
+                    Else If False Then
+                        Print False
+                    Else
+                        Print False
+                    End If
+                end sub
             `;
             testTranspile(code);
             testTranspile(code.toLowerCase());
             testTranspile(code.toUpperCase());
         });
         it('does not transpile `then` tokens', () => {
-            const code = `
-                if true
-                    print true
-                else if true
-                    print false
-                end if
-            `;
-            testTranspile(code);
+            testTranspile(`
+                sub main()
+                    if true
+                        print true
+                    else if true
+                        print false
+                    end if
+                end sub
+            `);
         });
         it('honors spacing between multi-word tokens', () => {
             testTranspile(`
-                if true
-                    print true
-                elseif true
-                    print false
-                endif
+                sub main()
+                    if true
+                        print true
+                    elseif true
+                        print false
+                    endif
+                end sub
             `);
         });
         it('handles when only some of the statements have `then`', () => {
             testTranspile(`
-                if true
-                else if true then
-                else if true
-                else if true then
-                    if true then
-                        return true
+                sub main()
+                    if true
+                    else if true then
+                    else if true
+                    else if true then
+                        if true then
+                            return true
+                        end if
                     end if
-                end if
+                end sub
             `);
         });
         it('retains casing of parameter types', () => {
@@ -1924,7 +1957,7 @@ describe('BrsFile', () => {
                 testTranspile(`
                     sub main()
                         try
-                            print a.b.c
+                            print m.b.c
                         catch e
                             print e
                         end try
@@ -1942,7 +1975,7 @@ describe('BrsFile', () => {
                     sub main()
                         sayHello = NameA.NameB.Speak
                         sayHello()
-                        someOtherObject = some.other.object
+                        someOtherObject = m.other.object
                     end sub
                 `, `
                     sub NameA_NameB_Speak()
@@ -1951,7 +1984,7 @@ describe('BrsFile', () => {
                     sub main()
                         sayHello = NameA_NameB_Speak
                         sayHello()
-                        someOtherObject = some.other.object
+                        someOtherObject = m.other.object
                     end sub
                 `);
             });
@@ -2075,27 +2108,42 @@ describe('BrsFile', () => {
             `, 'trim', 'source/main.bs');
         });
         it('transpiles dim', () => {
-            testTranspile(`Dim c[5]`, `Dim c[5]`);
-            testTranspile(`Dim c[5, 4]`, `Dim c[5, 4]`);
-            testTranspile(`Dim c[5, 4, 6]`, `Dim c[5, 4, 6]`);
-            testTranspile(`Dim requestData[requestList.count()]`, `Dim requestData[requestList.count()]`);
-            testTranspile(`Dim requestData[1, requestList.count()]`, `Dim requestData[1, requestList.count()]`);
-            testTranspile(`Dim requestData[1, requestList.count(), 2]`, `Dim requestData[1, requestList.count(), 2]`);
-            testTranspile(`Dim requestData[requestList[2]]`, `Dim requestData[requestList[2]]`);
-            testTranspile(`Dim requestData[1, requestList[2]]`, `Dim requestData[1, requestList[2]]`);
-            testTranspile(`Dim requestData[1, requestList[2], 2]`, `Dim requestData[1, requestList[2], 2]`);
-            testTranspile(`Dim requestData[requestList["2"]]`, `Dim requestData[requestList["2"]]`);
-            testTranspile(`Dim requestData[1, requestList["2"]]`, `Dim requestData[1, requestList["2"]]`);
-            testTranspile(`Dim requestData[1, requestList["2"], 2]`, `Dim requestData[1, requestList["2"], 2]`);
-            testTranspile(`Dim requestData[1, getValue(), 2]`, `Dim requestData[1, getValue(), 2]`);
+            function doTest(code) {
+                testTranspile(`
+                    sub main()
+                        requestList = []
+                        ${code}
+                    end sub
+                `, `
+                    sub main()
+                        requestList = []
+                        ${code}
+                    end sub
+                `);
+            }
+            doTest(`Dim c[5]`);
+            doTest(`Dim c[5, 4]`);
+            doTest(`Dim c[5, 4, 6]`);
+            doTest(`Dim requestData[requestList.count()]`);
+            doTest(`Dim requestData[1, requestList.count()]`);
+            doTest(`Dim requestData[1, requestList.count(), 2]`);
+            doTest(`Dim requestData[requestList[2]]`);
+            doTest(`Dim requestData[1, requestList[2]]`);
+            doTest(`Dim requestData[1, requestList[2], 2]`);
+            doTest(`Dim requestData[requestList["2"]]`);
+            doTest(`Dim requestData[1, requestList["2"]]`);
+            doTest(`Dim requestData[1, requestList["2"], 2]`);
+            doTest(`Dim requestData[1, StrToI("1"), 2]`);
             testTranspile(`
-                Dim requestData[1, getValue({
-                    key: "value"
-                }), 2]
-            `, `
-                Dim requestData[1, getValue({
-                    key: "value"
-                }), 2]
+                function getValue(param1)
+                end function
+
+                sub main()
+                    requestList = []
+                    Dim requestData[1, getValue({
+                        key: "value"
+                    }), 2]
+                end sub
             `);
         });
         it('transpiles calls to fully-qualified namespaced functions', () => {
@@ -2209,49 +2257,55 @@ describe('BrsFile', () => {
         });
         it('handles empty if block', () => {
             testTranspile(`
-                if true then
-                end if
-                if true then
-                else
-                    print "else"
-                end if
-                if true then
-                else if true then
-                    print "else"
-                end if
-                if true then
-                else if true then
-                    print "elseif"
-                else
-                    print "else"
-                end if
+                sub main()
+                    if true then
+                    end if
+                    if true then
+                    else
+                        print "else"
+                    end if
+                    if true then
+                    else if true then
+                        print "else"
+                    end if
+                    if true then
+                    else if true then
+                        print "elseif"
+                    else
+                        print "else"
+                    end if
+                end sub
             `);
         });
         it('handles empty elseif block', () => {
             testTranspile(`
-                if true then
-                    print "if"
-                else if true then
-                end if
-                if true then
-                    print "if"
-                else if true then
-                else if true then
-                end if
+                sub main()
+                    if true then
+                        print "if"
+                    else if true then
+                    end if
+                    if true then
+                        print "if"
+                    else if true then
+                    else if true then
+                    end if
+                end sub
             `);
         });
         it('handles empty else block', () => {
             testTranspile(`
-                if true then
-                    print "if"
-                else
-                end if
-                if true then
-                    print "if"
-                else if true then
-                    print "elseif"
-                else
-                end if
+                sub main()
+                    if true then
+                        print "if"
+                    else
+                    end if
+                    if true then
+                        print "if"
+                    else if true then
+                        print "elseif"
+                    else
+                    end if
+                end sub
             `);
         });
         it('works for function parameters', () => {
@@ -2361,7 +2415,7 @@ describe('BrsFile', () => {
                         3 'comment
                     ] 'comment
                     firstIndex = indexes[0] 'comment
-                    for each idx in indxes 'comment
+                    for each idx in indexes 'comment
                         indexes[idx] = idx + 1 'comment
                     end for 'comment
                     if not true then 'comment
@@ -2441,8 +2495,9 @@ describe('BrsFile', () => {
         describe('transpile', () => {
             it('does not produce diagnostics', () => {
                 program.setFile('source/main.bs', `
-                    sub main()
-                        someObject@.someFunction(paramObject.value)
+                    sub test()
+                        someNode = createObject("roSGNode", "Rectangle")
+                        someNode@.someFunction(test.value)
                     end sub
                 `);
                 program.validate();