From 10539d5fbb462323e713a93fd8476f87687d1ccd Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Sun, 1 Mar 2026 10:16:33 -0800 Subject: [PATCH 1/4] Tidy imports and "ignore" comments --- .../app/lib/src/event_channel_messages.g.dart | 7 ++++--- packages/pigeon/example/app/lib/src/messages.g.dart | 7 ++++--- packages/pigeon/lib/src/dart/dart_generator.dart | 13 ++++++------- .../lib/src/generated/core_tests.gen.dart | 7 ++++--- .../lib/src/generated/enum.gen.dart | 7 ++++--- .../lib/src/generated/event_channel_tests.gen.dart | 7 ++++--- .../event_channel_without_classes_tests.gen.dart | 7 ++++--- .../lib/src/generated/flutter_unittests.gen.dart | 7 ++++--- .../lib/src/generated/message.gen.dart | 7 ++++--- .../lib/src/generated/multiple_arity.gen.dart | 7 ++++--- .../lib/src/generated/non_null_fields.gen.dart | 7 ++++--- .../lib/src/generated/null_fields.gen.dart | 7 ++++--- .../lib/src/generated/nullable_returns.gen.dart | 7 ++++--- .../lib/src/generated/primitive.gen.dart | 7 ++++--- .../lib/src/generated/proxy_api_tests.gen.dart | 8 ++++---- 15 files changed, 62 insertions(+), 50 deletions(-) diff --git a/packages/pigeon/example/app/lib/src/event_channel_messages.g.dart b/packages/pigeon/example/app/lib/src/event_channel_messages.g.dart index 5c7f5c6b31b5..de85c03cf7ca 100644 --- a/packages/pigeon/example/app/lib/src/event_channel_messages.g.dart +++ b/packages/pigeon/example/app/lib/src/event_channel_messages.g.dart @@ -3,13 +3,14 @@ // found in the LICENSE file. // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; bool _deepEquals(Object? a, Object? b) { if (a is List && b is List) { diff --git a/packages/pigeon/example/app/lib/src/messages.g.dart b/packages/pigeon/example/app/lib/src/messages.g.dart index d62d999988a9..99561f097eeb 100644 --- a/packages/pigeon/example/app/lib/src/messages.g.dart +++ b/packages/pigeon/example/app/lib/src/messages.g.dart @@ -3,13 +3,14 @@ // found in the LICENSE file. // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/lib/src/dart/dart_generator.dart b/packages/pigeon/lib/src/dart/dart_generator.dart index 45b3f34372da..55b59eb82e35 100644 --- a/packages/pigeon/lib/src/dart/dart_generator.dart +++ b/packages/pigeon/lib/src/dart/dart_generator.dart @@ -136,9 +136,8 @@ class DartGenerator extends StructuredGenerator { } indent.writeln('// ${getGeneratedCodeWarning()}'); indent.writeln('// $seeAlsoWarning'); - indent.writeln( - '// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers', - ); + indent.writeln('// ignore_for_file: unused_import, unused_shown_name'); + indent.writeln('// ignore_for_file: type=lint'); indent.newln(); } @@ -154,19 +153,19 @@ class DartGenerator extends StructuredGenerator { indent.writeln("import 'dart:io' show Platform;"); } indent.writeln( - "import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List;", + "import 'dart:typed_data' show Float64List, Int32List, Int64List;", ); indent.newln(); - indent.writeln( - "import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer${root.containsProxyApi ? ', immutable, protected, visibleForTesting' : ''};", - ); indent.writeln("import 'package:flutter/services.dart';"); if (root.containsProxyApi) { indent.writeln( "import 'package:flutter/widgets.dart' show WidgetsFlutterBinding;", ); } + indent.writeln( + "import 'package:meta/meta.dart' show immutable, protected, visibleForTesting;", + ); } @override diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart index b325d041e44a..2c6ffaa5a760 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart index d5cb251222e0..1729231d0fdd 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart index 8ad8dd6ba6c1..c07c0e2f0a1b 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; bool _deepEquals(Object? a, Object? b) { if (a is List && b is List) { diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_without_classes_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_without_classes_tests.gen.dart index 6e58cd7c26db..21a5570031f8 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_without_classes_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_without_classes_tests.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; class _PigeonCodec extends StandardMessageCodec { const _PigeonCodec(); diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart index 0c470ba7e2f7..cebe55493a03 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart index 3c16b1c9c19d..0ff7ed62aae5 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart index 5b62e1baac51..63263ddcefc6 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart index d5173300a6b6..68e2b1c2baed 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart index 0c0fe277fa15..c0659c8f5d8a 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart index b41ddd61dba0..cbdf5cd2e842 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart index d1a8fef75d5c..e8de4ca72321 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart @@ -4,13 +4,14 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' show ReadBuffer, WriteBuffer; import 'package:flutter/services.dart'; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart index b645e66dca32..adb9d9b60ce7 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart @@ -4,16 +4,16 @@ // // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon -// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers +// ignore_for_file: unused_import, unused_shown_name +// ignore_for_file: type=lint import 'dart:async'; import 'dart:io' show Platform; -import 'dart:typed_data' show Float64List, Int32List, Int64List, Uint8List; +import 'dart:typed_data' show Float64List, Int32List, Int64List; -import 'package:flutter/foundation.dart' - show ReadBuffer, WriteBuffer, immutable, protected, visibleForTesting; import 'package:flutter/services.dart'; import 'package:flutter/widgets.dart' show WidgetsFlutterBinding; +import 'package:meta/meta.dart' show immutable, protected, visibleForTesting; Object? _extractReplyValueOrThrow( List? replyList, From cdf7221d98813be56387e78e66a576eac559190a Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Sun, 1 Mar 2026 10:18:55 -0800 Subject: [PATCH 2/4] CHANGELOG --- packages/pigeon/CHANGELOG.md | 7 +++++++ packages/pigeon/lib/src/generator_tools.dart | 2 +- packages/pigeon/pubspec.yaml | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/CHANGELOG.md b/packages/pigeon/CHANGELOG.md index 83727e1ecef0..2e2a8998a301 100644 --- a/packages/pigeon/CHANGELOG.md +++ b/packages/pigeon/CHANGELOG.md @@ -1,3 +1,10 @@ +## 26.1.10 + +* [dart] Ignores all lint rules in generated code. +* [dart] In generated code, imports the meta package for annotations, instead of + the Flutter foundation library. +* [dart] In generated code, no longer imports Uint8List. + ## 26.1.9 * [dart] Reduces much duplication in reply-handling code. diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart index d1f962b1f981..12b3bbec7f0b 100644 --- a/packages/pigeon/lib/src/generator_tools.dart +++ b/packages/pigeon/lib/src/generator_tools.dart @@ -15,7 +15,7 @@ import 'generator.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '26.1.9'; +const String pigeonVersion = '26.1.10'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index ede8e75399ec..e0e25734e32e 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 26.1.9 # This must match the version in lib/src/generator_tools.dart +version: 26.1.10 # This must match the version in lib/src/generator_tools.dart environment: sdk: ^3.9.0 From 783b5a928ab5e237671444cc5c1179c66ddb5ad9 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Mon, 2 Mar 2026 11:53:47 -0800 Subject: [PATCH 3/4] 26.1.11 --- packages/pigeon/lib/src/generator_tools.dart | 2 +- packages/pigeon/pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/pigeon/lib/src/generator_tools.dart b/packages/pigeon/lib/src/generator_tools.dart index 406cf94f1556..f60aef42c071 100644 --- a/packages/pigeon/lib/src/generator_tools.dart +++ b/packages/pigeon/lib/src/generator_tools.dart @@ -15,7 +15,7 @@ import 'generator.dart'; /// The current version of pigeon. /// /// This must match the version in pubspec.yaml. -const String pigeonVersion = '26.1.10'; +const String pigeonVersion = '26.1.11'; /// Read all the content from [stdin] to a String. String readStdin() { diff --git a/packages/pigeon/pubspec.yaml b/packages/pigeon/pubspec.yaml index e0e25734e32e..ef6202d4350a 100644 --- a/packages/pigeon/pubspec.yaml +++ b/packages/pigeon/pubspec.yaml @@ -2,7 +2,7 @@ name: pigeon description: Code generator tool to make communication between Flutter and the host platform type-safe and easier. repository: https://github.com/flutter/packages/tree/main/packages/pigeon issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+pigeon%22 -version: 26.1.10 # This must match the version in lib/src/generator_tools.dart +version: 26.1.11 # This must match the version in lib/src/generator_tools.dart environment: sdk: ^3.9.0 From 133467152edffe4f715fba95a970c8a5b6fd9376 Mon Sep 17 00:00:00 2001 From: Sam Rawlins Date: Fri, 6 Mar 2026 13:23:11 -0800 Subject: [PATCH 4/4] option --- .../app/lib/src/event_channel_messages.g.dart | 2 +- .../example/app/lib/src/messages.g.dart | 2 +- .../app/pigeons/event_channel_messages.dart | 2 +- .../pigeon/example/app/pigeons/messages.dart | 2 +- .../pigeon/lib/src/dart/dart_generator.dart | 35 ++++++- packages/pigeon/lib/src/pigeon_lib.dart | 12 ++- .../pigeon/lib/src/pigeon_lib_internal.dart | 3 +- .../pigeons/configure_pigeon_dart_out.dart | 2 +- .../lib/src/generated/core_tests.gen.dart | 2 +- .../lib/src/generated/enum.gen.dart | 2 +- .../generated/event_channel_tests.gen.dart | 2 +- ...ent_channel_without_classes_tests.gen.dart | 2 +- .../src/generated/flutter_unittests.gen.dart | 2 +- .../lib/src/generated/message.gen.dart | 2 +- .../lib/src/generated/multiple_arity.gen.dart | 2 +- .../src/generated/non_null_fields.gen.dart | 2 +- .../lib/src/generated/null_fields.gen.dart | 2 +- .../src/generated/nullable_returns.gen.dart | 2 +- .../lib/src/generated/primitive.gen.dart | 2 +- .../src/generated/proxy_api_tests.gen.dart | 2 +- .../shared_test_plugin_code/pubspec.yaml | 1 + packages/pigeon/test/dart/proxy_api_test.dart | 32 +++--- packages/pigeon/test/dart_generator_test.dart | 98 +++++++++++-------- packages/pigeon/tool/shared/generation.dart | 2 +- 24 files changed, 134 insertions(+), 83 deletions(-) diff --git a/packages/pigeon/example/app/lib/src/event_channel_messages.g.dart b/packages/pigeon/example/app/lib/src/event_channel_messages.g.dart index de85c03cf7ca..456b3629f7df 100644 --- a/packages/pigeon/example/app/lib/src/event_channel_messages.g.dart +++ b/packages/pigeon/example/app/lib/src/event_channel_messages.g.dart @@ -4,7 +4,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/example/app/lib/src/messages.g.dart b/packages/pigeon/example/app/lib/src/messages.g.dart index 99561f097eeb..c9dd158bcfd1 100644 --- a/packages/pigeon/example/app/lib/src/messages.g.dart +++ b/packages/pigeon/example/app/lib/src/messages.g.dart @@ -4,7 +4,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/example/app/pigeons/event_channel_messages.dart b/packages/pigeon/example/app/pigeons/event_channel_messages.dart index 388b327155b2..c786e8204f9a 100644 --- a/packages/pigeon/example/app/pigeons/event_channel_messages.dart +++ b/packages/pigeon/example/app/pigeons/event_channel_messages.dart @@ -7,7 +7,7 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon( PigeonOptions( dartOut: 'lib/src/event_channel_messages.g.dart', - dartOptions: DartOptions(), + dartOptions: DartOptions(ignoreLints: false), cppOptions: CppOptions(namespace: 'pigeon_example'), kotlinOut: 'android/app/src/main/kotlin/dev/flutter/pigeon_example_app/EventChannelMessages.g.kt', diff --git a/packages/pigeon/example/app/pigeons/messages.dart b/packages/pigeon/example/app/pigeons/messages.dart index 7e3d08a799e2..479a09c1e978 100644 --- a/packages/pigeon/example/app/pigeons/messages.dart +++ b/packages/pigeon/example/app/pigeons/messages.dart @@ -8,7 +8,7 @@ import 'package:pigeon/pigeon.dart'; @ConfigurePigeon( PigeonOptions( dartOut: 'lib/src/messages.g.dart', - dartOptions: DartOptions(), + dartOptions: DartOptions(ignoreLints: false), cppOptions: CppOptions(namespace: 'pigeon_example'), cppHeaderOut: 'windows/runner/messages.g.h', cppSourceOut: 'windows/runner/messages.g.cpp', diff --git a/packages/pigeon/lib/src/dart/dart_generator.dart b/packages/pigeon/lib/src/dart/dart_generator.dart index 827b89842539..115923f7b483 100644 --- a/packages/pigeon/lib/src/dart/dart_generator.dart +++ b/packages/pigeon/lib/src/dart/dart_generator.dart @@ -49,7 +49,8 @@ class DartOptions { this.copyrightHeader, this.sourceOutPath, this.testOutPath, - }); + bool ignoreLints = true, + }) : _ignoreLints = ignoreLints; /// A copyright header that will get prepended to generated code. final Iterable? copyrightHeader; @@ -60,6 +61,9 @@ class DartOptions { /// Path to output generated Test file for tests. final String? testOutPath; + /// Whether to ignore lint violations in generated Dart code. + final bool _ignoreLints; + /// Creates a [DartOptions] from a Map representation where: /// `x = DartOptions.fromMap(x.toMap())`. static DartOptions fromMap(Map map) { @@ -68,6 +72,7 @@ class DartOptions { copyrightHeader: copyrightHeader?.cast(), sourceOutPath: map['sourceOutPath'] as String?, testOutPath: map['testOutPath'] as String?, + ignoreLints: (map['ignoreLints'] as bool?) ?? true, ); } @@ -78,6 +83,7 @@ class DartOptions { if (copyrightHeader != null) 'copyrightHeader': copyrightHeader!, if (sourceOutPath != null) 'sourceOutPath': sourceOutPath!, if (testOutPath != null) 'testOutPath': testOutPath!, + 'ignoreLints': _ignoreLints, }; return result; } @@ -92,7 +98,12 @@ class DartOptions { /// Options that control how Dart code will be generated. class InternalDartOptions extends InternalOptions { /// Constructor for InternalDartOptions. - const InternalDartOptions({this.copyrightHeader, this.dartOut, this.testOut}); + const InternalDartOptions({ + this.copyrightHeader, + this.dartOut, + this.testOut, + required bool ignoreLints, + }) : _ignoreLints = ignoreLints; /// Creates InternalDartOptions from DartOptions. InternalDartOptions.fromDartOptions( @@ -102,7 +113,8 @@ class InternalDartOptions extends InternalOptions { String? testOut, }) : copyrightHeader = copyrightHeader ?? options.copyrightHeader, dartOut = (dartOut ?? options.sourceOutPath)!, - testOut = testOut ?? options.testOutPath; + testOut = testOut ?? options.testOutPath, + _ignoreLints = options._ignoreLints; /// A copyright header that will get prepended to generated code. final Iterable? copyrightHeader; @@ -112,6 +124,9 @@ class InternalDartOptions extends InternalOptions { /// Path to output generated Test file for tests. final String? testOut; + + /// Whether to ignore lint violations in generated Dart code. + final bool _ignoreLints; } /// Class that manages all Dart code generation. @@ -137,7 +152,19 @@ class DartGenerator extends StructuredGenerator { indent.writeln('// ${getGeneratedCodeWarning()}'); indent.writeln('// $seeAlsoWarning'); indent.writeln('// ignore_for_file: unused_import, unused_shown_name'); - indent.writeln('// ignore_for_file: type=lint'); + if (generatorOptions._ignoreLints) { + indent.writeln('// ignore_for_file: type=lint'); + } else { + // Just ignore the lint rules we know we violate and which we care about + // in our own checked-in generated files. + indent.writeln( + '// ignore_for_file: public_member_api_docs, ' + 'non_constant_identifier_names, avoid_as, unnecessary_parenthesis, ' + 'prefer_null_aware_operators, omit_local_variable_types, ' + 'omit_obvious_local_variable_types, unnecessary_import, ' + 'no_leading_underscores_for_local_identifiers', + ); + } indent.newln(); } diff --git a/packages/pigeon/lib/src/pigeon_lib.dart b/packages/pigeon/lib/src/pigeon_lib.dart index 97ad3859850a..4d8b4444dc14 100644 --- a/packages/pigeon/lib/src/pigeon_lib.dart +++ b/packages/pigeon/lib/src/pigeon_lib.dart @@ -22,8 +22,8 @@ import 'package:path/path.dart' as path; import 'ast.dart'; import 'cpp/cpp_generator.dart'; import 'dart/dart_generator.dart'; -import 'generator_tools.dart'; import 'generator_tools.dart' as generator_tools; +import 'generator_tools.dart'; import 'gobject/gobject_generator.dart'; import 'java/java_generator.dart'; import 'kotlin/kotlin_generator.dart'; @@ -264,6 +264,7 @@ class PigeonOptions { this.debugGenerators, this.basePath, String? dartPackageName, + this.ignoreLints = true, }) : _dartPackageName = dartPackageName; /// Path to the file which will be processed. @@ -339,6 +340,9 @@ class PigeonOptions { /// The name of the package the pigeon files will be used in. final String? _dartPackageName; + /// Whether to ignore lint violations in generated Dart code. + final bool ignoreLints; + /// Creates a [PigeonOptions] from a Map representation where: /// `x = PigeonOptions.fromMap(x.toMap())`. static PigeonOptions fromMap(Map map) { @@ -611,6 +615,11 @@ ${_argParser.usage}'''; ..addOption( 'package_name', help: 'The package that generated code will be in.', + ) + ..addFlag( + 'ignore_lints', + help: 'Ignore all lint violations in generated Dart code.', + hide: true, ); /// Convert command-line arguments to [PigeonOptions]. @@ -652,6 +661,7 @@ ${_argParser.usage}'''; debugGenerators: results['debug_generators'] as bool?, basePath: results['base_path'] as String?, dartPackageName: results['package_name'] as String?, + ignoreLints: results.flag('ignore_lints'), ); return opts; } diff --git a/packages/pigeon/lib/src/pigeon_lib_internal.dart b/packages/pigeon/lib/src/pigeon_lib_internal.dart index fe187acac691..ef78c588e45f 100644 --- a/packages/pigeon/lib/src/pigeon_lib_internal.dart +++ b/packages/pigeon/lib/src/pigeon_lib_internal.dart @@ -111,7 +111,8 @@ class InternalPigeonOptions { options.dartOptions?.sourceOutPath == null) ? null : InternalDartOptions.fromDartOptions( - options.dartOptions ?? const DartOptions(), + options.dartOptions ?? + DartOptions(ignoreLints: options.ignoreLints), dartOut: options.dartOut, testOut: options.dartTestOut, copyrightHeader: copyrightHeader, diff --git a/packages/pigeon/pigeons/configure_pigeon_dart_out.dart b/packages/pigeon/pigeons/configure_pigeon_dart_out.dart index 6cec4e7b43aa..05282780d62f 100644 --- a/packages/pigeon/pigeons/configure_pigeon_dart_out.dart +++ b/packages/pigeon/pigeons/configure_pigeon_dart_out.dart @@ -8,7 +8,7 @@ import 'package:pigeon/pigeon.dart'; PigeonOptions( dartOut: 'stdout', javaOut: 'stdout', - dartOptions: DartOptions(), + dartOptions: DartOptions(ignoreLints: false), ), ) @HostApi() diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart index 2c6ffaa5a760..15a634df4ac9 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/core_tests.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart index 1729231d0fdd..0e102bbacff6 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/enum.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart index c07c0e2f0a1b..4fee0160614f 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_tests.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_without_classes_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_without_classes_tests.gen.dart index 21a5570031f8..80e794008d43 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_without_classes_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/event_channel_without_classes_tests.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart index cebe55493a03..ad00879b077b 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/flutter_unittests.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart index 0ff7ed62aae5..a527489dbe61 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/message.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart index 63263ddcefc6..0064595029c5 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/multiple_arity.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart index 68e2b1c2baed..723c2623fa78 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/non_null_fields.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart index c0659c8f5d8a..9938f7d71aa6 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/null_fields.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart index cbdf5cd2e842..a7b8990bd709 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/nullable_returns.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart index e8de4ca72321..bdbd6912c332 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/primitive.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:typed_data' show Float64List, Int32List, Int64List; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart index adb9d9b60ce7..83bc1d2f1bf6 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/lib/src/generated/proxy_api_tests.gen.dart @@ -5,7 +5,7 @@ // Autogenerated from Pigeon, do not edit directly. // See also: https://pub.dev/packages/pigeon // ignore_for_file: unused_import, unused_shown_name -// ignore_for_file: type=lint +// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, omit_obvious_local_variable_types, unnecessary_import, no_leading_underscores_for_local_identifiers import 'dart:async'; import 'dart:io' show Platform; diff --git a/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml b/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml index 995b01de0f50..cdd2de159076 100644 --- a/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml +++ b/packages/pigeon/platform_tests/shared_test_plugin_code/pubspec.yaml @@ -18,6 +18,7 @@ dependencies: sdk: flutter integration_test: sdk: flutter + meta: ^1.18.0 mockito: ^5.4.4 dev_dependencies: diff --git a/packages/pigeon/test/dart/proxy_api_test.dart b/packages/pigeon/test/dart/proxy_api_test.dart index c66a7f850911..3b948f2c628e 100644 --- a/packages/pigeon/test/dart/proxy_api_test.dart +++ b/packages/pigeon/test/dart/proxy_api_test.dart @@ -80,7 +80,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -152,7 +152,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -205,7 +205,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -234,7 +234,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -281,7 +281,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -327,7 +327,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -383,7 +383,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -441,7 +441,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -485,7 +485,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -603,7 +603,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -723,7 +723,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -807,7 +807,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -852,7 +852,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -952,7 +952,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1003,7 +1003,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1097,7 +1097,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, diff --git a/packages/pigeon/test/dart_generator_test.dart b/packages/pigeon/test/dart_generator_test.dart index 707673a9857e..ac913bb9221f 100644 --- a/packages/pigeon/test/dart_generator_test.dart +++ b/packages/pigeon/test/dart_generator_test.dart @@ -50,7 +50,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -72,7 +72,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -136,7 +136,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -185,7 +185,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -241,7 +241,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -290,7 +290,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -335,7 +335,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -398,7 +398,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -449,7 +449,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -498,7 +498,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -546,7 +546,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -612,7 +612,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -665,7 +665,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -736,7 +736,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -782,7 +782,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -864,7 +864,7 @@ void main() { final testCodeSink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, mainCodeSink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -879,7 +879,11 @@ void main() { const testGenerator = DartGenerator(); testGenerator.generateTest( - const InternalDartOptions(dartOut: "fo'o.dart", testOut: 'test.dart'), + const InternalDartOptions( + dartOut: "fo'o.dart", + testOut: 'test.dart', + ignoreLints: false, + ), root, testCodeSink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -948,7 +952,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1012,7 +1016,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1077,7 +1081,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1123,7 +1127,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1142,7 +1146,10 @@ void main() { const generator = DartGenerator(); generator.generate( - InternalDartOptions(copyrightHeader: makeIterable('hello world')), + InternalDartOptions( + copyrightHeader: makeIterable('hello world'), + ignoreLints: false, + ), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1175,7 +1182,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1210,7 +1217,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1252,7 +1259,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1293,7 +1300,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1329,7 +1336,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1380,7 +1387,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1420,7 +1427,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1457,7 +1464,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1497,7 +1504,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1531,7 +1538,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1566,7 +1573,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1601,7 +1608,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1642,7 +1649,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1680,7 +1687,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1720,7 +1727,7 @@ void main() { final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1749,6 +1756,7 @@ name: foobar InternalDartOptions( dartOut: path.join(foo.path, 'bar.dart'), testOut: path.join(tempDir.path, 'test', 'bar_test.dart'), + ignoreLints: false, ), root, sink, @@ -1843,7 +1851,7 @@ name: foobar final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1909,7 +1917,7 @@ name: foobar final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1958,7 +1966,11 @@ name: foobar const testGenerator = DartGenerator(); testGenerator.generateTest( - const InternalDartOptions(dartOut: 'code.dart', testOut: 'test.dart'), + const InternalDartOptions( + dartOut: 'code.dart', + testOut: 'test.dart', + ignoreLints: false, + ), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -1999,7 +2011,7 @@ name: foobar final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -2036,7 +2048,7 @@ name: foobar final mainCodeSink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(testOut: 'test.dart'), + const InternalDartOptions(testOut: 'test.dart', ignoreLints: false), root, mainCodeSink, dartPackageName: DEFAULT_PACKAGE_NAME, @@ -2069,7 +2081,7 @@ name: foobar final sink = StringBuffer(); const generator = DartGenerator(); generator.generate( - const InternalDartOptions(), + const InternalDartOptions(ignoreLints: false), root, sink, dartPackageName: DEFAULT_PACKAGE_NAME, diff --git a/packages/pigeon/tool/shared/generation.dart b/packages/pigeon/tool/shared/generation.dart index 99a19cb1fb71..82256117180b 100644 --- a/packages/pigeon/tool/shared/generation.dart +++ b/packages/pigeon/tool/shared/generation.dart @@ -275,7 +275,7 @@ Future runPigeon({ copyrightHeader: copyrightHeader, dartOut: dartOut, dartTestOut: dartTestOut, - dartOptions: const DartOptions(), + dartOptions: const DartOptions(ignoreLints: false), cppHeaderOut: cppHeaderOut, cppSourceOut: cppSourceOut, cppOptions: CppOptions(namespace: cppNamespace),