diff --git a/protoc_plugin/lib/src/file_generator.dart b/protoc_plugin/lib/src/file_generator.dart index a41ad93df..e6d561790 100644 --- a/protoc_plugin/lib/src/file_generator.dart +++ b/protoc_plugin/lib/src/file_generator.dart @@ -303,7 +303,7 @@ class FileGenerator extends ProtobufContainer { /// Writes the header and imports for the .pb.dart file. void writeMainHeader(IndentingWriter out, [OutputConfiguration config = const DefaultOutputConfiguration()]) { - _writeHeading(out, extraIgnores: {'unnecessary_import'}); + _writeHeading(out); final importWriter = ImportWriter(); @@ -710,6 +710,7 @@ const _fileIgnores = { 'library_prefixes', 'non_constant_identifier_names', 'prefer_final_fields', - 'return_of_invalid_type', + 'unnecessary_import', 'unnecessary_this', + 'unused_import', }; diff --git a/protoc_plugin/test/goldens/grpc_service.pb b/protoc_plugin/test/goldens/grpc_service.pb index 4d7512a34..d87498d70 100644 --- a/protoc_plugin/test/goldens/grpc_service.pb +++ b/protoc_plugin/test/goldens/grpc_service.pb @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_import, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/grpc_service.pbgrpc b/protoc_plugin/test/goldens/grpc_service.pbgrpc index 7e0faecd3..94e0a7062 100644 --- a/protoc_plugin/test/goldens/grpc_service.pbgrpc +++ b/protoc_plugin/test/goldens/grpc_service.pbgrpc @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:async' as $async; import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/header_in_package.pb b/protoc_plugin/test/goldens/header_in_package.pb index 497e31f8b..8033c9310 100644 --- a/protoc_plugin/test/goldens/header_in_package.pb +++ b/protoc_plugin/test/goldens/header_in_package.pb @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_import, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/header_with_fixnum.pb b/protoc_plugin/test/goldens/header_with_fixnum.pb index 4e79052eb..926157f4b 100644 --- a/protoc_plugin/test/goldens/header_with_fixnum.pb +++ b/protoc_plugin/test/goldens/header_with_fixnum.pb @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_import, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/imports.pb b/protoc_plugin/test/goldens/imports.pb index 1125964f2..9b52c4581 100644 --- a/protoc_plugin/test/goldens/imports.pb +++ b/protoc_plugin/test/goldens/imports.pb @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_import, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/imports.pbjson b/protoc_plugin/test/goldens/imports.pbjson index f433833e2..575a49bd7 100644 --- a/protoc_plugin/test/goldens/imports.pbjson +++ b/protoc_plugin/test/goldens/imports.pbjson @@ -7,5 +7,5 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import diff --git a/protoc_plugin/test/goldens/int64.pb b/protoc_plugin/test/goldens/int64.pb index 3b7f7bc86..fa78bf320 100644 --- a/protoc_plugin/test/goldens/int64.pb +++ b/protoc_plugin/test/goldens/int64.pb @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_import, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/oneMessage.pb b/protoc_plugin/test/goldens/oneMessage.pb index 4bde34492..d7ab8e1b6 100644 --- a/protoc_plugin/test/goldens/oneMessage.pb +++ b/protoc_plugin/test/goldens/oneMessage.pb @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_import, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/oneMessage.pb.meta b/protoc_plugin/test/goldens/oneMessage.pb.meta index fec2f3576..94750b7a5 100644 --- a/protoc_plugin/test/goldens/oneMessage.pb.meta +++ b/protoc_plugin/test/goldens/oneMessage.pb.meta @@ -2,15 +2,15 @@ annotation: { path: 4 path: 0 sourceFile: test - begin: 434 - end: 445 + begin: 425 + end: 436 } annotation: { path: 4 path: 0 sourceFile: test - begin: 516 - end: 527 + begin: 507 + end: 518 } annotation: { path: 4 @@ -18,8 +18,8 @@ annotation: { path: 2 path: 0 sourceFile: test - begin: 2236 - end: 2242 + begin: 2227 + end: 2233 } annotation: { path: 4 @@ -27,8 +27,8 @@ annotation: { path: 2 path: 0 sourceFile: test - begin: 2284 - end: 2290 + begin: 2275 + end: 2281 } annotation: { path: 4 @@ -36,8 +36,8 @@ annotation: { path: 2 path: 0 sourceFile: test - begin: 2363 - end: 2372 + begin: 2354 + end: 2363 } annotation: { path: 4 @@ -45,8 +45,8 @@ annotation: { path: 2 path: 0 sourceFile: test - begin: 2415 - end: 2426 + begin: 2406 + end: 2417 } annotation: { path: 4 @@ -54,8 +54,8 @@ annotation: { path: 2 path: 1 sourceFile: test - begin: 2484 - end: 2488 + begin: 2475 + end: 2479 } annotation: { path: 4 @@ -63,8 +63,8 @@ annotation: { path: 2 path: 1 sourceFile: test - begin: 2530 - end: 2534 + begin: 2521 + end: 2525 } annotation: { path: 4 @@ -72,8 +72,8 @@ annotation: { path: 2 path: 1 sourceFile: test - begin: 2609 - end: 2616 + begin: 2600 + end: 2607 } annotation: { path: 4 @@ -81,8 +81,8 @@ annotation: { path: 2 path: 1 sourceFile: test - begin: 2659 - end: 2668 + begin: 2650 + end: 2659 } annotation: { path: 4 @@ -90,8 +90,8 @@ annotation: { path: 2 path: 2 sourceFile: test - begin: 2729 - end: 2733 + begin: 2720 + end: 2724 } annotation: { path: 4 @@ -99,8 +99,8 @@ annotation: { path: 2 path: 2 sourceFile: test - begin: 2780 - end: 2784 + begin: 2771 + end: 2775 } annotation: { path: 4 @@ -108,8 +108,8 @@ annotation: { path: 2 path: 2 sourceFile: test - begin: 2857 - end: 2864 + begin: 2848 + end: 2855 } annotation: { path: 4 @@ -117,6 +117,6 @@ annotation: { path: 2 path: 2 sourceFile: test - begin: 2907 - end: 2916 + begin: 2898 + end: 2907 } diff --git a/protoc_plugin/test/goldens/oneMessage.pbjson b/protoc_plugin/test/goldens/oneMessage.pbjson index 18a26fa9f..1165652c7 100644 --- a/protoc_plugin/test/goldens/oneMessage.pbjson +++ b/protoc_plugin/test/goldens/oneMessage.pbjson @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:convert' as $convert; import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/service.pb b/protoc_plugin/test/goldens/service.pb index 0453c41a3..1d65ff24c 100644 --- a/protoc_plugin/test/goldens/service.pb +++ b/protoc_plugin/test/goldens/service.pb @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_import, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:async' as $async; import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/service.pbserver b/protoc_plugin/test/goldens/service.pbserver index 2e51e5b64..ec7b80543 100644 --- a/protoc_plugin/test/goldens/service.pbserver +++ b/protoc_plugin/test/goldens/service.pbserver @@ -8,7 +8,7 @@ // ignore_for_file: constant_identifier_names // ignore_for_file: deprecated_member_use_from_same_package, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:async' as $async; import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/serviceGenerator.pb.json b/protoc_plugin/test/goldens/serviceGenerator.pb.json index fd33f34f0..7c7155421 100644 --- a/protoc_plugin/test/goldens/serviceGenerator.pb.json +++ b/protoc_plugin/test/goldens/serviceGenerator.pb.json @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:convert' as $convert; import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/topLevelEnum.pb b/protoc_plugin/test/goldens/topLevelEnum.pb index 1edf66280..16050edb6 100644 --- a/protoc_plugin/test/goldens/topLevelEnum.pb +++ b/protoc_plugin/test/goldens/topLevelEnum.pb @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_import, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbenum b/protoc_plugin/test/goldens/topLevelEnum.pbenum index 6c4a6719c..84830294b 100644 --- a/protoc_plugin/test/goldens/topLevelEnum.pbenum +++ b/protoc_plugin/test/goldens/topLevelEnum.pbenum @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:core' as $core; diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbenum.meta b/protoc_plugin/test/goldens/topLevelEnum.pbenum.meta index 7a989a4f1..178cde8bd 100644 --- a/protoc_plugin/test/goldens/topLevelEnum.pbenum.meta +++ b/protoc_plugin/test/goldens/topLevelEnum.pbenum.meta @@ -2,8 +2,8 @@ annotation: { path: 5 path: 0 sourceFile: test - begin: 414 - end: 423 + begin: 425 + end: 434 } annotation: { path: 5 @@ -11,8 +11,8 @@ annotation: { path: 2 path: 0 sourceFile: test - begin: 476 - end: 482 + begin: 487 + end: 493 } annotation: { path: 5 @@ -20,8 +20,8 @@ annotation: { path: 2 path: 1 sourceFile: test - begin: 558 - end: 562 + begin: 569 + end: 573 } annotation: { path: 5 @@ -29,8 +29,8 @@ annotation: { path: 2 path: 2 sourceFile: test - begin: 636 - end: 640 + begin: 647 + end: 651 } annotation: { path: 5 @@ -38,6 +38,6 @@ annotation: { path: 2 path: 3 sourceFile: test - begin: 715 - end: 723 + begin: 726 + end: 734 } diff --git a/protoc_plugin/test/goldens/topLevelEnum.pbjson b/protoc_plugin/test/goldens/topLevelEnum.pbjson index 64dd163c3..8c4dbdc9d 100644 --- a/protoc_plugin/test/goldens/topLevelEnum.pbjson +++ b/protoc_plugin/test/goldens/topLevelEnum.pbjson @@ -7,7 +7,7 @@ // ignore_for_file: annotate_overrides, camel_case_types // ignore_for_file: constant_identifier_names, library_prefixes // ignore_for_file: non_constant_identifier_names, prefer_final_fields -// ignore_for_file: return_of_invalid_type, unnecessary_this +// ignore_for_file: unnecessary_import, unnecessary_this, unused_import import 'dart:convert' as $convert; import 'dart:core' as $core;