Skip to content

[protobuf2] Fix blockLit to allow trailing comma #4632

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 2 commits into from
Sep 29, 2025
Merged

[protobuf2] Fix blockLit to allow trailing comma #4632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32a29ce
[protobuf] Fix blockLit to allow trailing comma
dsyer Sep 26, 2025
b8405a9
Add example with blockLits
dsyer Sep 26, 2025
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
2 changes: 1 addition & 1 deletion protobuf/protobuf2/Protobuf2.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ constant

// not specified in specification but used in tests
blockLit
: LC (ident COLON constant)* RC
: LC (ident COLON constant (COMMA)?)* RC
;

emptyStatement_
Expand Down
22 changes: 22 additions & 0 deletions protobuf/protobuf2/examples/block.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
syntax = 'proto2';

// Extracted from google/protobuf/descriptor.proto
message FeatureSet {
enum FieldPresence {
FIELD_PRESENCE_UNKNOWN = 0;
EXPLICIT = 1;
IMPLICIT = 2;
LEGACY_REQUIRED = 3;
}
optional FieldPresence field_presence = 1 [
retention = RETENTION_RUNTIME,
targets = TARGET_TYPE_FIELD,
targets = TARGET_TYPE_FILE,
feature_support = {
edition_introduced: EDITION_2023,
},
edition_defaults = { edition: EDITION_LEGACY, value: "EXPLICIT" },
edition_defaults = { edition: EDITION_PROTO3, value: "IMPLICIT" },
edition_defaults = { edition: EDITION_2023, value: "EXPLICIT" }
];
}
Loading