Skip to content

There are two reasons for the error in the total instruction number: #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
skyevil12 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

There are two reasons for the error in the total instruction number: #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions jacoco-filtering-extension/src/main/kotlin/com/form/coverage/diff/git/JgitDiff.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -40,6 +41,8 @@ class JgitDiff(workingDir: File) {
DiffFormatter(diffContent).apply {
initialize()

setDiffComparator(RawTextComparator.WS_IGNORE_ALL)

obtainDiffEntries(git, revision).forEach {
format(it)
}
Expand Down
4 changes: 4 additions & 0 deletions jacoco-filtering-extension/src/main/kotlin/com/form/coverage/filters/ModifiedLinesFilter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<LineNode> {
Expand Down