diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/CollectScriptCompilationDependenciesTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/CollectScriptCompilationDependenciesTest.kt index ccedcf94305..d1bbb9d6b86 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/CollectScriptCompilationDependenciesTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/CollectScriptCompilationDependenciesTest.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.cli.jvm.config.jvmClasspathRoots import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.loadScriptingPlugin -import org.jetbrains.kotlin.scripting.shared.definitions.KotlinScriptDefinitionAdapterFromNewAPI +import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinitionAdapterFromNewAPI import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptCliCompilationTest.kt b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptCliCompilationTest.kt index f499652aa99..1fb8f8bcc5b 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptCliCompilationTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptCliCompilationTest.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.config.JVMConfigurationKeys import org.jetbrains.kotlin.daemon.TestMessageCollector import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.loadScriptingPlugin -import org.jetbrains.kotlin.scripting.shared.definitions.KotlinScriptDefinitionAdapterFromNewAPI +import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinitionAdapterFromNewAPI import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestJdkKind diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt index 167b88da557..bf93f1531b5 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/project/getModuleInfo.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.idea.util.isInSourceContentWithoutInjected import org.jetbrains.kotlin.idea.util.isKotlinBinary import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.getParentOfType -import org.jetbrains.kotlin.scripting.shared.definitions.scriptDefinitionByFileName +import org.jetbrains.kotlin.scripting.definitions.scriptDefinitionByFileName import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.utils.yieldIfNotNull diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java index a5f5c76ffca..ea28fdfedbb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/TargetPlatformDetector.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.KtPsiFactoryKt; import org.jetbrains.kotlin.resolve.TargetPlatform; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.script.KotlinScriptDefinition; -import org.jetbrains.kotlin.scripting.shared.definitions.DefinitionsKt; +import org.jetbrains.kotlin.scripting.definitions.DefinitionsKt; public class TargetPlatformDetector { public static final TargetPlatformDetector INSTANCE = new TargetPlatformDetector(); diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt index e25221a0849..140027cd34d 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/searchUtil.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.idea.util.compat.psiSearchHelperInstance import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtNamedDeclaration -import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition +import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition import org.jetbrains.kotlin.types.expressions.OperatorConventions import java.util.* diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt index e0a60d65cba..5a355d7dcdb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ProjectRootsUtil.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager import org.jetbrains.kotlin.idea.decompiler.builtIns.KotlinBuiltInFileType import org.jetbrains.kotlin.idea.decompiler.js.KotlinJavaScriptMetaFileType import org.jetbrains.kotlin.idea.util.application.runReadAction -import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition +import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition import kotlin.script.experimental.location.ScriptExpectedLocation abstract class KotlinBinaryExtension(val fileType: FileType) { 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 7f5d1425dec..c68e31e2aa9 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 @@ -42,8 +42,8 @@ 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.scripting.shared.definitions.KotlinScriptDefinitionAdapterFromNewAPI -import org.jetbrains.kotlin.scripting.shared.definitions.LazyScriptDefinitionProvider +import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinitionAdapterFromNewAPI +import org.jetbrains.kotlin.scripting.definitions.LazyScriptDefinitionProvider import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.utils.addToStdlib.flattenTo diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt index f283b800a2b..50aedb39f84 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesManager.kt @@ -25,7 +25,7 @@ import com.intellij.util.io.URLUtil import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.idea.core.script.dependencies.SyncScriptDependenciesLoader import org.jetbrains.kotlin.script.ScriptDependenciesProvider -import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition +import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition import java.io.File import kotlin.script.experimental.dependencies.ScriptDependencies diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt index 978a172bb97..e289c30aef7 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDependenciesUpdater.kt @@ -40,8 +40,8 @@ import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.NotNullableUserDataProperty import org.jetbrains.kotlin.script.KotlinScriptDefinition -import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition -import org.jetbrains.kotlin.scripting.shared.definitions.scriptDefinition +import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition +import org.jetbrains.kotlin.scripting.definitions.scriptDefinition import kotlin.script.experimental.dependencies.ScriptDependencies class ScriptDependenciesUpdater( diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/AsyncScriptDependenciesLoader.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/AsyncScriptDependenciesLoader.kt index 71a3394bb93..e91e10823d3 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/AsyncScriptDependenciesLoader.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/AsyncScriptDependenciesLoader.kt @@ -17,7 +17,7 @@ import kotlinx.coroutines.runBlocking import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.asResolveFailure -import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition +import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.write diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt index 8ef1b2b9d8a..af0af76b3e0 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/dependencies/KotlinScriptResolveScopeProvider.kt @@ -23,7 +23,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.idea.core.script.ScriptDependenciesManager import org.jetbrains.kotlin.idea.core.script.StandardIdeScriptDefinition import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate -import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition +import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition class KotlinScriptResolveScopeProvider : ResolveScopeProvider() { companion object { diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt index 13ca461a8a7..c9918647ea1 100644 --- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt +++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/core/script/GradleScriptTemplateProvider.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.lexer.KotlinLexer import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate -import org.jetbrains.kotlin.scripting.shared.definitions.KotlinScriptDefinitionAdapterFromNewAPIBase +import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinitionAdapterFromNewAPIBase import org.jetbrains.plugins.gradle.config.GradleSettingsListenerAdapter import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper import org.jetbrains.plugins.gradle.settings.DistributionType diff --git a/idea/resources/META-INF/plugin-kotlin-extensions.xml b/idea/resources/META-INF/plugin-kotlin-extensions.xml index eed8e23982c..387ef2e8cd7 100644 --- a/idea/resources/META-INF/plugin-kotlin-extensions.xml +++ b/idea/resources/META-INF/plugin-kotlin-extensions.xml @@ -29,7 +29,7 @@ - - + + \ No newline at end of file diff --git a/idea/src/org/jetbrains/kotlin/idea/script/BridgeDefinitionsContributor.kt b/idea/src/org/jetbrains/kotlin/idea/script/BridgeDefinitionsContributor.kt index 56659ec3d53..8941be29ced 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/BridgeDefinitionsContributor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/BridgeDefinitionsContributor.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.idea.core.script.ScriptDefinitionContributor import org.jetbrains.kotlin.idea.core.script.loadDefinitionsFromTemplates import org.jetbrains.kotlin.script.KotlinScriptDefinition -import org.jetbrains.kotlin.scripting.shared.definitions.ScriptDefinitionsFromClasspathDiscoverySource +import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsFromClasspathDiscoverySource import kotlin.script.experimental.intellij.ScriptDefinitionsProvider class BridgeScriptDefinitionsContributor(private val project: Project) : ScriptDefinitionContributor { diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt index 8ea7fc6f1e5..7b2d652488a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/configuration/KotlinScriptDefinitionsModel.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.idea.core.script.settings.KotlinScriptingSettings import org.jetbrains.kotlin.parsing.KotlinParserDefinition import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate -import org.jetbrains.kotlin.scripting.shared.definitions.KotlinScriptDefinitionAdapterFromNewAPIBase +import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinitionAdapterFromNewAPIBase class KotlinScriptDefinitionsModelDescriptor(val definition: KotlinScriptDefinition, var isEnabled: Boolean) diff --git a/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt b/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt index ddafbf70b8b..97c88f83a6c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/configuration/MultipleScriptDefinitionsChecker.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.parsing.KotlinParserDefinition import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.KotlinScriptDefinitionFromAnnotatedTemplate -import org.jetbrains.kotlin.scripting.shared.definitions.KotlinScriptDefinitionAdapterFromNewAPIBase +import org.jetbrains.kotlin.scripting.definitions.KotlinScriptDefinitionAdapterFromNewAPIBase class MultipleScriptDefinitionsChecker(private val project: Project) : EditorNotifications.Provider() { diff --git a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt index 877f45b6ffa..56b58e48403 100644 --- a/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt +++ b/idea/src/org/jetbrains/kotlin/idea/script/scriptsTemplatesFromDependencies.kt @@ -15,8 +15,8 @@ import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.idea.core.script.loadDefinitionsFromTemplates import org.jetbrains.kotlin.idea.util.projectStructure.allModules import org.jetbrains.kotlin.script.KotlinScriptDefinition -import org.jetbrains.kotlin.scripting.shared.definitions.SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT -import org.jetbrains.kotlin.scripting.shared.definitions.SCRIPT_DEFINITION_MARKERS_PATH +import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT +import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_PATH import java.io.File import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.write diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt index a5ec36df43e..b9124b36179 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/scripting/internal/ScriptingGradleSubplugin.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.gradle.plugin.* import org.jetbrains.kotlin.gradle.scripting.ScriptingExtension import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.useLazyTaskConfiguration -import org.jetbrains.kotlin.scripting.shared.definitions.ScriptDefinitionsFromClasspathDiscoverySource +import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsFromClasspathDiscoverySource import java.io.File private const val MISCONFIGURATION_MESSAGE_SUFFIX = "the plugin is probably applied by a mistake" diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt similarity index 98% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt index fcee474992d..5b8d8567f3a 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/KotlinScriptDefinitionAdapterFromNewAPI.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.definitions +package org.jetbrains.kotlin.scripting.definitions import com.intellij.openapi.fileTypes.LanguageFileType import org.jetbrains.kotlin.idea.KotlinFileType diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionFromDiscoveredClass.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionFromDiscoveredClass.kt similarity index 98% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionFromDiscoveredClass.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionFromDiscoveredClass.kt index 5ee8b6975b7..1db0b803b60 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionFromDiscoveredClass.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionFromDiscoveredClass.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.definitions +package org.jetbrains.kotlin.scripting.definitions import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionProvider.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionProvider.kt similarity index 98% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionProvider.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionProvider.kt index 81bcec6fcd6..bcc9931d456 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/LazyScriptDefinitionProvider.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/LazyScriptDefinitionProvider.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.definitions +package org.jetbrains.kotlin.scripting.definitions import com.intellij.ide.highlighter.JavaFileType import org.jetbrains.kotlin.idea.KotlinFileType diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt similarity index 98% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt index f90429c89ed..827bfc220c3 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptiDefinitionsFromClasspathDiscoverySource.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.definitions +package org.jetbrains.kotlin.scripting.definitions import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector @@ -62,7 +62,9 @@ fun discoverScriptTemplatesInClasspath( if (jar.getJarEntry(SCRIPT_DEFINITION_MARKERS_PATH) != null) { val definitionNames = jar.entries().asSequence().mapNotNull { if (it.isDirectory || !it.name.startsWith(SCRIPT_DEFINITION_MARKERS_PATH)) null - else it.name.removePrefix(SCRIPT_DEFINITION_MARKERS_PATH).removeSuffix(SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT) + else it.name.removePrefix(SCRIPT_DEFINITION_MARKERS_PATH).removeSuffix( + SCRIPT_DEFINITION_MARKERS_EXTENSION_WITH_DOT + ) }.toList() val (loadedDefinitions, notFoundClasses) = definitionNames.partitionLoadJarDefinitions(jar, loader, scriptResolverEnv, messageCollector) diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/asmBasedAnnotationsLoading.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/asmBasedAnnotationsLoading.kt similarity index 96% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/asmBasedAnnotationsLoading.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/asmBasedAnnotationsLoading.kt index 7b1053d8ea1..89cf71f2270 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/asmBasedAnnotationsLoading.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/asmBasedAnnotationsLoading.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.definitions +package org.jetbrains.kotlin.scripting.definitions import org.jetbrains.org.objectweb.asm.* diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/definitions.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt similarity index 97% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/definitions.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt index 1da21b2f18b..bce7b1d6196 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/definitions/definitions.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/definitions.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.definitions +package org.jetbrains.kotlin.scripting.definitions import com.intellij.ide.highlighter.JavaClassFileType import com.intellij.openapi.fileTypes.FileTypeRegistry diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptExtraImportsProviderExtension.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptExtraImportsProviderExtension.kt similarity index 96% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptExtraImportsProviderExtension.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptExtraImportsProviderExtension.kt index 3d20ac31a8c..2a7e2819c2a 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptExtraImportsProviderExtension.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptExtraImportsProviderExtension.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.extensions +package org.jetbrains.kotlin.scripting.extensions import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.KtFile diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptingResolveExtension.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptingResolveExtension.kt similarity index 90% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptingResolveExtension.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptingResolveExtension.kt index 3e049435964..d260ed16df7 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/extensions/ScriptingResolveExtension.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/extensions/ScriptingResolveExtension.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.extensions +package org.jetbrains.kotlin.scripting.extensions import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.resolve.extensions.SyntheticResolveExtension import org.jetbrains.kotlin.resolve.lazy.LazyClassContext import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider -import org.jetbrains.kotlin.scripting.shared.resolve.LazyScriptDescriptor +import org.jetbrains.kotlin.scripting.resolve.LazyScriptDescriptor class ScriptingResolveExtension : SyntheticResolveExtension { override fun generateSyntheticClasses( diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/identifiers.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/identifiers.kt similarity index 82% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/identifiers.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/identifiers.kt index 318a165f562..4e30845caca 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/identifiers.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/identifiers.kt @@ -3,6 +3,6 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared +package org.jetbrains.kotlin.scripting const val KOTLIN_SCRIPTING_PLUGIN_ID = "kotlin.scripting" diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptClassMemberScope.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptClassMemberScope.kt similarity index 98% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptClassMemberScope.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptClassMemberScope.kt index e7f59f27adf..9ac417e7b4f 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptClassMemberScope.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptClassMemberScope.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.resolve +package org.jetbrains.kotlin.scripting.resolve import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt similarity index 97% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptDescriptor.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt index 1b53c625bd8..fbdd6c76c1e 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/LazyScriptDescriptor.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/LazyScriptDescriptor.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.resolve +package org.jetbrains.kotlin.scripting.resolve import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.VirtualFileManager @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.source.toSourceElement import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.ScriptDependenciesProvider import org.jetbrains.kotlin.script.ScriptPriorities -import org.jetbrains.kotlin.scripting.shared.definitions.scriptDefinitionByFileName +import org.jetbrains.kotlin.scripting.definitions.scriptDefinitionByFileName import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.typeUtil.isNothing import org.jetbrains.kotlin.types.typeUtil.isUnit @@ -105,7 +105,10 @@ class LazyScriptDescriptor( override fun getPriority() = priority val scriptDefinition: () -> KotlinScriptDefinition = resolveSession.storageManager.createLazyValue { - scriptDefinitionByFileName(resolveSession.project, scriptInfo.script.containingKtFile.name) + scriptDefinitionByFileName( + resolveSession.project, + scriptInfo.script.containingKtFile.name + ) } override fun substitute(substitutor: TypeSubstitutor) = this diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ReplResultPropertyDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ReplResultPropertyDescriptor.kt similarity index 95% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ReplResultPropertyDescriptor.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ReplResultPropertyDescriptor.kt index 35864a24c34..34ffdca920a 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ReplResultPropertyDescriptor.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ReplResultPropertyDescriptor.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.resolve +package org.jetbrains.kotlin.scripting.resolve import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertiesDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertiesDescriptor.kt similarity index 98% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertiesDescriptor.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertiesDescriptor.kt index dd703e0576d..ca2cba0894e 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertiesDescriptor.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertiesDescriptor.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.resolve +package org.jetbrains.kotlin.scripting.resolve import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertyDescriptor.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertyDescriptor.kt similarity index 98% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertyDescriptor.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertyDescriptor.kt index a2d428b14ef..398a59d6b1d 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/ScriptProvidedPropertyDescriptor.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/ScriptProvidedPropertyDescriptor.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.resolve +package org.jetbrains.kotlin.scripting.resolve import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.annotations.Annotations diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/legacyWrappers.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/legacyWrappers.kt similarity index 98% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/legacyWrappers.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/legacyWrappers.kt index 939f4a63b93..a1f209ac93f 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/legacyWrappers.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/legacyWrappers.kt @@ -5,7 +5,7 @@ @file:Suppress("DEPRECATION") -package org.jetbrains.kotlin.scripting.shared.resolve +package org.jetbrains.kotlin.scripting.resolve import org.jetbrains.kotlin.script.DependencyResolverWrapper import java.io.File diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/scriptDescriptorUtil.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/scriptDescriptorUtil.kt similarity index 92% rename from plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/scriptDescriptorUtil.kt rename to plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/scriptDescriptorUtil.kt index 5714a9b0f92..ffba9aa1784 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/shared/resolve/scriptDescriptorUtil.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/resolve/scriptDescriptorUtil.kt @@ -3,7 +3,7 @@ * that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.scripting.shared.resolve +package org.jetbrains.kotlin.scripting.resolve import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCommandLineProcessor.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCommandLineProcessor.kt index 673e183c0d5..ef2b4762fa6 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCommandLineProcessor.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCommandLineProcessor.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.compiler.plugin.CommandLineProcessor import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.CompilerConfigurationKey import org.jetbrains.kotlin.config.JVMConfigurationKeys -import org.jetbrains.kotlin.scripting.shared.KOTLIN_SCRIPTING_PLUGIN_ID +import org.jetbrains.kotlin.scripting.KOTLIN_SCRIPTING_PLUGIN_ID object ScriptingConfigurationKeys { val DISABLE_SCRIPTING_PLUGIN_OPTION: CompilerConfigurationKey = diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerConfigurationExtension.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerConfigurationExtension.kt index f2b5fd200f6..85a1538d3df 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerConfigurationExtension.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerConfigurationExtension.kt @@ -17,8 +17,8 @@ import org.jetbrains.kotlin.extensions.CompilerConfigurationExtension import org.jetbrains.kotlin.idea.KotlinFileType import org.jetbrains.kotlin.script.ScriptDefinitionProvider import org.jetbrains.kotlin.script.StandardScriptDefinition -import org.jetbrains.kotlin.scripting.shared.definitions.ScriptDefinitionsFromClasspathDiscoverySource -import org.jetbrains.kotlin.scripting.shared.definitions.loadScriptTemplatesFromClasspath +import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionsFromClasspathDiscoverySource +import org.jetbrains.kotlin.scripting.definitions.loadScriptTemplatesFromClasspath import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider import java.io.File diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/pluginRegisrar.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/pluginRegisrar.kt index 876883515bf..7d1f463c7d4 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/pluginRegisrar.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/pluginRegisrar.kt @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.script.ScriptReportSink import org.jetbrains.kotlin.scripting.legacy.CliScriptDefinitionProvider import org.jetbrains.kotlin.scripting.legacy.CliScriptDependenciesProvider import org.jetbrains.kotlin.scripting.legacy.CliScriptReportSink -import org.jetbrains.kotlin.scripting.shared.extensions.ScriptExtraImportsProviderExtension -import org.jetbrains.kotlin.scripting.shared.extensions.ScriptingResolveExtension +import org.jetbrains.kotlin.scripting.extensions.ScriptExtraImportsProviderExtension +import org.jetbrains.kotlin.scripting.extensions.ScriptingResolveExtension private fun ProjectExtensionDescriptor.registerExtensionIfRequired(project: MockProject, extension: T) { try { diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDefinitionProvider.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDefinitionProvider.kt index 668d85bb91f..c13a5ded069 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDefinitionProvider.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDefinitionProvider.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.scripting.legacy import org.jetbrains.kotlin.script.KotlinScriptDefinition import org.jetbrains.kotlin.script.ScriptDefinitionsSource import org.jetbrains.kotlin.script.StandardScriptDefinition -import org.jetbrains.kotlin.scripting.shared.definitions.LazyScriptDefinitionProvider +import org.jetbrains.kotlin.scripting.definitions.LazyScriptDefinitionProvider import kotlin.concurrent.write open class CliScriptDefinitionProvider : LazyScriptDefinitionProvider() { diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDependenciesProvider.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDependenciesProvider.kt index 600bd429766..3b88cc86e4d 100644 --- a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDependenciesProvider.kt +++ b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/legacy/CliScriptDependenciesProvider.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.script.ScriptContentLoader import org.jetbrains.kotlin.script.ScriptDependenciesProvider import org.jetbrains.kotlin.script.ScriptReportSink import org.jetbrains.kotlin.script.adjustByDefinition -import org.jetbrains.kotlin.scripting.shared.definitions.findScriptDefinition +import org.jetbrains.kotlin.scripting.definitions.findScriptDefinition import java.io.File import java.util.concurrent.locks.ReentrantReadWriteLock import kotlin.concurrent.read diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt index dd335460a0b..1cca5984d94 100644 --- a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt +++ b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.compiler.plugin.AbstractCliOption import org.jetbrains.kotlin.compiler.plugin.ComponentRegistrar import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.config.JVMConfigurationKeys -import org.jetbrains.kotlin.scripting.shared.definitions.SCRIPT_DEFINITION_MARKERS_PATH -import org.jetbrains.kotlin.scripting.shared.definitions.discoverScriptTemplatesInClasspath -import org.jetbrains.kotlin.scripting.shared.definitions.loadScriptTemplatesFromClasspath +import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_PATH +import org.jetbrains.kotlin.scripting.definitions.discoverScriptTemplatesInClasspath +import org.jetbrains.kotlin.scripting.definitions.loadScriptTemplatesFromClasspath import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.TestCaseWithTmpdir diff --git a/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt b/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt index 94f80912dc3..e03d6b334bc 100644 --- a/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt +++ b/plugins/scripting/scripting-idea/src/org/jetbrains/kotlin/scripting/idea/plugin/ScriptingGradleProjectImportHandler.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.scripting.idea.plugin import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.idea.configuration.GradleProjectImportHandler import org.jetbrains.kotlin.idea.facet.KotlinFacet -import org.jetbrains.kotlin.scripting.shared.KOTLIN_SCRIPTING_PLUGIN_ID +import org.jetbrains.kotlin.scripting.KOTLIN_SCRIPTING_PLUGIN_ID import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData import java.io.File