Change the -coverage-exclude-classlikes option and its doc

Author: KacperFKorban

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -127,7 +127,7 @@ trait CommonScalaSettings:
 
   /* Coverage settings */
   val coverageOutputDir = PathSetting("-coverage-out", "Destination for coverage classfiles and instrumentation data.", "", aliases = List("--coverage-out"))
-  val coverageExcludePackages: Setting[List[String]] = MultiStringSetting("-coverage-exclude-packages", "packages", "List of regexes for packages to exclude from coverage.", aliases = List("--coverage-exclude-packages"))
+  val coverageExcludeClasslikes: Setting[List[String]] = MultiStringSetting("-coverage-exclude-classlikes", "packages, clesses and modules", "List of regexes for packages, classes and modules to exclude from coverage.", aliases = List("--coverage-exclude-classlikes"))
   val coverageExcludeFiles: Setting[List[String]] = MultiStringSetting("-coverage-exclude-files", "files", "List of regexes for files to exclude from coverage.", aliases = List("--coverage-exclude-files"))
 
   /* Other settings */

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

@@ -61,7 +61,7 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
     Serializer.serialize(coverage, outputPath, ctx.settings.sourceroot.value)
 
   private def isClassIncluded(sym: Symbol)(using Context): Boolean =
-    val excludedClassNamePatterns = ctx.settings.coverageExcludePackages.value.map(_.r.pattern)
+    val excludedClassNamePatterns = ctx.settings.coverageExcludeClasslikes.value.map(_.r.pattern)
     excludedClassNamePatterns.isEmpty || !excludedClassNamePatterns.exists(
       _.matcher(sym.fullName.toText(ctx.printerFn(ctx)).show).nn.matches
     )

tests/coverage/pos/ExcludeClass.scala

@@ -1,4 +1,4 @@
-//> using options -coverage-exclude-packages:covtest.Klass
+//> using options -coverage-exclude-classlikes:covtest.Klass
 
 package covtest
 

tests/coverage/pos/ExcludeClass.scoverage.check

@@ -25,8 +25,8 @@ Klass2
 Class
 covtest.Klass2
 abs
-217
-218
+219
+220
 16
 i
 Ident
@@ -42,8 +42,8 @@ Klass2
 Class
 covtest.Klass2
 abs
-234
 236
+238
 18
 unary_-
 Select
@@ -59,8 +59,8 @@ Klass2
 Class
 covtest.Klass2
 abs
-175
-182
+177
+184
 14
 abs
 DefDef

tests/coverage/pos/ExcludeDef.scala

@@ -1,4 +1,4 @@
-//> using options -coverage-exclude-packages:covtest\..*
+//> using options -coverage-exclude-classlikes:covtest\..*
 
 package covtest
 

tests/coverage/pos/ExcludeOtherStuff.scala

@@ -1,4 +1,4 @@
-//> using options -coverage-exclude-packages:covtest.Oject,covtest.Tait
+//> using options -coverage-exclude-classlikes:covtest.Oject,covtest.Tait
 
 package covtest
 

tests/coverage/pos/ExcludePackage.scala

@@ -1,4 +1,4 @@
-//> using options -coverage-exclude-packages:covtest
+//> using options -coverage-exclude-classlikes:covtest
 
 package covtest