Add ability to elide targets for mixins/resources #1231
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
kstich
requested changes
May 19, 2022
smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlModelParser.java
Outdated
Show resolved
Hide resolved
smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlModelParser.java
Outdated
Show resolved
Hide resolved
smithy-model/src/main/java/software/amazon/smithy/model/loader/AbstractMutableModelFile.java
Outdated
Show resolved
Hide resolved
smithy-model/src/main/java/software/amazon/smithy/model/loader/AbstractMutableModelFile.java
Outdated
Show resolved
Hide resolved
mtdowling
requested changes
May 19, 2022
smithy-model/src/main/java/software/amazon/smithy/model/loader/AbstractMutableModelFile.java
Show resolved
Hide resolved
smithy-model/src/main/java/software/amazon/smithy/model/loader/AbstractMutableModelFile.java
Outdated
Show resolved
Hide resolved
...l/src/test/resources/software/amazon/smithy/model/loader/invalid/elide-nonexistent-id.smithy
Outdated
Show resolved
Hide resolved
.../src/test/resources/software/amazon/smithy/model/loader/invalid/elided-type-conflicts.smithy
Show resolved
Hide resolved
smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlModelParser.java
Show resolved
Hide resolved
smithy-model/src/main/java/software/amazon/smithy/model/loader/IdlModelParser.java
Outdated
Show resolved
Hide resolved
JordonPhillips
force-pushed
the
inherit-from-resource
branch
2 times, most recently
from
515e976 to
430ef61
Compare
kstich
approved these changes
May 20, 2022
mtdowling
requested changes
May 31, 2022
This adds in syntactic sugar that allows modelers to elide targets for members that are inherited from mixins or defined in resources. This necessarily also adds the ability for a structure to indicate a resource to pull potential targets from. This is all syntactic sugar for the IDL, so the JSON AST isn't impacted. This is accomplished by refactoring the code used for mixins to instead be a generic system for applying modifications to a shape after some set of dependencies has been resolved.
JordonPhillips
force-pushed
the
inherit-from-resource
branch
from
430ef61 to
22fe64a
Compare
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.
This adds in syntactic sugar that allows modelers to elide targets for members that are inherited from mixins or defined in resources.
This necessarily also adds the ability for a structure to indicate a resource to pull potential targets from.
This is all syntactic sugar for the IDL, so the JSON AST isn't impacted.
This is accomplished by refactoring the code used for mixins to instead be a generic system for applying modifications to a shape after some set of dependencies has been resolved.
Note that we'll also need to update the syntax highlighter in a follow-up pr.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.