[ffigen] Fix #1268

pkgs/ffigen/CHANGELOG.md

@@ -1,13 +1,18 @@
-## 18.1.1-wip
+## 18.2.0-wip
 
+- Use package:objective_c 7.2.0.
 - Make it easier for a downstream clone to change behavior of certain utils.
+- Fix [a bug](https://github.com/dart-lang/native/issues/1268) where types could
+  occasionally show up as a generic ObjCObjectBase, when they were supposed to
+  be codegenned as a more specific interface types.
 
 ## 18.1.0
 
 - Fix a clang warning in ObjC protocol generated bindings.
 
 ## 18.0.0
 
+- Use package:objective_c 7.0.0.
 - Add variable substitutions that can be used in the `headers.entry-points` to
   locate Apple APIs: `$XCODE`, `$IOS_SDK`, and `$MACOS_SDK`.
 - Add an empty constructor to all ObjC interfaces that have a `new` method,

pkgs/ffigen/lib/src/header_parser/type_extractor/extractor.dart

@@ -252,6 +252,7 @@ _CreateTypeFromCursorResult _createTypeFromCursor(clang_types.CXType cxtype,
         return _CreateTypeFromCursorResult(enumClass);
       }
     case clang_types.CXTypeKind.CXType_ObjCInterface:
+    case clang_types.CXTypeKind.CXType_ObjCObject:
       return _CreateTypeFromCursorResult(parseObjCInterfaceDeclaration(cursor));
     default:
       return _CreateTypeFromCursorResult(

pkgs/ffigen/pubspec.yaml

@@ -41,7 +41,7 @@ dev_dependencies:
   dart_flutter_team_lints: ^2.0.0
   json_schema: ^5.1.1
   leak_tracker: ^10.0.7
-  objective_c: ^7.0.0
+  objective_c: ^7.2.0
   test: ^1.16.2
 
 dependency_overrides:

pkgs/ffigen/test/native_objc_test/property_config.yaml

@@ -8,6 +8,6 @@ objc-interfaces:
     - PropertyInterface
 headers:
   entry-points:
-    - 'property_test.m'
+    - 'property_test.h'
 preamble: |
   // ignore_for_file: camel_case_types, non_constant_identifier_names, unnecessary_non_null_assertion, unused_element, unused_field

pkgs/ffigen/test/native_objc_test/property_test.dart

@@ -9,6 +9,7 @@ import 'dart:ffi';
 import 'dart:io';
 
 import 'package:ffi/ffi.dart';
+import 'package:objective_c/objective_c.dart';
 import 'package:test/test.dart';
 import '../test_utils.dart';
 import 'property_bindings.dart';
@@ -50,7 +51,8 @@ void main() {
       });
     });
 
-    group('Regress #608', () {
+    group('Regress #209', () {
+      // Test for https://github.com/dart-lang/native/issues/209
       test('Structs', () {
         final inputPtr = calloc<Vec4>();
         final input = inputPtr.ref;
@@ -85,5 +87,12 @@ void main() {
       expect(testInstance.instStaticSameName, 123);
       expect(PropertyInterface.getInstStaticSameName$1(), 456);
     });
+
+    test('Regress #1268', () {
+      // Test for https://github.com/dart-lang/native/issues/1268
+      NSArray array = PropertyInterface.getRegressGH1268();
+      expect(array.length, 1);
+      expect(NSString.castFrom(array[0]).toDartString(), "hello");
+    });
   });
 }

pkgs/ffigen/test/native_objc_test/property_test.h

@@ -0,0 +1,32 @@
+#import <Foundation/NSObject.h>
+
+@class UndefinedTemplate<ObjectType>;
+@class NSString;
+@class NSArray<ObjectType>;
+
+typedef struct {
+  double x;
+  double y;
+  double z;
+  double w;
+} Vec4;
+
+@interface PropertyInterface : NSObject {
+}
+
+@property (readonly) int32_t readOnlyProperty;
+@property int32_t readWriteProperty;
+@property (class, readonly, copy) UndefinedTemplate<NSString *> *regressGH436;
+@property (class, readonly) int32_t classReadOnlyProperty;
+@property (class) int32_t classReadWriteProperty;
+@property float floatProperty;
+@property double doubleProperty;
+@property Vec4 structProperty;
+@property (class, readonly, copy) NSArray<NSString *> *regressGH1268;
+
+// An instance property and a static property with the same name.
+// https://github.com/dart-lang/native/issues/1136
+@property(readonly) int32_t instStaticSameName;
+@property(class, readonly) int32_t instStaticSameName;
+
+@end

pkgs/ffigen/test/native_objc_test/property_test.m

@@ -1,32 +1,7 @@
-#import <Foundation/NSObject.h>
+#import "property_test.h"
 
-@class UndefinedTemplate<ObjectType>;
-
-typedef struct {
-  double x;
-  double y;
-  double z;
-  double w;
-} Vec4;
-
-@interface PropertyInterface : NSObject {
-}
-
-@property (readonly) int32_t readOnlyProperty;
-@property int32_t readWriteProperty;
-@property (class, readonly, copy) UndefinedTemplate<NSString *> *regressGH436;
-@property (class, readonly) int32_t classReadOnlyProperty;
-@property (class) int32_t classReadWriteProperty;
-@property float floatProperty;
-@property double doubleProperty;
-@property Vec4 structProperty;
-
-// An instance property and a static property with the same name.
-// https://github.com/dart-lang/native/issues/1136
-@property(readonly) int32_t instStaticSameName;
-@property(class, readonly) int32_t instStaticSameName;
-
-@end
+#import <Foundation/NSString.h>
+#import <Foundation/NSArray.h>
 
 @implementation PropertyInterface
 
@@ -56,4 +31,8 @@ + (int32_t)instStaticSameName {
   return 456;
 }
 
++ (NSArray<NSString *> *)regressGH1268 {
+  return @[@"hello"];
+}
+
 @end

pkgs/objective_c/CHANGELOG.md

@@ -1,5 +1,6 @@
 ## 7.2.0-wip
 
+- Use ffigen 18.2.0
 - NSArray is now a Dart Iterable and NSMutableArray is now a Dart List.
 
 ## 7.1.0