Restore old package for ScriptTemplatesProvider.
Note that this is EP used in another plugins (ex. LivePlugin https://plugins.jetbrains.com/plugin/7282-liveplugin)
This commit is contained in:
@@ -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
|
||||
|
||||
+2
-12
@@ -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<KotlinScriptDefinition> {
|
||||
return loadDefinitionsFromTemplates(
|
||||
templatesProvider.templateClassNames.toList(), templatesProvider.templateClasspath,
|
||||
templatesProvider.environment.orEmpty(), templatesProvider.additionalResolverClasspath)
|
||||
}
|
||||
}
|
||||
+22
@@ -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<KotlinScriptDefinition> {
|
||||
return loadDefinitionsFromTemplates(
|
||||
templatesProvider.templateClassNames.toList(), templatesProvider.templateClasspath,
|
||||
templatesProvider.environment.orEmpty(), templatesProvider.additionalResolverClasspath
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -35,7 +35,7 @@
|
||||
interface="org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor"
|
||||
area="IDEA_PROJECT"/>
|
||||
<extensionPoint qualifiedName="org.jetbrains.kotlin.scriptTemplatesProvider"
|
||||
interface="org.jetbrains.kotlin.idea.core.script.ScriptTemplatesProvider"
|
||||
interface="org.jetbrains.kotlin.script.ScriptTemplatesProvider"
|
||||
area="IDEA_PROJECT"/>
|
||||
<extensionPoint qualifiedName="org.jetbrains.kotlin.facetConfigurationExtension"
|
||||
interface="org.jetbrains.kotlin.idea.facet.KotlinFacetConfigurationExtension"/>
|
||||
|
||||
Reference in New Issue
Block a user