From 7956ebe46c7799be47ed6c8fc3810908c5a2e94c Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 20 Nov 2015 20:26:33 +0300 Subject: [PATCH] Move script related stuff into a separate package --- .../cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt | 2 +- .../kotlin/cli/jvm/compiler/CommandLineScriptUtils.java | 2 +- .../kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt | 5 +++-- .../cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java | 6 ++++-- .../kotlin/cli/jvm/config/JVMConfigurationKeys.java | 4 ++-- .../org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java | 1 + .../jetbrains/kotlin/config/CommonConfigurationKeys.java | 2 +- .../src/org/jetbrains/kotlin/parsing/KotlinParser.java | 1 + .../frontend/src/org/jetbrains/kotlin/psi/KtScript.java | 3 +-- .../jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt | 7 +++++-- .../resolve/lazy/descriptors/AbstractLazyMemberScope.kt | 2 +- .../resolve/lazy/descriptors/LazyScriptClassMemberScope.kt | 2 +- .../resolve/lazy/descriptors/LazyScriptDescriptor.kt | 6 ++++-- .../{resolve => script}/AnalyzerScriptParameter.java | 2 +- .../kotlin/{parsing => script}/KotlinScriptDefinition.kt | 4 +--- .../KotlinScriptDefinitionProvider.java | 4 ++-- .../kotlin/{resolve => script}/ScriptNameUtil.java | 4 +--- .../kotlin/{resolve => script}/ScriptPriorities.java | 2 +- .../kotlin/codegen/AbstractScriptCodegenTest.java | 2 +- .../org/jetbrains/kotlin/codegen/CodegenTestFiles.java | 6 +++--- .../tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java | 6 +++--- .../org/jetbrains/kotlin/parsing/AbstractParsingTest.java | 1 + .../tests/org/jetbrains/kotlin/scripts/ScriptTest.java | 6 +++--- 23 files changed, 43 insertions(+), 37 deletions(-) rename compiler/frontend/src/org/jetbrains/kotlin/{resolve => script}/AnalyzerScriptParameter.java (96%) rename compiler/frontend/src/org/jetbrains/kotlin/{parsing => script}/KotlinScriptDefinition.kt (87%) rename compiler/frontend/src/org/jetbrains/kotlin/{parsing => script}/KotlinScriptDefinitionProvider.java (96%) rename compiler/frontend/src/org/jetbrains/kotlin/{resolve => script}/ScriptNameUtil.java (92%) rename compiler/frontend/src/org/jetbrains/kotlin/{resolve => script}/ScriptPriorities.java (96%) diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 172c7d83521..a2732845018 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.config.addKotlinSourceRoot import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter +import org.jetbrains.kotlin.script.AnalyzerScriptParameter import org.jetbrains.kotlin.util.PerformanceCounter import org.jetbrains.kotlin.utils.KotlinPaths import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java index 2303eb615cd..c4d8987e6ee 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.cli.jvm.compiler; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; +import org.jetbrains.kotlin.script.AnalyzerScriptParameter; import org.jetbrains.kotlin.types.KotlinType; import java.util.Collections; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt index ba5a18f1c6f..2da710bc7dc 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinCoreEnvironment.kt @@ -28,7 +28,8 @@ import com.intellij.mock.MockApplication import com.intellij.openapi.Disposable import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.components.ServiceManager -import com.intellij.openapi.extensions.* +import com.intellij.openapi.extensions.Extensions +import com.intellij.openapi.extensions.ExtensionsArea import com.intellij.openapi.fileTypes.FileTypeExtensionPoint import com.intellij.openapi.fileTypes.PlainTextFileType import com.intellij.openapi.project.Project @@ -78,7 +79,6 @@ import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.isValidJavaFqName import org.jetbrains.kotlin.parsing.KotlinParserDefinition -import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade @@ -86,6 +86,7 @@ import org.jetbrains.kotlin.resolve.jvm.extensions.AnalysisCompletedHandlerExten import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider import org.jetbrains.kotlin.utils.PathUtil import java.io.File import java.util.* diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 3209c4fe85e..73514554888 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -54,13 +54,15 @@ import org.jetbrains.kotlin.modules.Module; import org.jetbrains.kotlin.modules.TargetId; import org.jetbrains.kotlin.modules.TargetIdKt; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.KotlinScriptDefinition; +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; +import org.jetbrains.kotlin.script.ScriptNameUtil; import org.jetbrains.kotlin.util.PerformanceCounter; import org.jetbrains.kotlin.utils.KotlinPaths; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java index 06003573266..a84b8c4fea8 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/config/JVMConfigurationKeys.java @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.cli.jvm.config; -import org.jetbrains.kotlin.modules.Module; import org.jetbrains.kotlin.cli.jvm.compiler.CompilerJarLocator; import org.jetbrains.kotlin.config.CompilerConfigurationKey; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents; -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.modules.Module; +import org.jetbrains.kotlin.script.AnalyzerScriptParameter; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index 0f32c24c444..3af846169b3 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -66,6 +66,7 @@ import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.kotlin.resolve.lazy.declarations.*; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyScriptDescriptor; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; +import org.jetbrains.kotlin.script.ScriptPriorities; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java b/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java index 8d6eec899ee..9f0fafe0413 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.config; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; +import org.jetbrains.kotlin.script.KotlinScriptDefinition; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParser.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParser.java index 9f8e5f0ee29..ffb39b9dc48 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParser.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParser.java @@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; public class KotlinParser implements PsiParser { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtScript.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtScript.java index cd7a13e1a33..c5846e08133 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtScript.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtScript.java @@ -20,10 +20,9 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.stubs.KotlinScriptStub; import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes; -import org.jetbrains.kotlin.resolve.ScriptNameUtil; +import org.jetbrains.kotlin.script.ScriptNameUtil; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt index 970e5ca119a..58ed5f12819 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt @@ -16,10 +16,13 @@ package org.jetbrains.kotlin.resolve.lazy.data -import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.kotlin.resolve.ScriptNameUtil import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.psi.KtAnnotationEntry +import org.jetbrains.kotlin.psi.KtObjectDeclaration +import org.jetbrains.kotlin.psi.KtParameter +import org.jetbrains.kotlin.psi.KtScript +import org.jetbrains.kotlin.script.ScriptNameUtil public class JetScriptInfo( val script: KtScript diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index 970b7449e5b..9dc25b43576 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -26,7 +26,6 @@ import org.jetbrains.kotlin.incremental.record import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.BindingTrace -import org.jetbrains.kotlin.resolve.ScriptNameUtil import org.jetbrains.kotlin.resolve.lazy.LazyClassContext import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo @@ -34,6 +33,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProvider import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.MemberScopeImpl +import org.jetbrains.kotlin.script.ScriptNameUtil import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.utils.Printer diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt index 954a38fa9e2..40ace1a6610 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt @@ -24,10 +24,10 @@ import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.kotlin.incremental.components.LookupLocation import org.jetbrains.kotlin.incremental.components.NoLookupLocation import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider import org.jetbrains.kotlin.utils.toReadOnlyList public class LazyScriptClassMemberScope( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt index 0c4db85599b..33db68ce90d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt @@ -16,15 +16,17 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors -import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorVisitor +import org.jetbrains.kotlin.descriptors.ScriptDescriptor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.resolve.ScriptPriorities import org.jetbrains.kotlin.resolve.lazy.LazyClassContext import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider import org.jetbrains.kotlin.resolve.source.toSourceElement +import org.jetbrains.kotlin.script.ScriptPriorities import org.jetbrains.kotlin.types.TypeSubstitutor public class LazyScriptDescriptor( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzerScriptParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/script/AnalyzerScriptParameter.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzerScriptParameter.java rename to compiler/frontend/src/org/jetbrains/kotlin/script/AnalyzerScriptParameter.java index 8922ae826f3..c3a972c06ca 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzerScriptParameter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/AnalyzerScriptParameter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.resolve; +package org.jetbrains.kotlin.script; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinition.kt b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt similarity index 87% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinition.kt rename to compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt index 621d3cb4be5..64f788769b2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinition.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinition.kt @@ -14,8 +14,6 @@ * limitations under the License. */ -package org.jetbrains.kotlin.parsing - -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter +package org.jetbrains.kotlin.script class KotlinScriptDefinition(val extension: String, val scriptParameters: List) \ No newline at end of file diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinitionProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinitionProvider.java rename to compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.java index 22c5818b508..99fe5d38757 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinScriptDefinitionProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/KotlinScriptDefinitionProvider.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.kotlin.parsing; +package org.jetbrains.kotlin.script; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.parsing.KotlinParserDefinition; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptNameUtil.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/script/ScriptNameUtil.java index 3cb378b04c4..66c7eda3adf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptNameUtil.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.jetbrains.kotlin.resolve; +package org.jetbrains.kotlin.script; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.psi.KtFile; import org.jetbrains.kotlin.psi.KtPackageDirective; import org.jetbrains.kotlin.psi.KtScript; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptPriorities.java b/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptPriorities.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptPriorities.java rename to compiler/frontend/src/org/jetbrains/kotlin/script/ScriptPriorities.java index efae36e86bf..1eb4dd12326 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptPriorities.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/script/ScriptPriorities.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.resolve; +package org.jetbrains.kotlin.script; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java index 82ac5c03141..2f7deb8da62 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.resolve.ScriptNameUtil; +import org.jetbrains.kotlin.script.ScriptNameUtil; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.utils.ExceptionUtilsKt; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 975ec17588a..5bf48fa932c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -24,12 +24,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.checkers.CheckerTestUtil; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.psi.KtFile; -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; +import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.KotlinScriptDefinition; +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.types.KotlinType; import org.jetbrains.kotlin.types.Variance; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java index b225c104c4e..434f3d4b259 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; +import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.KotlinScriptDefinition; +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java index 52341746aa1..95dca09bc3d 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractParsingTest.java @@ -30,6 +30,7 @@ import com.intellij.util.PathUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.KtNodeTypes; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.test.KotlinTestUtils; import java.lang.annotation.Annotation; diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java index 0766bca77bc..68f40bdcb67 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java @@ -31,10 +31,10 @@ import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinition; -import org.jetbrains.kotlin.parsing.KotlinScriptDefinitionProvider; -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; +import org.jetbrains.kotlin.script.AnalyzerScriptParameter; +import org.jetbrains.kotlin.script.KotlinScriptDefinition; +import org.jetbrains.kotlin.script.KotlinScriptDefinitionProvider; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestJdkKind;