split NestableDeclaration (#2466)

Author: liamappelbe

pkgs/swift2objc/lib/src/ast/_core/interfaces/compound_declaration.dart

@@ -18,7 +18,8 @@ abstract interface class CompoundDeclaration
         Declaration,
         TypeParameterizable,
         ProtocolConformable,
-        NestableDeclaration {
+        OuterNestableDeclaration,
+        InnerNestableDeclaration {
   abstract List<PropertyDeclaration> properties;
   abstract List<MethodDeclaration> methods;
   abstract List<InitializerDeclaration> initializers;

pkgs/swift2objc/lib/src/ast/_core/interfaces/enum_declaration.dart

@@ -15,7 +15,8 @@ abstract interface class EnumDeclaration
         Declaration,
         TypeParameterizable,
         ProtocolConformable,
-        NestableDeclaration {
+        OuterNestableDeclaration,
+        InnerNestableDeclaration {
   abstract List<EnumCase> cases;
 }
 

pkgs/swift2objc/lib/src/ast/_core/interfaces/nestable_declaration.dart

@@ -5,14 +5,20 @@
 import '../../ast_node.dart';
 import 'declaration.dart';
 
+/// A Swift entity that can contain other declarations.
+abstract interface class OuterNestableDeclaration
+    implements Declaration, AstNode {
+  abstract final List<InnerNestableDeclaration> nestedDeclarations;
+}
+
 /// A Swift entity that can be nested inside other declarations.
-abstract interface class NestableDeclaration implements Declaration, AstNode {
-  abstract NestableDeclaration? nestingParent;
-  abstract final List<NestableDeclaration> nestedDeclarations;
+abstract interface class InnerNestableDeclaration
+    implements Declaration, AstNode {
+  abstract OuterNestableDeclaration? nestingParent;
 }
 
-extension FillNestingParents on List<NestableDeclaration> {
-  void fillNestingParents(NestableDeclaration parent) {
+extension FillNestingParents on List<InnerNestableDeclaration> {
+  void fillNestingParents(OuterNestableDeclaration parent) {
     for (final nested in this) {
       assert(nested.nestingParent == null);
       nested.nestingParent = parent;

pkgs/swift2objc/lib/src/ast/_core/shared/referred_type.dart

@@ -30,7 +30,7 @@ class DeclaredType<T extends Declaration> extends AstNode
 
   String get name {
     final decl = declaration;
-    final parent = decl is NestableDeclaration ? decl.nestingParent : null;
+    final parent = decl is InnerNestableDeclaration ? decl.nestingParent : null;
     final nesting = parent != null ? '${parent.name}.' : '';
     return '$nesting${declaration.name}';
   }

pkgs/swift2objc/lib/src/ast/declarations/compounds/class_declaration.dart

@@ -55,10 +55,10 @@ class ClassDeclaration extends AstNode
   List<InitializerDeclaration> initializers;
 
   @override
-  NestableDeclaration? nestingParent;
+  OuterNestableDeclaration? nestingParent;
 
   @override
-  List<NestableDeclaration> nestedDeclarations;
+  List<InnerNestableDeclaration> nestedDeclarations;
 
   ClassDeclaration({
     required this.id,

pkgs/swift2objc/lib/src/ast/declarations/compounds/protocol_declaration.dart

@@ -34,10 +34,10 @@ class ProtocolDeclaration extends AstNode implements CompoundDeclaration {
   List<InitializerDeclaration> initializers;
 
   @override
-  NestableDeclaration? nestingParent;
+  OuterNestableDeclaration? nestingParent;
 
   @override
-  List<NestableDeclaration> nestedDeclarations;
+  List<InnerNestableDeclaration> nestedDeclarations;
 
   ProtocolDeclaration({
     required this.id,

pkgs/swift2objc/lib/src/ast/declarations/compounds/struct_declaration.dart

@@ -35,10 +35,10 @@ class StructDeclaration extends AstNode implements CompoundDeclaration {
   List<InitializerDeclaration> initializers;
 
   @override
-  NestableDeclaration? nestingParent;
+  OuterNestableDeclaration? nestingParent;
 
   @override
-  List<NestableDeclaration> nestedDeclarations;
+  List<InnerNestableDeclaration> nestedDeclarations;
 
   StructDeclaration({
     required this.id,

pkgs/swift2objc/lib/src/ast/declarations/enums/associated_value_enum_declaration.dart

@@ -29,10 +29,10 @@ class AssociatedValueEnumDeclaration extends AstNode
   List<DeclaredType<ProtocolDeclaration>> conformedProtocols;
 
   @override
-  NestableDeclaration? nestingParent;
+  OuterNestableDeclaration? nestingParent;
 
   @override
-  List<NestableDeclaration> nestedDeclarations;
+  List<InnerNestableDeclaration> nestedDeclarations;
 
   AssociatedValueEnumDeclaration({
     required this.id,

pkgs/swift2objc/lib/src/ast/declarations/enums/normal_enum_declaration.dart

@@ -27,10 +27,10 @@ class NormalEnumDeclaration extends AstNode implements EnumDeclaration {
   List<DeclaredType<ProtocolDeclaration>> conformedProtocols;
 
   @override
-  NestableDeclaration? nestingParent;
+  OuterNestableDeclaration? nestingParent;
 
   @override
-  List<NestableDeclaration> nestedDeclarations;
+  List<InnerNestableDeclaration> nestedDeclarations;
 
   NormalEnumDeclaration({
     required this.id,

pkgs/swift2objc/lib/src/ast/declarations/enums/raw_value_enum_declaration.dart

@@ -31,10 +31,10 @@ class RawValueEnumDeclaration<T> extends AstNode
   bool hasObjCAnnotation;
 
   @override
-  NestableDeclaration? nestingParent;
+  OuterNestableDeclaration? nestingParent;
 
   @override
-  List<NestableDeclaration> nestedDeclarations;
+  List<InnerNestableDeclaration> nestedDeclarations;
 
   ReferredType rawValueType;