Merge branch 'master' into feature/as_custom_type

rokucommunity · Jan 12, 2021 · 2a2e34c · 2a2e34c
2 parents c2cf523 + 34a86d3
commit 2a2e34c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/src/files/BrsFile.Class.spec.ts b/src/files/BrsFile.Class.spec.ts
@@ -949,4 +949,44 @@ describe('BrsFile BrighterScript classes', () => {
         await program.validate();
         expectZeroDiagnostics(program);
     });
+
+    it('computes correct super index for grandchild class', async () => {
+        await program.addOrReplaceFile('source/main.bs', `
+            sub Main()
+                c = new App.ClassC()
+            end sub
+
+            namespace App
+                class ClassA
+                end class
+
+                class ClassB extends ClassA
+                end class
+            end namespace
+        `);
+
+        await testTranspile(`
+            namespace App
+                class ClassC extends ClassB
+                    sub new()
+                        super()
+                    end sub
+                end class
+            end namespace
+        `, `
+            function __App_ClassC_builder()
+                instance = __App_ClassB_builder()
+                instance.super1_new = instance.new
+                instance.new = sub()
+                    m.super1_new()
+                end sub
+                return instance
+            end function
+            function App_ClassC()
+                instance = __App_ClassC_builder()
+                instance.new()
+                return instance
+            end function
+        `, 'trim', 'source/App.ClassC.bs');
+    });
 });
diff --git a/src/parser/Statement.ts b/src/parser/Statement.ts
@@ -1258,7 +1258,11 @@ export class ClassStatement extends Statement implements TypedefProvider {
         let stmt = this as ClassStatement;
         while (stmt) {
             if (stmt.parentClassName) {
-                stmt = state.file.getClassByName(stmt.parentClassName.getName(ParseMode.BrighterScript));
+                const fqParentClassName = util.getFullyQualifiedClassName(
+                    stmt.parentClassName.getName(ParseMode.BrighterScript),
+                    stmt.namespaceName?.getName(ParseMode.BrighterScript)
+                );
+                stmt = state.file.getClassByName(fqParentClassName);
                 myIndex++;
             } else {
                 break;