Merge pull request #191 from gw-kit/make-include-filter-primary

Make include filter primary
gw-kit · Dec 15, 2024 · a5aec47 · a5aec47
2 parents 43cd316 + 212b30b
commit a5aec47
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -230,6 +230,7 @@ configure<io.github.surpsg.deltacoverage.gradle.DeltaCoverageConfiguration> {
             coverageBinaryFiles = files("/path/to/jacoco/exec/file.exec")
 
             // Optional. Specifies classes to include for the analysis.
+            // If set then excludeClasses patterns are ignored.
             matchClasses.value(
               listOf("**/com/*/classes/to/include/Class*")
             )

diff --git a/...e/src/main/kotlin/io/github/surpsg/deltacoverage/gradle/sources/filter/CompositeFilter.kt b/...e/src/main/kotlin/io/github/surpsg/deltacoverage/gradle/sources/filter/CompositeFilter.kt
diff --git a/...adle/src/main/kotlin/io/github/surpsg/deltacoverage/gradle/sources/filter/SourceFilter.kt b/...adle/src/main/kotlin/io/github/surpsg/deltacoverage/gradle/sources/filter/SourceFilter.kt
@@ -37,12 +37,11 @@ internal fun interface SourceFilter {
             } else {
                 NOOP_FILTER
             }
-            return CompositeFilter(
-                listOf(
-                    AntSourceExcludeFilter(config.excludeClasses.get()),
-                    includeFilter,
-                )
-            )
+            return if (includeFilter == NOOP_FILTER) {
+                AntSourceExcludeFilter(config.excludeClasses.get())
+            } else {
+                includeFilter
+            }
         }
     }