Merge branch '2020.3'

Author: zero9178

build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 group 'net.zero9178'
-version '2020.3.4'
+version '2020.3.5'
 
 sourceCompatibility = 1.8
 

src/main/kotlin/net/zero9178/cov/CoverageConfigurationExtension.kt

@@ -20,17 +20,13 @@ import com.intellij.openapi.progress.Task
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.ModuleRootManager
 import com.intellij.openapi.util.Key
-import com.intellij.openapi.util.SystemInfo
 import com.intellij.openapi.util.UserDataHolder
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.openapi.wm.ToolWindowManager
-import com.jetbrains.cidr.cpp.cmake.model.CMakeConfiguration
 import com.jetbrains.cidr.cpp.cmake.workspace.CMakeWorkspace
 import com.jetbrains.cidr.cpp.execution.CMakeAppRunConfiguration
 import com.jetbrains.cidr.cpp.execution.CMakeBuildProfileExecutionTarget
 import com.jetbrains.cidr.cpp.execution.coverage.CMakeCoverageBuildOptionsInstallerFactory
-import com.jetbrains.cidr.cpp.execution.testing.CMakeTestRunConfiguration
-import com.jetbrains.cidr.cpp.execution.testing.ctest.CidrCTestRunConfigurationData
 import com.jetbrains.cidr.cpp.toolchains.CPPEnvironment
 import com.jetbrains.cidr.execution.CidrBuildTarget
 import com.jetbrains.cidr.execution.CidrRunConfiguration
@@ -44,7 +40,7 @@ import net.zero9178.cov.data.*
 import net.zero9178.cov.editor.CoverageFileAccessProtector
 import net.zero9178.cov.editor.CoverageHighlighter
 import net.zero9178.cov.settings.CoverageGeneratorSettings
-import net.zero9178.cov.util.isCTestInstalled
+import net.zero9178.cov.util.getCMakeConfigurations
 import net.zero9178.cov.window.CoverageView
 import java.io.File
 import javax.swing.event.HyperlinkEvent
@@ -99,13 +95,15 @@ class CoverageConfigurationExtension : CidrRunConfigurationExtensionBase() {
  ) {
  return
  }
- context.putUserData(EXECUTION_TARGET_USED, state.executionTarget)
+ val executionTarget = state.executionTarget as? CMakeBuildProfileExecutionTarget ?: return
+ context.putUserData(EXECUTION_TARGET_USED, executionTarget)
  val commandLine = context.getUserData(GENERAL_COMMAND_LINE) ?: return
  getCoverageGenerator(environment, configuration.project)?.patchEnvironment(
  configuration,
  environment,
- state.executionTarget,
- commandLine
+ executionTarget,
+ commandLine,
+ context
  )
  }
 
