Correctly prettify names in coverage info (#18542)

This way, the output will be more consistent with Scala 2.
scala · Feb 7, 2024 · 9c9f01c · 9c9f01c
2 parents cba1cfc + 497eef7
commit 9c9f01c
Show file tree

Hide file tree

Showing 33 changed files with 624 additions and 624 deletions.
diff --git a/compiler/src/dotty/tools/dotc/coverage/Location.scala b/compiler/src/dotty/tools/dotc/coverage/Location.scala
@@ -31,9 +31,9 @@ object Location:
 
     val ownerDenot = ctx.owner.denot
     val enclosingClass = ownerDenot.enclosingClass
-    val packageName = ownerDenot.enclosingPackageClass.fullName.toSimpleName.toString
-    val className = enclosingClass.name.toSimpleName.toString
-    val methodName = ownerDenot.enclosingMethod.name.toSimpleName.toString
+    val packageName = ownerDenot.enclosingPackageClass.fullName.toSimpleName.show
+    val className = enclosingClass.name.toSimpleName.show
+    val methodName = ownerDenot.enclosingMethod.name.toSimpleName.show
 
     val classType: String =
       if enclosingClass.is(Trait) then "Trait"

diff --git a/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala b/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
@@ -101,7 +101,7 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
         // the internal line number is 0-base https://github.com/lampepfl/dotty/blob/18ada516a85532524a39a962b2ddecb243c65376/compiler/src/dotty/tools/dotc/util/SourceFile.scala#L173-L176
         line = pos.line + 1,
         desc = sourceFile.content.slice(pos.start, pos.end).mkString,
-        symbolName = tree.symbol.name.toSimpleName.toString,
+        symbolName = tree.symbol.name.toSimpleName.show,
         treeName = tree.getClass.getSimpleName.nn,
         branch
       )

diff --git a/tests/coverage/pos/Constructor.scoverage.check b/tests/coverage/pos/Constructor.scoverage.check
@@ -174,9 +174,9 @@ def g
 9
 Constructor.scala
 covtest
-O$
+O
 Object
-covtest.O$
+covtest.O
 g
 203
 208
@@ -191,9 +191,9 @@ def g
 10
 Constructor.scala
 covtest
-O$
+O
 Object
-covtest.O$
+covtest.O
 y
 223
 228
@@ -208,9 +208,9 @@ def y
 11
 Constructor.scala
 covtest
-O$
+O
 Object
-covtest.O$
+covtest.O
 <init>
 235
 239
@@ -225,9 +225,9 @@ g(y)
 12
 Constructor.scala
 covtest
-O$
+O
 Object
-covtest.O$
+covtest.O
 <init>
 237
 238

diff --git a/tests/coverage/pos/Enum.scoverage.check b/tests/coverage/pos/Enum.scoverage.check
@@ -72,9 +72,9 @@ def surfaceWeight
 3
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1043
 1077
@@ -89,9 +89,9 @@ println("Example 1: \\n"+emptyList)
 4
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1051
 1076
@@ -106,9 +106,9 @@ false
 5
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1082
 1103
@@ -123,9 +123,9 @@ println(s"${list}\\n")
 6
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1090
 1102
@@ -140,9 +140,9 @@ s"${list}\\n"
 7
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 calculateEarthWeightOnPlanets
 1195
 1222
@@ -157,9 +157,9 @@ Planet.Earth.surfaceGravity
 8
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 calculateEarthWeightOnPlanets
 1229
 1320
@@ -174,9 +174,9 @@ for p <- Planet.values do\n        println(s"Your weight on $p is ${p.surfaceWei
 9
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 calculateEarthWeightOnPlanets
 1238
 1251
@@ -191,9 +191,9 @@ Planet.values
 10
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 $anonfun
 1263
 1320
@@ -208,9 +208,9 @@ println(s"Your weight on $p is ${p.surfaceWeight(mass)}")
 11
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 $anonfun
 1271
 1319
@@ -225,9 +225,9 @@ s"Your weight on $p is ${p.surfaceWeight(mass)}"
 12
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 $anonfun
 1296
 1317
@@ -242,9 +242,9 @@ p.surfaceWeight(mass)
 13
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 calculateEarthWeightOnPlanets
 1109
 1142
@@ -259,9 +259,9 @@ def calculateEarthWeightOnPlanets
 14
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1326
 1347
@@ -276,9 +276,9 @@ println("Example 2:")
 15
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 1352
 1385
@@ -293,9 +293,9 @@ calculateEarthWeightOnPlanets(80)
 16
 Enum.scala
 covtest
-EnumTypes$
+EnumTypes
 Object
-covtest.EnumTypes$
+covtest.EnumTypes
 test
 901
 909