diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 55498f55af44..7f061f5dff62 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -1637,6 +1637,8 @@ idea.coverage.new.test.tracking.enabled=true idea.coverage.new.test.tracking.enabled.description=Enable fast array instrumentation for IDEA test tracking coverage idea.coverage.loading.threads=2 idea.coverage.loading.threads.description=Number of working threads for coverage report loading (set 0 for maximum available threads) +idea.coverage.calculate.exact.hits=true +idea.coverage.calculate.exact.hits.description=Collect information on the exact number of executions per line/branch show.affected.tests.in.changelists=false show.affected.tests.in.changelists.description=Show a link with affected tests in change lists diff --git a/plugins/coverage/resources/messages/JavaCoverageBundle.properties b/plugins/coverage/resources/messages/JavaCoverageBundle.properties index fba7ef641528..79d8875181f8 100644 --- a/plugins/coverage/resources/messages/JavaCoverageBundle.properties +++ b/plugins/coverage/resources/messages/JavaCoverageBundle.properties @@ -10,8 +10,6 @@ run.configuration.enable.coverage.in.test.folders=Collect coverage in test folde run.configuration.track.per.test.coverage=Track per test coverage run.configuration.track.per.test.coverage.comment=Collect data about which code lines were tested by specific tests settings.coverage.java.ignore.implicitly.declared.default.constructors=Ignore implicitly declared default constructors -settings.coverage.java.exact.hits=Collect information on the exact number of executions per line/branch -settings.coverage.java.exact.hits.comment=Enabling this option has extra overhead # run config settings coverage.settings=Show code coverage options diff --git a/plugins/coverage/src/com/intellij/coverage/IDEACoverageRunner.java b/plugins/coverage/src/com/intellij/coverage/IDEACoverageRunner.java index ac9a6df61206..a47bb606847e 100644 --- a/plugins/coverage/src/com/intellij/coverage/IDEACoverageRunner.java +++ b/plugins/coverage/src/com/intellij/coverage/IDEACoverageRunner.java @@ -102,7 +102,7 @@ public final class IDEACoverageRunner extends JavaCoverageRunner { if (testTracking && !Registry.is("idea.coverage.new.test.tracking.enabled")) { targetParameters.add(request -> JavaTargetParameter.fixed("-Didea.new.test.tracking.coverage=false")); } - if (project != null && JavaCoverageOptionsProvider.getInstance(project).getCalculateExactHits()) { + if (Registry.is("idea.coverage.calculate.exact.hits")) { targetParameters.add(request -> JavaTargetParameter.fixed("-Didea.coverage.calculate.hits=true")); } } diff --git a/plugins/coverage/src/com/intellij/coverage/JavaCoverageOptions.kt b/plugins/coverage/src/com/intellij/coverage/JavaCoverageOptions.kt index 41bb5b6cc537..e9d218d865f1 100644 --- a/plugins/coverage/src/com/intellij/coverage/JavaCoverageOptions.kt +++ b/plugins/coverage/src/com/intellij/coverage/JavaCoverageOptions.kt @@ -14,7 +14,6 @@ import com.intellij.ui.dsl.builder.bindSelected import com.intellij.ui.dsl.builder.panel import com.intellij.ui.layout.selectedValueMatches import com.intellij.util.ArrayUtil -import com.intellij.util.ThreeState import javax.swing.JComponent class JavaCoverageOptions(private val project: Project) : CoverageOptions() { @@ -54,12 +53,6 @@ class JavaCoverageOptions(private val project: Project) : CoverageOptions() { .bindSelected(coverageOptionsProvider::ignoreImplicitConstructors) .visibleIf(isIdeaRunner) } - row { - checkBox(JavaCoverageBundle.message("settings.coverage.java.exact.hits")) - .bindSelected(coverageOptionsProvider::calculateExactHits) - .comment(JavaCoverageBundle.message("settings.coverage.java.exact.hits.comment")) - .visibleIf(runner.selectedValueMatches { it?.calculateExactHits() == ThreeState.UNSURE }) - } row { val excludeAnnotationsPanel = object : AnnotationsPanel( project, "Exclude", "", diff --git a/plugins/coverage/src/com/intellij/coverage/JavaCoverageOptionsProvider.kt b/plugins/coverage/src/com/intellij/coverage/JavaCoverageOptionsProvider.kt index 17a06fa06219..6c9050c23acd 100644 --- a/plugins/coverage/src/com/intellij/coverage/JavaCoverageOptionsProvider.kt +++ b/plugins/coverage/src/com/intellij/coverage/JavaCoverageOptionsProvider.kt @@ -18,7 +18,6 @@ class JavaCoverageOptionsProvider(private val project: Project) : PersistentStat var branchCoverage: Boolean by state::myBranchCoverage var testTracking: Boolean by state::myTestTracking var testModulesCoverage: Boolean by state::myTestModulesCoverage - var calculateExactHits: Boolean by state::myCalculateExactHits var ignoreImplicitConstructors: Boolean by state::myIgnoreImplicitConstructors var excludeAnnotationPatterns: List by state::myExcludeAnnotationPatterns var coverageRunner: CoverageRunner? @@ -44,7 +43,6 @@ class JavaCoverageOptionsProvider(private val project: Project) : PersistentStat state.myBranchCoverage = loaded.myBranchCoverage state.myTestTracking = loaded.myTestTracking state.myTestModulesCoverage = loaded.myTestModulesCoverage - state.myCalculateExactHits = loaded.myCalculateExactHits state.myIgnoreImplicitConstructors = loaded.myIgnoreImplicitConstructors state.myExcludeAnnotationPatterns = listWithDefaultAnnotations(loaded.myExcludeAnnotationPatterns) } @@ -54,7 +52,6 @@ class JavaCoverageOptionsProvider(private val project: Project) : PersistentStat internal var myBranchCoverage: Boolean = true internal var myTestTracking: Boolean = false internal var myTestModulesCoverage: Boolean = false - internal var myCalculateExactHits: Boolean = true internal var myIgnoreImplicitConstructors: Boolean = true internal var myExcludeAnnotationPatterns: List = defaultExcludeAnnotationPatterns } diff --git a/plugins/coverage/testSrc/com/intellij/coverage/CoverageSettingsTest.kt b/plugins/coverage/testSrc/com/intellij/coverage/CoverageSettingsTest.kt index f4d291d16f9f..55ae8193af66 100644 --- a/plugins/coverage/testSrc/com/intellij/coverage/CoverageSettingsTest.kt +++ b/plugins/coverage/testSrc/com/intellij/coverage/CoverageSettingsTest.kt @@ -20,7 +20,6 @@ class CoverageSettingsTest : CoverageIntegrationBaseTest() { myTestTracking = !defaultSettings.myTestTracking myTestModulesCoverage = !defaultSettings.myTestModulesCoverage myIgnoreImplicitConstructors = !defaultSettings.myIgnoreImplicitConstructors - myCalculateExactHits = !defaultSettings.myCalculateExactHits } settings.loadState(otherSettings) assertSettings(otherSettings) @@ -38,6 +37,5 @@ class CoverageSettingsTest : CoverageIntegrationBaseTest() { assertEquals(expected.myTestTracking, settings.testTracking) assertEquals(expected.myTestModulesCoverage, settings.testModulesCoverage) assertEquals(expected.myIgnoreImplicitConstructors, settings.ignoreImplicitConstructors) - assertEquals(expected.myCalculateExactHits, settings.calculateExactHits) } }