Fix async transform in REPL

The async transform only runs on source files with `await` calls. For REPL lines there are two SourceFile created for a single line. Make sure the async phase connects these dots.
LannyRipple · Oct 23, 2024 · d64861a · d64861a
1 parent 0b0fa5a
commit d64861a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/src/compiler/scala/tools/nsc/transform/async/AsyncPhase.scala b/src/compiler/scala/tools/nsc/transform/async/AsyncPhase.scala
@@ -14,7 +14,7 @@ package scala.tools.nsc.transform.async
 
 import scala.collection.mutable
 import scala.tools.nsc.transform.{Transform, TypingTransformers}
-import scala.reflect.internal.util.{SourceFile, NoSourceFile}
+import scala.reflect.internal.util.{NoSourceFile, ReplBatchSourceFile, SourceFile}
 
 abstract class AsyncPhase extends Transform with TypingTransformers with AnfTransform with Lifter with LiveVariables {
   self =>
@@ -81,7 +81,11 @@ abstract class AsyncPhase extends Transform with TypingTransformers with AnfTran
     override def transformUnit(unit: CompilationUnit): Unit = {
       if (settings.async.value) {
         // NoSourceFile can happen for, e.g., toolbox compilation; overestimate by always transforming them. See test/async/jvm/toolbox.scala
-        val shouldTransform = unit.source == NoSourceFile || sourceFilesToTransform.contains(unit.source)
+        val shouldTransform = unit.source == NoSourceFile || sourceFilesToTransform(unit.source) || (unit.source match {
+          // scala/bug#13050, see also `PerRunReporting.repSrc`
+          case r: ReplBatchSourceFile => sourceFilesToTransform(r.parserSource)
+          case _ => false
+        })
         if (shouldTransform) super.transformUnit(unit)
         if (awaits.exists(_.isInitialized)) {
           unit.body.foreach {

diff --git a/test/files/run/t13050.check b/test/files/run/t13050.check
@@ -0,0 +1,8 @@
+
+scala> import scala.tools.partest.async.OptionAwait._
+import scala.tools.partest.async.OptionAwait._
+
+scala> println(optionally { value(Some(1)) + value(Some(2)) })
+Some(3)
+
+scala> :quit
diff --git a/test/files/run/t13050.scala b/test/files/run/t13050.scala
@@ -0,0 +1,9 @@
+import scala.tools.nsc._
+import scala.tools.partest.ReplTest
+
+object Test extends ReplTest {
+  override def extraSettings = "-Xasync"
+  def code =
+    """import scala.tools.partest.async.OptionAwait._
+      |println(optionally { value(Some(1)) + value(Some(2)) })""".stripMargin
+}