Skip to content

Sort input proto files before processing #983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 9, 2025
Merged

Sort input proto files before processing #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions protoc_plugin/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
## 22.0.2-wip

* Fix factory argument types for protobuf `Map` fields. ([#975])
* Fix import order changes when files are passed in different order to `protoc`.
([#952])

[#975]: https://github.com/google/protobuf.dart/issues/975
[#952]: https://github.com/google/protobuf.dart/issues/952

## 22.0.1

Expand Down
3 changes: 3 additions & 0 deletions protoc_plugin/lib/src/code_generator.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import 'dart:io' hide BytesBuilder;
import 'dart:typed_data' show BytesBuilder;

import 'package:collection/collection.dart';
import 'package:fixnum/fixnum.dart';
import 'package:protobuf/protobuf.dart';

Expand Down Expand Up @@ -105,6 +106,8 @@ class CodeGenerator {
request.mergeFromCodedBufferReader(reader, extensions);
reader.checkLastTagWas(0);

request.protoFile.sortBy((desc) => desc.name);

final response = CodeGeneratorResponse();

// Parse the options in the request. Return the errors if any.
Expand Down
2 changes: 1 addition & 1 deletion protoc_plugin/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ environment:
sdk: '>=3.3.0 <4.0.0'

dependencies:
collection: ^1.15.0
Copy link
Member Author

@osa1 osa1 May 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: this package already depends on collection, via protobuf.

fixnum: ^1.0.0
path: ^1.8.0
protobuf: ^4.0.0

dev_dependencies:
collection: ^1.15.0
dart_flutter_team_lints: ^1.0.0
matcher: ^0.12.10
test: ^1.16.0
Expand Down