diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt index 71c5f58f36c..75323905fd6 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt @@ -27,6 +27,7 @@ import com.intellij.openapi.projectRoots.ex.PathUtilEx import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate import org.jetbrains.kotlin.script.ScriptDefinitionProvider +import org.jetbrains.kotlin.script.ScriptTemplatesProvider import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.addToStdlib.flattenTo import java.io.File diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTemplatesProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTemplatesProvider.kt index df988490fba..4bfc2a4f865 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTemplatesProvider.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTemplatesProvider.kt @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.core.script +@file:Suppress("PackageDirectoryMismatch") +package org.jetbrains.kotlin.script import com.intellij.openapi.extensions.ExtensionPointName -import org.jetbrains.kotlin.script.KotlinScriptDefinition import java.io.File import kotlin.script.experimental.dependencies.DependenciesResolver @@ -59,13 +59,3 @@ interface ScriptTemplatesProvider { } } -class ScriptTemplatesProviderAdapter(private val templatesProvider: ScriptTemplatesProvider) : ScriptDefinitionContributor { - override val id: String - get() = templatesProvider.id - - override fun getDefinitions(): List { - return loadDefinitionsFromTemplates( - templatesProvider.templateClassNames.toList(), templatesProvider.templateClasspath, - templatesProvider.environment.orEmpty(), templatesProvider.additionalResolverClasspath) - } -} \ No newline at end of file diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTemplatesProviderAdapter.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTemplatesProviderAdapter.kt new file mode 100644 index 00000000000..be690e2ad04 --- /dev/null +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptTemplatesProviderAdapter.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2000-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.script + +import org.jetbrains.kotlin.script.KotlinScriptDefinition +import org.jetbrains.kotlin.script.ScriptTemplatesProvider + +class ScriptTemplatesProviderAdapter(private val templatesProvider: ScriptTemplatesProvider) : + ScriptDefinitionContributor { + override val id: String + get() = templatesProvider.id + + override fun getDefinitions(): List { + return loadDefinitionsFromTemplates( + templatesProvider.templateClassNames.toList(), templatesProvider.templateClasspath, + templatesProvider.environment.orEmpty(), templatesProvider.additionalResolverClasspath + ) + } +} \ No newline at end of file diff --git a/idea/src/META-INF/extensions/compiler.xml b/idea/src/META-INF/extensions/compiler.xml index e7be6223c32..eeb7a5a2dd5 100644 --- a/idea/src/META-INF/extensions/compiler.xml +++ b/idea/src/META-INF/extensions/compiler.xml @@ -35,7 +35,7 @@ interface="org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor" area="IDEA_PROJECT"/>