From d20aee51fd5633f1685b4bf038f21be4118fbe03 Mon Sep 17 00:00:00 2001
From: Mark Pearce <mark.pearce@redspace.com>
Date: Mon, 6 Jan 2025 10:26:11 -0400
Subject: [PATCH] Fixed issue for callfuncs returning voidtype

---
 .../validation/ScopeValidator.spec.ts         | 91 +++++++++++++++++++
 src/util.ts                                   |  4 +
 2 files changed, 95 insertions(+)

diff --git a/src/bscPlugin/validation/ScopeValidator.spec.ts b/src/bscPlugin/validation/ScopeValidator.spec.ts
index d15ed9f51..c206a3466 100644
--- a/src/bscPlugin/validation/ScopeValidator.spec.ts
+++ b/src/bscPlugin/validation/ScopeValidator.spec.ts
@@ -4856,6 +4856,97 @@ describe('ScopeValidator', () => {
                 DiagnosticMessages.argumentTypeMismatch('string', 'integer').message
             ]);
         });
+
+        it('respects return value of as callfunc functions', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getInt" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                sub getInt() as integer
+                    return 1
+                end sub
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(widget as roSGNodeWidget)
+                    takesInt(widget@.getInt())
+                end sub
+
+                sub takesInt(number as integer)
+                    print number
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('respects return value of as callfunc functions - negative case', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="getInt" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                sub getInt() as integer
+                    return 1
+                end sub
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(widget as roSGNodeWidget)
+                    takesString(widget@.getInt())
+                end sub
+
+                sub takesString(word as string)
+                    print word
+                end sub
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.argumentTypeMismatch('integer', 'string').message
+            ]);
+        });
+
+        it('allows return value of as void functions to be dynamic', () => {
+            program.setFile('components/Widget.xml', trim`
+                <?xml version="1.0" encoding="utf-8" ?>
+                <component name="Widget" extends="Group">
+                    <script uri="Widget.bs"/>
+                    <interface>
+                        <function name="noop" />
+                    </interface>
+                </component>
+            `);
+
+            program.setFile('components/Widget.bs', `
+                sub noop()
+                end sub
+            `);
+
+            program.setFile('source/test.bs', `
+                sub doCallfunc(widget as roSGNodeWidget)
+                    takesAny(widget@.noop())
+                end sub
+
+                sub takesAny(anything)
+                    print anything
+                end sub
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
     });
 });
 
diff --git a/src/util.ts b/src/util.ts
index 33fa90ac2..d437ea7ca 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -2556,6 +2556,10 @@ export class Util {
                 }
             }
         }
+        if (isVoidType(result)) {
+            // CallFunc will always return invalid, even if function called is `as void`
+            result = DynamicType.instance;
+        }
         if (options.data && !options.ignoreCall) {
             options.data.isFromCallFunc = true;
         }