Fix analysis

dart-lang · Apr 15, 2024 · 8eb98a5 · 8eb98a5
1 parent bc269a1
commit 8eb98a5
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 13 deletions.
diff --git a/pkgs/ffigen/lib/src/code_generator/objc_interface.dart b/pkgs/ffigen/lib/src/code_generator/objc_interface.dart
@@ -55,9 +55,7 @@ class ObjCInterface extends BindingType {
     super.dartDoc,
     required this.builtInFunctions,
   })  : lookupName = lookupName ?? originalName,
-        super(
-          name: name ?? originalName,
-        ) {}
+        super(name: name ?? originalName);
 
   bool get _isBuiltIn => builtInFunctions.isBuiltInInterface(name);
 
@@ -67,9 +65,6 @@ class ObjCInterface extends BindingType {
       return BindingString(type: BindingStringType.objcInterface, string: '');
     }
 
-    w.markImportUsed(ffiPkgImport);
-    w.markImportUsed(objcPkgImport);
-
     String paramsToString(List<ObjCMethodParam> params,
         {required bool isStatic}) {
       final List<String> stringParams = [];

diff --git a/pkgs/ffigen/lib/src/executables/ffigen.dart b/pkgs/ffigen/lib/src/executables/ffigen.dart
@@ -58,7 +58,7 @@ void main(List<String> args) async {
 
   // Generate file for the parsed bindings.
   final gen = File(config.output);
-  library.generateFile(gen, format: argResult[format]);
+  library.generateFile(gen, format: argResult[format] as bool);
   _logger
       .info(successPen('Finished, Bindings generated in ${gen.absolute.path}'));
 

diff --git a/pkgs/ffigen/test/native_objc_test/is_instance_test.dart b/pkgs/ffigen/test/native_objc_test/is_instance_test.dart
@@ -9,8 +9,8 @@
 import 'dart:ffi';
 import 'dart:io';
 
-import 'package:test/test.dart';
 import 'package:objective_c/objective_c.dart';
+import 'package:test/test.dart';
 
 import '../test_utils.dart';
 import 'is_instance_bindings.dart';

diff --git a/pkgs/ffigen/test/native_objc_test/nullable_inheritance_test.dart b/pkgs/ffigen/test/native_objc_test/nullable_inheritance_test.dart
@@ -8,8 +8,8 @@
 import 'dart:ffi';
 import 'dart:io';
 
-import 'package:test/test.dart';
 import 'package:objective_c/objective_c.dart';
+import 'package:test/test.dart';
 
 import '../test_utils.dart';
 import 'nullable_inheritance_bindings.dart';

diff --git a/pkgs/ffigen/test/native_objc_test/nullable_test.dart b/pkgs/ffigen/test/native_objc_test/nullable_test.dart
@@ -8,8 +8,8 @@
 import 'dart:ffi';
 import 'dart:io';
 
-import 'package:test/test.dart';
 import 'package:objective_c/objective_c.dart';
+import 'package:test/test.dart';
 
 import '../test_utils.dart';
 import 'nullable_bindings.dart';

diff --git a/pkgs/ffigen/test/native_objc_test/string_test.dart b/pkgs/ffigen/test/native_objc_test/string_test.dart
@@ -8,8 +8,8 @@
 import 'dart:ffi';
 import 'dart:io';
 
-import 'package:test/test.dart';
 import 'package:objective_c/objective_c.dart';
+import 'package:test/test.dart';
 
 import '../test_utils.dart';
 import 'string_bindings.dart';

diff --git a/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart b/pkgs/objective_c/lib/src/objective_c_bindings_generated.dart
@@ -13,9 +13,9 @@
 //
 // Generated by `package:ffigen`.
 // ignore_for_file: type=lint
+import 'dart:ffi' as ffi;
 import 'package:ffi/ffi.dart' as pkg_ffi;
 import '../objective_c.dart' as objc;
-import 'dart:ffi' as ffi;
 
 class NSObject extends objc.ObjCObjectBase {
   NSObject._(ffi.Pointer<objc.ObjCObject> pointer,
@@ -325,6 +325,7 @@ class Protocol extends objc.ObjCObjectBase {
   }
 }
 
+late final _class_Protocol = objc.getClass("Protocol");
 final _objc_msgSend_0 = objc.msgSendPointer
     .cast<
         ffi.NativeFunction<
@@ -336,7 +337,6 @@ final _objc_msgSend_0 = objc.msgSendPointer
         bool Function(ffi.Pointer<objc.ObjCObject>,
             ffi.Pointer<objc.ObjCSelector>, ffi.Pointer<objc.ObjCObject>)>();
 late final _sel_isKindOfClass_ = objc.registerName("isKindOfClass:");
-late final _class_Protocol = objc.getClass("Protocol");
 late final _sel_conformsToProtocol_ = objc.registerName("conformsToProtocol:");
 final _objc_msgSend_5 = objc.msgSendPointer
     .cast<

diff --git a/pkgs/objective_c/tool/generate_code.dart b/pkgs/objective_c/tool/generate_code.dart
@@ -45,6 +45,8 @@ Map<String, String> parseExtraMethods(String filename) {
       }
     }
   }
+  extraMethods["import 'dart:ffi' as ffi;"] =
+      "import 'package:ffi/ffi.dart' as pkg_ffi;";
   return extraMethods;
 }