Google Git
Sign in
dart/native/refs/heads/ffigen_callback_migration^!/.
commit
a78b902d89e0c4fdf180aece05c441557d83bb79
[log]
author
Liam Appelbe <liama@google.com>
Tue Jul 14 10:48:39 2026 +1000
committer
Liam Appelbe <liama@google.com>
Tue Jul 14 10:48:39 2026 +1000
tree
bc43c0dffb5facf0afd7681accf6940deefbbd7e
parent
a329260898adc3cc829c50b10b6e6053032749fa [diff]
fmt

diff --git a/pkgs/ffigen/lib/src/code_generator/objc_block.dart b/pkgs/ffigen/lib/src/code_generator/objc_block.dart
index 16b7a38..fd19f36 100644
--- a/pkgs/ffigen/lib/src/code_generator/objc_block.dart
+++ b/pkgs/ffigen/lib/src/code_generator/objc_block.dart

@@ -634,12 +634,16 @@
           'objc_retainBlock($argName);',
         );
         unconsumedReleases.add(
-          'if (args->$argName != NULL) { id relObj = (__bridge_transfer id)args->$argName; }',
+          'if (args->$argName != NULL) {\n'
+          '      id relObj = (__bridge_transfer id)args->$argName;\n'
+          '    }',
         );
       } else if (isObjCObject) {
         assignments.add('args->$argName = (__bridge_retained void*)$argName;');
         unconsumedReleases.add(
-          'if (args->$argName != NULL) { id relObj = (__bridge_transfer id)args->$argName; }',
+          'if (args->$argName != NULL) {\n'
+          '      id relObj = (__bridge_transfer id)args->$argName;\n'
+          '    }',
         );
       } else {
         assignments.add('args->$argName = $argName;');
@@ -773,12 +777,16 @@
           'objc_retainBlock($argName);',
         );
         unconsumedReleases.add(
-          'if (args->$argName != NULL) { id relObj = (__bridge_transfer id)args->$argName; }',
+          'if (args->$argName != NULL) {\n'
+          '      id relObj = (__bridge_transfer id)args->$argName;\n'
+          '    }',
         );
       } else if (isObjCObject) {
         assignments.add('args->$argName = (__bridge_retained void*)$argName;');
         unconsumedReleases.add(
-          'if (args->$argName != NULL) { id relObj = (__bridge_transfer id)args->$argName; }',
+          'if (args->$argName != NULL) {\n'
+          '      id relObj = (__bridge_transfer id)args->$argName;\n'
+          '    }',
         );
       } else {
         assignments.add('args->$argName = $argName;');

diff --git a/pkgs/ffigen/test/native_objc_test/block_annotation_test_bindings.m b/pkgs/ffigen/test/native_objc_test/block_annotation_test_bindings.m
index 2b4b09d..8be9158 100644
--- a/pkgs/ffigen/test/native_objc_test/block_annotation_test_bindings.m
+++ b/pkgs/ffigen/test/native_objc_test/block_annotation_test_bindings.m

@@ -220,7 +220,9 @@
 void _z0xonr_BlockArgs_1iiqbf5_free(void* peer) {
   @autoreleasepool {
     _z0xonr_BlockArgs_1iiqbf5* args = (__bridge _z0xonr_BlockArgs_1iiqbf5*)peer;
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -283,7 +285,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -362,7 +366,9 @@
 void _z0xonr_BlockArgs_10ofcgx_free(void* peer) {
   @autoreleasepool {
     _z0xonr_BlockArgs_10ofcgx* args = (__bridge _z0xonr_BlockArgs_10ofcgx*)peer;
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -425,7 +431,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }

diff --git a/pkgs/ffigen/test/native_objc_test/block_test_bindings.m b/pkgs/ffigen/test/native_objc_test/block_test_bindings.m
index d3ccd29..07e692d 100644
--- a/pkgs/ffigen/test/native_objc_test/block_test_bindings.m
+++ b/pkgs/ffigen/test/native_objc_test/block_test_bindings.m

@@ -187,7 +187,9 @@
 void _18tji2r_BlockArgs_46g30m_free(void* peer) {
   @autoreleasepool {
     _18tji2r_BlockArgs_46g30m* args = (__bridge _18tji2r_BlockArgs_46g30m*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -243,7 +245,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -809,7 +813,9 @@
 void _18tji2r_BlockArgs_1xjdmo1_free(void* peer) {
   @autoreleasepool {
     _18tji2r_BlockArgs_1xjdmo1* args = (__bridge _18tji2r_BlockArgs_1xjdmo1*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -865,7 +871,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -931,7 +939,9 @@
 void _18tji2r_BlockArgs_1nfopnd_free(void* peer) {
   @autoreleasepool {
     _18tji2r_BlockArgs_1nfopnd* args = (__bridge _18tji2r_BlockArgs_1nfopnd*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -987,7 +997,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1065,7 +1077,9 @@
 void _18tji2r_BlockArgs_1uznk83_free(void* peer) {
   @autoreleasepool {
     _18tji2r_BlockArgs_1uznk83* args = (__bridge _18tji2r_BlockArgs_1uznk83*)peer;
-    if (args->arg2 != NULL) { id relObj = (__bridge_transfer id)args->arg2; }
+    if (args->arg2 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg2;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1135,7 +1149,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg2 != NULL) { id relObj = (__bridge_transfer id)args->arg2; }
+    if (args->arg2 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg2;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }

diff --git a/pkgs/ffigen/test/native_objc_test/protocol_test_bindings.m b/pkgs/ffigen/test/native_objc_test/protocol_test_bindings.m
index 11f8c21..bd309a2 100644
--- a/pkgs/ffigen/test/native_objc_test/protocol_test_bindings.m
+++ b/pkgs/ffigen/test/native_objc_test/protocol_test_bindings.m

@@ -389,7 +389,9 @@
 void _13hhotk_BlockArgs_o4v3e9_free(void* peer) {
   @autoreleasepool {
     _13hhotk_BlockArgs_o4v3e9* args = (__bridge _13hhotk_BlockArgs_o4v3e9*)peer;
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -452,7 +454,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }

diff --git a/pkgs/objective_c/src/objective_c_bindings_generated.m b/pkgs/objective_c/src/objective_c_bindings_generated.m
index 9b56252..643805b 100644
--- a/pkgs/objective_c/src/objective_c_bindings_generated.m
+++ b/pkgs/objective_c/src/objective_c_bindings_generated.m

@@ -289,8 +289,12 @@
 void _1wx624s_BlockArgs_tbq8wd_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_tbq8wd* args = (__bridge _1wx624s_BlockArgs_tbq8wd*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -362,8 +366,12 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -579,9 +587,15 @@
 void _1wx624s_BlockArgs_dgl1yu_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_dgl1yu* args = (__bridge _1wx624s_BlockArgs_dgl1yu*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
-    if (args->arg2 != NULL) { id relObj = (__bridge_transfer id)args->arg2; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
+    if (args->arg2 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg2;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -655,9 +669,15 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
-    if (args->arg2 != NULL) { id relObj = (__bridge_transfer id)args->arg2; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
+    if (args->arg2 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg2;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1023,7 +1043,9 @@
 void _1wx624s_BlockArgs_v348wu_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_v348wu* args = (__bridge _1wx624s_BlockArgs_v348wu*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1086,7 +1108,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1153,7 +1177,9 @@
 void _1wx624s_BlockArgs_1yuig1_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_1yuig1* args = (__bridge _1wx624s_BlockArgs_1yuig1*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1209,7 +1235,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1691,7 +1719,9 @@
 void _1wx624s_BlockArgs_borsj5_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_borsj5* args = (__bridge _1wx624s_BlockArgs_borsj5*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1754,7 +1784,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -1951,7 +1983,9 @@
 void _1wx624s_BlockArgs_1vi0sov_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_1vi0sov* args = (__bridge _1wx624s_BlockArgs_1vi0sov*)peer;
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -2014,7 +2048,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -2093,7 +2129,9 @@
 void _1wx624s_BlockArgs_1mmoiyc_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_1mmoiyc* args = (__bridge _1wx624s_BlockArgs_1mmoiyc*)peer;
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -2156,7 +2194,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -2381,7 +2421,9 @@
 void _1wx624s_BlockArgs_n9asv4_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_n9asv4* args = (__bridge _1wx624s_BlockArgs_n9asv4*)peer;
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -2451,7 +2493,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -2553,9 +2597,15 @@
 void _1wx624s_BlockArgs_a5zxhf_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_a5zxhf* args = (__bridge _1wx624s_BlockArgs_a5zxhf*)peer;
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
-    if (args->arg2 != NULL) { id relObj = (__bridge_transfer id)args->arg2; }
-    if (args->arg3 != NULL) { id relObj = (__bridge_transfer id)args->arg3; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
+    if (args->arg2 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg2;
+    }
+    if (args->arg3 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg3;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -2643,9 +2693,15 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
-    if (args->arg2 != NULL) { id relObj = (__bridge_transfer id)args->arg2; }
-    if (args->arg3 != NULL) { id relObj = (__bridge_transfer id)args->arg3; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
+    if (args->arg2 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg2;
+    }
+    if (args->arg3 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg3;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -3123,7 +3179,9 @@
 void _1wx624s_BlockArgs_1a2aane_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_1a2aane* args = (__bridge _1wx624s_BlockArgs_1a2aane*)peer;
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -3186,7 +3244,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg1 != NULL) { id relObj = (__bridge_transfer id)args->arg1; }
+    if (args->arg1 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg1;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -3265,7 +3325,9 @@
 void _1wx624s_BlockArgs_enc3u4_free(void* peer) {
   @autoreleasepool {
     _1wx624s_BlockArgs_enc3u4* args = (__bridge _1wx624s_BlockArgs_enc3u4*)peer;
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }
@@ -3335,7 +3397,9 @@
       ((DOBJC_Context*)args->context)->signalWaiter(args->waiter);
       args->waiter = NULL;
     }
-    if (args->arg0 != NULL) { id relObj = (__bridge_transfer id)args->arg0; }
+    if (args->arg0 != NULL) {
+      id relObj = (__bridge_transfer id)args->arg0;
+    }
     id argsObj = (__bridge_transfer id)peer;
   }
 }