diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml index b7e1cb716c9..544343171c4 100644 --- a/.idea/inspectionProfiles/idea_default.xml +++ b/.idea/inspectionProfiles/idea_default.xml @@ -108,6 +108,7 @@ + diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleTestRunConfigurationProducer.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleTestRunConfigurationProducer.kt index da9d8dfa17b..25000556def 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleTestRunConfigurationProducer.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/run/KotlinGradleTestRunConfigurationProducer.kt @@ -15,7 +15,6 @@ */ package org.jetbrains.kotlin.idea.run -import com.intellij.execution.JavaRunConfigurationExtensionManager import com.intellij.execution.actions.ConfigurationContext import com.intellij.execution.actions.RunConfigurationProducer import com.intellij.execution.junit.PatternConfigurationProducer @@ -93,7 +92,7 @@ class KotlinTestClassGradleConfigurationProducer : TestClassGradleConfigurationP configuration.settings.scriptParameters = String.format("--tests \"%s\"", testClass.qualifiedName) configuration.name = testClass.name - JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, contextLocation) + JavaRunConfigurationExtensionManagerUtil.getInstance().extendCreatedConfiguration(configuration, contextLocation) return true } @@ -151,7 +150,7 @@ class KotlinTestMethodGradleConfigurationProducer : TestMethodGradleConfiguratio if (!applyTestMethodConfiguration(configuration, context, psiMethod, containingClass)) return false - JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, contextLocation) + JavaRunConfigurationExtensionManagerUtil.getInstance().extendCreatedConfiguration(configuration, contextLocation) return true } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java new file mode 100644 index 00000000000..310549f8a33 --- /dev/null +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java @@ -0,0 +1,19 @@ +/* + * 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.run; + +import com.intellij.execution.JavaRunConfigurationExtensionManager; + +// Introduced for compatibility reasons only. +// Method JavaRunConfigurationExtensionManager.getInstance() was rewritten to Kotlin in 191 and +// can't be called from Kotlin anymore. +// BUNCH: 191 +public class JavaRunConfigurationExtensionManagerUtil { + public static JavaRunConfigurationExtensionManager getInstance() { + //noinspection IncompatibleAPI + return JavaRunConfigurationExtensionManager.getInstance(); + } +} 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 46378867b44..051761f5c32 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 @@ -86,7 +86,7 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer getConfigurationEditor() { SettingsEditorGroup group = new SettingsEditorGroup(); group.addEditor(ExecutionBundle.message("run.configuration.configuration.tab.title"), new KotlinRunConfigurationEditor(getProject())); - JavaRunConfigurationExtensionManager.getInstance().appendEditors(this, group); + JavaRunConfigurationExtensionManagerUtil.getInstance().appendEditors(this, group); group.addEditor(ExecutionBundle.message("logs.tab.title"), new LogConfigurationPanel()); return group; } @@ -107,7 +107,7 @@ public class KotlinRunConfiguration extends JetRunConfiguration { PathMacroManager.getInstance(getProject()).expandPaths(element); super.readExternal(element); - JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element); + JavaRunConfigurationExtensionManagerUtil.getInstance().readExternal(this, element); DefaultJDOMExternalizer.readExternal(this, element); readModule(element); @@ -117,7 +117,7 @@ public class KotlinRunConfiguration extends JetRunConfiguration { @Override public void writeExternal(Element element) throws WriteExternalException { super.writeExternal(element); - JavaRunConfigurationExtensionManager.getInstance().writeExternal(this, element); + JavaRunConfigurationExtensionManagerUtil.getInstance().writeExternal(this, element); DefaultJDOMExternalizer.writeExternal(this, element); writeModule(element); diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java index 4a5e4f0c676..85c2a272f2d 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java @@ -16,16 +16,10 @@ package org.jetbrains.kotlin.idea.run; -import com.intellij.execution.configurations.RunConfiguration; -import com.intellij.execution.JavaExecutionUtil; -import com.intellij.execution.JavaRunConfigurationExtensionManager; -import com.intellij.execution.Location; -import com.intellij.execution.PsiLocation; -import com.intellij.execution.RunnerAndConfigurationSettings; -import com.intellij.execution.RunManager; -import com.intellij.execution.CommonJavaRunConfigurationParameters; +import com.intellij.execution.*; import com.intellij.execution.actions.ConfigurationContext; import com.intellij.execution.actions.ConfigurationFromContext; +import com.intellij.execution.configurations.RunConfiguration; import com.intellij.execution.junit.InheritorChooser; import com.intellij.execution.junit2.info.MethodLocation; import com.intellij.openapi.module.Module; @@ -222,7 +216,7 @@ public class KotlinTestNgConfigurationProducer extends TestNGConfigurationProduc } configuration.restoreOriginalModule(originalModule); configuration.setName(configuration.getName()); - JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, location); + JavaRunConfigurationExtensionManagerUtil.getInstance().extendCreatedConfiguration(configuration, location); return true; } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt index f958cfefcc4..88a56e22a2f 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt @@ -24,8 +24,6 @@ import com.intellij.execution.runners.ExecutionEnvironment import com.intellij.execution.util.JavaParametersUtil import com.intellij.execution.util.ProgramParametersUtil import com.intellij.ide.projectView.impl.ProjectRootsUtil -import com.intellij.openapi.compiler.CompilerPaths -import com.intellij.openapi.compiler.ex.CompilerPathsEx import com.intellij.openapi.components.PathMacroManager import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleUtilCore @@ -41,6 +39,7 @@ import com.intellij.refactoring.listeners.RefactoringElementAdapter import com.intellij.refactoring.listeners.RefactoringElementListener import org.jdom.Element import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager +import org.jetbrains.kotlin.idea.run.JavaRunConfigurationExtensionManagerUtil import org.jetbrains.kotlin.idea.run.KotlinRunConfiguration import org.jetbrains.kotlin.idea.run.script.standalone.KotlinStandaloneScriptRunConfigurationProducer.Companion.pathFromPsiElement import org.jetbrains.kotlin.idea.util.ProjectRootsUtil.isProjectSourceFile @@ -113,13 +112,13 @@ class KotlinStandaloneScriptRunConfiguration( override fun getConfigurationEditor(): SettingsEditor { val group = SettingsEditorGroup() group.addEditor(ExecutionBundle.message("run.configuration.configuration.tab.title"), KotlinStandaloneScriptRunConfigurationEditor(project)) - JavaRunConfigurationExtensionManager.getInstance().appendEditors(this, group) + JavaRunConfigurationExtensionManagerUtil.getInstance().appendEditors(this, group) return group } override fun writeExternal(element: Element) { super.writeExternal(element) - JavaRunConfigurationExtensionManager.getInstance().writeExternal(this, element) + JavaRunConfigurationExtensionManagerUtil.getInstance().writeExternal(this, element) DefaultJDOMExternalizer.writeExternal(this, element) EnvironmentVariablesComponent.writeExternal(element, getEnvs()) PathMacroManager.getInstance(project).collapsePathsRecursively(element) @@ -128,7 +127,7 @@ class KotlinStandaloneScriptRunConfiguration( override fun readExternal(element: Element) { PathMacroManager.getInstance(project).expandPaths(element) super.readExternal(element) - JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element) + JavaRunConfigurationExtensionManagerUtil.getInstance().readExternal(this, element) DefaultJDOMExternalizer.readExternal(this, element) EnvironmentVariablesComponent.readExternal(element, getEnvs()) }