From 169aa6348c70f7664a86b95de94182d819560d09 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 27 Aug 2019 19:17:39 +0300 Subject: [PATCH] Remove runConfigurationsCompat.kt after removing 182 #KT-33536 Fixed --- .idea/inspectionProfiles/idea_default.xml | 3 -- .../idea/coverage/KotlinCoverageExtension.kt | 4 +-- .../kotlin/idea/run/JetRunConfiguration.kt | 4 ++- .../KotlinJUnitRunConfigurationProducer.kt | 3 +- .../idea/run/runConfigurationsCompat.kt | 29 ------------------- .../idea/run/runConfigurationsCompat.kt.as34 | 29 ------------------- .../idea/run/runConfigurationsCompat.kt.as35 | 29 ------------------- .../idea/run/runConfigurationsCompat.kt.as36 | 29 ------------------- 8 files changed, 7 insertions(+), 123 deletions(-) delete mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt delete mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 delete mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as35 delete mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as36 diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml index d9bf86b142a..8ecbb17d497 100644 --- a/.idea/inspectionProfiles/idea_default.xml +++ b/.idea/inspectionProfiles/idea_default.xml @@ -101,9 +101,6 @@ - - - diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt index 72045fb16a2..79ab9af84c4 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/coverage/KotlinCoverageExtension.kt @@ -20,6 +20,7 @@ import com.intellij.coverage.CoverageSuitesBundle import com.intellij.coverage.JavaCoverageAnnotator import com.intellij.coverage.JavaCoverageEngineExtension import com.intellij.coverage.PackageAnnotator +import com.intellij.execution.configurations.RunConfigurationBase import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.roots.CompilerModuleExtension @@ -34,14 +35,13 @@ import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil import org.jetbrains.kotlin.idea.core.isInTestSourceContentKotlinAware import org.jetbrains.kotlin.idea.run.KotlinRunConfiguration -import org.jetbrains.kotlin.idea.run.RunConfigurationBaseAny import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile import java.io.File class KotlinCoverageExtension : JavaCoverageEngineExtension() { - override fun isApplicableTo(conf: RunConfigurationBaseAny?): Boolean = conf is KotlinRunConfiguration + override fun isApplicableTo(conf: RunConfigurationBase<*>?): Boolean = conf is KotlinRunConfiguration override fun suggestQualifiedName(sourceFile: PsiFile, classes: Array, names: MutableSet): Boolean { if (sourceFile is KtFile) { diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.kt index fcbad66aafe..c86a09d0ccb 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JetRunConfiguration.kt @@ -20,7 +20,9 @@ import com.intellij.execution.CommonJavaRunConfigurationParameters import com.intellij.execution.ExternalizablePath import com.intellij.execution.configurations.ConfigurationFactory import com.intellij.execution.configurations.JavaRunConfigurationModule +import com.intellij.execution.configurations.ModuleBasedConfiguration import com.intellij.execution.configurations.RefactoringListenerProvider +import org.jdom.Element @Suppress("PropertyName", "MemberVisibilityCanBePrivate") @Deprecated("Will be dropped in 1.2.20. Use KotlinRunConfiguration instead.") @@ -29,7 +31,7 @@ abstract class JetRunConfiguration( runConfigurationModule: JavaRunConfigurationModule, factory: ConfigurationFactory ) : - ModuleBasedConfigurationElement(name, runConfigurationModule, factory), + ModuleBasedConfiguration(name, runConfigurationModule, factory), CommonJavaRunConfigurationParameters, RefactoringListenerProvider { diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt index 487918bfac8..eb9414519ca 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt @@ -12,6 +12,7 @@ import com.intellij.execution.RunnerAndConfigurationSettings import com.intellij.execution.actions.ConfigurationContext import com.intellij.execution.actions.ConfigurationFromContext import com.intellij.execution.actions.RunConfigurationProducer +import com.intellij.execution.configurations.ModuleBasedConfiguration import com.intellij.execution.junit.* import com.intellij.execution.testframework.AbstractPatternBasedConfigurationProducer import com.intellij.openapi.project.DumbService @@ -62,7 +63,7 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer).configurationModule.module val configurationModule = configuration.configurationModule.module return configurationModule == context.location?.module?.asJvmModule() || configurationModule == predefinedModule } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt deleted file mode 100644 index 41a9980f891..00000000000 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -@file:Suppress("IncompatibleAPI") - -package org.jetbrains.kotlin.idea.run - -import com.intellij.execution.configurations.LocatableConfigurationBase -import com.intellij.execution.configurations.ModuleBasedConfiguration -import com.intellij.execution.configurations.RunConfigurationBase -import org.jdom.Element - -// Generalized in 183 -// BUNCH: 183 -typealias RunConfigurationBaseAny = RunConfigurationBase<*> - -// Generalized in 183 -// BUNCH: 183 -typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *> - -// Generalized in 183 -// BUNCH: 183 -typealias LocatableConfigurationBaseAny = LocatableConfigurationBase - -// Generalized in 183 -// BUNCH: 183 -typealias ModuleBasedConfigurationElement = ModuleBasedConfiguration \ No newline at end of file diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 deleted file mode 100644 index 86756e590dd..00000000000 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as34 +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -@file:Suppress("IncompatibleAPI") - -package org.jetbrains.kotlin.idea.run - -import com.intellij.execution.configurations.LocatableConfigurationBase -import com.intellij.execution.configurations.ModuleBasedConfiguration -import com.intellij.execution.configurations.RunConfigurationBase -import org.jdom.Element - -// Generalized in 183 -// BUNCH: 182 -typealias RunConfigurationBaseAny = RunConfigurationBase<*> - -// Generalized in 183 -// BUNCH: 182 -typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *> - -// Generalized in 183 -// BUNCH: 182 -typealias LocatableConfigurationBaseAny = LocatableConfigurationBase - -// Generalized in 183 -// BUNCH: 182 -typealias ModuleBasedConfigurationElement = ModuleBasedConfiguration \ No newline at end of file diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as35 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as35 deleted file mode 100644 index 86756e590dd..00000000000 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as35 +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -@file:Suppress("IncompatibleAPI") - -package org.jetbrains.kotlin.idea.run - -import com.intellij.execution.configurations.LocatableConfigurationBase -import com.intellij.execution.configurations.ModuleBasedConfiguration -import com.intellij.execution.configurations.RunConfigurationBase -import org.jdom.Element - -// Generalized in 183 -// BUNCH: 182 -typealias RunConfigurationBaseAny = RunConfigurationBase<*> - -// Generalized in 183 -// BUNCH: 182 -typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *> - -// Generalized in 183 -// BUNCH: 182 -typealias LocatableConfigurationBaseAny = LocatableConfigurationBase - -// Generalized in 183 -// BUNCH: 182 -typealias ModuleBasedConfigurationElement = ModuleBasedConfiguration \ No newline at end of file diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as36 b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as36 deleted file mode 100644 index 86756e590dd..00000000000 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/runConfigurationsCompat.kt.as36 +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -@file:Suppress("IncompatibleAPI") - -package org.jetbrains.kotlin.idea.run - -import com.intellij.execution.configurations.LocatableConfigurationBase -import com.intellij.execution.configurations.ModuleBasedConfiguration -import com.intellij.execution.configurations.RunConfigurationBase -import org.jdom.Element - -// Generalized in 183 -// BUNCH: 182 -typealias RunConfigurationBaseAny = RunConfigurationBase<*> - -// Generalized in 183 -// BUNCH: 182 -typealias ModuleBasedConfigurationAny = ModuleBasedConfiguration<*, *> - -// Generalized in 183 -// BUNCH: 182 -typealias LocatableConfigurationBaseAny = LocatableConfigurationBase - -// Generalized in 183 -// BUNCH: 182 -typealias ModuleBasedConfigurationElement = ModuleBasedConfiguration \ No newline at end of file