Js run configuration producers: get module from ConfigurationContext

Delegate mpp concerns to MultipleRunLocationsProvider EP
Restore old behaviour via bunch files

idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JsIdePlatformKindTooling.kt

@@ -5,6 +5,8 @@
 
 package org.jetbrains.kotlin.idea.core.platform.impl
 
+import com.intellij.execution.PsiLocation
+import com.intellij.execution.actions.ConfigurationContext
 import com.intellij.execution.actions.RunConfigurationProducer
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.roots.libraries.Library
@@ -21,6 +23,7 @@ import org.jetbrains.kotlin.idea.framework.JsLibraryStdDetectionUtil
 import org.jetbrains.kotlin.idea.highlighter.KotlinTestRunLineMarkerContributor.Companion.getTestStateIcon
 import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationDataProvider
 import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
+import org.jetbrains.kotlin.idea.run.multiplatform.KotlinMultiplatformRunLocationsProvider
 import org.jetbrains.kotlin.idea.util.string.joinWithEscape
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
@@ -61,13 +64,15 @@ class JsIdePlatformKindTooling : IdePlatformKindTooling() {
     override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
         if (!descriptor.isTest()) return null
 
+        val contexts by lazy { computeConfigurationContexts(declaration) }
+
         val runConfigData = RunConfigurationProducer
             .getProducers(declaration.project)
             .asSequence()
             .filterIsInstance<KotlinJSRunConfigurationDataProvider<*>>()
             .filter { it.isForTests }
-            .mapNotNull { it.getConfigurationData(declaration) }
-            .firstOrNull() ?: return null
+            .flatMap { provider -> contexts.map { context -> provider.getConfigurationData(context) } }
+            .firstOrNull { it != null } ?: return null
 
         val locations = ArrayList<String>()
 
@@ -93,13 +98,22 @@ class JsIdePlatformKindTooling : IdePlatformKindTooling() {
     }
 
     override fun acceptsAsEntryPoint(function: KtFunction): Boolean {
+        val contexts by lazy { computeConfigurationContexts(function) }
+
         return RunConfigurationProducer
             .getProducers(function.project)
             .asSequence()
             .filterIsInstance<KotlinJSRunConfigurationDataProvider<*>>()
             .filter { !it.isForTests }
-            .mapNotNull { it.getConfigurationData(function) }
-            .firstOrNull() != null
+            .flatMap { provider -> contexts.map { context -> provider.getConfigurationData(context) } }
+            .any { it != null }
+    }
+
+    private fun computeConfigurationContexts(declaration: KtNamedDeclaration): Sequence<ConfigurationContext> {
+        val location = PsiLocation(declaration)
+        return KotlinMultiplatformRunLocationsProvider().getAlternativeLocations(location).map {
+            ConfigurationContext.createEmptyContextForLocation(it)
+        }.ifEmpty { listOf(ConfigurationContext.createEmptyContextForLocation(location)) }.asSequence()
     }
 
     private fun DeclarationDescriptor.isIgnored(): Boolean =

idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JsIdePlatformKindTooling.kt.181

@@ -0,0 +1,127 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.platform.impl
+
+import com.intellij.execution.PsiLocation
+import com.intellij.execution.actions.ConfigurationContext
+import com.intellij.execution.actions.RunConfigurationProducer
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.libraries.Library
+import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.gradle.KotlinPlatform
+import org.jetbrains.kotlin.idea.caches.resolve.JsAnalyzerFacade
+import org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JsCompilerArgumentsHolder
+import org.jetbrains.kotlin.idea.framework.JSLibraryKind
+import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription
+import org.jetbrains.kotlin.idea.framework.JsLibraryStdDetectionUtil
+import org.jetbrains.kotlin.idea.highlighter.KotlinTestRunLineMarkerContributor.Companion.getTestStateIcon
+import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationDataProvider
+import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
+import org.jetbrains.kotlin.idea.util.string.joinWithEscape
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtFunction
+import org.jetbrains.kotlin.psi.KtNamedDeclaration
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
+import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
+import org.jetbrains.kotlin.utils.PathUtil
+import javax.swing.Icon
+
+class JsIdePlatformKindTooling : IdePlatformKindTooling() {
+    companion object {
+        private const val MAVEN_OLD_JS_STDLIB_ID = "kotlin-js-library"
+
+        private val TEST_FQ_NAME = FqName("kotlin.test.Test")
+        private val IGNORE_FQ_NAME = FqName("kotlin.test.Ignore")
+    }
+
+    override val kind = JsIdePlatformKind
+
+    override fun compilerArgumentsForProject(project: Project) = Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings
+
+    override val resolverForModuleFactory = JsAnalyzerFacade
+
+    override val mavenLibraryIds = listOf(PathUtil.JS_LIB_NAME, MAVEN_OLD_JS_STDLIB_ID)
+    override val gradlePluginId = "kotlin-platform-js"
+    override val gradlePlatformIds: List<KotlinPlatform> get() = listOf(KotlinPlatform.JS)
+
+    override val libraryKind = JSLibraryKind
+    override fun getLibraryDescription(project: Project) = JSLibraryStdDescription(project)
+
+    override fun getLibraryVersionProvider(project: Project) = { library: Library ->
+        JsLibraryStdDetectionUtil.getJsLibraryStdVersion(library, project)
+    }
+
+    override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
+        if (!descriptor.isTest()) return null
+
+        val contexts by lazy { computeConfigurationContexts(declaration) }
+
+        val runConfigData = RunConfigurationProducer
+            .getProducers(declaration.project)
+            .asSequence()
+            .filterIsInstance<KotlinJSRunConfigurationDataProvider<*>>()
+            .filter { it.isForTests }
+            .flatMap { provider -> contexts.map { context -> provider.getConfigurationData(context) } }
+            .firstOrNull { it != null } ?: return null
+
+        val locations = ArrayList<String>()
+
+        locations += FileUtil.toSystemDependentName(runConfigData.jsOutputFilePath)
+
+        val klass = when (declaration) {
+            is KtClassOrObject -> declaration
+            is KtNamedFunction -> declaration.containingClassOrObject ?: return null
+            else -> return null
+        }
+        locations += klass.parentsWithSelf.filterIsInstance<KtNamedDeclaration>().mapNotNull { it.name }.toList().asReversed()
+
+        val testName = (declaration as? KtNamedFunction)?.name
+        if (testName != null) {
+            locations += "$testName"
+        }
+
+        val prefix = if (testName != null) "test://" else "suite://"
+
+        val url = prefix + locations.joinWithEscape('.')
+
+        return getTestStateIcon(url, declaration.project)
+    }
+
+    override fun acceptsAsEntryPoint(function: KtFunction): Boolean {
+        val contexts by lazy { computeConfigurationContexts(function) }
+
+        return RunConfigurationProducer
+            .getProducers(function.project)
+            .asSequence()
+            .filterIsInstance<KotlinJSRunConfigurationDataProvider<*>>()
+            .filter { !it.isForTests }
+            .flatMap { provider -> contexts.map { context -> provider.getConfigurationData(context) } }
+            .any { it != null }
+    }
+
+    private fun computeConfigurationContexts(declaration: KtNamedDeclaration): Sequence<ConfigurationContext> {
+        return sequenceOf(ConfigurationContext(declaration))
+    }
+
+    private fun DeclarationDescriptor.isIgnored(): Boolean =
+        annotations.any { it.fqName == IGNORE_FQ_NAME } || ((containingDeclaration as? ClassDescriptor)?.isIgnored() ?: false)
+
+    private fun DeclarationDescriptor.isTest(): Boolean {
+        if (isIgnored()) return false
+
+        if (annotations.any { it.fqName == TEST_FQ_NAME }) return true
+        if (this is ClassDescriptorWithResolutionScopes) {
+            return declaredCallableMembers.any { it.isTest() }
+        }
+        return false
+    }
+}

