diff --git a/jacoco-filtering-extension/src/main/kotlin/com/form/coverage/diff/git/JgitDiff.kt b/jacoco-filtering-extension/src/main/kotlin/com/form/coverage/diff/git/JgitDiff.kt index d7b49e5..d324f64 100644 --- a/jacoco-filtering-extension/src/main/kotlin/com/form/coverage/diff/git/JgitDiff.kt +++ b/jacoco-filtering-extension/src/main/kotlin/com/form/coverage/diff/git/JgitDiff.kt @@ -3,6 +3,7 @@ package com.form.coverage.diff.git import org.eclipse.jgit.api.Git import org.eclipse.jgit.diff.DiffEntry import org.eclipse.jgit.diff.DiffFormatter +import org.eclipse.jgit.diff.RawTextComparator import org.eclipse.jgit.lib.ConfigConstants import org.eclipse.jgit.lib.Constants import org.eclipse.jgit.lib.ObjectId @@ -40,6 +41,8 @@ class JgitDiff(workingDir: File) { DiffFormatter(diffContent).apply { initialize() + setDiffComparator(RawTextComparator.WS_IGNORE_ALL) + obtainDiffEntries(git, revision).forEach { format(it) } diff --git a/jacoco-filtering-extension/src/main/kotlin/com/form/coverage/filters/ModifiedLinesFilter.kt b/jacoco-filtering-extension/src/main/kotlin/com/form/coverage/filters/ModifiedLinesFilter.kt index af865b0..1ddc32f 100644 --- a/jacoco-filtering-extension/src/main/kotlin/com/form/coverage/filters/ModifiedLinesFilter.kt +++ b/jacoco-filtering-extension/src/main/kotlin/com/form/coverage/filters/ModifiedLinesFilter.kt @@ -42,6 +42,10 @@ class ModifiedLinesFilter(private val codeUpdateInfo: CodeUpdateInfo) : IFilter log.debug("\tlines: $it") } } + + if (groupedModifiedLines[true].isNullOrEmpty()) { + output.ignore(methodNode.instructions.first, methodNode.instructions.last) + } } private fun collectLineNodes(instructionNodes: InsnList): Sequence {