Fix issue with missing ancestors when crossing different namespaces

rokucommunity · Jan 10, 2025 · c71189b · c71189b
1 parent ce8c570
commit c71189b
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/src/parser/Statement.ts b/src/parser/Statement.ts
@@ -2144,7 +2144,7 @@ export class ClassStatement extends Statement implements TypedefProvider {
         let stmt = this as ClassStatement;
         while (stmt) {
             if (stmt.parentClassName) {
-                const namespace = this.findAncestor<NamespaceStatement>(isNamespaceStatement);
+                const namespace = stmt.findAncestor<NamespaceStatement>(isNamespaceStatement);
                 stmt = state.file.getClassFileLink(
                     stmt.parentClassName.getName(ParseMode.BrighterScript),
                     namespace?.getName(ParseMode.BrighterScript)
@@ -2180,13 +2180,9 @@ export class ClassStatement extends Statement implements TypedefProvider {
      */
     private getConstructorParams(ancestors: ClassStatement[]) {
         for (let ancestor of ancestors) {
-            // @todo: somehow, ancestors can have a list where the last element is null.
-            //        this is exposed by the test named "extending namespaced class transpiles properly".
-            if (ancestor) {
-                const ctor = ancestor.getConstructorFunction();
-                if (ctor) {
-                    return ctor.func.parameters;
-                }
+            const ctor = ancestor?.getConstructorFunction();
+            if (ctor) {
+                return ctor.func.parameters;
             }
         }
         return [];