idea/idea-jvm/src/org/jetbrains/kotlin/idea/platform/JsIdePlatformKindTooling.kt.as33

@@ -0,0 +1,127 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.idea.core.platform.impl
+
+import com.intellij.execution.PsiLocation
+import com.intellij.execution.actions.ConfigurationContext
+import com.intellij.execution.actions.RunConfigurationProducer
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.libraries.Library
+import com.intellij.openapi.util.io.FileUtil
+import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes
+import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.gradle.KotlinPlatform
+import org.jetbrains.kotlin.idea.caches.resolve.JsAnalyzerFacade
+import org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JsCompilerArgumentsHolder
+import org.jetbrains.kotlin.idea.framework.JSLibraryKind
+import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription
+import org.jetbrains.kotlin.idea.framework.JsLibraryStdDetectionUtil
+import org.jetbrains.kotlin.idea.highlighter.KotlinTestRunLineMarkerContributor.Companion.getTestStateIcon
+import org.jetbrains.kotlin.idea.js.KotlinJSRunConfigurationDataProvider
+import org.jetbrains.kotlin.idea.platform.IdePlatformKindTooling
+import org.jetbrains.kotlin.idea.util.string.joinWithEscape
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.platform.impl.JsIdePlatformKind
+import org.jetbrains.kotlin.psi.KtClassOrObject
+import org.jetbrains.kotlin.psi.KtFunction
+import org.jetbrains.kotlin.psi.KtNamedDeclaration
+import org.jetbrains.kotlin.psi.KtNamedFunction
+import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
+import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
+import org.jetbrains.kotlin.utils.PathUtil
+import javax.swing.Icon
+
+class JsIdePlatformKindTooling : IdePlatformKindTooling() {
+    companion object {
+        private const val MAVEN_OLD_JS_STDLIB_ID = "kotlin-js-library"
+
+        private val TEST_FQ_NAME = FqName("kotlin.test.Test")
+        private val IGNORE_FQ_NAME = FqName("kotlin.test.Ignore")
+    }
+
+    override val kind = JsIdePlatformKind
+
+    override fun compilerArgumentsForProject(project: Project) = Kotlin2JsCompilerArgumentsHolder.getInstance(project).settings
+
+    override val resolverForModuleFactory = JsAnalyzerFacade
+
+    override val mavenLibraryIds = listOf(PathUtil.JS_LIB_NAME, MAVEN_OLD_JS_STDLIB_ID)
+    override val gradlePluginId = "kotlin-platform-js"
+    override val gradlePlatformIds: List<KotlinPlatform> get() = listOf(KotlinPlatform.JS)
+
+    override val libraryKind = JSLibraryKind
+    override fun getLibraryDescription(project: Project) = JSLibraryStdDescription(project)
+
+    override fun getLibraryVersionProvider(project: Project) = { library: Library ->
+        JsLibraryStdDetectionUtil.getJsLibraryStdVersion(library, project)
+    }
+
+    override fun getTestIcon(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor): Icon? {
+        if (!descriptor.isTest()) return null
+
+        val contexts by lazy { computeConfigurationContexts(declaration) }
+
+        val runConfigData = RunConfigurationProducer
+            .getProducers(declaration.project)
+            .asSequence()
+            .filterIsInstance<KotlinJSRunConfigurationDataProvider<*>>()
+            .filter { it.isForTests }
+            .flatMap { provider -> contexts.map { context -> provider.getConfigurationData(context) } }
+            .firstOrNull { it != null } ?: return null
+
+        val locations = ArrayList<String>()
+
+        locations += FileUtil.toSystemDependentName(runConfigData.jsOutputFilePath)
+
+        val klass = when (declaration) {
+            is KtClassOrObject -> declaration
+            is KtNamedFunction -> declaration.containingClassOrObject ?: return null
+            else -> return null
+        }
+        locations += klass.parentsWithSelf.filterIsInstance<KtNamedDeclaration>().mapNotNull { it.name }.toList().asReversed()
+
+        val testName = (declaration as? KtNamedFunction)?.name
+        if (testName != null) {
+            locations += "$testName"
+        }
+
+        val prefix = if (testName != null) "test://" else "suite://"
+
+        val url = prefix + locations.joinWithEscape('.')
+
+        return getTestStateIcon(url, declaration.project)
+    }
+
+    override fun acceptsAsEntryPoint(function: KtFunction): Boolean {
+        val contexts by lazy { computeConfigurationContexts(function) }
+
+        return RunConfigurationProducer
+            .getProducers(function.project)
+            .asSequence()
+            .filterIsInstance<KotlinJSRunConfigurationDataProvider<*>>()
+            .filter { !it.isForTests }
+            .flatMap { provider -> contexts.map { context -> provider.getConfigurationData(context) } }
+            .any { it != null }
+    }
+
+    private fun computeConfigurationContexts(declaration: KtNamedDeclaration): Sequence<ConfigurationContext> {
+        return sequenceOf(ConfigurationContext(declaration))
+    }
+
+    private fun DeclarationDescriptor.isIgnored(): Boolean =
+        annotations.any { it.fqName == IGNORE_FQ_NAME } || ((containingDeclaration as? ClassDescriptor)?.isIgnored() ?: false)
+
+    private fun DeclarationDescriptor.isTest(): Boolean {
+        if (isIgnored()) return false
+
+        if (annotations.any { it.fqName == TEST_FQ_NAME }) return true
+        if (this is ClassDescriptorWithResolutionScopes) {
+            return declaredCallableMembers.any { it.isTest() }
+        }
+        return false
+    }
+}

