Fixes issue with AA overriding built-in properties (#1106)

Co-authored-by: Bronley Plumb <bronley@gmail.com>
rokucommunity · Mar 11, 2024 · 5b9384e · 5b9384e
1 parent 6e0158a
commit 5b9384e
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 1 deletion.
diff --git a/src/bscPlugin/validation/ScopeValidator.spec.ts b/src/bscPlugin/validation/ScopeValidator.spec.ts
@@ -7,8 +7,9 @@ import type { TypeCompatibilityData } from '../../interfaces';
 import { IntegerType } from '../../types/IntegerType';
 import { StringType } from '../../types/StringType';
 import type { BrsFile } from '../../files/BrsFile';
-import { FloatType } from '../../types';
+import { FloatType, InterfaceType } from '../../types';
 import { SymbolTypeFlag } from '../../SymbolTypeFlag';
+import { AssociativeArrayType } from '../../types/AssociativeArrayType';
 
 describe('ScopeValidator', () => {
 
@@ -2057,6 +2058,59 @@ describe('ScopeValidator', () => {
             program.validate();
             expectZeroDiagnostics(program);
         });
+
+
+        it('allows AA with overidden props to meet interface', () => {
+            program.setFile('source/code.bs', `
+                namespace alpha.beta
+                    interface Stream
+                        thumbnailTiler as Thumbnail
+                    end interface
+
+                    interface Thumbnail
+                        count as integer
+                    end interface
+
+                    function createStreamObject() as Stream
+                        return {
+                            thumbnailTiler: {
+                                count: 1
+                            }
+                        }
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectZeroDiagnostics(program);
+        });
+
+        it('allows AA with inside AA to be validated properly', () => {
+            program.setFile('source/code.bs', `
+                namespace alpha.beta
+                    interface Stream
+                        thumbnailTiler as Thumbnail
+                    end interface
+
+                    interface Thumbnail
+                        count as integer
+                    end interface
+
+                    function createStreamObject() as Stream
+                        return {
+                            thumbnailTiler: {
+                                count: "hello"
+                            }
+                        }
+                    end function
+                end namespace
+            `);
+            program.validate();
+            expectDiagnostics(program, [
+                DiagnosticMessages.returnTypeMismatch('roAssociativeArray', 'alpha.beta.Stream', {
+                    fieldMismatches: [{ name: 'thumbnailTiler', expectedType: new InterfaceType('alpha.beta.Thumbnail'), actualType: new AssociativeArrayType() }]
+                }).message
+            ]);
+        });
     });
 
     describe('assignmentTypeMismatch', () => {

diff --git a/src/parser/Expression.ts b/src/parser/Expression.ts
@@ -1059,6 +1059,7 @@ export class AALiteralExpression extends Expression {
 
     getType(options: GetTypeOptions): BscType {
         const resultType = new AssociativeArrayType();
+        resultType.addBuiltInInterfaces();
         for (const element of this.elements) {
             if (isAAMemberExpression(element)) {
                 resultType.addMember(element.tokens.key.text, { definingNode: element }, element.getType(options), SymbolTypeFlag.runtime);

diff --git a/src/types/AssociativeArrayType.ts b/src/types/AssociativeArrayType.ts
@@ -1,3 +1,4 @@
+import { SymbolTable } from '../SymbolTable';
 import { SymbolTypeFlag } from '../SymbolTypeFlag';
 import { isAssociativeArrayType, isClassType, isDynamicType, isObjectType } from '../astUtils/reflection';
 import type { GetTypeOptions, TypeCompatibilityData } from '../interfaces';
@@ -44,4 +45,16 @@ export class AssociativeArrayType extends BscType {
     isEqual(otherType: BscType) {
         return isAssociativeArrayType(otherType) && this.checkCompatibilityBasedOnMembers(otherType, SymbolTypeFlag.runtime);
     }
+
+    private builtInMemberTable: SymbolTable;
+
+    getBuiltInMemberTable(): SymbolTable {
+        if (this.builtInMemberTable) {
+            return this.builtInMemberTable;
+        }
+        this.builtInMemberTable = new SymbolTable(`${this.__identifier} Built-in Members`);
+        this.pushMemberProvider(() => this.builtInMemberTable);
+        return this.builtInMemberTable;
+
+    }
 }