Skip to content

fix: properly parse empty messages in options #1429

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
alexander-fenster merged 2 commits into from
Jun 17, 2020
Merged

fix: properly parse empty messages in options #1429

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
e6c116c
Properly parse empty messages in options
murgatroid99 Jun 17, 2020
e1d8cb5
Add missing semicolon in test
murgatroid99 Jun 17, 2020
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
4 changes: 2 additions & 2 deletions src/parse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ function parse(source, root, options) {

function parseOptionValue(parent, name) {
if (skip("{", true)) { // { a: "foo" b { c: "bar" } }
do {
while (!skip("}", true)) {
/* istanbul ignore if */
if (!nameRe.test(token = next()))
throw illegal(token, "name");
Expand All @@ -570,7 +570,7 @@ function parse(source, root, options) {
setOption(parent, name + "." + token, readValue(true));
}
skip(",", true);
} while (!skip("}", true));
}
} else
setOption(parent, name, readValue(true));
// Does not enforce a delimiter to be universal
Expand Down
2 changes: 2 additions & 0 deletions tests/data/uncommon.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ message Test2 {

map<uint64,Test> longmap = 10;

int32 optionTest = 11 [(my_options) = { a: "foo" b {} }];

/** pre */
oneof kind;
oneof kind2; /// post
Expand Down
⚡