Fix #1007

liamappelbe · liamappelbe · commit 194eb0ddf7a8 · 2024-06-06T15:38:41.000+12:00
diff --git a/pkgs/ffigen/lib/src/code_generator/objc_interface.dart b/pkgs/ffigen/lib/src/code_generator/objc_interface.dart
@@ -79,7 +79,8 @@ class ObjCInterface extends BindingType {
       s.write(makeDartDoc(dartDoc!));
     }
 
-    final uniqueNamer = UniqueNamer({name, 'pointer'});
+    final uniqueNamer =
+        UniqueNamer({name, 'pointer'}, parent: w.topLevelUniqueNamer);
 
     final rawObjType = PointerType(objCObjectType).getCType(w);
     final wrapObjType = ObjCBuiltInFunctions.objectBase.gen(w);
diff --git a/pkgs/ffigen/lib/src/code_generator/utils.dart b/pkgs/ffigen/lib/src/code_generator/utils.dart
@@ -15,9 +15,15 @@ class UniqueNamer {
   final Set<String> _usedUpNames;
 
   /// Creates a UniqueNamer with given [usedUpNames] and Dart reserved keywords.
-  UniqueNamer(Set<String> usedUpNames)
+  ///
+  /// If [parent] is provided, also includes all the parent's names.
+  UniqueNamer(Set<String> usedUpNames, {UniqueNamer? parent})
       : assert(keywords.intersection(usedUpNames).isEmpty),
-        _usedUpNames = {...keywords, ...usedUpNames};
+        _usedUpNames = {
+          ...keywords,
+          ...usedUpNames,
+          ...(parent?._usedUpNames ?? {}),
+        };
 
   /// Creates a UniqueNamer with given [usedUpNames] only.
   UniqueNamer._raw(this._usedUpNames);
diff --git a/pkgs/ffigen/test/native_objc_test/method_test.dart b/pkgs/ffigen/test/native_objc_test/method_test.dart
@@ -93,6 +93,18 @@ void main() {
       test('Doubles', () {
         expect(testInstance.addDoubles_Y_(1.23, 4.56), closeTo(5.79, 1e-6));
       });
+
+      test('Method with same name as a type', () {
+        // Test for https://github.com/dart-lang/native/issues/1007
+        final resultPtr = calloc<Vec4>();
+        final result = resultPtr.ref;
+        testInstance.Vec41(resultPtr);  // A slightly unfortunate rename :P
+        expect(result.x, 1);
+        expect(result.y, 2);
+        expect(result.z, 3);
+        expect(result.w, 4);
+        calloc.free(resultPtr);
+      });
     });
   });
 }
diff --git a/pkgs/ffigen/test/native_objc_test/method_test.m b/pkgs/ffigen/test/native_objc_test/method_test.m
@@ -24,6 +24,7 @@ +(int32_t)sub:(int32_t)x Y:(int32_t) y Z:(int32_t) z;
 -(Vec4)twiddleVec4Components:(Vec4)v;
 -(float)addFloats:(float)x Y:(float) y;
 -(double)addDoubles:(double)x Y:(double) y;
+-(Vec4)Vec4;
 
 @end
 
@@ -78,4 +79,13 @@ -(double)addDoubles:(double)x Y:(double) y {
     return x + y;
 }
 
+-(Vec4)Vec4 {
+    Vec4 u;
+    u.x = 1;
+    u.y = 2;
+    u.z = 3;
+    u.w = 4;
+    return u;
+}
+
 @end

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,8 @@ class ObjCInterface extends BindingType {`
`79`	`79`	`s.write(makeDartDoc(dartDoc!));`
`80`	`80`	`}`
`81`	`81`
`82`		`- final uniqueNamer = UniqueNamer({name, 'pointer'});`
	`82`	`+ final uniqueNamer =`
	`83`	`+ UniqueNamer({name, 'pointer'}, parent: w.topLevelUniqueNamer);`
`83`	`84`
`84`	`85`	`final rawObjType = PointerType(objCObjectType).getCType(w);`
`85`	`86`	`final wrapObjType = ObjCBuiltInFunctions.objectBase.gen(w);`