Coverage: handle TypeApply in a more robust way, fix #15771

Author: TheElectronWill

compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala

@@ -59,15 +59,15 @@ C
 Class
 covtest.C
 <init>
-62
-63
+60
+64
 5
-x
-Select
+f
+Apply
 false
 0
 false
-x
+f(x)
 
 3
 Constructor.scala
@@ -76,15 +76,15 @@ C
 Class
 covtest.C
 <init>
-60
-64
+62
+63
 5
-f
-Apply
+x
+Select
 false
 0
 false
-f(x)
+x
 
 4
 Constructor.scala
@@ -127,15 +127,15 @@ O$
 Object
 covtest.O$
 <init>
-112
-113
+110
+114
 10
-y
-Ident
+g
+Apply
 false
 0
 false
-y
+g(y)
 
 7
 Constructor.scala
@@ -144,13 +144,13 @@ O$
 Object
 covtest.O$
 <init>
-110
-114
+112
+113
 10
-g
-Apply
+y
+Ident
 false
 0
 false
-g(y)
+y
 

tests/coverage/pos/Constructor.scoverage.check

@@ -76,6 +76,40 @@ Imperative
 Class
 covtest.Imperative
 readPerson
+252
+295
+13
+<init>
+Apply
+false
+0
+false
+OnError((e) => readName2(using e)(using s))
+
+4
+ContextFunctions.scala
+covtest
+Imperative
+Class
+covtest.Imperative
+$anonfun
+267
+294
+13
+apply
+Apply
+false
+0
+false
+readName2(using e)(using s)
+
+5
+ContextFunctions.scala
+covtest
+Imperative
+Class
+covtest.Imperative
+readPerson
 192
 206
 11

tests/coverage/pos/ContextFunctions.scoverage.check

@@ -212,15 +212,15 @@ EnumTypes$
 Object
 covtest.EnumTypes$
 test
-1051
-1076
+1043
+1077
 30
-+
+println
 Apply
 false
 0
 false
-"Example 1: \n"+emptyList
+println("Example 1: \n"+emptyList)
 
 12
 Enum.scala
@@ -229,15 +229,15 @@ EnumTypes$
 Object
 covtest.EnumTypes$
 test
-1043
-1077
+1051
+1076
 30
-println
++
 Apply
 false
 0
 false
-println("Example 1: \n"+emptyList)
+"Example 1: \n"+emptyList
 
 13
 Enum.scala
@@ -246,15 +246,15 @@ EnumTypes$
 Object
 covtest.EnumTypes$
 test
-1090
-1102
+1082
+1103
 31
-s
+println
 Apply
 false
 0
 false
-s"${list}\n"
+println(s"${list}\n")
 
 14
 Enum.scala
@@ -263,15 +263,15 @@ EnumTypes$
 Object
 covtest.EnumTypes$
 test
-1082
-1103
+1090
+1102
 31
-println
+s
 Apply
 false
 0
 false
-println(s"${list}\n")
+s"${list}\n"
 
 15
 Enum.scala
@@ -297,32 +297,33 @@ EnumTypes$
 Object
 covtest.EnumTypes$
 calculateEarthWeightOnPlanets
-1238
-1251
+1229
+1320
 35
-refArrayOps
+foreach
 Apply
 false
 0
 false
-Planet.values
+for p <- Planet.values do
+        println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
 
 17
 Enum.scala
 covtest
 EnumTypes$
 Object
 covtest.EnumTypes$
-$anonfun
-1296
-1317
-36
-surfaceWeight
+calculateEarthWeightOnPlanets
+1238
+1251
+35
+refArrayOps
 Apply
 false
 0
 false
-p.surfaceWeight(mass)
+Planet.values
 
 18
 Enum.scala
@@ -331,15 +332,15 @@ EnumTypes$
 Object
 covtest.EnumTypes$
 $anonfun
-1271
-1319
+1263
+1320
 36
-s
+println
 Apply
 false
 0
 false
-s"Your weight on $p is ${p.surfaceWeight(mass)}"
+println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
 
 19
 Enum.scala
@@ -348,33 +349,32 @@ EnumTypes$
 Object
 covtest.EnumTypes$
 $anonfun
-1263
-1320
+1271
+1319
 36
-println
+s
 Apply
 false
 0
 false
-println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
+s"Your weight on $p is ${p.surfaceWeight(mass)}"
 
 20
 Enum.scala
 covtest
 EnumTypes$
 Object
 covtest.EnumTypes$
-calculateEarthWeightOnPlanets
-1229
-1320
-35
-foreach
+$anonfun
+1296
+1317
+36
+surfaceWeight
 Apply
 false
 0
 false
-for p <- Planet.values do
-        println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
+p.surfaceWeight(mass)
 
 21
 Enum.scala

tests/coverage/pos/Enum.scoverage.check

@@ -0,0 +1,6 @@
+package covtest
+
+enum MyLogLevel extends java.lang.Enum[MyLogLevel]:
+  case Warn  extends MyLogLevel
+  case Error extends MyLogLevel
+  case Fatal extends MyLogLevel

tests/coverage/pos/EnumJava.scala.disabled

@@ -0,0 +1,14 @@
+package covtest
+
+def testForLoop: Unit =
+  for i <- 1 to 10 do
+    println(i)
+
+def testForAdvanced: Unit =
+  def f(x: Int): Boolean = true
+  for j <- 1 to 10 if f(j) do
+    println(j)
+
+def testForeach: Unit =
+  // An anonymous function is created here, but the user code must still be instrumented!
+  Nil.foreach(_ => println("user code here"))