Mix scala 2 and 3 macros #395
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| scala-2.13 |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,4 +1,5 @@ | ||||||
| package enumeratum | ||||||
| package compat | ||||||
|
|
||||||
| import ContextUtils.Context | ||||||
|
|
||||||
|
|
@@ -10,7 +11,7 @@ object EnumMacros { | |||||
|
|
||||||
| /** Finds any [A] in the current scope and returns an expression for a list of them | ||||||
| */ | ||||||
| def findValuesImpl[A: c.WeakTypeTag](c: Context): c.Tree = { | ||||||
| import c.universe._ | ||||||
| val typeSymbol = weakTypeOf[A].typeSymbol | ||||||
| validateType(c)(typeSymbol) | ||||||
|
|
@@ -160,20 +161,22 @@ object EnumMacros { | |||||
| @SuppressWarnings(Array("org.wartremover.warts.AsInstanceOf")) | ||||||
| private[enumeratum] def buildSeqExpr[A: c.WeakTypeTag](c: Context)( | ||||||
| subclassSymbols: Seq[c.universe.Symbol] | ||||||
| ): c.Tree = { | ||||||
| import c.universe._ | ||||||
| val resultType = weakTypeOf[A] | ||||||
| val indexedSeq = Ident(c.mirror.staticModule(classOf[IndexedSeq[A]].getName)) | ||||||
|
There was a problem hiding this comment. Using
Suggested change
Contributor
There was a problem hiding this comment. I believe this change was necessary because we no longer have a |
||||||
| if (subclassSymbols.isEmpty) { | ||||||
| TypeApply( | ||||||
| Select(indexedSeq, ContextUtils.termName(c)("empty")), | ||||||
| List(TypeTree(resultType)) | ||||||
| ) | ||||||
| } else { | ||||||
| Apply( | ||||||
| TypeApply( | ||||||
| Select(indexedSeq, ContextUtils.termName(c)("apply")), | ||||||
| List(TypeTree(resultType)) | ||||||
| ), | ||||||
| subclassSymbols.map(Ident(_)).toList | ||||||
| ) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change | ||||||||
|---|---|---|---|---|---|---|---|---|---|---|
| @@ -1,4 +1,5 @@ | ||||||||||
| package enumeratum | ||||||||||
| package compat | ||||||||||
|
|
||||||||||
| import ContextUtils.Context | ||||||||||
|
|
||||||||||
|
|
@@ -15,7 +16,7 @@ object ValueEnumMacros { | |||||||||
| */ | ||||||||||
| def findIntValueEntriesImpl[ValueEntryType: c.WeakTypeTag]( | ||||||||||
| c: Context | ||||||||||
| ): c.Tree = { | ||||||||||
| findValueEntriesImpl[ValueEntryType, ContextUtils.CTInt, Int](c)(identity) | ||||||||||
| } | ||||||||||
|
|
||||||||||
|
|
@@ -25,7 +26,7 @@ object ValueEnumMacros { | |||||||||
| */ | ||||||||||
| def findLongValueEntriesImpl[ValueEntryType: c.WeakTypeTag]( | ||||||||||
| c: Context | ||||||||||
| ): c.Tree = { | ||||||||||
| findValueEntriesImpl[ValueEntryType, ContextUtils.CTLong, Long](c)(identity) | ||||||||||
| } | ||||||||||
|
|
||||||||||
|
|
@@ -38,7 +39,7 @@ object ValueEnumMacros { | |||||||||
| */ | ||||||||||
| def findShortValueEntriesImpl[ValueEntryType: c.WeakTypeTag]( | ||||||||||
| c: Context | ||||||||||
| ): c.Tree = { | ||||||||||
| findValueEntriesImpl[ValueEntryType, ContextUtils.CTInt, Short](c)( | ||||||||||
| _.toShort | ||||||||||
| ) // do a transform because there is no such thing as Short literals | ||||||||||
|
|
@@ -52,7 +53,7 @@ object ValueEnumMacros { | |||||||||
| */ | ||||||||||
| def findStringValueEntriesImpl[ValueEntryType: c.WeakTypeTag]( | ||||||||||
| c: Context | ||||||||||
| ): c.Tree = { | ||||||||||
| findValueEntriesImpl[ValueEntryType, String, String](c)(identity) | ||||||||||
| } | ||||||||||
|
|
||||||||||
|
|
@@ -64,7 +65,7 @@ object ValueEnumMacros { | |||||||||
| */ | ||||||||||
| def findByteValueEntriesImpl[ValueEntryType: c.WeakTypeTag]( | ||||||||||
| c: Context | ||||||||||
| ): c.Tree = { | ||||||||||
| findValueEntriesImpl[ValueEntryType, ContextUtils.CTInt, Byte](c)(_.toByte) | ||||||||||
| } | ||||||||||
|
|
||||||||||
|
|
@@ -76,7 +77,7 @@ object ValueEnumMacros { | |||||||||
| */ | ||||||||||
| def findCharValueEntriesImpl[ValueEntryType: c.WeakTypeTag]( | ||||||||||
| c: Context | ||||||||||
| ): c.Tree = { | ||||||||||
| findValueEntriesImpl[ValueEntryType, ContextUtils.CTChar, Char](c)(identity) | ||||||||||
| } | ||||||||||
|
|
||||||||||
|
|
@@ -88,7 +89,7 @@ object ValueEnumMacros { | |||||||||
| ProcessedValue | ||||||||||
| ](c: Context)( | ||||||||||
| processFoundValues: ValueType => ProcessedValue | ||||||||||
| ): c.Tree = { | ||||||||||
| import c.universe._ | ||||||||||
| val typeSymbol = weakTypeOf[ValueEntryType].typeSymbol | ||||||||||
| EnumMacros.validateType(c)(typeSymbol) | ||||||||||
|
|
@@ -104,7 +105,11 @@ object ValueEnumMacros { | |||||||||
| processFoundValues | ||||||||||
| ) | ||||||||||
|
|
||||||||||
| if ( | ||||||||||
| weakTypeOf[ValueEntryType].baseClasses.contains( | ||||||||||
| c.mirror.staticClass(classOf[AllowAlias].getName) | ||||||||||
| ) | ||||||||||
|
Comment on lines
+109
to
+111
There was a problem hiding this comment. [nitpick] The refactored type check using
Suggested change
Contributor
There was a problem hiding this comment. There's a similar problem here: the Scala 3 compiler is unable to summon |
||||||||||
| ) { | ||||||||||
| // Skip the uniqueness check | ||||||||||
| } else { | ||||||||||
| // Make sure the processed found value implementations are unique | ||||||||||
|
|
||||||||||
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Curious if there's a way to make this additional dependency
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately I think only the consumer of the library knows if the mixed mode macro is being used, from here, sbt only knows that it's a scala3 build.
I believe we could mark this as
Providedtoo, but then all consumers would need to explicitly provide it. Marking it provided here means I also need to add it as Provided incore. It would only need to be added as a normal/runtime dep if the project was using the mixed mode because I think this is only needed for the scala 2 portion of the build.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@lloydmeta let me know if you have a preference here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Still having a think about this - has there been any better solution than the ones presented here? Adding another runtime dependency is not great.
Personally I think it's fine if the experience is subpar for "mixed mode" but not for Scala 2 or 3 users.