Apply review suggestions to coverage filter checking

[Cherry-picked 641f5db]
scala · Jul 2, 2024 · 5cb6ca2 · 5cb6ca2
1 parent f63f9c7
commit 5cb6ca2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala b/compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala
@@ -69,13 +69,15 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
     Serializer.serialize(coverage, outputPath, ctx.settings.sourceroot.value)
 
   private def isClassIncluded(sym: Symbol)(using Context): Boolean =
+    val fqn = sym.fullName.toText(ctx.printerFn(ctx)).show
     coverageExcludeClasslikePatterns.isEmpty || !coverageExcludeClasslikePatterns.exists(
-      _.matcher(sym.fullName.toText(ctx.printerFn(ctx)).show).nn.matches
+      _.matcher(fqn).nn.matches
     )
 
   private def isFileIncluded(file: SourceFile)(using Context): Boolean =
+    val normalizedPath = file.path.replace(".scala", "")
     coverageExcludeFilePatterns.isEmpty || !coverageExcludeFilePatterns.exists(
-      _.matcher(file.path.replace(".scala", "")).nn.matches
+      _.matcher(normalizedPath).nn.matches
     )
 
   override protected def newTransformer(using Context) =