Try to distinguish between test/production compilations
This commit is contained in:
+19
-6
@@ -9,10 +9,13 @@ import com.intellij.execution.Location
|
|||||||
import com.intellij.execution.PsiLocation
|
import com.intellij.execution.PsiLocation
|
||||||
import com.intellij.execution.actions.MultipleRunLocationsProvider
|
import com.intellij.execution.actions.MultipleRunLocationsProvider
|
||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
|
import com.intellij.openapi.module.ModuleManager
|
||||||
|
import com.intellij.openapi.roots.ModuleRootManager
|
||||||
import org.jetbrains.kotlin.config.KotlinModuleKind
|
import org.jetbrains.kotlin.config.KotlinModuleKind
|
||||||
import org.jetbrains.kotlin.idea.caches.project.implementingModules
|
import org.jetbrains.kotlin.idea.caches.project.implementingModules
|
||||||
import org.jetbrains.kotlin.idea.caches.project.isNewMPPModule
|
import org.jetbrains.kotlin.idea.caches.project.isNewMPPModule
|
||||||
import org.jetbrains.kotlin.idea.configuration.toModuleGroup
|
import org.jetbrains.kotlin.idea.configuration.toModuleGroup
|
||||||
|
import org.jetbrains.kotlin.idea.core.isInTestSourceContentKotlinAware
|
||||||
import org.jetbrains.kotlin.idea.facet.KotlinFacet
|
import org.jetbrains.kotlin.idea.facet.KotlinFacet
|
||||||
|
|
||||||
class KotlinMultiplatformRunLocationsProvider : MultipleRunLocationsProvider() {
|
class KotlinMultiplatformRunLocationsProvider : MultipleRunLocationsProvider() {
|
||||||
@@ -23,7 +26,9 @@ class KotlinMultiplatformRunLocationsProvider : MultipleRunLocationsProvider() {
|
|||||||
|
|
||||||
override fun getAlternativeLocations(originalLocation: Location<*>): List<Location<*>> {
|
override fun getAlternativeLocations(originalLocation: Location<*>): List<Location<*>> {
|
||||||
val originalModule = originalLocation.module ?: return emptyList()
|
val originalModule = originalLocation.module ?: return emptyList()
|
||||||
return modulesToRunFrom(originalModule).map { PsiLocation(originalLocation.project, it, originalLocation.psiElement) }
|
val virtualFile = originalLocation.virtualFile ?: return emptyList()
|
||||||
|
val shouldRunAsTest = ModuleRootManager.getInstance(originalModule).fileIndex.isInTestSourceContentKotlinAware(virtualFile)
|
||||||
|
return modulesToRunFrom(originalModule, shouldRunAsTest).map { PsiLocation(originalLocation.project, it, originalLocation.psiElement) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,11 +41,19 @@ private fun compactedGradleProjectId(module: Module): String? {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun modulesToRunFrom(originalModule: Module): List<Module> {
|
private fun modulesToRunFrom(
|
||||||
|
originalModule: Module,
|
||||||
|
shouldRunAsTest: Boolean
|
||||||
|
): List<Module> {
|
||||||
val modules = originalModule.implementingModules
|
val modules = originalModule.implementingModules
|
||||||
return if (originalModule.isNewMPPModule) {
|
if (!originalModule.isNewMPPModule) return modules
|
||||||
modules.filter { KotlinFacet.get(it)?.configuration?.settings?.kind == KotlinModuleKind.COMPILATION_AND_SOURCE_SET_HOLDER }
|
val compilations = modules.filter {
|
||||||
} else {
|
KotlinFacet.get(it)?.configuration?.settings?.kind == KotlinModuleKind.COMPILATION_AND_SOURCE_SET_HOLDER
|
||||||
modules
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val project = originalModule.project
|
||||||
|
// TODO: more robust way to get test/production compilations
|
||||||
|
val baseName = originalModule.toModuleGroup().baseModule.name
|
||||||
|
val commonTests = ModuleManager.getInstance(project).findModuleByName(baseName + "_commonTest") ?: return compilations
|
||||||
|
return compilations.filter { ModuleRootManager.getInstance(it).isDependsOn(commonTests) == shouldRunAsTest }
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user