Escape enum variants to avoid collision with generated Unknown variant #388
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
rcoh
approved these changes
May 17, 2021
| string SomeEnum | ||
| """.asSmithyModel() | ||
|
|
||
| val shape = model.expectShape(ShapeId.from("test#SomeEnum"), StringShape::class.java) |
There was a problem hiding this comment.
Suggested change
| val shape = model.expectShape(ShapeId.from("test#SomeEnum"), StringShape::class.java) | |
| val shape = model.lookup<StringShape>("test#SomeEnum") |
rcoh
approved these changes
May 18, 2021
| import java.lang.IllegalStateException | ||
|
|
||
| /** Model that wraps [EnumDefinition] to calculate and cache values required to generate the Rust enum source. */ | ||
| internal class EnumMemberModel(private val definition: EnumDefinition) { |
There was a problem hiding this comment.
[not required] this code would probably be slightly cleaner (and avoid the need for null) if these were constructed after we had already validated that the enum did have names (eg. if the parameters were name: String value:String)
There was a problem hiding this comment.
I like the idea. I think this would only save a single null check though since we probably still want to assert the EnumDefinition.name is not null for code correctness. Given that, I'm less inclined to refactor.
| private fun RustWriter.docWithNote(doc: String?, note: String?) { | ||
| doc?.also { docs(it) } | ||
| note?.also { | ||
| doc?.also { write("///") } |
There was a problem hiding this comment.
can you add a comment saying the point of this is to create a line break? I originally thought these were the /// before **Note**
ghost
merged commit
This pull request was closed.
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 fixes enum variant collisions in #386.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.