@@ -208,7 +206,8 @@ class CoverageConfigurationExtension : CidrRunConfigurationExtensionBase() {
  configuration,
  environment,
  executionTarget,
- indicator
+ indicator,
+ context
  )
  val root = DefaultMutableTreeNode("invisible-root")
  invokeLater {
@@ -268,32 +267,6 @@ class CoverageConfigurationExtension : CidrRunConfigurationExtensionBase() {
  return coverageGenerator
  }
 
- private fun getCMakeConfigurations(
- configuration: CMakeAppRunConfiguration,
- executionTarget: CMakeBuildProfileExecutionTarget
- ): Sequence<CMakeConfiguration> {
- return if (configuration is CMakeTestRunConfiguration && isCTestInstalled() && configuration.testData is CidrCTestRunConfigurationData) {
- val testData = configuration.testData as CidrCTestRunConfigurationData
- testData.infos?.mapNotNull {
- it?.command?.exePath
- }?.distinct()?.asSequence()?.mapNotNull { executable ->
- CMakeWorkspace.getInstance(configuration.project).modelTargets.asSequence().mapNotNull { target ->
- target.buildConfigurations.find { it.profileName == executionTarget.profileName }
- }.find {
- it.productFile?.name == executable.substringAfterLast(
- '/',
- if (SystemInfo.isWindows) executable.substringAfterLast('\\') else executable
- )
- }
- } ?: emptySequence()
- } else {
- val runConfiguration =
- configuration.getBuildAndRunConfigurations(executionTarget)?.buildConfiguration
- ?: return emptySequence()
- sequenceOf(runConfiguration)
- }
- }
-
  private fun hasCompilerFlags(
  configuration: CMakeAppRunConfiguration,
  executionTarget: CMakeBuildProfileExecutionTarget
@@ -337,23 +310,31 @@ class CoverageConfigurationExtension : CidrRunConfigurationExtensionBase() {
  }
  }
 
+ val previouslyChanged = mutableSetOf<String>()
  val map = mutableMapOf<String, ChosenName>()
  for ((_, value) in data.files) {
  var new = ChosenName(value.filePath.replace('\\', '/'), 1, value)
  val filename = new.getFilename()
- val existing = map[filename]
- if (existing == null) {
+ var existing = map[filename]
+ if (existing == null && !previouslyChanged.contains(filename)) {
  map[filename] = new
  continue
  }
  map.remove(filename)
- var nonNull: ChosenName = existing
- while (new.getFilename() == nonNull.getFilename()) {
+ while (new.getFilename() == existing?.getFilename() || previouslyChanged.contains(new.getFilename())) {
+  previouslyChanged.add(new.getFilename())
  new = new.copy(count = new.count + 1)
- nonNull = nonNull.copy(count = nonNull.count + 1)
+ existing = existing?.copy(count = existing.count + 1)
+ if (existing == null) {
+ // If existing is null due to a filename being part of previouslyChanged, also attempt to find
+ // existing files that might also have to be changed a long the way
+ existing = map[new.getFilename()]
+ }
  }
  map[new.getFilename()] = new
- map[nonNull.getFilename()] = nonNull
+ existing?.let {
+ map[it.getFilename()] = it
+ }
  }
 
  val fileDataToName = map.map {

src/main/kotlin/net/zero9178/cov/data/CoverageGenerator.kt

@@ -1,29 +1,32 @@
 package net.zero9178.cov.data
 
-import com.intellij.execution.ExecutionTarget
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.openapi.progress.ProgressIndicator
 import com.intellij.util.io.exists
 import com.jetbrains.cidr.cpp.execution.CMakeAppRunConfiguration
+import com.jetbrains.cidr.cpp.execution.CMakeBuildProfileExecutionTarget
 import com.jetbrains.cidr.cpp.toolchains.CPPEnvironment
 import com.jetbrains.cidr.cpp.toolchains.WSL
+import com.jetbrains.cidr.execution.ConfigurationExtensionContext
 import java.nio.file.Paths
 import java.util.concurrent.TimeUnit
 
 interface CoverageGenerator {
  fun patchEnvironment(
  configuration: CMakeAppRunConfiguration,
  environment: CPPEnvironment,
- executionTarget: ExecutionTarget,
- cmdLine: GeneralCommandLine
+ executionTarget: CMakeBuildProfileExecutionTarget,
+ cmdLine: GeneralCommandLine,
+ context: ConfigurationExtensionContext
  ) {
  }
 
  fun generateCoverage(
  configuration: CMakeAppRunConfiguration,
  environment: CPPEnvironment,
- executionTarget: ExecutionTarget,
- indicator: ProgressIndicator
+ executionTarget: CMakeBuildProfileExecutionTarget,
+ indicator: ProgressIndicator,
+ context: ConfigurationExtensionContext
  ): CoverageData? {
  return null
  }

src/main/kotlin/net/zero9178/cov/data/GCCGCDACoverageGenerator.kt

@@ -4,7 +4,6 @@ import com.github.h0tk3y.betterParse.combinators.*
 import com.github.h0tk3y.betterParse.grammar.Grammar
 import com.github.h0tk3y.betterParse.grammar.parseToEnd
 import com.github.h0tk3y.betterParse.parser.ParseException
-import com.intellij.execution.ExecutionTarget
 import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
@@ -13,7 +12,9 @@ import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
 import com.jetbrains.cidr.cpp.cmake.workspace.CMakeWorkspace
 import com.jetbrains.cidr.cpp.execution.CMakeAppRunConfiguration
+import com.jetbrains.cidr.cpp.execution.CMakeBuildProfileExecutionTarget
 import com.jetbrains.cidr.cpp.toolchains.CPPEnvironment
+import com.jetbrains.cidr.execution.ConfigurationExtensionContext
 import net.zero9178.cov.settings.CoverageGeneratorSettings
 import net.zero9178.cov.util.toCP
 import java.nio.file.Files
@@ -210,8 +211,9 @@ class GCCGCDACoverageGenerator(private val myGcov: String, private val myMajorVe
  override fun generateCoverage(
  configuration: CMakeAppRunConfiguration,
  environment: CPPEnvironment,
- executionTarget: ExecutionTarget,
- indicator: ProgressIndicator
+ executionTarget: CMakeBuildProfileExecutionTarget,
+ indicator: ProgressIndicator,
+ context: ConfigurationExtensionContext
  ): CoverageData? {
  val config = CMakeWorkspace.getInstance(configuration.project).getCMakeConfigurationFor(
  configuration.getResolveConfiguration(executionTarget)