Fix inline io parsing with mixins #1756
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AndrewFossAWS
approved these changes
Apr 26, 2023
mtdowling
reviewed
Apr 26, 2023
smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlModelLoader.java
Outdated
Show resolved
Hide resolved
When there was no space between the `:=` and `with` tokens when
parsing an inline io statement, for example:
```
operation Foo {
input :=with [Bar] {}
}
```
the parser would skip the `with` and so not realize its parsing a
mixin, failing when it sees a `[` instead of a `{`. This was due
to an extra call to `tokenizer.next()`, which skipped the `with`.
Usually the `next()` would just skip the space before the `with`,
but when the space wasn't present it skipped the `with`.
The inline-io test was updated to include this case.
hpmellema
requested changes
Apr 26, 2023
smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlModelLoader.java
Outdated
Show resolved
Hide resolved
milesziemer
force-pushed
the
fix-inline-io-mixin-parsing
branch
from
72b87a5 to
5cddecc
Compare
hpmellema
approved these changes
Apr 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When there was no space between the
:=andwithtokens when parsing an inline io statement, for example:the parser would skip the
withand so not realize its parsing a mixin, failing when it sees a[instead of a{. This was due to an extra call totokenizer.next(), which skipped thewith. Usually thenext()would just skip the space before thewith, but when the space wasn't present it skipped thewith.The inline-io test was updated to include this case.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.