Tastydoc: update remaining tasty.reflect.IsXYZ usages

Author: nicolasstucki

tastydoc/src/dotty/tastydoc/TastyExtractor.scala

@@ -75,9 +75,9 @@ trait TastyExtractor extends TastyTypeConverter with CommentParser with CommentC
     }
 
     (body.flatMap {
-        case IsDefDef(_) => None //No definitions, they are appended with symbol.methods below
-        case IsValDef(_) => None //No val/var, they are appended with symbol.fields below
-        case IsInlined(_) => None //Inlined aren't desirable members
+        case _: DefDef => None //No definitions, they are appended with symbol.methods below
+        case _: ValDef => None //No val/var, they are appended with symbol.fields below
+        case _: Inlined => None //Inlined aren't desirable members
         case x => Some(x)
       }.filter(x => filterSymbol(x.symbol)).map(convertToRepresentation(reflect)(_, parentRepresentation)) ++
     symbol.methods.filter(x => filterSymbol(x)).map{x => convertToRepresentation(reflect)(x.tree, parentRepresentation)} ++
@@ -102,8 +102,8 @@ trait TastyExtractor extends TastyTypeConverter with CommentParser with CommentC
     import reflect.{given, _}
 
     val parentsReferences = parents.map{
-      case reflect.IsTypeTree(c) => convertTypeToReference(reflect)(c.tpe)
-      case reflect.IsTerm(c) => convertTypeToReference(reflect)(c.tpe)
+      case c: TypeTree => convertTypeToReference(reflect)(c.tpe)
+      case c: Term => convertTypeToReference(reflect)(c.tpe)
       case _ => throw Exception("Unhandeld case in parents. Please open an issue.")
     }
 

tastydoc/src/dotty/tastydoc/TastyTypeConverter.scala

@@ -16,8 +16,8 @@ trait TastyTypeConverter {
     }
 
     typeOrBounds match {
-      case reflect.IsType(tpe) => convertTypeToReference(reflect)(tpe)
-      case reflect.IsTypeBounds(reflect.TypeBounds(low, hi)) =>
+      case tpe: Type => convertTypeToReference(reflect)(tpe)
+      case TypeBounds(low, hi) =>
         val lowRef = convertTypeToReference(reflect)(low)
         val hiRef = convertTypeToReference(reflect)(hi)
         if(hiRef == lowRef){
@@ -43,7 +43,7 @@ trait TastyTypeConverter {
       case TypeLambda(paramNames, paramTypes, resType) => ConstantReference(tp.show) //TOFIX
       case Refinement(parent, name, info) =>
         val tuple = convertTypeOrBoundsToReference(reflect)(info) match {
-          case r if (info match {case reflect.IsTypeBounds(info) => true case _ => false}) => ("type", name, r)
+          case r if (info match {case info: TypeBounds => true case _ => false}) => ("type", name, r)
           case r@TypeReference(_, _, _, _) => ("val", name, r)
           case ByNameReference(rChild) => ("def", name, rChild)
           case r => throw new Exception("Match error in info of Refinement. This should not happend, please open an issue. " + r)

tastydoc/src/dotty/tastydoc/representations.scala

@@ -115,7 +115,7 @@ object representations extends TastyExtractor {
     override val constructors =
       (convertToRepresentation(reflect)(internal.constructor, Some(this)) ::
       (internal.body.flatMap{_ match {
-        case reflect.IsDefDef(d@reflect.DefDef(_)) => if(d.name == "<init>") Some(d) else None
+        case d: reflect.DefDef => if(d.name == "<init>") Some(d) else None
         case _ => None
         }
       }.map(convertToRepresentation(reflect)(_, Some(this)))
@@ -183,8 +183,8 @@ object representations extends TastyExtractor {
     override val typeParams = Nil
     override val annotations = extractAnnotations(reflect)(internal.symbol.annots)
     val alias: Option[Reference] = internal.rhs match{
-      case reflect.IsTypeBoundsTree(t) => Some(convertTypeOrBoundsToReference(reflect)(t.tpe))
-      case reflect.IsTypeTree(t) => Some(convertTypeOrBoundsToReference(reflect)(t.tpe.asInstanceOf[reflect.TypeOrBounds]))
+      case t: TypeBoundsTree => Some(convertTypeOrBoundsToReference(reflect)(t.tpe))
+      case t: TypeTree => Some(convertTypeOrBoundsToReference(reflect)(t.tpe.asInstanceOf[reflect.TypeOrBounds]))
       case _ => None
     }
     override def isAbstract: Boolean = !alias.isDefined
@@ -195,7 +195,7 @@ object representations extends TastyExtractor {
     import reflect.{given, _}
 
     tree match {
-      case reflect.IsPackageClause(t@reflect.PackageClause(_)) =>
+      case t: reflect.PackageClause =>
         val noColorPid = t.pid.symbol.show
         val emulatedPackage = mutablePackagesMap.get(noColorPid) match {
           case Some(x) => x
@@ -209,15 +209,15 @@ object representations extends TastyExtractor {
         emulatedPackage.packagesMembers = r :: emulatedPackage.packagesMembers
         r
 
-      case reflect.IsImport(t@reflect.Import(_)) => new ImportRepresentation(reflect, t, parentRepresentation)
+      case t: reflect.Import => new ImportRepresentation(reflect, t, parentRepresentation)
 
-      case reflect.IsClassDef(t@reflect.ClassDef(_)) => new ClassRepresentation(reflect, t, parentRepresentation)
+      case t: reflect.ClassDef => new ClassRepresentation(reflect, t, parentRepresentation)
 
-      case reflect.IsDefDef(t@reflect.DefDef(_)) => new DefRepresentation(reflect, t, parentRepresentation)
+      case t: reflect.DefDef => new DefRepresentation(reflect, t, parentRepresentation)
 
-      case reflect.IsValDef(t@reflect.ValDef(_)) => new ValRepresentation(reflect, t, parentRepresentation)
+      case t: reflect.ValDef => new ValRepresentation(reflect, t, parentRepresentation)
 
-      case reflect.IsTypeDef(t@reflect.TypeDef(_)) => new TypeRepresentation(reflect, t, parentRepresentation)
+      case t: reflect.TypeDef => new TypeRepresentation(reflect, t, parentRepresentation)
 
       case _ => throw new Exception("Tree match error in conversion to representation. Please open an issue. " + tree)
   }}