Skip to content

Commit 08e7410

Browse files
authored
ignore unused_imports for json files (#1013)
1 parent efdabd7 commit 08e7410

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

protoc_plugin/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
* Update how we calculate import prefixes ([#1010]); import prefixes are now
44
unique per-library instead of being unique across all generated libraries.
5+
* Ignore `unused_import` diagnostics for `*.pbjson.dart` files.
56

67
[#1010]: https://github.com/google/protobuf.dart/issues/1010
78

protoc_plugin/lib/src/file_generator.dart

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class FileGenerator extends ProtobufContainer {
237237
final files = [
238238
makeFile('.pb.dart', mainWriter.toString()),
239239
if (enumWriter != null) makeFile('.pbenum.dart', enumWriter.toString()),
240+
// TODO(devoncarew): Consider not emitting empty json files.
240241
makeFile('.pbjson.dart', generateJsonFile(config)),
241242
];
242243

@@ -269,8 +270,8 @@ class FileGenerator extends ProtobufContainer {
269270
IndentingWriter generateMainFile(
270271
[OutputConfiguration config = const DefaultOutputConfiguration()]) {
271272
if (!_linked) throw StateError('not linked');
272-
final out = makeWriter();
273273

274+
final out = makeWriter();
274275
writeMainHeader(out, config);
275276

276277
// Generate code.
@@ -516,6 +517,7 @@ class FileGenerator extends ProtobufContainer {
516517
String generateGrpcFile(
517518
[OutputConfiguration config = const DefaultOutputConfiguration()]) {
518519
if (!_linked) throw StateError('not linked');
520+
519521
final out = makeWriter();
520522
_writeHeading(out);
521523

@@ -578,8 +580,9 @@ class FileGenerator extends ProtobufContainer {
578580
String generateJsonFile(
579581
[OutputConfiguration config = const DefaultOutputConfiguration()]) {
580582
if (!_linked) throw StateError('not linked');
583+
581584
final out = makeWriter();
582-
_writeHeading(out);
585+
_writeHeading(out, extraIgnores: {'unused_import'});
583586

584587
final importWriter = ImportWriter();
585588
importWriter.addImport(_convertImportUrl, prefix: _convertImportPrefix);

protoc_plugin/test/goldens/oneMessage.pbjson

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// ignore_for_file: constant_identifier_names
99
// ignore_for_file: curly_braces_in_flow_control_structures
1010
// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
11-
// ignore_for_file: non_constant_identifier_names
11+
// ignore_for_file: non_constant_identifier_names, unused_import
1212

1313
import 'dart:convert' as $convert;
1414
import 'dart:core' as $core;

protoc_plugin/test/goldens/serviceGenerator.pb.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// ignore_for_file: constant_identifier_names
99
// ignore_for_file: curly_braces_in_flow_control_structures
1010
// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
11-
// ignore_for_file: non_constant_identifier_names
11+
// ignore_for_file: non_constant_identifier_names, unused_import
1212

1313
import 'dart:convert' as $convert;
1414
import 'dart:core' as $core;

protoc_plugin/test/goldens/topLevelEnum.pbjson

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// ignore_for_file: constant_identifier_names
99
// ignore_for_file: curly_braces_in_flow_control_structures
1010
// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
11-
// ignore_for_file: non_constant_identifier_names
11+
// ignore_for_file: non_constant_identifier_names, unused_import
1212

1313
import 'dart:convert' as $convert;
1414
import 'dart:core' as $core;

0 commit comments

Comments
 (0)