azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce SourceType and use KotlinFacetSettings.isTestModule

Browse Source 
Refactor dealing with production/test roots
Remove ad-hoc code in KotlinMultiplatformRunLocationsProvider
This commit is contained in:
Pavel V. Talanov
2018-09-25 18:18:34 +02:00
parent 1be491504a
commit cc1be5f559
5 changed files with 55 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/multiplatform/KotlinMultiplatformRunLocationsProvider.kt
+7 -11
View File
@@ -9,13 +9,14 @@ import com.intellij.execution.Location
import com.intellij.execution.PsiLocation
import com.intellij.execution.actions.MultipleRunLocationsProvider
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.idea.caches.project.SourceType
import org.jetbrains.kotlin.idea.caches.project.implementingModules
import org.jetbrains.kotlin.idea.caches.project.isNewMPPModule
import org.jetbrains.kotlin.idea.caches.project.sourceType
import org.jetbrains.kotlin.idea.configuration.toModuleGroup
import org.jetbrains.kotlin.idea.core.isInTestSourceContentKotlinAware
import org.jetbrains.kotlin.idea.core.getSourceType
import org.jetbrains.kotlin.idea.facet.KotlinFacet
class KotlinMultiplatformRunLocationsProvider : MultipleRunLocationsProvider() {
@@ -27,8 +28,8 @@ class KotlinMultiplatformRunLocationsProvider : MultipleRunLocationsProvider() {
override fun getAlternativeLocations(originalLocation: Location<*>): List<Location<*>> {
val originalModule = originalLocation.module ?: return emptyList()
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) }
val sourceType = ModuleRootManager.getInstance(originalModule).fileIndex.getSourceType(virtualFile) ?: return emptyList()
return modulesToRunFrom(originalModule, sourceType).map { PsiLocation(originalLocation.project, it, originalLocation.psiElement) }
}
}
@@ -43,17 +44,12 @@ private fun compactedGradleProjectId(module: Module): String? {
private fun modulesToRunFrom(
originalModule: Module,
shouldRunAsTest: Boolean
originalSourceType: SourceType
): List<Module> {
val modules = originalModule.implementingModules
if (!originalModule.isNewMPPModule) return modules
val compilations = modules.filter {
KotlinFacet.get(it)?.configuration?.settings?.kind == KotlinModuleKind.COMPILATION_AND_SOURCE_SET_HOLDER
}
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 }
return compilations.filter { it.sourceType == originalSourceType }
}