Skip to content

Commit c01baea

Browse files
committed
Change the -coverage-exclude-classlikes option and its doc
1 parent 7affcee commit c01baea

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Diff for: compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ trait CommonScalaSettings:
127127

128128
/* Coverage settings */
129129
val coverageOutputDir = PathSetting("-coverage-out", "Destination for coverage classfiles and instrumentation data.", "", aliases = List("--coverage-out"))
130-
val coverageExcludePackages: Setting[List[String]] = MultiStringSetting("-coverage-exclude-packages", "packages", "List of regexes for packages to exclude from coverage.", aliases = List("--coverage-exclude-packages"))
130+
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"))
131131
val coverageExcludeFiles: Setting[List[String]] = MultiStringSetting("-coverage-exclude-files", "files", "List of regexes for files to exclude from coverage.", aliases = List("--coverage-exclude-files"))
132132

133133
/* Other settings */

Diff for: compiler/src/dotty/tools/dotc/transform/InstrumentCoverage.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class InstrumentCoverage extends MacroTransform with IdentityDenotTransformer:
6161
Serializer.serialize(coverage, outputPath, ctx.settings.sourceroot.value)
6262

6363
private def isClassIncluded(sym: Symbol)(using Context): Boolean =
64-
val excludedClassNamePatterns = ctx.settings.coverageExcludePackages.value.map(_.r.pattern)
64+
val excludedClassNamePatterns = ctx.settings.coverageExcludeClasslikes.value.map(_.r.pattern)
6565
excludedClassNamePatterns.isEmpty || !excludedClassNamePatterns.exists(
6666
_.matcher(sym.fullName.toText(ctx.printerFn(ctx)).show).nn.matches
6767
)

Diff for: tests/coverage/pos/ExcludeClass.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using options -coverage-exclude-packages:covtest.Klass
1+
//> using options -coverage-exclude-classlikes:covtest.Klass
22

33
package covtest
44

Diff for: tests/coverage/pos/ExcludeClass.scoverage.check

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ Klass2
2525
Class
2626
covtest.Klass2
2727
abs
28-
217
29-
218
28+
219
29+
220
3030
16
3131
i
3232
Ident
@@ -42,8 +42,8 @@ Klass2
4242
Class
4343
covtest.Klass2
4444
abs
45-
234
4645
236
46+
238
4747
18
4848
unary_-
4949
Select
@@ -59,8 +59,8 @@ Klass2
5959
Class
6060
covtest.Klass2
6161
abs
62-
175
63-
182
62+
177
63+
184
6464
14
6565
abs
6666
DefDef

Diff for: tests/coverage/pos/ExcludeDef.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using options -coverage-exclude-packages:covtest\..*
1+
//> using options -coverage-exclude-classlikes:covtest\..*
22

33
package covtest
44

Diff for: tests/coverage/pos/ExcludeOtherStuff.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using options -coverage-exclude-packages:covtest.Oject,covtest.Tait
1+
//> using options -coverage-exclude-classlikes:covtest.Oject,covtest.Tait
22

33
package covtest
44

Diff for: tests/coverage/pos/ExcludePackage.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//> using options -coverage-exclude-packages:covtest
1+
//> using options -coverage-exclude-classlikes:covtest
22

33
package covtest
44

0 commit comments

Comments
 (0)