idea/src/org/jetbrains/kotlin/idea/js/KotlinJSRunConfigurationDataProvider.kt

@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.idea.js
 
+import com.intellij.execution.actions.ConfigurationContext
 import com.intellij.openapi.module.Module
 import com.intellij.psi.PsiElement
 
@@ -16,5 +17,5 @@ interface KotlinJSRunConfigurationData {
 
 interface KotlinJSRunConfigurationDataProvider<out T : KotlinJSRunConfigurationData> {
     val isForTests: Boolean
-    fun getConfigurationData(element: PsiElement): T?
+    fun getConfigurationData(context: ConfigurationContext): T?
 }

idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt

@@ -19,12 +19,10 @@ package org.jetbrains.kotlin.idea.js
 import com.intellij.openapi.module.Module
 import com.intellij.openapi.roots.CompilerModuleExtension
 import org.jetbrains.jps.util.JpsPathUtil
-import org.jetbrains.kotlin.idea.caches.project.implementingModules
 import org.jetbrains.kotlin.idea.facet.KotlinFacet
 import org.jetbrains.kotlin.idea.framework.isGradleModule
-import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
-import org.jetbrains.kotlin.js.resolve.JsPlatform
-import org.jetbrains.kotlin.resolve.TargetPlatform
+import org.jetbrains.kotlin.idea.project.platform
+import org.jetbrains.kotlin.platform.impl.isJavaScript
 import org.jetbrains.plugins.gradle.settings.GradleSystemRunningSettings
 
 val Module.jsTestOutputFilePath: String?
@@ -49,11 +47,7 @@ val Module.jsProductionOutputFilePath: String?
         return JpsPathUtil.urlToPath("$outputDir/$name.js")
     }
 
