Move source related method to Source

Author: nicolasstucki

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

@@ -51,7 +51,6 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
 
   def Context_owner(self: Context): Symbol = self.owner
 
-  def Context_source(self: Context): java.nio.file.Path = self.compilationUnit.source.file.jpath
 
   def Context_GADT_setFreshGADTBounds(self: Context): Context =
     self.fresh.setFreshGADTBounds.addMode(Mode.GadtConstraintInference)
@@ -62,11 +61,16 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend
   def Context_GADT_approximation(self: Context)(sym: Symbol, fromBelow: Boolean): Type =
     self.gadt.approximation(sym, fromBelow)
 
-  def Context_isJavaCompilationUnit(self: Context): Boolean = self.compilationUnit.isInstanceOf[fromtasty.JavaCompilationUnit]
-  def Context_isScala2CompilationUnit(self: Context): Boolean = self.compilationUnit.isInstanceOf[fromtasty.Scala2CompilationUnit]
-  def Context_isAlreadyLoadedCompilationUnit(self: Context): Boolean = self.compilationUnit.isInstanceOf[fromtasty.AlreadyLoadedCompilationUnit]
-  def Context_compilationUnitClassname(self: Context): String =
-    self.compilationUnit match {
+  ////////////
+  // Source //
+  ////////////
+
+  def Source_path(using Context): java.nio.file.Path = ctx.compilationUnit.source.file.jpath
+  def Source_isJavaCompilationUnit(using Context): Boolean = ctx.compilationUnit.isInstanceOf[fromtasty.JavaCompilationUnit]
+  def Source_isScala2CompilationUnit(using Context): Boolean = ctx.compilationUnit.isInstanceOf[fromtasty.Scala2CompilationUnit]
+  def Source_isAlreadyLoadedCompilationUnit(using Context): Boolean = ctx.compilationUnit.isInstanceOf[fromtasty.AlreadyLoadedCompilationUnit]
+  def Source_compilationUnitClassname(using Context): String =
+    ctx.compilationUnit match {
       case cu: fromtasty.JavaCompilationUnit => cu.className
       case cu: fromtasty.Scala2CompilationUnit => cu.className
       case cu: fromtasty.AlreadyLoadedCompilationUnit => cu.className

library/src/scala/tasty/Reflection.scala

@@ -429,23 +429,32 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
     extension (self: Context):
       /** Returns the owner of the context */
       def owner: Symbol = internal.Context_owner(self)
+    end extension
+  end Context
 
-      /** Returns the source file being compiled. The path is relative to the current working directory. */
-      def source: java.nio.file.Path = internal.Context_source(self)
 
-      /** Returns true if we've tried to reflect on a Java class. */
-      def isJavaCompilationUnit(): Boolean = internal Context_isJavaCompilationUnit(self)
+  ///////////////
+  //   Source  //
+  ///////////////
 
-      /** Returns true if we've tried to reflect on a Scala2 (non-Tasty) class. */
-      def isScala2CompilationUnit(): Boolean = internal Context_isScala2CompilationUnit(self)
+  object Source:
 
-      /** Returns true if we've tried to reflect on a class that's already loaded (e.g. Option). */
-      def isAlreadyLoadedCompilationUnit(): Boolean = internal.Context_isAlreadyLoadedCompilationUnit(self)
+    /** Returns the source file being compiled. The path is relative to the current working directory. */
+    def path(using ctx: Context): java.nio.file.Path = internal.Source_path
 
-      /** Class name of the current CompilationUnit */
-      def compilationUnitClassname(): String = internal.Context_compilationUnitClassname(self)
-    end extension
-  end Context
+    /** Returns true if we've tried to reflect on a Java class. */
+    def isJavaCompilationUnit(using ctx: Context): Boolean = internal.Source_isJavaCompilationUnit
+
+    /** Returns true if we've tried to reflect on a Scala2 (non-Tasty) class. */
+    def isScala2CompilationUnit(using ctx: Context): Boolean = internal.Source_isScala2CompilationUnit
+
+    /** Returns true if we've tried to reflect on a class that's already loaded (e.g. Option). */
+    def isAlreadyLoadedCompilationUnit(using ctx: Context): Boolean = internal.Source_isAlreadyLoadedCompilationUnit
+
+    /** Class name of the current CompilationUnit */
+    def compilationUnitClassname(using ctx: Context): String = internal.Source_compilationUnitClassname
+
+  end Source
 
 
   ///////////////

library/src/scala/tasty/reflect/CompilerInterface.scala

@@ -143,25 +143,29 @@ trait CompilerInterface {
   /** Returns the owner of the context */
   def Context_owner(self: Context): Symbol
 
-  /** Returns the source file being compiled. The path is relative to the current working directory. */
-  def Context_source(self: Context): java.nio.file.Path
-
   def Context_GADT_setFreshGADTBounds(self: Context): Context
   def Context_GADT_addToConstraint(self: Context)(syms: List[Symbol]): Boolean
   def Context_GADT_approximation(self: Context)(sym: Symbol, fromBelow: Boolean): Type
 
+
+  ////////////
+  // Source //
+  ////////////
+
+  /** Returns the source file being compiled. The path is relative to the current working directory. */
+  def Source_path(using ctx: Context): java.nio.file.Path
+
   /** Returns true if we've tried to reflect on a Java class. */
-  def Context_isJavaCompilationUnit(self: Context): Boolean
+  def Source_isJavaCompilationUnit(using ctx: Context): Boolean
 
   /** Returns true if we've tried to reflect on a Scala2 (non-Tasty) class. */
-  def Context_isScala2CompilationUnit(self: Context): Boolean
+  def Source_isScala2CompilationUnit(using ctx: Context): Boolean
 
   /** Returns true if we've tried to reflect on a class that's already loaded (e.g. Option). */
-  def Context_isAlreadyLoadedCompilationUnit(self: Context): Boolean
+  def Source_isAlreadyLoadedCompilationUnit(using ctx: Context): Boolean
 
   /** Class name of the current CompilationUnit */
-  def Context_compilationUnitClassname(self: Context): String
-
+  def Source_compilationUnitClassname(using ctx: Context): String
 
   ///////////////
   // REPORTING //

tests/run-custom-args/tasty-inspector/i8215.scala

@@ -35,8 +35,7 @@ class TestInspector_NonTasty() extends TastyInspector:
   var isScala2: Boolean = false
   var className: String = ""
 
-  protected def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit = 
-    import reflect.{_, given _}
-    isJava = reflect.rootContext.isJavaCompilationUnit()
-    isScala2 = reflect.rootContext.isScala2CompilationUnit()
-    className = reflect.rootContext.compilationUnitClassname()
+  protected def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit =
+    isJava = reflect.Source.isJavaCompilationUnit
+    isScala2 = reflect.Source.isScala2CompilationUnit
+    className = reflect.Source.compilationUnitClassname

tests/run-custom-args/tasty-inspector/i8558.scala

@@ -17,7 +17,6 @@ class TestInspector_NonTasty() extends TastyInspector:
   var isAlreadyLoaded: Boolean = false
   var className: String = ""
 
-  protected def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit = 
-    import reflect.{_, given _}
-    isAlreadyLoaded = reflect.rootContext.isAlreadyLoadedCompilationUnit()
-    className = reflect.rootContext.compilationUnitClassname()
+  protected def processCompilationUnit(reflect: Reflection)(root: reflect.Tree): Unit =
+    isAlreadyLoaded = reflect.Source.isAlreadyLoadedCompilationUnit
+    className = reflect.Source.compilationUnitClassname

tests/run-macros/tasty-getfile-implicit-fun-context/Macro_1.scala

@@ -10,8 +10,7 @@ object SourceFiles {
 
   def getThisFileImpl: Macro[String] = {
     val qctx = tastyContext
-    import qctx.tasty._
-    Expr(rootContext.source.getFileName.toString)
+    Expr(qctx.tasty.Source.path.getFileName.toString)
   }
 
 }

tests/run-macros/tasty-getfile/Macro_1.scala

@@ -6,9 +6,7 @@ object SourceFiles {
   implicit inline def getThisFile: String =
     ${getThisFileImpl}
 
-  private def getThisFileImpl(using qctx: QuoteContext) : Expr[String] = {
-    import qctx.tasty._
-    Expr(summon[Context].source.getFileName.toString)
-  }
+  private def getThisFileImpl(using qctx: QuoteContext) : Expr[String] =
+    Expr(qctx.tasty.Source.path.getFileName.toString)
 
 }