fixes enums and interfaces resulting in diagnostics error when used a…

…s field types
rokucommunity · May 26, 2022 · cd51b36 · cd51b36
1 parent 7a40966
commit cd51b36
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/Scope.spec.ts b/src/Scope.spec.ts
@@ -789,6 +789,25 @@ describe('Scope', () => {
                 ]);
             });
 
+            it('supports enums and interfaces as types', () => {
+                program.setFile({ src: s`${rootDir}/source/main.bs`, dest: s`source/main.bs` }, `
+
+                    interface MyInterface
+                        title as string
+                    end interface
+                    enum myEnum
+                        title = "t"
+                    end enum
+
+                    class myClass
+                        foo as myInterface
+                        foo2 as myEnum
+                    end class
+                `);
+                program.validate();
+                expectZeroDiagnostics(program);
+            });
+
             it('finds interface types', () => {
                 program.setFile({ src: s`${rootDir}/source/main.bs`, dest: s`source/main.bs` }, `
                     namespace MyNamespace

diff --git a/src/validators/ClassValidator.ts b/src/validators/ClassValidator.ts
@@ -282,7 +282,7 @@ export class BsClassValidator {
                         if (lowerFieldTypeName) {
                             const currentNamespaceName = classStatement.namespaceName?.getName(ParseMode.BrighterScript);
                             //check if this custom type is in our class map
-                            if (!this.getClassByName(lowerFieldTypeName, currentNamespaceName)) {
+                            if (!this.getClassByName(lowerFieldTypeName, currentNamespaceName) && !this.scope.hasInterface(lowerFieldTypeName) && !this.scope.hasEnum(lowerFieldTypeName)) {
                                 this.diagnostics.push({
                                     ...DiagnosticMessages.cannotFindType(fieldTypeName),
                                     range: statement.type.range,