-fun Module.jsOrJsImpl() = when (TargetPlatformDetector.getPlatform(this)) {
-    is TargetPlatform.Common -> implementingModules.firstOrNull { TargetPlatformDetector.getPlatform(it) is JsPlatform }
-    is JsPlatform -> this
-    else -> null
-}
+fun Module.asJsModule(): Module? = takeIf { it.platform.isJavaScript }
 
 val Module.shouldUseJpsOutput: Boolean
     get() = !(isGradleModule() && GradleSystemRunningSettings.getInstance().isUseGradleAwareMake)

idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt.181

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.js
+
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.roots.CompilerModuleExtension
+import org.jetbrains.jps.util.JpsPathUtil
+import org.jetbrains.kotlin.idea.caches.project.implementingModules
+import org.jetbrains.kotlin.idea.facet.KotlinFacet
+import org.jetbrains.kotlin.idea.framework.isGradleModule
+import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
+import org.jetbrains.kotlin.js.resolve.JsPlatform
+import org.jetbrains.kotlin.resolve.TargetPlatform
+import org.jetbrains.plugins.gradle.settings.GradleSystemRunningSettings
+
+val Module.jsTestOutputFilePath: String?
+    get() {
+        if (!shouldUseJpsOutput) {
+            (KotlinFacet.get(this)?.configuration?.settings?.testOutputPath)?.let { return it }
+        }
+
+        val compilerExtension = CompilerModuleExtension.getInstance(this)
+        val outputDir = compilerExtension?.compilerOutputUrlForTests ?: return null
+        return JpsPathUtil.urlToPath("$outputDir/${name}_test.js")
+    }
+
+val Module.jsProductionOutputFilePath: String?
+    get() {
+        if (!shouldUseJpsOutput) {
+            (KotlinFacet.get(this)?.configuration?.settings?.productionOutputPath)?.let { return it }
+        }
+
+        val compilerExtension = CompilerModuleExtension.getInstance(this)
+        val outputDir = compilerExtension?.compilerOutputUrl ?: return null
+        return JpsPathUtil.urlToPath("$outputDir/$name.js")
+    }
+
+fun Module.asJsModule(): Module? = when (TargetPlatformDetector.getPlatform(this)) {
+    is TargetPlatform.Common -> implementingModules.firstOrNull { TargetPlatformDetector.getPlatform(it) is JsPlatform }
+    is JsPlatform -> this
+    else -> null
+}
+
+val Module.shouldUseJpsOutput: Boolean
+    get() = !(isGradleModule() && GradleSystemRunningSettings.getInstance().isUseGradleAwareMake)

