refactor: change parseCompoundDeclaration signature

Author: Hassnaa9

pkgs/swift2objc/lib/src/parser/_core/parsed_symbolgraph.dart

@@ -66,6 +66,7 @@ class ParsedSymbol {
   final InputConfig? source;
   final Json json;
   List<Declaration> declarations;
+  Declaration get primaryDeclaration => declarations.first;
 
   ParsedSymbol({
     required this.source,

pkgs/swift2objc/lib/src/parser/parsers/declaration_parsers/parse_compound_declaration.dart

@@ -27,14 +27,13 @@ typedef CompoundTearOff<T extends CompoundDeclaration> =
       required List<AvailabilityInfo> availability,
     });
 
-typedef ParsedCompound<T> = ({T compound, List<Declaration> excessMembers});
-
-ParsedCompound<T> parseCompoundDeclaration<T extends CompoundDeclaration>(
+List<Declaration> parseCompoundDeclaration<T extends CompoundDeclaration>(
   Context context,
   ParsedSymbol symbol,
   ParsedSymbolgraph symbolgraph,
-  CompoundTearOff<T> tearoffConstructor,
-) {
+  CompoundTearOff<T> tearoffConstructor, {
+  void Function(T compound, List<Declaration> excessMembers)? onExcessMembers,
+}) {
   final compoundId = parseSymbolId(symbol.json);
 
   final compoundRelations =
@@ -126,15 +125,17 @@ ParsedCompound<T> parseCompoundDeclaration<T extends CompoundDeclaration>(
 
   compound.nestedDeclarations.fillNestingParents(compound);
 
-  return (compound: compound, excessMembers: memberDeclarations);
+  onExcessMembers?.call(compound, memberDeclarations);
+
+  return symbol.declarations;
 }
 
 List<Declaration> parseClassDeclaration(
   Context context,
   ParsedSymbol classSymbol,
   ParsedSymbolgraph symbolgraph,
 ) {
-  parseCompoundDeclaration(
+  return parseCompoundDeclaration(
     context,
     classSymbol,
     symbolgraph,
@@ -154,15 +155,14 @@ List<Declaration> parseClassDeclaration(
       nestedDeclarations: [],
     ),
   );
-  return classSymbol.declarations;
 }
 
 List<Declaration> parseStructDeclaration(
   Context context,
   ParsedSymbol structSymbol,
   ParsedSymbolgraph symbolgraph,
 ) {
-  parseCompoundDeclaration(
+  return parseCompoundDeclaration(
     context,
     structSymbol,
     symbolgraph,
@@ -182,5 +182,4 @@ List<Declaration> parseStructDeclaration(
       nestedDeclarations: [],
     ),
   );
-  return structSymbol.declarations;
 }

pkgs/swift2objc/lib/src/parser/parsers/declaration_parsers/parse_enum_declaration.dart

@@ -17,7 +17,7 @@ List<Declaration> parseEnumDeclaration(
   ParsedSymbol symbol,
   ParsedSymbolgraph symbolgraph,
 ) {
-  final (compound: enumDecl, :excessMembers) = parseCompoundDeclaration(
+  return parseCompoundDeclaration(
     context,
     symbol,
     symbolgraph,
@@ -37,9 +37,12 @@ List<Declaration> parseEnumDeclaration(
       initializers: [],
       nestedDeclarations: [],
     ),
+    onExcessMembers: (enumDecl, excessMembers) {
+      enumDecl.cases.addAll(
+        excessMembers.removeWhereType<EnumCaseDeclaration>(),
+      );
+    },
   );
-  enumDecl.cases.addAll(excessMembers.removeWhereType<EnumCaseDeclaration>());
-  return symbol.declarations;
 }
 
 EnumCaseDeclaration parseEnumCaseDeclaration(

pkgs/swift2objc/lib/src/parser/parsers/parse_type.dart

@@ -119,11 +119,8 @@ typedef PrefixParselet =
     );
   }
 
-  final type = parseDeclaration(
-    context,
-    symbol,
-    symbolgraph,
-  ).first.asDeclaredType;
+  parseDeclaration(context, symbol, symbolgraph);
+  final type = symbol.primaryDeclaration.asDeclaredType;
   return (type, fragments);
 }