test GenIso with inner classes

Author: liufengyun

compiler/src/dotty/tools/dotc/tastyreflect/TreeOpsImpl.scala

@@ -383,8 +383,8 @@ trait TreeOpsImpl extends scala.tasty.reflect.TreeOps with RootPositionImpl with
     }
 
     object Ident extends IdentModule {
-      def apply(tmref: TermRef)(implicit ctx: Context): Ident =
-        withDefaultPos(implicit ctx => tpd.Ident(tmref))
+      def apply(tmref: TermRef)(implicit ctx: Context): Term =
+        withDefaultPos(implicit ctx => tpd.ref(tmref).asInstanceOf[Term])
 
       def copy(original: Tree)(name: String)(implicit ctx: Context): Ident =
         tpd.cpy.Ident(original)(name.toTermName)

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

@@ -248,7 +248,7 @@ trait TreeOps extends Core {
     /** Scala term identifier */
     val Ident: IdentModule
     abstract class IdentModule {
-      def apply(tmref: TermRef)(implicit ctx: Context): Ident
+      def apply(tmref: TermRef)(implicit ctx: Context): Term
 
       def copy(original: Tree)(name: String)(implicit ctx: Context): Ident
 

tests/run-with-compiler/i5941/usage_2.scala

@@ -40,5 +40,19 @@ object Test {
     assert(jNum(3.5) == JNum(3.5))
     assert(jNum.getOption(JNum(3.5)) == Some(3.5))
     assert(jNum.getOption(JNull) == None)
+
+    // inner classes
+    val inner = new Inner
+    assert(GenIso[inner.JStr, String].to(inner.JStr("Hello")) == "Hello")
+    assert(GenIso.unit[inner.JNull.type].to(inner.JNull) == 1)
+    assert(GenIso.unit[inner.JNull.type].from(1) == inner.JNull)
   }
+}
+
+class Inner {
+  sealed trait Json
+  case object JNull extends Json
+  case class JStr(v: String) extends Json
+  case class JNum(v: Double) extends Json
+  case class JObj(v: Map[String, Json]) extends Json
 }