idea/src/org/jetbrains/kotlin/idea/js/jsUtils.kt.as33

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.idea.js
+
+import com.intellij.openapi.module.Module
+import com.intellij.openapi.roots.CompilerModuleExtension
+import org.jetbrains.jps.util.JpsPathUtil
+import org.jetbrains.kotlin.idea.caches.project.implementingModules
+import org.jetbrains.kotlin.idea.facet.KotlinFacet
+import org.jetbrains.kotlin.idea.framework.isGradleModule
+import org.jetbrains.kotlin.idea.project.TargetPlatformDetector
+import org.jetbrains.kotlin.js.resolve.JsPlatform
+import org.jetbrains.kotlin.resolve.TargetPlatform
+import org.jetbrains.plugins.gradle.settings.GradleSystemRunningSettings
+
+val Module.jsTestOutputFilePath: String?
+    get() {
+        if (!shouldUseJpsOutput) {
+            (KotlinFacet.get(this)?.configuration?.settings?.testOutputPath)?.let { return it }
+        }
+
+        val compilerExtension = CompilerModuleExtension.getInstance(this)
+        val outputDir = compilerExtension?.compilerOutputUrlForTests ?: return null
+        return JpsPathUtil.urlToPath("$outputDir/${name}_test.js")
+    }
+
+val Module.jsProductionOutputFilePath: String?
+    get() {
+        if (!shouldUseJpsOutput) {
+            (KotlinFacet.get(this)?.configuration?.settings?.productionOutputPath)?.let { return it }
+        }
+
+        val compilerExtension = CompilerModuleExtension.getInstance(this)
+        val outputDir = compilerExtension?.compilerOutputUrl ?: return null
+        return JpsPathUtil.urlToPath("$outputDir/$name.js")
+    }
+
+fun Module.asJsModule(): Module? = when (TargetPlatformDetector.getPlatform(this)) {
+    is TargetPlatform.Common -> implementingModules.firstOrNull { TargetPlatformDetector.getPlatform(it) is JsPlatform }
+    is JsPlatform -> this
+    else -> null
+}
+
+val Module.shouldUseJpsOutput: Boolean
+    get() = !(isGradleModule() && GradleSystemRunningSettings.getInstance().isUseGradleAwareMake)