Merge branch 'release-1.0.0' into better_handle_no_return_value

rokucommunity · Dec 13, 2024 · b248b03 · b248b03
2 parents 2b377de + f0304f7
commit b248b03
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 0 deletions.
diff --git a/src/bscPlugin/validation/BrsFileValidator.ts b/src/bscPlugin/validation/BrsFileValidator.ts
@@ -167,6 +167,10 @@ export class BrsFileValidator {
             FunctionExpression: (node) => {
                 const funcSymbolTable = node.getSymbolTable();
                 const isInlineFunc = !(isFunctionStatement(node.parent) || isMethodStatement(node.parent));
+                if (isInlineFunc) {
+                    // symbol table should not include any symbols from parent func
+                    funcSymbolTable.pushParentProvider(() => node.findAncestor<Body>(isBody).getSymbolTable());
+                }
                 if (!funcSymbolTable?.hasSymbol('m', SymbolTypeFlag.runtime) || isInlineFunc) {
                     if (!isTypecastStatement(node.body?.statements?.[0])) {
                         funcSymbolTable?.addSymbol('m', { isInstance: true }, new AssociativeArrayType(), SymbolTypeFlag.runtime);

diff --git a/src/bscPlugin/validation/ScopeValidator.spec.ts b/src/bscPlugin/validation/ScopeValidator.spec.ts
@@ -1960,6 +1960,50 @@ describe('ScopeValidator', () => {
             program.validate();
             expectZeroDiagnostics(program);
         });
+
+        it('has an diagnostic when using a variable defined in parent function', () => {
+            program.setFile('source/main.bs', `
+                function parentFunction()
+                    parentVar = "test"
+
+                    innerFunction = sub()
+                        ' Attempting to use parentVar from the parent function scope
+                        print parentVar ' This should trigger a diagnostic
+                        otherFunc() ' this is fine
+                    end sub
+
+                    innerFunction()
+                end function
+
+                sub otherFunc()
+                    print "hello"
+                end sub
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('parentVar')
+            ]);
+        });
+
+        it('has an diagnostic when using a param from  parent function', () => {
+            program.setFile('source/main.bs', `
+                function parentFunction(outerVal)
+                    parentVar = "test"
+
+                    innerFunction = sub(inner)
+                        print inner + outer
+                    end sub
+
+                    innerFunction(2)
+                end function
+            `);
+
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.cannotFindName('outer')
+            ]);
+        });
     });
 
     describe('itemCannotBeUsedAsVariable', () => {