[gen] fix codegen to reference subtypes nested with their encapsulating object when referenced directly #2869
Conversation
| // The following function will be used to alter the type of all fields needed. | ||
| // The `mapCaseClasses` helper takes a function that alters a case class, | ||
| // and lifts it such that we can apply it to any structure, and it'll take care to recurse when needed. | ||
| val mapType: String => Code.ScalaType => Code.ScalaType = encapsulatingName => |
There was a problem hiding this comment.
Too complicated. Can be a def (st: Code.ScalaType): ScalaType, since the string is always the scala type name.
| @@ -39,6 +39,12 @@ object EndpointGen { | |||
| case None => m - k | |||
| } | |||
| } | |||
|
|
|||
| implicit class OptionCompanionCompatOps(o: Option.type) { | |||
There was a problem hiding this comment.
You use this here only once. Please inline. Makes the code to complicated
| * @return | ||
| * [[Option]] of the altered type, or None if no modification was needed. | ||
| */ | ||
| def mapTypeRef(sType: Code.ScalaType)(f: Code.TypeRef => Option[Code.TypeRef]): Option[Code.ScalaType] = |
There was a problem hiding this comment.
I don't have so much time to take a deep look, but can this be simplified to return non option and always use the result, even if it is the previous value. Efficiency is not so important for code gen. We should prefer maintainability.
There was a problem hiding this comment.
simplified - no options
| * @param f | ||
| * a function that may alter the type, None means no altering is needed. | ||
| * @return | ||
| * [[Option]] of the altered type, or None if no modification was needed. |
There was a problem hiding this comment.
use full path to fix doc generation
There was a problem hiding this comment.
no need, Option is no longer used
| * structure recursively. | ||
| * | ||
| * @param f | ||
| * function to transform a [[Code.CaseClass]] |
There was a problem hiding this comment.
use full path to fix doc generation
fixes #2868
This code will:
Animal.Zebraas in the added test)Animalobject, does not need to prependAnimal.to any subtypes referenced directly)Option[Animal.Alligator]as in the added tests