Skip to content

Commit e86b1f2

Browse files
committed
Workaround for generalized configuration classes in 191
1 parent 8d48f9d commit e86b1f2

File tree

6 files changed

+54
-5
lines changed

6 files changed

+54
-5
lines changed

.idea/inspectionProfiles/idea_default.xml

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import com.intellij.coverage.CoverageSuitesBundle
2020
import com.intellij.coverage.JavaCoverageAnnotator
2121
import com.intellij.coverage.JavaCoverageEngineExtension
2222
import com.intellij.coverage.PackageAnnotator
23-
import com.intellij.execution.configurations.RunConfigurationBase
2423
import com.intellij.openapi.diagnostic.Logger
2524
import com.intellij.openapi.module.ModuleUtilCore
2625
import com.intellij.openapi.roots.CompilerModuleExtension
@@ -35,13 +34,14 @@ import com.intellij.psi.PsiNamedElement
3534
import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
3635
import org.jetbrains.kotlin.idea.core.isInTestSourceContentKotlinAware
3736
import org.jetbrains.kotlin.idea.run.KotlinRunConfiguration
37+
import org.jetbrains.kotlin.idea.run.RunConfigurationBaseAny
3838
import org.jetbrains.kotlin.idea.util.application.runReadAction
3939
import org.jetbrains.kotlin.psi.KtClassOrObject
4040
import org.jetbrains.kotlin.psi.KtFile
4141
import java.io.File
4242

4343
class KotlinCoverageExtension : JavaCoverageEngineExtension() {
44-
override fun isApplicableTo(conf: RunConfigurationBase?): Boolean = conf is KotlinRunConfiguration
44+
override fun isApplicableTo(conf: RunConfigurationBaseAny?): Boolean = conf is KotlinRunConfiguration
4545

4646
override fun suggestQualifiedName(sourceFile: PsiFile, classes: Array<out PsiClass>, names: MutableSet<String>): Boolean {
4747
if (sourceFile is KtFile) {

idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import com.intellij.execution.CommonJavaRunConfigurationParameters
2020
import com.intellij.execution.ExternalizablePath
2121
import com.intellij.execution.configurations.ConfigurationFactory
2222
import com.intellij.execution.configurations.JavaRunConfigurationModule
23-
import com.intellij.execution.configurations.ModuleBasedConfiguration
2423
import com.intellij.execution.configurations.RefactoringListenerProvider
2524

2625
@Suppress("PropertyName", "MemberVisibilityCanBePrivate")
@@ -30,7 +29,7 @@ abstract class JetRunConfiguration(
3029
runConfigurationModule: JavaRunConfigurationModule,
3130
factory: ConfigurationFactory
3231
) :
33-
ModuleBasedConfiguration<JavaRunConfigurationModule>(name, runConfigurationModule, factory),
32+
ModuleBasedConfigurationElement<JavaRunConfigurationModule>(name, runConfigurationModule, factory),
3433
CommonJavaRunConfigurationParameters,
3534
RefactoringListenerProvider {
3635

idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer<JUnitConfig
5959
if (vmParameters != null && configuration.vmParameters != vmParameters) return false
6060

6161
val template = RunManager.getInstance(configuration.project).getConfigurationTemplate(configurationFactory)
62-
val predefinedModule = (template.configuration as ModuleBasedConfiguration<*>).configurationModule.module
62+
val predefinedModule = (template.configuration as ModuleBasedConfigurationAny).configurationModule.module
6363
val configurationModule = configuration.configurationModule.module
6464
return configurationModule == context.location?.module?.asJvmModule() || configurationModule == predefinedModule
6565
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
3+
* that can be found in the license/LICENSE.txt file.
4+
*/
5+
6+
@file:Suppress("IncompatibleAPI")
7+
8+
package org.jetbrains.kotlin.idea.run
9+
10+
import com.intellij.execution.configurations.ModuleBasedConfiguration
11+
import com.intellij.execution.configurations.RunConfigurationBase
12+
import org.jdom.Element
13+
14+
// Generalized in 191
15+
// BUNCH: 191
16+
typealias RunConfigurationBaseAny = RunConfigurationBase
17+
18+
// Generalized in 191
19+
// BUNCH: 191
20+
typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*>
21+
22+
// Generalized in 191
23+
// BUNCH: 191
24+
typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T>
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*
2+
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
3+
* that can be found in the license/LICENSE.txt file.
4+
*/
5+
6+
@file:Suppress("IncompatibleAPI")
7+
8+
package org.jetbrains.kotlin.idea.run
9+
10+
import com.intellij.execution.configurations.ModuleBasedConfiguration
11+
import com.intellij.execution.configurations.RunConfigurationBase
12+
import org.jdom.Element
13+
14+
// Generalized in 191
15+
// BUNCH: 191
16+
typealias RunConfigurationBaseAny = RunConfigurationBase<*>
17+
18+
// Generalized in 191
19+
// BUNCH: 191
20+
typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *>
21+
22+
// Generalized in 191
23+
// BUNCH: 191
24+
typealias ModuleBasedConfigurationElement<T> = ModuleBasedConfiguration<T, Element>

0 commit comments

Comments
 (0)