Skip to content

Commit 50ba31d

Browse files
nicolasstuckinicolasstucki
committed
Rename TypeTree.{Ident|Select} to TypeTree.{TypeIdent|TypeSelect}
1 parent 5e31e59 commit 50ba31d

File tree

15 files changed

+119
-119
lines changed

15 files changed

+119
-119
lines changed

‎compiler/src/dotty/tools/dotc/tastyreflect/KernelImpl.scala‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -658,32 +658,32 @@ class KernelImpl(val rootContext: core.Contexts.Context, val rootPosition: util.
658658

659659
def TypeTree_Inferred_apply(tpe: Type)(implicit ctx: Context): TypeTree_Inferred = withDefaultPos(ctx => tpd.TypeTree(tpe)(ctx))
660660

661-
type TypeTree_Ident = tpd.Ident
661+
type TypeTree_TypeIdent = tpd.Ident
662662

663-
def matchTypeTree_Ident(tpt: Tree /*TypeTree | TypeBoundsTree*/)(implicit ctx: Context): Option[TypeTree_Ident] = tpt match {
663+
def matchTypeTree_TypeIdent(tpt: Tree /*TypeTree | TypeBoundsTree*/)(implicit ctx: Context): Option[TypeTree_TypeIdent] = tpt match {
664664
case tpt: tpd.Ident if tpt.isType => Some(tpt)
665665
case _ => None
666666
}
667667

668-
def TypeTree_Ident_name(self: TypeTree_Ident)(implicit ctx: Context): String = self.name.toString
668+
def TypeTree_TypeIdent_name(self: TypeTree_TypeIdent)(implicit ctx: Context): String = self.name.toString
669669

670-
def TypeTree_Ident_copy(original: TypeTree_Ident)(name: String)(implicit ctx: Context): TypeTree_Ident =
670+
def TypeTree_TypeIdent_copy(original: TypeTree_TypeIdent)(name: String)(implicit ctx: Context): TypeTree_TypeIdent =
671671
tpd.cpy.Ident(original)(name.toTypeName)
672672

673-
type TypeTree_Select = tpd.Select
673+
type TypeTree_TypeSelect = tpd.Select
674674

675-
def matchTypeTree_Select(tpt: Tree /*TypeTree | TypeBoundsTree*/)(implicit ctx: Context): Option[TypeTree_Select] = tpt match {
675+
def matchTypeTree_TypeSelect(tpt: Tree /*TypeTree | TypeBoundsTree*/)(implicit ctx: Context): Option[TypeTree_TypeSelect] = tpt match {
676676
case tpt: tpd.Select if tpt.isType && tpt.qualifier.isTerm => Some(tpt)
677677
case _ => None
678678
}
679679

680-
def TypeTree_Select_qualifier(self: TypeTree_Select)(implicit ctx: Context): Term = self.qualifier
681-
def TypeTree_Select_name(self: TypeTree_Select)(implicit ctx: Context): String = self.name.toString
680+
def TypeTree_TypeSelect_qualifier(self: TypeTree_TypeSelect)(implicit ctx: Context): Term = self.qualifier
681+
def TypeTree_TypeSelect_name(self: TypeTree_TypeSelect)(implicit ctx: Context): String = self.name.toString
682682

683-
def TypeTree_Select_apply(qualifier: Term, name: String)(implicit ctx: Context): TypeTree_Select =
683+
def TypeTree_TypeSelect_apply(qualifier: Term, name: String)(implicit ctx: Context): TypeTree_TypeSelect =
684684
withDefaultPos(ctx => tpd.Select(qualifier, name.toTypeName)(ctx))
685685

686-
def TypeTree_Select_copy(original: TypeTree_Select)(qualifier: Term, name: String)(implicit ctx: Context): TypeTree_Select =
686+
def TypeTree_TypeSelect_copy(original: TypeTree_TypeSelect)(qualifier: Term, name: String)(implicit ctx: Context): TypeTree_TypeSelect =
687687
tpd.cpy.Select(original)(qualifier, name.toTypeName)
688688

689689

‎docs/docs/reference/other-new-features/tasty-reflect.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ TASTy Reflect provides the following types:
117117
| +- While
118118
|
119119
+- TypeTree ----+- Synthetic
120-
| +- Ident
121-
| +- Select
120+
| +- TypeIdent
121+
| +- TypeSelect
122122
| +- Project
123123
| +- Singleton
124124
| +- Refined

‎library/src/scala/tasty/reflect/Core.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ package scala.tasty.reflect
3939
* |
4040
* |
4141
* +- TypeTree ----+- Inferred
42-
* | +- Ident
43-
* | +- Select
42+
* | +- TypeIdent
43+
* | +- TypeSelect
4444
* | +- Project
4545
* | +- Singleton
4646
* | +- Refined
@@ -250,10 +250,10 @@ trait Core {
250250
type Inferred = kernel.TypeTree_Inferred
251251

252252
/** Type tree representing a reference to definition with a given name */
253-
type Ident = kernel.TypeTree_Ident
253+
type TypeIdent = kernel.TypeTree_TypeIdent
254254

255255
/** Type tree representing a selection of definition with a given name on a given term prefix */
256-
type Select = kernel.TypeTree_Select
256+
type TypeSelect = kernel.TypeTree_TypeSelect
257257

258258
/** Type tree representing a selection of definition with a given name on a given type prefix */
259259
type Projection = kernel.TypeTree_Projection

‎library/src/scala/tasty/reflect/Kernel.scala‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ package scala.tasty.reflect
3838
* |
3939
* |
4040
* +- TypeTree ----+- TypeTree_Inferred
41-
* | +- TypeTree_Ident
42-
* | +- TypeTree_Select
41+
* | +- TypeTree_TypeIdent
42+
* | +- TypeTree_TypeSelect
4343
* | +- TypeTree_Project
4444
* | +- TypeTree_Singleton
4545
* | +- TypeTree_Refined
@@ -557,24 +557,24 @@ trait Kernel {
557557
def TypeTree_Inferred_apply(tpe: Type)(implicit ctx: Context): TypeTree_Inferred
558558

559559
/** Type tree representing a reference to definition with a given name */
560-
type TypeTree_Ident <: TypeTree
560+
type TypeTree_TypeIdent <: TypeTree
561561

562-
def matchTypeTree_Ident(tree: Tree)(implicit ctx: Context): Option[TypeTree_Ident]
562+
def matchTypeTree_TypeIdent(tree: Tree)(implicit ctx: Context): Option[TypeTree_TypeIdent]
563563

564-
def TypeTree_Ident_name(self: TypeTree_Ident)(implicit ctx: Context): String
564+
def TypeTree_TypeIdent_name(self: TypeTree_TypeIdent)(implicit ctx: Context): String
565565

566-
def TypeTree_Ident_copy(original: TypeTree_Ident)(name: String)(implicit ctx: Context): TypeTree_Ident
566+
def TypeTree_TypeIdent_copy(original: TypeTree_TypeIdent)(name: String)(implicit ctx: Context): TypeTree_TypeIdent
567567

568568
/** Type tree representing a selection of definition with a given name on a given term prefix */
569-
type TypeTree_Select <: TypeTree
569+
type TypeTree_TypeSelect <: TypeTree
570570

571-
def matchTypeTree_Select(tree: Tree)(implicit ctx: Context): Option[TypeTree_Select]
571+
def matchTypeTree_TypeSelect(tree: Tree)(implicit ctx: Context): Option[TypeTree_TypeSelect]
572572

573-
def TypeTree_Select_qualifier(self: TypeTree_Select)(implicit ctx: Context): Term
574-
def TypeTree_Select_name(self: TypeTree_Select)(implicit ctx: Context): String
573+
def TypeTree_TypeSelect_qualifier(self: TypeTree_TypeSelect)(implicit ctx: Context): Term
574+
def TypeTree_TypeSelect_name(self: TypeTree_TypeSelect)(implicit ctx: Context): String
575575

576-
def TypeTree_Select_apply(qualifier: Term, name: String)(implicit ctx: Context): TypeTree_Select
577-
def TypeTree_Select_copy(original: TypeTree_Select)(qualifier: Term, name: String)(implicit ctx: Context): TypeTree_Select
576+
def TypeTree_TypeSelect_apply(qualifier: Term, name: String)(implicit ctx: Context): TypeTree_TypeSelect
577+
def TypeTree_TypeSelect_copy(original: TypeTree_TypeSelect)(qualifier: Term, name: String)(implicit ctx: Context): TypeTree_TypeSelect
578578

579579
/** Type tree representing a selection of definition with a given name on a given type prefix */
580580
type TypeTree_Projection <: TypeTree

‎library/src/scala/tasty/reflect/Printers.scala‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -211,10 +211,10 @@ trait Printers
211211
this += "PackageClause(" += pid += ", " ++= stats += ")"
212212
case TypeTree.Inferred() =>
213213
this += "TypeTree.Inferred()"
214-
case TypeTree.Ident(name) =>
215-
this += "TypeTree.Ident(\"" += name += "\")"
216-
case TypeTree.Select(qualifier, name) =>
217-
this += "TypeTree.Select(" += qualifier += ", \"" += name += "\")"
214+
case TypeTree.TypeIdent(name) =>
215+
this += "TypeTree.TypeIdent(\"" += name += "\")"
216+
case TypeTree.TypeSelect(qualifier, name) =>
217+
this += "TypeTree.TypeSelect(" += qualifier += ", \"" += name += "\")"
218218
case TypeTree.Projection(qualifier, name) =>
219219
this += "TypeTree.Projection(" += qualifier += ", \"" += name += "\")"
220220
case TypeTree.Singleton(ref) =>
@@ -575,8 +575,8 @@ trait Printers
575575

576576
val parents1 = parents.filter {
577577
case IsTerm(Term.Apply(Term.Select(Term.New(tpt), _), _)) => !Types.JavaLangObject.unapply(tpt.tpe)
578-
case IsTypeTree(TypeTree.Select(Term.Select(Term.Ident("_root_"), "scala"), "Product")) => false
579-
case IsTypeTree(TypeTree.Select(Term.Select(Term.Ident("_root_"), "scala"), "Serializable")) => false
578+
case IsTypeTree(TypeTree.TypeSelect(Term.Select(Term.Ident("_root_"), "scala"), "Product")) => false
579+
case IsTypeTree(TypeTree.TypeSelect(Term.Select(Term.Ident("_root_"), "scala"), "Serializable")) => false
580580
case _ => true
581581
}
582582
if (parents1.nonEmpty)
@@ -1389,10 +1389,10 @@ trait Printers
13891389
}
13901390
printTypeAndAnnots(tree.tpe)
13911391

1392-
case TypeTree.Ident(name) =>
1392+
case TypeTree.TypeIdent(name) =>
13931393
printType(tree.tpe)
13941394

1395-
case TypeTree.Select(qual, name) =>
1395+
case TypeTree.TypeSelect(qual, name) =>
13961396
printTree(qual) += "." += highlightTypeDef(name, color)
13971397

13981398
case TypeTree.Projection(qual, name) =>

‎library/src/scala/tasty/reflect/TreeOps.scala‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -793,33 +793,33 @@ trait TreeOps extends Core {
793793
kernel.matchTypeTree_Inferred(tree).isDefined
794794
}
795795

796-
object IsIdent {
797-
/** Matches any Ident and returns it */
798-
def unapply(tree: Tree)(implicit ctx: Context): Option[Ident] =
799-
kernel.matchTypeTree_Ident(tree)
796+
object IsTypeIdent {
797+
/** Matches any TypeIdent and returns it */
798+
def unapply(tree: Tree)(implicit ctx: Context): Option[TypeIdent] =
799+
kernel.matchTypeTree_TypeIdent(tree)
800800
}
801801

802-
object Ident {
803-
// TODO def apply(name: String)(implicit ctx: Context): Ident
804-
def copy(original: Ident)(name: String)(implicit ctx: Context): Ident =
805-
kernel.TypeTree_Ident_copy(original)(name)
802+
object TypeIdent {
803+
// TODO def apply(name: String)(implicit ctx: Context): TypeIdent
804+
def copy(original: TypeIdent)(name: String)(implicit ctx: Context): TypeIdent =
805+
kernel.TypeTree_TypeIdent_copy(original)(name)
806806
def unapply(tree: Tree)(implicit ctx: Context): Option[String] =
807-
kernel.matchTypeTree_Ident(tree).map(_.name)
807+
kernel.matchTypeTree_TypeIdent(tree).map(_.name)
808808
}
809809

810-
object IsSelect {
811-
/** Matches any Select and returns it */
812-
def unapply(tree: Tree)(implicit ctx: Context): Option[Select] =
813-
kernel.matchTypeTree_Select(tree)
810+
object IsTypeSelect {
811+
/** Matches any TypeSelect and returns it */
812+
def unapply(tree: Tree)(implicit ctx: Context): Option[TypeSelect] =
813+
kernel.matchTypeTree_TypeSelect(tree)
814814
}
815815

816-
object Select {
817-
def apply(qualifier: Term, name: String)(implicit ctx: Context): Select =
818-
kernel.TypeTree_Select_apply(qualifier, name)
819-
def copy(original: Select)(qualifier: Term, name: String)(implicit ctx: Context): Select =
820-
kernel.TypeTree_Select_copy(original)(qualifier, name)
816+
object TypeSelect {
817+
def apply(qualifier: Term, name: String)(implicit ctx: Context): TypeSelect =
818+
kernel.TypeTree_TypeSelect_apply(qualifier, name)
819+
def copy(original: TypeSelect)(qualifier: Term, name: String)(implicit ctx: Context): TypeSelect =
820+
kernel.TypeTree_TypeSelect_copy(original)(qualifier, name)
821821
def unapply(tree: Tree)(implicit ctx: Context): Option[(Term, String)] =
822-
kernel.matchTypeTree_Select(tree).map(x => (x.qualifier, x.name))
822+
kernel.matchTypeTree_TypeSelect(tree).map(x => (x.qualifier, x.name))
823823
}
824824

825825
object IsProjection {
@@ -970,13 +970,13 @@ trait TreeOps extends Core {
970970
}
971971
}
972972

973-
implicit class TypeTree_IdentAPI(self: TypeTree.Ident) {
974-
def name(implicit ctx: Context): String = kernel.TypeTree_Ident_name(self)
973+
implicit class TypeTree_TypeIdentAPI(self: TypeTree.TypeIdent) {
974+
def name(implicit ctx: Context): String = kernel.TypeTree_TypeIdent_name(self)
975975
}
976976

977-
implicit class TypeTree_SelectAPI(self: TypeTree.Select) {
978-
def qualifier(implicit ctx: Context): Term = kernel.TypeTree_Select_qualifier(self)
979-
def name(implicit ctx: Context): String = kernel.TypeTree_Select_name(self)
977+
implicit class TypeTree_TypeSelectAPI(self: TypeTree.TypeSelect) {
978+
def qualifier(implicit ctx: Context): Term = kernel.TypeTree_TypeSelect_qualifier(self)
979+
def name(implicit ctx: Context): String = kernel.TypeTree_TypeSelect_name(self)
980980
}
981981

982982
implicit class TypeTree_ProjectionAPI(self: TypeTree.Projection) {

‎library/src/scala/tasty/reflect/TreeUtils.scala‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ trait TreeUtils
7676
case IsPackageClause(clause @ PackageClause(pid, stats)) =>
7777
foldTrees(foldTree(x, pid), stats)(clause.symbol.localContext)
7878
case TypeTree.Inferred() => x
79-
case TypeTree.Ident(_) => x
80-
case TypeTree.Select(qualifier, _) => foldTree(x, qualifier)
79+
case TypeTree.TypeIdent(_) => x
80+
case TypeTree.TypeSelect(qualifier, _) => foldTree(x, qualifier)
8181
case TypeTree.Projection(qualifier, _) => foldTree(x, qualifier)
8282
case TypeTree.Singleton(ref) => foldTree(x, ref)
8383
case TypeTree.Refined(tpt, refinements) => foldTrees(foldTree(x, tpt), refinements)
@@ -209,9 +209,9 @@ trait TreeUtils
209209

210210
def transformTypeTree(tree: TypeTree)(implicit ctx: Context): TypeTree = tree match {
211211
case TypeTree.Inferred() => tree
212-
case TypeTree.IsIdent(tree) => tree
213-
case TypeTree.IsSelect(tree) =>
214-
TypeTree.Select.copy(tree)(tree.qualifier, tree.name)
212+
case TypeTree.IsTypeIdent(tree) => tree
213+
case TypeTree.IsTypeSelect(tree) =>
214+
TypeTree.TypeSelect.copy(tree)(tree.qualifier, tree.name)
215215
case TypeTree.IsProjection(tree) =>
216216
TypeTree.Projection.copy(tree)(tree.qualifier, tree.name)
217217
case TypeTree.IsAnnotated(tree) =>

‎semanticdb/src/dotty/semanticdb/SemanticdbConsumer.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,13 +634,13 @@ class SemanticdbConsumer(sourceFilePath: java.nio.file.Path) extends TastyConsum
634634
def traverseTypeTree(tree: Tree /*TypeTree | TypeBoundsTree*/)(
635635
implicit ctx: Context): Unit = {
636636
tree match {
637-
case TypeTree.Ident(_) => {
637+
case TypeTree.TypeIdent(_) => {
638638
val typetree = tree.typetree
639639
addOccurenceTypeTree(typetree,
640640
s.SymbolOccurrence.Role.REFERENCE,
641641
createRange(typetree.pos))
642642
}
643-
case TypeTree.Select(qualifier, _) => {
643+
case TypeTree.TypeSelect(qualifier, _) => {
644644
val typetree = tree.typetree
645645
val range = rangeSelect(typetree.symbol.trueName, typetree.pos)
646646
addOccurenceTypeTree(typetree,

‎tests/run-custom-args/Yretain-trees/tasty-definitions-2.check‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
DefDef("foo", Nil, Nil, TypeTree.Ident("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+"), List(Term.Literal(Constant.Int(2))))))
2-
ValDef("bar", TypeTree.Ident("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+"), List(Term.Literal(Constant.Int(3))))))
1+
DefDef("foo", Nil, Nil, TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+"), List(Term.Literal(Constant.Int(2))))))
2+
ValDef("bar", TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+"), List(Term.Literal(Constant.Int(3))))))
33
Pattern.Bind("x", Pattern.Value(Term.Ident("_")))

‎tests/run-custom-args/Yretain-trees/tasty-load-tree-1.check‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
DefDef("foo", Nil, Nil, TypeTree.Ident("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+"), List(Term.Literal(Constant.Int(2))))))
2-
ValDef("bar", TypeTree.Ident("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+"), List(Term.Literal(Constant.Int(3))))))
1+
DefDef("foo", Nil, Nil, TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+"), List(Term.Literal(Constant.Int(2))))))
2+
ValDef("bar", TypeTree.TypeIdent("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+"), List(Term.Literal(Constant.Int(3))))))

0 commit comments

Comments
 (0)