Skip to content

Commit dc54517

Browse files
committed
Homogenize Reflect.SelectOuter API
1 parent 01fc4a1 commit dc54517

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

compiler/src/dotty/tools/dotc/quoted/QuoteContextImpl.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -954,13 +954,14 @@ class QuoteContextImpl private (ctx: Context) extends QuoteContext:
954954
withDefaultPos(tpd.Select(qualifier, NameKinds.OuterSelectName(name.toTermName, levels)))
955955
def copy(original: Tree)(qualifier: Term, name: String, levels: Int): SelectOuter =
956956
tpd.cpy.Select(original)(qualifier, NameKinds.OuterSelectName(name.toTermName, levels))
957-
def unapply(x: SelectOuter): Option[(Term, Int, Type)] = // TODO homogenize order of parameters
958-
Some((x.qualifier, x.level, x.tpe))
957+
def unapply(x: SelectOuter): Option[(Term, String, Int)] =
958+
Some((x.qualifier, x.name.toString, x.level))
959959
end SelectOuter
960960

961961
object SelectOuterMethodsImpl extends SelectOuterMethods:
962962
extension (self: SelectOuter):
963963
def qualifier: Term = self.qualifier
964+
def name: String = self.name.toString
964965
def level: Int =
965966
val NameKinds.OuterSelectName(_, levels) = self.name
966967
levels

library/src/scala/tasty/Reflection.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1107,7 +1107,7 @@ trait Reflection { reflection =>
11071107
trait SelectOuterModule { this: SelectOuter.type =>
11081108
def apply(qualifier: Term, name: String, levels: Int): SelectOuter
11091109
def copy(original: Tree)(qualifier: Term, name: String, levels: Int): SelectOuter
1110-
def unapply(x: SelectOuter): Option[(Term, Int, Type)] // TODO homogenize order of parameters
1110+
def unapply(x: SelectOuter): Option[(Term, String, Int)]
11111111
}
11121112

11131113
given SelectOuterMethods as SelectOuterMethods = SelectOuterMethodsImpl
@@ -1116,6 +1116,7 @@ trait Reflection { reflection =>
11161116
trait SelectOuterMethods:
11171117
extension (self: SelectOuter):
11181118
def qualifier: Term
1119+
def name: String
11191120
def level: Int
11201121
end extension
11211122
end SelectOuterMethods

0 commit comments

Comments
 (0)