Merge pull request #439 from scala/backport-lts-3.3-23203

Backport "Add jpath to VirtualFile (for pc)" to 3.3 LTS

Author: tgodzik

compiler/src/dotty/tools/dotc/util/SourceFile.scala

@@ -228,8 +228,7 @@ object SourceFile {
    *  It relies on SourceFile#virtual implementation to create the virtual file.
    */
   def virtual(uri: URI, content: String): SourceFile =
-    val path = Paths.get(uri).toString
-    SourceFile.virtual(path, content)
+    SourceFile(new VirtualFile(Paths.get(uri), content.getBytes(StandardCharsets.UTF_8)), content.toCharArray)
 
   /** Returns the relative path of `source` within the `reference` path
    *

compiler/src/dotty/tools/io/VirtualFile.scala

@@ -40,15 +40,34 @@ class VirtualFile(val name: String, override val path: String) extends AbstractF
     this.content = content
   }
 
+  /**
+    * Initializes this instance with the specified path
+    * and a name taken from the last path element.
+    *
+    * @param path the path of the virtual file to be created
+    * @param content the initial contents of the virtual file
+    * @return     the created virtual file
+    */
+  def this(path: JPath, content: Array[Byte]) = {
+    this(path.getFileName().toString(), path.toString())
+    this.content = content
+    this.jpath_ = path
+  }
+
   private var content = Array.emptyByteArray
 
+  private var jpath_ : JPath = null
+
   def absolute: AbstractFile = this
 
-  /** Returns null. */
-  def jpath: JPath = null
+  /** Returns path, which might be a non-existing file or null. */
+  def jpath: JPath = jpath_
 
   override def sizeOption: Option[Int] = Some(content.length)
 
+  /** Always returns true, even if jpath is a non-existing file. */
+  override def exists: Boolean = true
+
   def input : InputStream = new ByteArrayInputStream(content)
 
   override def output: OutputStream = {

presentation-compiler-testcases/src/tests/macros/metals7460.scala

@@ -0,0 +1,20 @@
+package tests.macros
+
+import scala.quoted.*
+
+object Macros7460 {
+
+  transparent inline def foo: String =
+    ${ fooImpl }
+
+  private def fooImpl(using Quotes): Expr[String] =
+    Expr("foo...")
+
+  transparent inline def bar: String =
+    ${ barImpl }
+
+  private def barImpl(using Quotes): Expr[String] =
+    quotes.reflect.Position.ofMacroExpansion.sourceFile.getJPath.get // this line is the culprit
+    Expr("bar...")
+
+}

presentation-compiler/test/dotty/tools/pc/tests/hover/HoverTermSuite.scala

@@ -731,3 +731,19 @@ class HoverTermSuite extends BaseHoverSuite:
          |""".stripMargin,
          "def valueOf($name: String): Foo".hover
     )
+
+  @Test def `i7460` =
+    check(
+      """|package tests.macros
+         |def m = Macros7460.foo.sub@@string(2, 4)
+         |""".stripMargin,
+         "def substring(x$0: Int, x$1: Int): String".hover
+    )
+
+  @Test def `i7460-2` =
+    check(
+      """|package tests.macros
+         |def m = Macros7460.bar.sub@@string(2, 4)
+         |""".stripMargin,
+         "def substring(x$0: Int, x$1: Int): String".hover
+    )