Frillback

analysis_options.yaml

@@ -19,6 +19,7 @@ analyzer:
   exclude: # DIFFERENT FROM FLUTTER/FLUTTER
     # Ignore generated files
     - '**/*.g.dart'
+    - '**/*.gen.jni.dart'
     - '**/*.mocks.dart' # Mockito @GenerateMocks
 
 linter:

packages/pigeon/example/app/lib/src/messages.g.dart

@@ -47,7 +47,7 @@ bool _deepEquals(Object? a, Object? b) {
 
 enum Code {
   one,
-  two,
+  two;
 }
 
 class MessageData {

packages/pigeon/lib/src/ast.dart

@@ -510,6 +510,24 @@ class TypeDeclaration {
   /// Associated [AstProxyApi], if any.
   final AstProxyApi? associatedProxyApi;
 
+  /// Returns the full annotated name of the type.
+  String getFullName({bool withNullable = true}) {
+    if (baseName == 'List' || baseName == 'Map') {
+      return '$baseName<$typeArgumentsString>${isNullable && withNullable ? '?' : ''}';
+    }
+    return '$baseName${isNullable && withNullable ? '?' : ''}';
+  }
+
+  /// Returns the Type Arguments in annotation form.
+  String get typeArgumentsString {
+    if (baseName == 'List') {
+      return typeArguments.firstOrNull?.getFullName() ?? 'Object?';
+    } else if (baseName == 'Map') {
+      return '${typeArguments.firstOrNull?.getFullName() ?? 'Object?'}, ${typeArguments.lastOrNull?.getFullName() ?? 'Object?'}';
+    }
+    return '';
+  }
+
   @override
   int get hashCode {
     // This has to be implemented because TypeDeclaration is used as a Key to a
@@ -541,32 +559,35 @@ class TypeDeclaration {
 
   /// Returns duplicated `TypeDeclaration` with attached `associatedEnum` value.
   TypeDeclaration copyWithEnum(Enum enumDefinition) {
-    return TypeDeclaration(
+    final TypeDeclaration newType = TypeDeclaration(
       baseName: baseName,
       isNullable: isNullable,
       associatedEnum: enumDefinition,
       typeArguments: typeArguments,
     );
+    return newType;
   }
 
   /// Returns duplicated `TypeDeclaration` with attached `associatedClass` value.
   TypeDeclaration copyWithClass(Class classDefinition) {
-    return TypeDeclaration(
+    final TypeDeclaration newType = TypeDeclaration(
       baseName: baseName,
       isNullable: isNullable,
       associatedClass: classDefinition,
       typeArguments: typeArguments,
     );
+    return newType;
   }
 
   /// Returns duplicated `TypeDeclaration` with attached `associatedProxyApi` value.
   TypeDeclaration copyWithProxyApi(AstProxyApi proxyApiDefinition) {
-    return TypeDeclaration(
+    final TypeDeclaration newType = TypeDeclaration(
       baseName: baseName,
       isNullable: isNullable,
       associatedProxyApi: proxyApiDefinition,
       typeArguments: typeArguments,
     );
+    return newType;
   }
 
   /// Returns duplicated `TypeDeclaration` with attached `associatedProxyApi` value.
@@ -814,6 +835,8 @@ class Root extends Node {
     required this.classes,
     required this.apis,
     required this.enums,
+    this.lists = const <String, TypeDeclaration>{},
+    this.maps = const <String, TypeDeclaration>{},
     this.containsHostApi = false,
     this.containsFlutterApi = false,
     this.containsProxyApi = false,
@@ -822,7 +845,13 @@ class Root extends Node {
 
   /// Factory function for generating an empty root, usually used when early errors are encountered.
   factory Root.makeEmpty() {
-    return Root(apis: <Api>[], classes: <Class>[], enums: <Enum>[]);
+    return Root(
+      apis: <Api>[],
+      classes: <Class>[],
+      enums: <Enum>[],
+      lists: <String, TypeDeclaration>{},
+      maps: <String, TypeDeclaration>{},
+    );
   }
 
   /// All the classes contained in the AST.
@@ -834,6 +863,12 @@ class Root extends Node {
   /// All of the enums contained in the AST.
   List<Enum> enums;
 
+  /// All of the lists contained in the AST.
+  Map<String, TypeDeclaration> lists;
+
+  /// All of the maps contained in the AST.
+  Map<String, TypeDeclaration> maps;
+
   /// Whether the root has any Host API definitions.
   bool containsHostApi;
 
@@ -856,6 +891,6 @@ class Root extends Node {
 
   @override
   String toString() {
-    return '(Root classes:$classes apis:$apis enums:$enums)';
+    return '(Root classes:$classes apis:$apis enums:$enums lists:$lists maps:$maps containsHostApi:$containsHostApi containsFlutterApi:$containsFlutterApi containsProxyApi:$containsProxyApi)';
   }
 }

packages/pigeon/lib/src/cpp/cpp_generator.dart

@@ -91,7 +91,7 @@ class CppOptions {
   /// Overrides any non-null parameters from [options] into this to make a new
   /// [CppOptions].
   CppOptions merge(CppOptions options) {
-    return CppOptions.fromMap(mergeMaps(toMap(), options.toMap()));
+    return CppOptions.fromMap(mergePigeonMaps(toMap(), options.toMap()));
   }
 }