Run configuration (#6)

* Don't display all packages on code coverage view with checked 
* created run configuration
* collect coverage stat from diff coverage core
* set min coverage in run configuration
* persist diff coverage configuration settings per IDE session

Author: SurpSG

CHANGELOG.md

@@ -3,6 +3,16 @@
 # diff-coverage-idea-plugin Changelog
 
 ## [Unreleased]
+### Added
+- Keep diff coverage configuration settings per IDE session
+- Added option to set up min coverage in run configuration
+### Changed
+- Diff Coverage running replaced with run configuration instead of shortcut
+- Removed triggering `diffCoverage` Gradle task
+### Fixed
+- Displaying all packages on code coverage view with checked 'Flatten Packages'
+
+## [0.0.4]
 ### Fixed
 - Intellij 2021.1 compatibility
 ### Changed

README.md

@@ -1,42 +1,39 @@
 # diff-coverage-idea-plugin
 
 ![Build](https://github.com/SurpSG/diff-coverage-idea-plugin/workflows/Build/badge.svg)
-[![Version](https://img.shields.io/jetbrains/plugin/v/16403-diff-coverage.svg)](https://plugins.jetbrains.com/plugin/PLUGIN_ID)
-[![Downloads](https://img.shields.io/jetbrains/plugin/d/16403-diff-coverage.svg)](https://plugins.jetbrains.com/plugin/PLUGIN_ID)
-
-* Create or open gradle project
-* Apply and setup [diff coverage plugin](https://github.com/form-com/diff-coverage-gradle)
-* Make some changes to your code and run tests to collect coverage info
-* Run diff coverage idea plugin: `ctrl+shift+d`
-
-Diff coverage IDEA plugin does:
-* detects a module to which DiffCoverage Gradle plugin is applied
-* Runs `diffCoverage` Gradle task
-* Displays coverage windows for modified code
-* Shows balloon with a link to diff coverage html report 
-
-## Template ToDo list
-- [x] Create a new [IntelliJ Platform Plugin Template][template] project.
-- [x] Verify the [pluginGroup](/gradle.properties), [plugin ID](/src/main/resources/META-INF/plugin.xml) and [sources package](/src/main/kotlin).
-- [x] Review the [Legal Agreements](https://plugins.jetbrains.com/docs/marketplace/legal-agreements.html).
-- [x] [Publish a plugin manually](https://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/publishing_plugin.html) for the first time.
-- [x] Set the Plugin ID in the above README badges.
-- [x] Set the [Deployment Token](https://plugins.jetbrains.com/docs/marketplace/plugin-upload.html).
-- [x] Click the <kbd>Watch</kbd> button on the top of the [IntelliJ Platform Plugin Template][template] to be notified about releases containing new features and fixes.
-
-<!-- Plugin description -->
-
-<!-- Plugin description end -->
+[![Version](https://img.shields.io/jetbrains/plugin/v/16403-diff-coverage.svg)](https://plugins.jetbrains.com/plugin/16403-diff-coverage)
+[![Downloads](https://img.shields.io/jetbrains/plugin/d/16403-diff-coverage.svg)](https://plugins.jetbrains.com/plugin/16403-diff-coverage)
 
 ## Installation
 
 - Using IDE built-in plugin system:
-  
+
   <kbd>Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>Marketplace</kbd> > <kbd>Search for "diff-coverage-idea-plugin"</kbd> >
   <kbd>Install Plugin</kbd>
-  
+
 - Manually:
 
   Download the [latest release](https://github.com/SurpSG/diff-coverage-idea-plugin/releases/latest) and install it manually using
   <kbd>Preferences</kbd> > <kbd>Plugins</kbd> > <kbd>⚙️</kbd> > <kbd>Install plugin from disk...</kbd>
+
+## How to use
+* Create or open gradle project
+* Apply and setup [DiffCoverage Gradle plugin](https://github.com/form-com/diff-coverage-gradle)
+* Make some changes to your code and run tests to collect coverage info
+* Set up Diff Coverage run configuration
 
+  ![Diff Coverage run configuration](imgs/diff-run-config.png)
+
+<!-- Plugin description -->
+
+<!-- Plugin description end -->
+
+## How it works
+Diff coverage IDEA plugin:
+* detects a module to which [DiffCoverage Gradle plugin](https://github.com/form-com/diff-coverage-gradle) is applied and collects settings
+* Analyzes coverage of uncommited code
+* Displays coverage panel for uncommited code and shows a balloon with coverage stats
+* Displays coverage for uncommited code in the project view and in code editor
+
+  ![Diff Coverage report view](imgs/coverage-view.png)
+  ![Diff Coverage project view](imgs/project-view.png)

build.gradle.kts

@@ -7,15 +7,17 @@ repositories {
     maven(url = "https://jitpack.io")
 }
 
+fun properties(key: String) = project.findProperty(key).toString()
+
 plugins {
     // Java support
     id("java")
     // Kotlin support
-    id("org.jetbrains.kotlin.jvm") version "1.4.0"
+    kotlin("jvm") version "1.5.0"
     // gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
-    id("org.jetbrains.intellij") version "0.4.21"
+    id("org.jetbrains.intellij") version "0.7.3"
     // gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
-    id("org.jetbrains.changelog") version "0.4.0"
+    id("org.jetbrains.changelog") version "1.1.2"
     // detekt linter - read more: https://detekt.github.io/detekt/kotlindsl.html
     id("io.gitlab.arturbosch.detekt") version "1.10.0"
 }
@@ -40,22 +42,22 @@ repositories {
     jcenter()
 }
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.3.9")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.3")
+    implementation("org.jetbrains.kotlin:kotlin-reflect:1.5.0")
 
     implementation("org.jacoco:org.jacoco.core:0.8.5")
     implementation("com.github.form-com.diff-coverage-gradle:jacoco-filtering-extension:0.7.1")
-    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.12.+")
     detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.10.0")
 }
 
 // Configure gradle-intellij-plugin plugin.
 // Read more: https://github.com/JetBrains/gradle-intellij-plugin
 intellij {
-    pluginName = pluginName
-    version = platformVersion
-    type = platformType
-    downloadSources = platformDownloadSources.toBoolean()
+    pluginName = properties("pluginName")
+    version = properties("platformVersion")
+    type = properties("platformType")
+    downloadSources = properties("platformDownloadSources").toBoolean()
     updateSinceUntilBuild = true
 
 //  Plugin Dependencies:

gradle.properties

@@ -3,7 +3,7 @@
 
 pluginGroup = com.github.surpsg.diffcoverage
 pluginName = Diff Coverage
-pluginVersion = 0.0.4
+pluginVersion = 1.0.0
 pluginSinceBuild = 203
 pluginUntilBuild = 211.*
 pluginVerifierIdeVersions = 2020.3.2, 2020.3.3, 2021.1

imgs/coverage-view.png

@@ -0,0 +1,49 @@
+package com.github.surpsg.diffcoverage.domain
+
+import org.jacoco.core.analysis.ICounter
+import org.jacoco.core.analysis.ICoverageNode
+import org.jacoco.core.internal.analysis.CounterImpl
+
+class CoverageStat(
+    counters: Map<ICoverageNode.CounterEntity, ICounter>
+) {
+    private val counters: MutableMap<ICoverageNode.CounterEntity, ICounter> = HashMap(counters)
+
+    val linesCoverage: Double
+        get() = getCoverage(ICoverageNode.CounterEntity.LINE).coveredRatio.toPercents()
+    val branchesCoverage: Double
+        get() = getCoverage(ICoverageNode.CounterEntity.BRANCH).coveredRatio.toPercents()
+    val instructionsCoverage: Double
+        get() = getCoverage(ICoverageNode.CounterEntity.INSTRUCTION).coveredRatio.toPercents()
+
+    fun getCoverage(coverageType: ICoverageNode.CounterEntity): ICounter {
+        return counters[coverageType] ?: createEmptyCounter()
+    }
+
+    fun merge(coverageStat: CoverageStat) {
+        coverageStat.counters.forEach { (type, counter) ->
+            mergeCounter(type, counter)
+        }
+    }
+
+    private fun mergeCounter(
+        type: ICoverageNode.CounterEntity,
+        counter: ICounter
+    ) {
+        val currentCounter = counters.computeIfAbsent(type) {
+            createEmptyCounter()
+        }
+        counters[type] = CounterImpl.getInstance(
+            currentCounter.missedCount + counter.missedCount,
+            currentCounter.coveredCount + counter.coveredCount
+        )
+    }
+
+    private fun createEmptyCounter() = CounterImpl.getInstance(0, 0)
+
+    private fun Double.toPercents(): Double = this * PERCENT_MULTIPLIER
+
+    private companion object {
+        const val PERCENT_MULTIPLIER = 100
+    }
+}

imgs/diff-run-config.png

@@ -0,0 +1,20 @@
+package com.github.surpsg.diffcoverage.domain
+
+import com.intellij.coverage.CoverageSuite
+import com.intellij.coverage.CoverageSuitesBundle
+
+class CoverageSuiteBundleWithStat(suite: CoverageSuite) : CoverageSuitesBundle(suite) {
+
+    override fun getCoverageData(): ProjectDataWithStat {
+        return suites.asSequence()
+            .map { it.getCoverageData(null) }
+            .map { it as? ProjectDataWithStat }
+            .filterNotNull()
+            .first()
+            .apply {
+                super.getCoverageData()?.let {
+                    merge(it)
+                }
+            }
+    }
+}