MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 11:53:49 +07:00
Code Issues Packages Projects Releases Wiki Activity

[coverage] IDEA-340741 Remove unnecessary option

Browse Source 
GitOrigin-RevId: 0f043207d2ec8802ebf5d6e3cfe912aab6939b01
This commit is contained in:
Maksim Zuev
2024-02-21 12:49:17 +01:00
committed by intellij-monorepo-bot
parent 446b9b0e60
commit 696934d22a
6 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/util/resources/misc/registry.properties
View File

@@ -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

2
plugins/coverage/resources/messages/JavaCoverageBundle.properties
View File

@@ -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

2
plugins/coverage/src/com/intellij/coverage/IDEACoverageRunner.java
View File

@@ -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"));
}
}

7
plugins/coverage/src/com/intellij/coverage/JavaCoverageOptions.kt
View File

@@ -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", "",

3
plugins/coverage/src/com/intellij/coverage/JavaCoverageOptionsProvider.kt
View File

@@ -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<String> 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<String> = defaultExcludeAnnotationPatterns
}

2
plugins/coverage/testSrc/com/intellij/coverage/CoverageSettingsTest.kt
View File

@@ -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)
}
}