More review feedback

pkgs/ffigen/example/ffinative/lib/generated_bindings.dart

@@ -65,7 +65,7 @@ external ffi.Array<ffi.Int> array;
     assetId: 'package:ffinative_example/generated_bindings.dart')
 external final ffi.Pointer<ffi.Char> library_version;
 
-const _SymbolAddresses addresses = _SymbolAddresses();
+const addresses = _SymbolAddresses();
 
 class _SymbolAddresses {
   const _SymbolAddresses();

pkgs/ffigen/lib/src/code_generator/compound.dart

@@ -80,16 +80,6 @@ abstract class Compound extends BindingType {
     }
   }
 
-  List<int> _getArrayDimensionLengths(Type type) {
-    final array = <int>[];
-    var startType = type;
-    while (startType is ConstantArray) {
-      array.add(startType.length);
-      startType = startType.child;
-    }
-    return array;
-  }
-
   String _getInlineArrayTypeString(Type type, Writer w) {
     if (type is ConstantArray) {
       return '${w.ffiLibraryPrefix}.Array<'
@@ -132,9 +122,8 @@ abstract class Compound extends BindingType {
         s.writeAll(m.dartDoc!.split('\n'), '\n$depth/// ');
         s.write('\n');
       }
-      if (m.type is ConstantArray) {
-        s.write('$depth@${w.ffiLibraryPrefix}.Array.multi(');
-        s.write('${_getArrayDimensionLengths(m.type)})\n');
+      if (m.type case final ConstantArray arrayType) {
+        s.writeln(makeArrayAnnotation(w, arrayType));
         s.write('${depth}external ${_getInlineArrayTypeString(m.type, w)} ');
         s.write('${m.name};\n\n');
       } else {

pkgs/ffigen/lib/src/code_generator/global.dart

@@ -50,7 +50,7 @@ class Global extends LookUpBinding {
 
     if (nativeConfig.enabled) {
       if (type case final ConstantArray arr) {
-        arr.generateSizeAnnotation(s, w);
+        s.writeln(makeArrayAnnotation(w, arr));
       }
 
       s
@@ -116,21 +116,3 @@ class Global extends LookUpBinding {
     type.addDependencies(dependencies);
   }
 }
-
-extension on ConstantArray {
-  void generateSizeAnnotation(StringBuffer buffer, Writer w) {
-    buffer.write('@${w.ffiLibraryPrefix}.Array(');
-
-    Type? array = this;
-    var first = true;
-    while (array is ConstantArray) {
-      if (!first) buffer.write(', ');
-
-      buffer.write(array.length);
-      first = false;
-      array = array.baseArrayType;
-    }
-
-    buffer.writeln(')');
-  }
-}

pkgs/ffigen/lib/src/code_generator/utils.dart

@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart_keywords.dart';
+import 'pointer.dart';
+import 'type.dart';
 import 'writer.dart';
 
 class UniqueNamer {
@@ -103,3 +105,14 @@ String makeNativeAnnotation(
   final combinedArgs = args.map((e) => '${e.$1}: ${e.$2}').join(', ');
   return '@${w.ffiLibraryPrefix}.Native<$nativeType>($combinedArgs)';
 }
+
+String makeArrayAnnotation(Writer w, ConstantArray arrayType) {
+  final dimensions = <int>[];
+  Type type = arrayType;
+  while (type is ConstantArray) {
+    dimensions.add(type.length);
+    type = type.child;
+  }
+
+  return '@${w.ffiLibraryPrefix}.Array.multi([${dimensions.join(', ')}])';
+}

pkgs/ffigen/lib/src/code_generator/writer.dart

@@ -361,9 +361,9 @@ class SymbolAddressWriter {
     final fieldName = w._symbolAddressVariableName;
 
     if (hasNonNativeAddress) {
-      return 'late final $className $fieldName = $className(this);';
+      return 'late final $fieldName = $className(this);';
     } else {
-      return 'const $className $fieldName = $className();';
+      return 'const $fieldName = $className();';
     }
   }
 

pkgs/ffigen/test/code_generator_tests/code_generator_test.dart

@@ -386,7 +386,8 @@ void main() {
                   NativeType(
                     SupportedNativeType.Int8,
                   ),
-                  // Arrays are always supported in struct fields
+                  // This flag is ignored for struct fields, which always use
+                  // inline arrays.
                   useArrayType: true,
                 ),
               ),

pkgs/ffigen/test/code_generator_tests/expected_bindings/_expected_global_native_bindings.dart

@@ -14,7 +14,7 @@ external int test1;
 @ffi.Native<ffi.Pointer<ffi.Float>>()
 external final ffi.Pointer<ffi.Float> test2;
 
-@ffi.Array(10)
+@ffi.Array.multi([10])
 @ffi.Native<ffi.Array<ffi.Float>>()
 external final ffi.Array<ffi.Float> test3;