Skip to content

Fix reflect typeMembers to return all members #15033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2619,13 +2619,15 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
case sym if sym.isType => sym.asType
}.toList

def memberType(name: String): Symbol = typeMember(name)
def memberType(name: String): Symbol =
self.typeRef.decls.find(sym => sym.name == name.toTypeName)
def typeMember(name: String): Symbol =
self.unforcedDecls.find(sym => sym.name == name.toTypeName)
lookupPrefix.member(name.toTypeName).symbol

def memberTypes: List[Symbol] = typeMembers
def memberTypes: List[Symbol] =
self.typeRef.decls.filter(_.isType)
def typeMembers: List[Symbol] =
self.unforcedDecls.filter(_.isType)
lookupPrefix.typeMembers.map(_.symbol).toList

def declarations: List[Symbol] =
self.typeRef.info.decls.toList
Expand Down
8 changes: 4 additions & 4 deletions library/src/scala/quoted/Quotes.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3879,17 +3879,17 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
def declaredTypes: List[Symbol]

/** Type member with the given name directly declared in the class */
@deprecated("Use typeMember", "3.1.0")
@deprecated("Use declaredType or typeMember", "3.1.0")
def memberType(name: String): Symbol

/** Type member with the given name directly declared in the class */
/** Type member with the given name declared or inherited in the class */
def typeMember(name: String): Symbol

/** Type member directly declared in the class */
@deprecated("Use typeMembers", "3.1.0")
@deprecated("Use declaredTypes or typeMembers", "3.1.0")
def memberTypes: List[Symbol]

/** Type member directly declared in the class */
/** Type member directly declared or inherited in the class */
def typeMembers: List[Symbol]

/** All members directly declared in the class */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ object SyntheticsSupport:
c.symbol.typeRef.baseClasses.map(b => b -> c.symbol.typeRef.baseType(b)).tail

def typeForClass(using Quotes)(c: reflect.ClassDef): reflect.TypeRepr =
c.symbol.typeRef.appliedTo(c.symbol.typeMembers.filter(_.isTypeParam).map(_.typeRef))
c.symbol.typeRef.appliedTo(c.symbol.declaredTypes.filter(_.isTypeParam).map(_.typeRef))

/* We need there to filter out symbols with certain flagsets, because these symbols come from compiler and TASTY can't handle them well.
They are valdefs that describe case companion objects and cases from enum.
Expand Down
4 changes: 4 additions & 0 deletions tests/run-macros/i14902.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
List(X)
List(X, Y, Z)
List(X)
List(Y, Z)
16 changes: 16 additions & 0 deletions tests/run-macros/i14902/Macros_1.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import scala.quoted.*

inline def typeMembers[A]: List[String] = ${ typeMembersExpr[A] }
inline def declaredTypes[A]: List[String] = ${ declaredTypesExpr[A] }

private def typeMembersExpr[A: Type](using Quotes): Expr[List[String]] = {
import quotes.reflect.*
val members = TypeRepr.of[A].typeSymbol.typeMembers
Expr(members.map(_.name))
}

private def declaredTypesExpr[A: Type](using Quotes): Expr[List[String]] = {
import quotes.reflect.*
val decls = TypeRepr.of[A].typeSymbol.declaredTypes
Expr(decls.map(_.name))
}
12 changes: 12 additions & 0 deletions tests/run-macros/i14902/Test_2.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@main def Test: Unit =
println(typeMembers[A])
println(typeMembers[B])
println(declaredTypes[A])
println(declaredTypes[B])

class A:
type X

class B extends A:
type Y
type Z