diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml index 0470a5057be..59c94fc3d8c 100644 --- a/TeamCityBuild.xml +++ b/TeamCityBuild.xml @@ -12,7 +12,7 @@ - + diff --git a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt index 42942fd51d8..bfc3a530e2c 100644 --- a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt +++ b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JsTask.kt @@ -20,7 +20,7 @@ import org.apache.tools.ant.types.Path import java.io.File public class Kotlin2JsTask : KotlinCompilerBaseTask() { - override val compilerFqName = "org.jetbrains.jet.cli.js.K2JSCompiler" + override val compilerFqName = "org.jetbrains.kotlin.cli.js.K2JSCompiler" public var library: Path? = null public var outputPrefix: File? = null diff --git a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt index 8701799639e..674166fd032 100644 --- a/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt +++ b/ant/src/org/jetbrains/kotlin/ant/Kotlin2JvmTask.kt @@ -22,7 +22,7 @@ import java.io.File import java.io.File.pathSeparator public class Kotlin2JvmTask : KotlinCompilerBaseTask() { - override val compilerFqName = "org.jetbrains.jet.cli.jvm.K2JVMCompiler" + override val compilerFqName = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" public var externalAnnotations: Path? = null public var includeRuntime: Boolean = true diff --git a/build.xml b/build.xml index 9c84fef3d72..a524c38f7e5 100644 --- a/build.xml +++ b/build.xml @@ -256,7 +256,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -614,7 +614,7 @@ - + @@ -693,7 +693,7 @@ - + diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index e212d11fa00..2da79810474 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -24,8 +24,6 @@ import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.CodegenTestFiles; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; @@ -33,6 +31,8 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.utils.Printer; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil; import org.junit.Assert; diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index 103de20e421..646ef4aac17 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -19,16 +19,16 @@ package org.jetbrains.kotlin.serialization.builtins import java.io.File import com.intellij.openapi.util.Disposer import org.jetbrains.jet.config.CompilerConfiguration -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.descriptors.serialization.* import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.name.Name import java.io.ByteArrayOutputStream import org.jetbrains.jet.lang.types.lang.BuiltInsSerializationUtil import com.intellij.openapi.Disposable -import org.jetbrains.jet.cli.common.CLIConfigurationKeys +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.jet.config.CommonConfigurationKeys -import org.jetbrains.jet.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.utils.recursePostOrder import com.intellij.psi.search.GlobalSearchScope @@ -39,8 +39,8 @@ import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters import org.jetbrains.jet.analyzer.ModuleContent import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys private object BuiltInsSerializerExtension : SerializerExtension() { override fun serializeClass(descriptor: ClassDescriptor, proto: ProtoBuf.Class.Builder, stringTable: StringTable) { diff --git a/compiler/cli/bin/kotlinc-js b/compiler/cli/bin/kotlinc-js index ba3e0451539..ad94ee29442 100755 --- a/compiler/cli/bin/kotlinc-js +++ b/compiler/cli/bin/kotlinc-js @@ -84,4 +84,4 @@ CPSELECT="-cp " ${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \ org.jetbrains.kotlin.preloading.Preloader \ "${KOTLIN_HOME}/lib/kotlin-compiler.jar" \ - org.jetbrains.jet.cli.js.K2JSCompiler 4096 notime "$@" + org.jetbrains.kotlin.cli.js.K2JSCompiler 4096 notime "$@" diff --git a/compiler/cli/bin/kotlinc-js.bat b/compiler/cli/bin/kotlinc-js.bat index 26c763b93d2..b5eab062a4e 100644 --- a/compiler/cli/bin/kotlinc-js.bat +++ b/compiler/cli/bin/kotlinc-js.bat @@ -27,7 +27,7 @@ set _JAVA_OPTS=-Xmx256M -Xms32M -noverify "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ org.jetbrains.kotlin.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^ - org.jetbrains.jet.cli.js.K2JSCompiler 4096 notime %* + org.jetbrains.kotlin.cli.js.K2JSCompiler 4096 notime %* exit /b %ERRORLEVEL% goto end diff --git a/compiler/cli/bin/kotlinc-jvm b/compiler/cli/bin/kotlinc-jvm index 35906f6c171..ae7b99b94cd 100755 --- a/compiler/cli/bin/kotlinc-jvm +++ b/compiler/cli/bin/kotlinc-jvm @@ -84,4 +84,4 @@ CPSELECT="-cp " ${CPSELECT}"${KOTLIN_HOME}/lib/kotlin-preloader.jar" \ org.jetbrains.kotlin.preloading.Preloader \ "${KOTLIN_HOME}/lib/kotlin-compiler.jar" \ - org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 notime "$@" + org.jetbrains.kotlin.cli.jvm.K2JVMCompiler 4096 notime "$@" diff --git a/compiler/cli/bin/kotlinc-jvm.bat b/compiler/cli/bin/kotlinc-jvm.bat index ddae33633b7..edbae846d3e 100644 --- a/compiler/cli/bin/kotlinc-jvm.bat +++ b/compiler/cli/bin/kotlinc-jvm.bat @@ -27,7 +27,7 @@ set _JAVA_OPTS=-Xmx256M -Xms32M -noverify "%_JAVACMD%" %_JAVA_OPTS% -cp "%_KOTLIN_HOME%\lib\kotlin-preloader.jar" ^ org.jetbrains.kotlin.preloading.Preloader "%_KOTLIN_HOME%\lib\kotlin-compiler.jar" ^ - org.jetbrains.jet.cli.jvm.K2JVMCompiler 4096 notime %* + org.jetbrains.kotlin.cli.jvm.K2JVMCompiler 4096 notime %* exit /b %ERRORLEVEL% goto end diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/ExitCode.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/ExitCode.java similarity index 90% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/ExitCode.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/ExitCode.java index bd705cd500c..598cb186fc3 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/ExitCode.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/ExitCode.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common; +package org.jetbrains.kotlin.cli.common; public enum ExitCode { OK(0), diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/KotlinVersion.java similarity index 90% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/KotlinVersion.java index 98bf5b13c22..3d9c2b0a875 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/KotlinVersion.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common; +package org.jetbrains.kotlin.cli.common; public class KotlinVersion { // The value of this constant is generated by the build script diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CommonCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java similarity index 94% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CommonCompilerArguments.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java index 1335aea036e..66318bf21f6 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/CommonCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.arguments; +package org.jetbrains.kotlin.cli.common.arguments; import com.intellij.util.SmartList; import com.sampullara.cli.Argument; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JSCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java similarity index 89% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JSCompilerArguments.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java index 2a3f817b4da..8d8839f3d87 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JSCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.arguments; +package org.jetbrains.kotlin.cli.common.arguments; import com.sampullara.cli.Argument; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import static org.jetbrains.jet.cli.common.arguments.K2JsArgumentConstants.CALL; -import static org.jetbrains.jet.cli.common.arguments.K2JsArgumentConstants.NO_CALL; +import static org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants.CALL; +import static org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants.NO_CALL; public class K2JSCompilerArguments extends CommonCompilerArguments { @Argument(value = "output", description = "Output file path") diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java similarity index 96% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java index 3a0f99bc843..27b1e73d9eb 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JVMCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.arguments; +package org.jetbrains.kotlin.cli.common.arguments; import com.sampullara.cli.Argument; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JsArgumentConstants.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JsArgumentConstants.java similarity index 87% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JsArgumentConstants.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JsArgumentConstants.java index a36419d0715..99fbc7e9ace 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/K2JsArgumentConstants.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JsArgumentConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.arguments; +package org.jetbrains.kotlin.cli.common.arguments; public interface K2JsArgumentConstants { String CALL = "call"; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/ValueDescription.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/ValueDescription.java similarity index 89% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/ValueDescription.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/ValueDescription.java index f0e6480129d..a6504ec3572 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/arguments/ValueDescription.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/ValueDescription.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.arguments; +package org.jetbrains.kotlin.cli.common.arguments; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageLocation.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.java similarity index 96% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageLocation.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.java index 1cabeadb333..58eae4637b6 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageLocation.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageLocation.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import org.jetbrains.annotations.Nullable; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageSeverity.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageSeverity.java similarity index 90% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageSeverity.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageSeverity.java index acd8e1df6b7..13bdfd9c7cc 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/CompilerMessageSeverity.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/CompilerMessageSeverity.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import java.util.EnumSet; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/FilteringMessageCollector.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/FilteringMessageCollector.java similarity index 93% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/FilteringMessageCollector.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/FilteringMessageCollector.java index a6de7e72a9e..d915a4a9a27 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/FilteringMessageCollector.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/FilteringMessageCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import com.google.common.base.Predicate; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/GroupingMessageCollector.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/GroupingMessageCollector.java similarity index 97% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/GroupingMessageCollector.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/GroupingMessageCollector.java index 458823f69d0..b77c48397b3 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/GroupingMessageCollector.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/GroupingMessageCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollector.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollector.java similarity index 92% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollector.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollector.java index 7044d8928a5..ceaeb1955f9 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollector.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorPlainTextToStream.java similarity index 94% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorPlainTextToStream.java index 12a514a4a38..62be00e93b0 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorPlainTextToStream.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorPlainTextToStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorToString.java similarity index 94% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorToString.java index f796f206d2c..5f87ee7012e 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorToString.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorToString.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorUtil.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorUtil.java similarity index 91% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorUtil.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorUtil.java index 2b78931bfe1..0f078d5d80f 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageCollectorUtil.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageCollectorUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageRenderer.java similarity index 97% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageRenderer.java index 948c10783fe..552ab612e08 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageRenderer.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import com.intellij.openapi.util.text.StringUtil; import kotlin.io.IoPackage; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageSeverityCollector.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageSeverityCollector.java similarity index 94% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageSeverityCollector.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageSeverityCollector.java index 0b8c3fc9703..df7975b182d 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/MessageSeverityCollector.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/MessageSeverityCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/OutputMessageUtil.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtil.java similarity index 96% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/OutputMessageUtil.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtil.java index 7d18c0d5cc1..5f0453dbdb3 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/OutputMessageUtil.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java similarity index 94% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java index faeeb7d5ea5..d3d127f427d 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/messages/PrintingMessageCollector.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/messages/PrintingMessageCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/DelegatedSaxHandler.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/DelegatedSaxHandler.java similarity index 65% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/DelegatedSaxHandler.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/DelegatedSaxHandler.java index ef3c32b5d87..7fe3c371758 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/DelegatedSaxHandler.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/DelegatedSaxHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.modules; +package org.jetbrains.kotlin.cli.common.modules; import org.jetbrains.annotations.NotNull; import org.xml.sax.*; @@ -28,22 +28,23 @@ public abstract class DelegatedSaxHandler extends DefaultHandler { protected abstract DefaultHandler getDelegate(); @Override - public InputSource resolveEntity(String publicId, String systemId) throws IOException, SAXException { + public InputSource resolveEntity(String publicId, @NotNull String systemId) throws IOException, SAXException { return getDelegate().resolveEntity(publicId, systemId); } @Override - public void notationDecl(String name, String publicId, String systemId) throws SAXException { + public void notationDecl(@NotNull String name, String publicId, String systemId) throws SAXException { getDelegate().notationDecl(name, publicId, systemId); } @Override - public void unparsedEntityDecl(String name, String publicId, String systemId, String notationName) throws SAXException { + public void unparsedEntityDecl(@NotNull String name, String publicId, @NotNull String systemId, String notationName) + throws SAXException { getDelegate().unparsedEntityDecl(name, publicId, systemId, notationName); } @Override - public void setDocumentLocator(Locator locator) { + public void setDocumentLocator(@NotNull Locator locator) { getDelegate().setDocumentLocator(locator); } @@ -58,7 +59,7 @@ public abstract class DelegatedSaxHandler extends DefaultHandler { } @Override - public void startPrefixMapping(String prefix, String uri) throws SAXException { + public void startPrefixMapping(String prefix, @NotNull String uri) throws SAXException { getDelegate().startPrefixMapping(prefix, uri); } @@ -68,12 +69,13 @@ public abstract class DelegatedSaxHandler extends DefaultHandler { } @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + public void startElement(@NotNull String uri, @NotNull String localName, @NotNull String qName, @NotNull Attributes attributes) + throws SAXException { getDelegate().startElement(uri, localName, qName, attributes); } @Override - public void endElement(String uri, String localName, String qName) throws SAXException { + public void endElement(String uri, @NotNull String localName, @NotNull String qName) throws SAXException { getDelegate().endElement(uri, localName, qName); } @@ -88,27 +90,27 @@ public abstract class DelegatedSaxHandler extends DefaultHandler { } @Override - public void processingInstruction(String target, String data) throws SAXException { + public void processingInstruction(@NotNull String target, @NotNull String data) throws SAXException { getDelegate().processingInstruction(target, data); } @Override - public void skippedEntity(String name) throws SAXException { + public void skippedEntity(@NotNull String name) throws SAXException { getDelegate().skippedEntity(name); } @Override - public void warning(SAXParseException e) throws SAXException { + public void warning(@NotNull SAXParseException e) throws SAXException { getDelegate().warning(e); } @Override - public void error(SAXParseException e) throws SAXException { + public void error(@NotNull SAXParseException e) throws SAXException { getDelegate().error(e); } @Override - public void fatalError(SAXParseException e) throws SAXException { + public void fatalError(@NotNull SAXParseException e) throws SAXException { getDelegate().fatalError(e); } } diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleScriptData.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleScriptData.java similarity index 88% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleScriptData.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleScriptData.java index 1fcdb6e4e3a..40e8f3cc31c 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleScriptData.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleScriptData.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.modules; +package org.jetbrains.kotlin.cli.common.modules; import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import java.util.Collections; import java.util.List; @@ -26,15 +25,14 @@ import java.util.List; public class ModuleScriptData { public static final ModuleScriptData EMPTY = new ModuleScriptData(Collections.emptyList()); - @NotNull private final List modules; + public ModuleScriptData(@NotNull List modules) { + this.modules = modules; + } + @NotNull public List getModules() { return modules; } - - public ModuleScriptData(@NotNull List modules) { - this.modules = modules; - } } diff --git a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleXmlParser.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java similarity index 83% rename from compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleXmlParser.java rename to compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java index 9861e676a60..d9b53f47b7c 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/modules/ModuleXmlParser.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.modules; +package org.jetbrains.kotlin.cli.common.modules; import com.intellij.openapi.util.io.StreamUtil; import com.intellij.util.SmartList; import kotlin.modules.Module; import kotlin.modules.ModuleBuilder; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.common.messages.MessageCollectorUtil; -import org.jetbrains.jet.cli.common.messages.OutputMessageUtil; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; +import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; @@ -34,8 +34,8 @@ import javax.xml.parsers.SAXParserFactory; import java.io.*; import java.util.List; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; public class ModuleXmlParser { @@ -107,7 +107,8 @@ public class ModuleXmlParser { private final DefaultHandler initial = new DefaultHandler() { @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + public void startElement(@NotNull String uri, @NotNull String localName, @NotNull String qName, @NotNull Attributes attributes) + throws SAXException { if (!MODULES.equalsIgnoreCase(qName)) { throw createError(qName); } @@ -118,7 +119,8 @@ public class ModuleXmlParser { private final DefaultHandler insideModules = new DefaultHandler() { @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + public void startElement(@NotNull String uri, @NotNull String localName, @NotNull String qName, @NotNull Attributes attributes) + throws SAXException { if (!MODULE.equalsIgnoreCase(qName)) { throw createError(qName); } @@ -130,7 +132,7 @@ public class ModuleXmlParser { } @Override - public void endElement(String uri, String localName, String qName) throws SAXException { + public void endElement(String uri, @NotNull String localName, @NotNull String qName) throws SAXException { if (MODULE.equalsIgnoreCase(qName) || MODULES.equalsIgnoreCase(qName)) { setCurrentState(insideModules); } @@ -146,7 +148,8 @@ public class ModuleXmlParser { } @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + public void startElement(@NotNull String uri, @NotNull String localName, @NotNull String qName, @NotNull Attributes attributes) + throws SAXException { if (SOURCES.equalsIgnoreCase(qName)) { String path = getAttribute(attributes, PATH, qName); moduleBuilder.addSourceFiles(path); @@ -165,7 +168,7 @@ public class ModuleXmlParser { } @Override - public void endElement(String uri, String localName, String qName) throws SAXException { + public void endElement(String uri, @NotNull String localName, @NotNull String qName) throws SAXException { if (MODULE.equalsIgnoreCase(qName)) { setCurrentState(insideModules); } diff --git a/compiler/cli/src/com/intellij/ide/plugins/PluginManagerCoreProxy.java b/compiler/cli/src/com/intellij/ide/plugins/PluginManagerCoreProxy.java index 486a40d2efc..a649335356c 100644 --- a/compiler/cli/src/com/intellij/ide/plugins/PluginManagerCoreProxy.java +++ b/compiler/cli/src/com/intellij/ide/plugins/PluginManagerCoreProxy.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java similarity index 95% rename from compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java index 22099afa0c5..968663747e3 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common; +package org.jetbrains.kotlin.cli.common; import com.google.common.base.Predicates; import com.google.common.collect.Lists; @@ -23,16 +23,16 @@ import com.intellij.openapi.util.Disposer; import com.sampullara.cli.Args; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jet.cli.common.messages.*; -import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentException; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.config.Services; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.messages.*; +import org.jetbrains.kotlin.cli.jvm.compiler.CompileEnvironmentException; import java.io.PrintStream; import java.util.List; -import static org.jetbrains.jet.cli.common.ExitCode.*; +import static org.jetbrains.kotlin.cli.common.ExitCode.*; public abstract class CLICompiler { @NotNull diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLIConfigurationKeys.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java similarity index 87% rename from compiler/cli/src/org/jetbrains/jet/cli/common/CLIConfigurationKeys.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java index 7a92f9a7deb..6d11b3f6206 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLIConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common; +package org.jetbrains.kotlin.cli.common; -import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.config.CompilerConfigurationKey; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerPlugin.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPlugin.java similarity index 91% rename from compiler/cli/src/org/jetbrains/jet/cli/common/CompilerPlugin.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPlugin.java index fb45d03d5a3..e584c801bd5 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerPlugin.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPlugin.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common; +package org.jetbrains.kotlin.cli.common; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerPluginContext.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java similarity index 95% rename from compiler/cli/src/org/jetbrains/jet/cli/common/CompilerPluginContext.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java index b250bbfe7d7..2fb5a53bdbb 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerPluginContext.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common; +package org.jetbrains.kotlin.cli.common; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/Usage.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java similarity index 92% rename from compiler/cli/src/org/jetbrains/jet/cli/common/Usage.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java index a648742a494..b2577a763fc 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/Usage.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common; +package org.jetbrains.kotlin.cli.common; import com.sampullara.cli.Argument; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.ValueDescription; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.ValueDescription; import java.io.PrintStream; import java.lang.reflect.Field; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java similarity index 99% rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java index 0d4260edcf8..c359d94f5ab 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; @@ -248,4 +248,4 @@ public final class AnalyzerWithCompilerReport { return true; } } -} \ No newline at end of file +} diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java similarity index 96% rename from compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageUtil.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java index 99c0281162e..b118769738a 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/messages/MessageUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/MessageUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.impl.jar.CoreJarVirtualFile; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/common/output/outputUtils.kt similarity index 80% rename from compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt rename to compiler/cli/src/org/jetbrains/kotlin/cli/common/output/outputUtils.kt index 5056538baa8..5c09aee88b6 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/common/output/outputUtils.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/output/outputUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.output.outputUtils +package org.jetbrains.kotlin.cli.common.output.outputUtils import org.jetbrains.kotlin.backend.common.output.OutputFileCollection -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation -import org.jetbrains.jet.cli.common.messages.OutputMessageUtil -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.jet.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.MessageCollector import java.io.File import com.intellij.openapi.util.io.FileUtil diff --git a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java similarity index 89% rename from compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index 8acd7ee81a9..b9274844ec5 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.js; +package org.jetbrains.kotlin.cli.js; import com.google.common.base.Joiner; import com.google.common.base.Predicates; @@ -33,25 +33,25 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.common.CLICompiler; -import org.jetbrains.jet.cli.common.CLIConfigurationKeys; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JsArgumentConstants; -import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport; -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.config.Services; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.common.CLICompiler; +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants; +import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.CompileEnvironmentUtil; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.config.EcmaVersion; @@ -62,9 +62,9 @@ import org.jetbrains.kotlin.js.facade.Status; import java.io.File; import java.util.List; -import static org.jetbrains.jet.cli.common.ExitCode.COMPILATION_ERROR; -import static org.jetbrains.jet.cli.common.ExitCode.OK; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.ExitCode.COMPILATION_ERROR; +import static org.jetbrains.kotlin.cli.common.ExitCode.OK; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; import static org.jetbrains.kotlin.js.facade.K2JSTranslator.translateWithMainCallParameters; public class K2JSCompiler extends CLICompiler { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java similarity index 96% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java index 45343574012..d4bb4ce7cfd 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm; +package org.jetbrains.kotlin.cli.jvm; import org.jetbrains.jet.config.CompilerConfigurationKey; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java similarity index 93% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java index 803878d6b98..5e0e11a04e0 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm; +package org.jetbrains.kotlin.cli.jvm; import com.google.common.base.Splitter; import com.google.common.collect.Lists; import com.intellij.openapi.Disposable; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.CLICompiler; -import org.jetbrains.jet.cli.common.CLIConfigurationKeys; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.cli.common.messages.*; -import org.jetbrains.jet.cli.common.modules.ModuleScriptData; -import org.jetbrains.jet.cli.jvm.compiler.*; -import org.jetbrains.jet.cli.jvm.repl.ReplFromTerminal; import org.jetbrains.jet.codegen.CompilationException; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; @@ -37,13 +29,21 @@ import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheP import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.jet.utils.KotlinPathsFromHomeDir; import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.cli.common.CLICompiler; +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.messages.*; +import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData; +import org.jetbrains.kotlin.cli.jvm.compiler.*; +import org.jetbrains.kotlin.cli.jvm.repl.ReplFromTerminal; import java.io.File; import java.util.Collections; import java.util.List; import static com.google.common.base.Predicates.in; -import static org.jetbrains.jet.cli.common.ExitCode.*; +import static org.jetbrains.kotlin.cli.common.ExitCode.*; @SuppressWarnings("UseOfSystemOutOrSystemErr") public class K2JVMCompiler extends CLICompiler { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClassPath.java similarity index 91% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClassPath.java index 4fbeed74f3e..8dead5f9379 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ClassPath.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ClassPath.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; @@ -28,6 +28,7 @@ public final class ClassPath implements Iterable { @NotNull private final List roots = new ArrayList(); + @NotNull @Override public Iterator iterator() { return roots.iterator(); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java similarity index 99% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java index 772f2f1aa4d..6082a68fcd1 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliLightClassGenerationSupport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java similarity index 97% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java index 3c1f36a719a..0c3eb05ed85 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinder.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinderFactory.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.java similarity index 84% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinderFactory.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.java index 46e8b064b92..dbec55f2eeb 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CliVirtualFileFinderFactory.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; @@ -22,11 +22,10 @@ import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory; public final class CliVirtualFileFinderFactory implements VirtualFileFinderFactory { - @NotNull private final ClassPath classPath; - public CliVirtualFileFinderFactory(@NotNull ClassPath path) { - classPath = path; + public CliVirtualFileFinderFactory(@NotNull ClassPath classpath) { + this.classPath = classpath; } @NotNull diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CommandLineScriptUtils.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java similarity index 91% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CommandLineScriptUtils.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java index 7f3eb8546cf..33f634c66fe 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CommandLineScriptUtils.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import java.util.Collections; @@ -38,5 +37,4 @@ public class CommandLineScriptUtils { AnalyzerScriptParameter argsParameter = new AnalyzerScriptParameter(ARGS_NAME, arrayOfStrings); return Collections.singletonList(argsParameter); } - } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentException.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentException.java similarity index 91% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentException.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentException.java index 7955a0a33f8..2647e8fc9bf 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentException.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; public class CompileEnvironmentException extends RuntimeException { public CompileEnvironmentException(String message) { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java similarity index 94% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index 8aaa92693ca..847df218dd3 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -36,14 +36,6 @@ import kotlin.modules.AllModules; import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.CLIConfigurationKeys; -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.common.messages.OutputMessageUtil; -import org.jetbrains.jet.cli.common.modules.ModuleScriptData; -import org.jetbrains.jet.cli.common.modules.ModuleXmlParser; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GeneratedClassLoader; import org.jetbrains.jet.codegen.state.GenerationState; @@ -57,6 +49,14 @@ import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil; +import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData; +import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import java.io.*; import java.lang.reflect.Method; @@ -68,8 +68,8 @@ import java.util.List; import java.util.Set; import java.util.jar.*; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; public class CompileEnvironmentUtil { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CoreExternalAnnotationsManager.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CoreExternalAnnotationsManager.java similarity index 96% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CoreExternalAnnotationsManager.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CoreExternalAnnotationsManager.java index 84d5cf36509..334cbc18f89 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CoreExternalAnnotationsManager.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CoreExternalAnnotationsManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import com.intellij.codeInsight.BaseExternalAnnotationsManager; import com.intellij.openapi.vfs.VirtualFile; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/EnvironmentConfigFiles.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/EnvironmentConfigFiles.java similarity index 93% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/EnvironmentConfigFiles.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/EnvironmentConfigFiles.java index d332064d20e..22ea4d9edcc 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/EnvironmentConfigFiles.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/EnvironmentConfigFiles.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import java.util.Arrays; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java similarity index 96% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java index 404073235b0..0b804269086 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.core.CoreApplicationEnvironment; @@ -42,11 +42,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.CompilerModeProvider; import org.jetbrains.jet.OperationModeProvider; -import org.jetbrains.jet.cli.common.CLIConfigurationKeys; -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.parsing.JetParserDefinition; @@ -62,14 +57,19 @@ import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.kotlin.asJava.JavaElementFinder; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.LightClassGenerationSupport; +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.WARNING; @SuppressWarnings("AssignmentToStaticFieldFromInstanceMethod") public class JetCoreEnvironment { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java similarity index 97% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index c304c30963b..120e829ee2e 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; import com.google.common.base.Predicates; import com.google.common.collect.Lists; @@ -31,12 +31,6 @@ import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.common.CLIConfigurationKeys; -import org.jetbrains.jet.cli.common.CompilerPlugin; -import org.jetbrains.jet.cli.common.CompilerPluginContext; -import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; import org.jetbrains.jet.codegen.*; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.Progress; @@ -59,6 +53,12 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.kotlin.asJava.FilteredJvmDiagnostics; +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; +import org.jetbrains.kotlin.cli.common.CompilerPlugin; +import org.jetbrains.kotlin.cli.common.CompilerPluginContext; +import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import java.io.File; import java.net.URL; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ModuleExecutionException.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ModuleExecutionException.java similarity index 91% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ModuleExecutionException.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ModuleExecutionException.java index 1539f253e17..6c8c3201ab8 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/ModuleExecutionException.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/ModuleExecutionException.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.kotlin.cli.jvm.compiler; public class ModuleExecutionException extends RuntimeException { public ModuleExecutionException(String message) { diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt similarity index 92% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt index ad07db03cdc..510089a772d 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.repl +package org.jetbrains.kotlin.cli.jvm.repl import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter -import org.jetbrains.jet.lang.psi.JetDeclaration open class DelegatePackageMemberDeclarationProvider(var delegate: PackageMemberDeclarationProvider) : PackageMemberDeclarationProvider { // Can't use Kotlin delegate feature because of inability to change delegate object in runtime (KT-5870) @@ -36,4 +35,4 @@ open class DelegatePackageMemberDeclarationProvider(var delegate: PackageMemberD override fun getPropertyDeclarations(name: Name) = delegate.getPropertyDeclarations(name) override fun getClassOrObjectDeclarations(name: Name) = delegate.getClassOrObjectDeclarations(name) -} \ No newline at end of file +} diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/EarlierLine.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/EarlierLine.java similarity index 83% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/EarlierLine.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/EarlierLine.java index 470501d0b2f..0aadf1e332e 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/EarlierLine.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/EarlierLine.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.repl; +package org.jetbrains.kotlin.cli.jvm.repl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; +import org.jetbrains.org.objectweb.asm.Type; public class EarlierLine { @NotNull @@ -32,7 +32,13 @@ public class EarlierLine { @NotNull private final Type classType; - public EarlierLine(@NotNull String code, @NotNull ScriptDescriptor scriptDescriptor, @NotNull Class scriptClass, @NotNull Object scriptInstance, @NotNull Type classType) { + public EarlierLine( + @NotNull String code, + @NotNull ScriptDescriptor scriptDescriptor, + @NotNull Class scriptClass, + @NotNull Object scriptInstance, + @NotNull Type classType + ) { this.code = code; this.scriptDescriptor = scriptDescriptor; this.scriptClass = scriptClass; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplClassLoader.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplClassLoader.java similarity index 86% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplClassLoader.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplClassLoader.java index 9924cfa7d76..3b5ee81a53d 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplClassLoader.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplClassLoader.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.repl; +package org.jetbrains.kotlin.cli.jvm.repl; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; @@ -27,17 +27,15 @@ import java.util.Map; public class ReplClassLoader extends ClassLoader { - private Map classes = Maps.newLinkedHashMap(); + private final Map classes = Maps.newLinkedHashMap(); public ReplClassLoader(@NotNull ClassLoader parent) { super(parent); } - public ReplClassLoader() { - } - + @NotNull @Override - protected Class findClass(String name) throws ClassNotFoundException { + protected Class findClass(@NotNull String name) throws ClassNotFoundException { byte[] classBytes = classes.get(JvmClassName.byFqNameWithoutInnerClasses(name)); if (classBytes != null) { return defineClass(name, classBytes, 0, classBytes.length); diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplFromTerminal.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java similarity index 98% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplFromTerminal.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java index 55f0a76b3a2..66a734669c4 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplFromTerminal.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.repl; +package org.jetbrains.kotlin.cli.jvm.repl; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.io.FileUtil; diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java similarity index 97% rename from compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java rename to compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index e9c33c6e460..1663e53d081 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.repl; +package org.jetbrains.kotlin.cli.jvm.repl; import com.google.common.base.Predicates; import com.google.common.base.Throwables; @@ -32,13 +32,6 @@ import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.common.messages.MessageCollectorToString; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.ClassBuilderFactories; import org.jetbrains.jet.codegen.CompilationErrorHandler; import org.jetbrains.jet.codegen.KotlinCodegenFacade; @@ -65,6 +58,13 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorToString; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForReplWithJava; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/preloader/instrumentation/ReadMe.md b/compiler/preloader/instrumentation/ReadMe.md index 81ad70a6ecd..1989dfef324 100644 --- a/compiler/preloader/instrumentation/ReadMe.md +++ b/compiler/preloader/instrumentation/ReadMe.md @@ -10,7 +10,7 @@ To run Preloader with instrumentation, pass ```instrument=...``` on the command ``` org.jetbrains.kotlin.preloading.Preloader \ dist/kotlinc/lib/kotlin-compiler.jar \ - org.jetbrains.jet.cli.jvm.K2JVMCompiler \ + org.jetbrains.kotlin.cli.jvm.K2JVMCompiler \ 5000 \ instrument=out/artifacts/Instrumentation/instrumentation.jar \ diff --git a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml index 4b3abbdf3f8..5c2eb7b342b 100644 --- a/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml +++ b/compiler/testData/integration/ant/js/outputWithoutDirectory/build.xml @@ -1,6 +1,6 @@ - + diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 5b7167f36f3..bee4cb7c8eb 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -48,8 +48,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; @@ -77,6 +75,8 @@ import org.jetbrains.jet.util.slicedmap.SlicedMap; import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.junit.Assert; import javax.tools.*; @@ -91,10 +91,10 @@ import java.util.regex.Pattern; import static org.jetbrains.jet.ConfigurationKind.ALL; import static org.jetbrains.jet.ConfigurationKind.JDK_AND_ANNOTATIONS; -import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.ANNOTATIONS_PATH_KEY; -import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY; import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetAnalysisResult; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys.ANNOTATIONS_PATH_KEY; +import static org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY; public class JetTestUtils { public static final String TEST_GENERATOR_NAME = "org.jetbrains.kotlin.generators.tests.TestsPackage"; diff --git a/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java b/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java index 4cb4d6ddfae..57d7d1a1aea 100644 --- a/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java +++ b/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java @@ -18,7 +18,7 @@ package org.jetbrains.jet; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; public abstract class KotlinTestWithEnvironmentManagement extends UsefulTestCase { static { diff --git a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java b/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java index 14b3f438c28..e7bf8f74cf2 100644 --- a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java +++ b/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java @@ -20,11 +20,11 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.io.ZipUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.jvm.K2JVMCompiler; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import java.io.*; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java index e5aa24136f7..1e67be817f1 100644 --- a/compiler/tests/org/jetbrains/jet/ScriptTest.java +++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java @@ -20,12 +20,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.CLIConfigurationKeys; -import org.jetbrains.jet.cli.common.messages.*; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.cli.jvm.compiler.KotlinToJVMBytecodeCompiler; import org.jetbrains.jet.codegen.CompilationException; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; @@ -36,6 +30,12 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; +import org.jetbrains.kotlin.cli.common.messages.*; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/tests/org/jetbrains/jet/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/jet/cfg/AbstractPseudocodeTest.java index 79dbf4f2ed3..a56bbc502d9 100644 --- a/compiler/tests/org/jetbrains/jet/cfg/AbstractPseudocodeTest.java +++ b/compiler/tests/org/jetbrains/jet/cfg/AbstractPseudocodeTest.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.cfg.pseudocode.Pseudocode; import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeImpl; import org.jetbrains.jet.lang.cfg.pseudocode.PseudocodeUtil; @@ -34,6 +33,7 @@ import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.LocalFunctionD import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.io.IOException; @@ -83,7 +83,7 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment { } } - private void addDeclaration(Map data, BindingContext bindingContext, JetDeclaration declaration) { + private static void addDeclaration(Map data, BindingContext bindingContext, JetDeclaration declaration) { Pseudocode pseudocode = PseudocodeUtil.generatePseudocode(declaration, bindingContext); data.put(declaration, pseudocode); for (LocalFunctionDeclarationInstruction instruction : pseudocode.getLocalDeclarations()) { @@ -98,9 +98,8 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment { StringBuilder instructionDump = new StringBuilder(); int i = 0; for (Pseudocode pseudocode : pseudocodes) { - JetElement correspondingElement = pseudocode.getCorrespondingElement(); - String label = ""; + String label; assert (correspondingElement instanceof JetNamedDeclaration || correspondingElement instanceof JetPropertyAccessor) : "Unexpected element class is pseudocode: " + correspondingElement.getClass(); if (correspondingElement instanceof JetFunctionLiteral) { @@ -110,7 +109,7 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment { JetNamedDeclaration namedDeclaration = (JetNamedDeclaration) correspondingElement; label = namedDeclaration.getName(); } - else if (correspondingElement instanceof JetPropertyAccessor) { + else { String propertyName = ((JetProperty) correspondingElement.getParent()).getName(); label = (((JetPropertyAccessor) correspondingElement).isGetter() ? "get" : "set") + "_" + propertyName; } @@ -135,7 +134,7 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment { protected void checkPseudocode(PseudocodeImpl pseudocode) { } - private String getIsDeadInstructionPrefix( + private static String getIsDeadInstructionPrefix( @NotNull Instruction instruction, @NotNull Set remainedAfterPostProcessInstructions ) { @@ -144,7 +143,7 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment { return isRemovedThroughPostProcess ? "-" : " "; } - private String getDepthInstructionPrefix(@NotNull Instruction instruction, @Nullable Instruction previous) { + private static String getDepthInstructionPrefix(@NotNull Instruction instruction, @Nullable Instruction previous) { Integer prevDepth = previous != null ? previous.getLexicalScope().getDepth() : null; int depth = instruction.getLexicalScope().getDepth(); if (prevDepth == null || depth != prevDepth) { @@ -153,7 +152,7 @@ public abstract class AbstractPseudocodeTest extends KotlinTestWithEnvironment { return " "; } - private String formatInstruction(Instruction instruction, int maxLength, String prefix) { + private static String formatInstruction(Instruction instruction, int maxLength, String prefix) { String[] parts = instruction.toString().split("\n"); if (parts.length == 1) { diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index e657ba34a56..7d4f604c4d4 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -28,7 +28,6 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.context.SimpleGlobalContext; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; @@ -42,9 +41,9 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; +import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -55,6 +54,7 @@ import org.jetbrains.jet.storage.LockBasedStorageManager; import org.jetbrains.jet.test.util.DescriptorValidator; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import java.io.File; import java.util.*; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java index e817c2405b2..c3cee5e4d8d 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java @@ -20,8 +20,6 @@ import com.google.common.base.Predicates; import com.intellij.openapi.Disposable; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; @@ -31,6 +29,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.kotlin.js.config.EcmaVersion; import org.jetbrains.kotlin.js.config.LibrarySourcesConfigWithCaching; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithStdLib.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithStdLib.java index 64597d07230..ba4e5e8fb03 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithStdLib.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithStdLib.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.checkers; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java index 19e2e229f8c..a35d69c06a6 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java @@ -24,11 +24,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.checkers.CheckerTestUtil.DiagnosedRange; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java b/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java index 97e41246665..f6ea2c41ad0 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java +++ b/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java @@ -25,11 +25,11 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java index 2ef566ce586..e5049b50d05 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/AbstractCheckLocalVariablesTableTest.java @@ -24,11 +24,11 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.org.objectweb.asm.*; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java index 6fe4452cea7..d805a4fbfd0 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/AbstractLineNumberTest.java @@ -25,9 +25,6 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; @@ -36,6 +33,9 @@ import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.org.objectweb.asm.*; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractTopLevelMembersInvocationTest.java index 4176a08d2c5..f86c776c884 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/AbstractTopLevelMembersInvocationTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/AbstractTopLevelMembersInvocationTest.java @@ -21,8 +21,8 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.*; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.util.ArrayList; diff --git a/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java b/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java index ec242705842..c61593ff32d 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ClassPathInParentClassLoaderTest.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.net.URLClassLoader; diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java index 46ffd5bfbe3..02be41be5f8 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java @@ -24,13 +24,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.tree.ClassNode; import org.jetbrains.org.objectweb.asm.tree.MethodNode; diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java index c7fa919cf5d..f0dd26af6f6 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java @@ -25,8 +25,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.Progress; @@ -35,6 +33,8 @@ import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java index 84dc7c4943a..2e184343a6a 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/GenerateNotNullAssertionsTest.java @@ -22,15 +22,15 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java index 1cb7cf2f8c0..952ed92bd33 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/JUnitUsageGenTest.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.codegen; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.junit.Test; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java index e4079b23455..6afa25aa01d 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/TestlibTest.java @@ -25,12 +25,6 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.common.CLIConfigurationKeys; -import org.jetbrains.jet.cli.common.messages.MessageCollectorPlainTextToStream; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.cli.jvm.compiler.KotlinToJVMBytecodeCompiler; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.codegen.state.JetTypeMapper; @@ -43,6 +37,12 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler; import java.io.File; import java.lang.reflect.Modifier; diff --git a/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java index cfa7da370ad..eab2405de00 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/flags/AbstractWriteFlagsTest.java @@ -21,11 +21,11 @@ import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.org.objectweb.asm.*; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java index 4eb5158c1f6..937f8331d20 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -24,16 +24,16 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.CodegenTestCase; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.InlineTestUtil; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java index b5ae8176b5e..8a3412a1277 100644 --- a/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/jet/descriptors/serialization/LoadBuiltinsTest.java @@ -22,7 +22,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.psi.JetFile; @@ -33,6 +32,7 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRendererBuilder; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index 5ef622e59f6..1ac0365f79b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -24,9 +24,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.InlineTestUtil; @@ -39,6 +36,9 @@ import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index e5f45b5d791..d77fa72b196 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -27,10 +27,6 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedClassDescriptor; @@ -50,6 +46,10 @@ import org.jetbrains.jet.storage.LockBasedStorageManager; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.test.util.DescriptorValidator; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.junit.Assert; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index 41cbe7e836a..1a865fb243d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -21,8 +21,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -35,6 +33,8 @@ import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java index 40f38ac89b6..94aeb228e61 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java @@ -23,12 +23,12 @@ import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java index fd483f8af96..bb12849f2f7 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java @@ -22,10 +22,10 @@ import com.intellij.openapi.Disposable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.IOException; import java.util.Enumeration; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java index bfc2d686705..90c1f708d7f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java @@ -20,11 +20,11 @@ import com.intellij.openapi.util.io.FileUtil; import junit.framework.TestCase; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.jvm.K2JVMCompiler; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.junit.Assert; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index bebeac557a3..de4ace6da27 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -25,10 +25,6 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.MockLibraryUtil; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport; -import org.jetbrains.jet.cli.common.messages.MessageCollectorPlainTextToStream; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; @@ -39,6 +35,10 @@ import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.test.util.DescriptorValidator; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.BufferedOutputStream; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java index 532386a8598..323b24f9f78 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java @@ -28,11 +28,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.compiler.CoreExternalAnnotationsManager; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.cli.jvm.compiler.CoreExternalAnnotationsManager; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.util.Set; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java index aa5ab5d52e5..a5676f15e14 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java @@ -30,11 +30,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt index c1a7c56549a..e331928a223 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.jvm.compiler import org.jetbrains.jet.KotlinTestWithEnvironmentManagement import org.jetbrains.jet.JetTestUtils import java.io.File -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.ConfigurationKind import org.jetbrains.jet.TestJdkKind import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder @@ -28,7 +28,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl import kotlin.test.assertEquals import kotlin.test.assertNotNull -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles public class KotlinClassFinderTest : KotlinTestWithEnvironmentManagement() { fun testNestedClass() { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 75d65b397df..691d644148c 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -28,10 +28,6 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.codegen.state.GenerationState; @@ -44,6 +40,10 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 01dc839fd2c..363156d1980 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -28,9 +28,9 @@ import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.descriptors.* import org.junit.Assert -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.config.CompilerConfiguration -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns @@ -41,7 +41,7 @@ import java.util.HashMap import org.jetbrains.jet.analyzer.ModuleContent import org.jetbrains.jet.lang.types.ErrorUtils import org.jetbrains.jet.lang.resolve.descriptorUtil.module -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { @@ -168,4 +168,4 @@ public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { class object { val PATH_TO_TEST_ROOT_DIR = "compiler/testData/multiModule/java/custom" } -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index 16743bb5757..3cdce8146e8 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -30,8 +30,6 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.TimeUtils; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; @@ -39,6 +37,8 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.ResolvePackage; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java index 3f4c679e4a1..ba84b67538d 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java @@ -19,12 +19,12 @@ package org.jetbrains.jet.lang.psi; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.junit.Assert; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt b/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt index 744c0075d01..3b80653da42 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt @@ -18,10 +18,10 @@ package org.jetbrains.jet.lang.psi import org.junit.Assert import org.jetbrains.jet.JetLiteFixture -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.jet.lang.psi.psiUtil.getReceiverExpression -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles public class JetSimpleNameExpressionTest() : JetLiteFixture() { public fun testGetReceiverExpressionIdentifier() { diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java index 37d77db6961..669e6a52c34 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -22,7 +22,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.psi.JetFile; @@ -30,6 +29,7 @@ import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import java.util.Collection; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/KotlinTestWithEnvironment.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/KotlinTestWithEnvironment.java index 83169ade537..6ad04f5aa73 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/KotlinTestWithEnvironment.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/KotlinTestWithEnvironment.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.KotlinTestWithEnvironmentManagement; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; public abstract class KotlinTestWithEnvironment extends KotlinTestWithEnvironmentManagement { private JetCoreEnvironment environment; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index 318d5176de5..2a868eb06f4 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -20,8 +20,6 @@ import com.google.common.base.Predicates; import com.google.common.collect.Sets; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; @@ -32,6 +30,8 @@ import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.SpecialNames; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.util.List; import java.util.Set; diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java index cc1bcd80f4a..8506e61c168 100644 --- a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java +++ b/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java @@ -21,12 +21,12 @@ import junit.framework.TestCase; import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.common.messages.MessageRenderer; -import org.jetbrains.jet.cli.common.modules.ModuleScriptData; -import org.jetbrains.jet.cli.common.modules.ModuleXmlParser; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.MessageRenderer; +import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData; +import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/jet/renderer/AbstractDescriptorRendererTest.kt index a0ea96a101d..27c454698c7 100644 --- a/compiler/tests/org/jetbrains/jet/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/jet/renderer/AbstractDescriptorRendererTest.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor import com.intellij.openapi.editor.impl.DocumentImpl import org.jetbrains.jet.JetTestUtils import java.util.ArrayList -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.ConfigurationKind import com.intellij.testFramework.UsefulTestCase import java.io.File @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM import org.jetbrains.jet.context.GlobalContext import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider import org.jetbrains.jet.lang.psi.JetFile import org.jetbrains.jet.lang.psi.JetClassObject diff --git a/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.kt b/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.kt index 42ef14946a0..c0e54d1712d 100644 --- a/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.kt +++ b/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.kt @@ -21,7 +21,7 @@ import com.intellij.testFramework.UsefulTestCase import org.jetbrains.jet.ConfigurationKind import org.jetbrains.jet.JetTestUtils import org.jetbrains.jet.TestJdkKind -import org.jetbrains.jet.cli.jvm.repl.ReplInterpreter +import org.jetbrains.kotlin.cli.jvm.repl.ReplInterpreter import java.io.File import java.util.ArrayDeque import java.util.ArrayList diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java index d8773c8bf7f..274a23d7909 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.psi.JetFile; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java index 135f892af24..3278c7246db 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java @@ -20,7 +20,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; @@ -37,6 +36,7 @@ import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt index dadab3f56d0..a68107a4159 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt @@ -21,13 +21,13 @@ import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace import org.junit.Assert import org.jetbrains.jet.lang.diagnostics.Diagnostic import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles class MutableDiagnosticsTest : KotlinTestWithEnvironment() { override fun createEnvironment(): JetCoreEnvironment? { diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index aecf2c1e22d..09ffac7deda 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; @@ -38,6 +37,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index 0c148ac701d..0a844abe337 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.resolve.calls import org.jetbrains.jet.ConfigurationKind import org.jetbrains.jet.JetLiteFixture import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue @@ -115,4 +115,4 @@ private fun ResolvedCall<*>.renderToText(): String { } } }.toString() -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt index ee495aeebf4..9142d3d0ef3 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.resolve.constraintSystem import org.jetbrains.jet.ConfigurationKind import org.jetbrains.jet.JetLiteFixture import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.di.InjectorForTests import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.diagnostics.rendering.Renderers diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt index 5d472120da5..fd6790e294c 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.resolve.typeApproximation import org.jetbrains.jet.JetLiteFixture -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.ConfigurationKind import java.io.File import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil @@ -25,12 +25,10 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.types.TypeSubstitutor import org.jetbrains.jet.lang.types.TypeProjectionImpl import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.Variance.* import org.jetbrains.jet.lang.types.typesApproximation.approximateCapturedTypes import org.jetbrains.jet.JetTestUtils import org.jetbrains.jet.lang.psi.JetPsiFactory -import org.jetbrains.jet.lang.resolve.calls.inference.CapturedTypeConstructor import org.jetbrains.jet.lang.resolve.calls.inference.createCapturedType import org.jetbrains.jet.lang.diagnostics.Severity import org.jetbrains.jet.lang.types.typesApproximation.approximateCapturedTypesIfNecessary @@ -196,4 +194,4 @@ public class CapturedTypeApproximationTest() : JetLiteFixture() { public fun testTwoVariables() { doTest("twoVariables.txt", "T", "R") } -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java index beb5ce65d4c..06cb7670e8d 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java @@ -20,7 +20,6 @@ import com.google.common.collect.Lists; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; @@ -28,6 +27,7 @@ import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.utils.Printer; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java index 4e60051cc8a..25bbc43d8e1 100644 --- a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.types; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetFile; @@ -28,6 +27,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.BoundsSubstitutor; import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.util.Collection; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 6a853151ab4..5a62486ef21 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -22,7 +22,6 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; @@ -39,6 +38,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.storage.ExceptionTracker; import org.jetbrains.jet.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index 92e9519e9ca..65ac7cd1014 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -20,7 +20,6 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetNamedFunction; @@ -28,6 +27,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.OverloadUtil; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index b2311e19172..edc2c211545 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -20,7 +20,6 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.psi.JetNamedFunction; @@ -28,6 +27,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; import static org.jetbrains.jet.lang.psi.PsiPackage.JetPsiFactory; diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index adc63230dfd..b43b68909b9 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -24,8 +24,6 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; @@ -45,6 +43,8 @@ import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index e71b5622083..b0e4d4c49c0 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -25,7 +25,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; @@ -45,6 +44,7 @@ import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java index ff92daf4acb..9bcf91bb2d1 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; @@ -38,6 +37,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; import java.util.Map; diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java index 7fa08ea9624..9d320fc1791 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java @@ -23,7 +23,7 @@ import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.checkers.KotlinMultiFileTestWithWithJava; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java index 63802907511..33b265def0b 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.asJava; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.util.List; diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java index 85329457b07..5dff49ee377 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java @@ -32,8 +32,8 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY; import static org.jetbrains.kotlin.asJava.KotlinLightClassStructureTest.ClassProperty.*; +import static org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY; @SuppressWarnings("JUnitTestClassNamingConvention") public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase { diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java index 809179efcb9..a2d9b5553cb 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java @@ -22,8 +22,8 @@ import com.intellij.psi.PsiModifierList; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import java.io.File; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/jet/cli/AbstractKotlincExecutableTest.java b/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/cli/AbstractKotlincExecutableTest.java rename to compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java index f31694ec6e9..20b25ac891b 100644 --- a/compiler/tests/org/jetbrains/jet/cli/AbstractKotlincExecutableTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.cli; +package org.jetbrains.kotlin.cli; import com.intellij.execution.process.ProcessOutput; import com.intellij.execution.util.ExecUtil; import com.intellij.openapi.util.SystemInfo; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.cli.common.ExitCode; import java.io.File; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java rename to compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index 3ee4623678b..b6007b150db 100644 --- a/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli; +package org.jetbrains.kotlin.cli; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; @@ -23,13 +23,13 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.common.CLICompiler; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.js.K2JSCompiler; -import org.jetbrains.jet.cli.jvm.K2JVMCompiler; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.test.Tmpdir; import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.cli.common.CLICompiler; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.js.K2JSCompiler; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.junit.Rule; import org.junit.rules.TestName; diff --git a/compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java rename to compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java index c38c99afb2b..731c756fbaf 100644 --- a/compiler/tests/org/jetbrains/jet/cli/CliCommonTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli; +package org.jetbrains.kotlin.cli; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; diff --git a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java index 6993b87f7c8..602fea7aa3b 100644 --- a/compiler/tests/org/jetbrains/jet/cli/KotlincExecutableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli; +package org.jetbrains.kotlin.cli; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/jet/cli/common/messages/OutputMessageUtilTest.java b/compiler/tests/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtilTest.java similarity index 90% rename from compiler/tests/org/jetbrains/jet/cli/common/messages/OutputMessageUtilTest.java rename to compiler/tests/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtilTest.java index 657c8ea8133..1d8a78f4814 100644 --- a/compiler/tests/org/jetbrains/jet/cli/common/messages/OutputMessageUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/common/messages/OutputMessageUtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.common.messages; +package org.jetbrains.kotlin.cli.common.messages; import junit.framework.TestCase; @@ -44,12 +44,12 @@ public class OutputMessageUtilTest extends TestCase { public abstract String convert(String path); } - private void doTest(String outputPath, String... sourcePathArray) { + private static void doTest(String outputPath, String... sourcePathArray) { doTest(TargetOS.UNIX, outputPath, sourcePathArray); doTest(TargetOS.WINDOWS, outputPath, sourcePathArray); } - private void doTest(TargetOS os, String outputPath, String... sourcePathArray) { + private static void doTest(TargetOS os, String outputPath, String... sourcePathArray) { File[] sourceFileArray = new File[sourcePathArray.length]; for (int i = 0; i < sourcePathArray.length; i++) { String path = sourcePathArray[i]; @@ -58,7 +58,7 @@ public class OutputMessageUtilTest extends TestCase { doTest(new File(os.convert(outputPath)), sourceFileArray); } - private void doTest(File outputFile, File... sourceFileArray) { + private static void doTest(File outputFile, File... sourceFileArray) { List sourceFiles = Arrays.asList(sourceFileArray); String message = OutputMessageUtil.formatOutputMessage(sourceFiles, outputFile); OutputMessageUtil.Output output = OutputMessageUtil.parseOutputMessage(message); diff --git a/compiler/tests/org/jetbrains/jet/cli/js/K2JsCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/cli/js/K2JsCliTest.java rename to compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java index be34e124187..dab2fbe225b 100644 --- a/compiler/tests/org/jetbrains/jet/cli/js/K2JsCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/js/K2JsCliTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.js; +package org.jetbrains.kotlin.cli.js; -import org.jetbrains.jet.cli.CliBaseTest; +import org.jetbrains.kotlin.cli.CliBaseTest; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java rename to compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java index a6513623992..ebd74ee1561 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/K2JvmCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm; +package org.jetbrains.kotlin.cli.jvm; -import org.jetbrains.jet.cli.CliBaseTest; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.cli.CliBaseTest; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java index 0012c90a89b..f6756a6a993 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java @@ -46,7 +46,7 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase { Collection javaArgs = new ArrayList(); javaArgs.add("-cp"); javaArgs.add(classpath); - javaArgs.add("org.jetbrains.jet.cli.jvm.K2JVMCompiler"); + javaArgs.add("org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"); Collections.addAll(javaArgs, arguments); return runJava(logName, ArrayUtil.toStringArray(javaArgs)); diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java index 46335bc1dc4..d27e6f0370c 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java @@ -32,10 +32,10 @@ import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.common.KotlinVersion; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.test.Tmpdir; import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.cli.common.KotlinVersion; import org.junit.ComparisonFailure; import org.junit.Rule; @@ -174,4 +174,4 @@ public abstract class KotlinIntegrationTestBase { protected static File getKotlinProjectHome() { return new File(PathManager.getHomePath()).getParentFile(); } -} \ No newline at end of file +} diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 71bd31cbe8d..37deed464a2 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -37,7 +37,7 @@ import org.jetbrains.jet.jvm.compiler.AbstractCompileJavaAgainstKotlinTest import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest import org.jetbrains.jet.modules.xml.AbstractModuleXmlParserTest import org.jetbrains.jet.jvm.compiler.AbstractWriteSignatureTest -import org.jetbrains.jet.cli.AbstractKotlincExecutableTest +import org.jetbrains.kotlin.cli.AbstractKotlincExecutableTest import org.jetbrains.jet.repl.AbstractReplInterpreterTest import org.jetbrains.jet.cfg.AbstractControlFlowTest import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java index 59eb0060548..f2329867d68 100644 --- a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java @@ -21,7 +21,7 @@ import com.intellij.util.Function; import com.intellij.util.containers.ComparatorUtil; import com.sampullara.cli.Argument; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; import java.lang.reflect.Field; import java.util.ArrayList; diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java index bc55d0e8c3c..cb3483c02f0 100644 --- a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java @@ -17,14 +17,14 @@ package org.jetbrains.kotlin.compilerRunner; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.jet.config.Services; import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.kotlin.preloading.ClassCondition; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; public class CompilerEnvironment { @NotNull diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java index b20af193adb..e5bb3d4ea3d 100644 --- a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java @@ -21,10 +21,10 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.common.messages.OutputMessageUtil; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -36,9 +36,9 @@ import java.io.IOException; import java.io.Reader; import java.util.Map; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*; -import static org.jetbrains.jet.cli.common.messages.MessageCollectorUtil.reportException; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*; +import static org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil.reportException; public class CompilerOutputParser { public static void parseCompilerMessagesFromReader(MessageCollector messageCollector, final Reader reader, OutputItemsCollector collector) { diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index f3b5d8e43cb..6e29966dd8e 100644 --- a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.compilerRunner; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.kotlin.preloading.ClassPreloadingUtils; @@ -29,8 +29,8 @@ import java.lang.ref.SoftReference; import java.lang.reflect.Method; import java.util.Collections; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; public class CompilerRunnerUtil { diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index fdccf0cb093..22515bce97f 100644 --- a/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -24,25 +24,25 @@ import com.intellij.util.xmlb.Accessor; import com.intellij.util.xmlb.XmlSerializerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.common.messages.MessageCollectorUtil; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; import org.jetbrains.kotlin.config.CompilerSettings; import java.io.*; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.INFO; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO; public class KotlinCompilerRunner { - private static final String K2JVM_COMPILER = "org.jetbrains.jet.cli.jvm.K2JVMCompiler"; - private static final String K2JS_COMPILER = "org.jetbrains.jet.cli.js.K2JSCompiler"; + private static final String K2JVM_COMPILER = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"; + private static final String K2JS_COMPILER = "org.jetbrains.kotlin.cli.js.K2JSCompiler"; private static final String INTERNAL_ERROR = ExitCode.INTERNAL_ERROR.toString(); public static void runK2JvmCompiler( diff --git a/ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java b/ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java index 3cddfa6426f..e321385310e 100644 --- a/ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java +++ b/ide-compiler-runner/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java @@ -27,7 +27,7 @@ import java.util.Set; import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; import static com.intellij.openapi.util.text.StringUtil.escapeXml; -import static org.jetbrains.jet.cli.common.modules.ModuleXmlParser.*; +import static org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.*; public class KotlinModuleXmlBuilderFactory implements KotlinModuleDescriptionBuilderFactory { diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java index 339e730abd5..ab5c877a1ef 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.compiler.configuration; import com.intellij.openapi.components.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java index 59898cbd637..a6bbabb0842 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.compiler.configuration; import com.intellij.openapi.components.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java index da6e216d189..16b2e9a8de1 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.compiler.configuration; import com.intellij.openapi.components.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH; diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java index e9a95325ce4..c1566f3cafd 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java @@ -30,8 +30,8 @@ import com.intellij.ui.RawCommandLineEditor; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.kotlin.config.CompilerSettings; diff --git a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java index 43cdfd7e449..e86118df8d8 100644 --- a/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java +++ b/idea/src/org/jetbrains/jet/plugin/configuration/KotlinMavenConfigurator.java @@ -42,7 +42,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.dom.MavenDomUtil; import org.jetbrains.idea.maven.dom.model.*; import org.jetbrains.idea.maven.project.MavenProjectsManager; -import org.jetbrains.jet.cli.common.KotlinVersion; +import org.jetbrains.kotlin.cli.common.KotlinVersion; import org.jetbrains.jet.plugin.JetPluginUtil; import org.jetbrains.jet.plugin.framework.ui.ConfigureDialogWithModulesAndVersion; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java index 7d3ccc5bc79..d967eb16c8d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt index 207dcd2541b..0c12f8ca532 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/NoErrorsInStdlibTest.kt @@ -20,8 +20,8 @@ import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor import com.intellij.openapi.vfs.VfsUtil import org.jetbrains.jet.lang.psi.JetFile -import org.jetbrains.jet.cli.common.messages.AnalyzerWithCompilerReport -import org.jetbrains.jet.cli.common.messages.MessageCollectorPlainTextToStream +import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream import com.intellij.openapi.projectRoots.Sdk import org.jetbrains.jet.plugin.PluginTestCaseBase import kotlin.test.assertEquals diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java b/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java index 738b89f51e0..6095da08422 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java @@ -17,9 +17,9 @@ package org.jetbrains.kotlin.jps; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.ex.JpsElementBase; diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 2e79eda708c..53a80307bd0 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.Key import com.intellij.openapi.util.io.FileUtil import gnu.trove.THashSet -import org.jetbrains.jet.cli.common.KotlinVersion -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.jet.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.common.KotlinVersion +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl @@ -41,8 +41,8 @@ import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage import java.io.File import java.util.* -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.* +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler @@ -52,7 +52,7 @@ import com.intellij.openapi.diagnostic.Logger import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.jps.builders.java.JavaBuilderUtil import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem import org.jetbrains.jet.utils.LibraryUtils diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index a2200c34dd7..10ead8134d8 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index ad810fdc2e8..09f10c25233 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java b/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 563ee48671a..70c60de3245 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java index 245e1e30b3a..ea215f3ed07 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java @@ -30,15 +30,15 @@ import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.js.JavaScript; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.config.EcmaVersion; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java index d01b40c17af..3aac7c5d67d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/CompileMavenGeneratedJSLibrary.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.js.test.semantics; import com.google.common.collect.Lists; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.js.K2JSCompiler; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.js.K2JSCompiler; import org.jetbrains.kotlin.js.config.EcmaVersion; import org.jetbrains.kotlin.js.test.SingleFileTranslationTest; diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index 80cebeb2ae2..c35407e2098 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -15,8 +15,8 @@ */ import org.junit.Test -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import com.intellij.openapi.util.Disposer import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.jet.lang.resolve.name.FqName @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import java.util.HashSet import org.jetbrains.jet.config.CommonConfigurationKeys -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.BindingTraceContext @@ -43,7 +43,7 @@ import org.jetbrains.kotlin.js.config.LibrarySourcesConfig import org.jetbrains.kotlin.js.config.EcmaVersion import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS import com.intellij.openapi.Disposable -import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport import org.jetbrains.jet.context.GlobalContext private val ANALYZE_PACKAGE_ROOTS_FOR_JVM = listOf("kotlin") diff --git a/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java b/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java index 4ea48ab0e50..de40054fbb8 100644 --- a/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java +++ b/libraries/tools/kdoc-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/doc/KDocMojo.java @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.maven.doc; import org.apache.maven.plugin.MojoExecutionException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.CLICompiler; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.cli.jvm.K2JVMCompiler; +import org.jetbrains.kotlin.cli.common.CLICompiler; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.doc.KDocArguments; import org.jetbrains.kotlin.doc.KDocCompiler; import org.jetbrains.kotlin.doc.KDocConfig; diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt index 61be9e80054..68cbb3fb89b 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/KDocCompiler.kt @@ -1,12 +1,12 @@ package org.jetbrains.kotlin.doc import java.io.PrintStream -import org.jetbrains.jet.cli.common.CLICompiler -import org.jetbrains.jet.cli.common.CLIConfigurationKeys -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.cli.jvm.K2JVMCompiler +import org.jetbrains.kotlin.cli.common.CLICompiler +import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.jet.config.CompilerConfiguration -import org.jetbrains.jet.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.common.messages.MessageCollector /** * Main for running the KDocCompiler diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlCompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlCompilerPlugin.kt index 18aa0d5a6db..e337f9676da 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlCompilerPlugin.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/highlighter/HtmlCompilerPlugin.kt @@ -1,7 +1,7 @@ package org.jetbrains.kotlin.doc.highlighter -import org.jetbrains.jet.cli.common.CompilerPlugin -import org.jetbrains.jet.cli.common.CompilerPluginContext +import org.jetbrains.kotlin.cli.common.CompilerPlugin +import org.jetbrains.kotlin.cli.common.CompilerPluginContext /** */ diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt index 2ba52dd692c..123b2e242e7 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KModelCompilerPlugin.kt @@ -1,8 +1,8 @@ package org.jetbrains.kotlin.doc.model import java.io.File -import org.jetbrains.jet.cli.common.CompilerPlugin -import org.jetbrains.jet.cli.common.CompilerPluginContext +import org.jetbrains.kotlin.cli.common.CompilerPlugin +import org.jetbrains.kotlin.cli.common.CompilerPluginContext import org.jetbrains.kotlin.doc.KDocArguments /** Base class for any compiler plugin which needs to process a KModel */ diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt index 491c9993ce1..9b471185321 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/HtmlVisitorTest.kt @@ -2,7 +2,7 @@ package test.kotlin.kdoc import java.io.File import kotlin.test.assertTrue -import org.jetbrains.jet.cli.jvm.K2JVMCompiler +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.doc.highlighter.HtmlCompilerPlugin import org.junit.Test diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt index db3d4c1f592..ef3d099345f 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocSampleTest.kt @@ -2,7 +2,7 @@ package test.kotlin.kdoc import java.io.File import java.io.IOException -import org.jetbrains.jet.cli.common.ExitCode +import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.doc.KDocCompiler import org.junit.Assert import org.junit.Test diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt index ad58da3772f..cad5242fb84 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt @@ -2,7 +2,7 @@ package test.kotlin.kdoc import java.io.File import kotlin.test.assertTrue -import org.jetbrains.jet.cli.common.ExitCode +import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.doc.KDocCompiler import org.junit.Assert import org.junit.Test diff --git a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt index 8fe634725c9..3661ed755f6 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt @@ -1,8 +1,8 @@ package test.kotlin -import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys -import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.cli.jvm.compiler.EnvironmentConfigFiles +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.jet.config.CompilerConfiguration import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer diff --git a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt index ab9fc5bd018..b53cc2e2fb6 100644 --- a/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt +++ b/libraries/tools/kotlin-gradle-plugin-core/src/main/kotlin/org/jetbrains/kotlin/gradle/tasks/Tasks.kt @@ -3,29 +3,29 @@ package org.jetbrains.kotlin.gradle.tasks import org.gradle.api.tasks.compile.AbstractCompile import java.io.File import org.gradle.api.GradleException -import org.jetbrains.jet.cli.common.ExitCode +import org.jetbrains.kotlin.cli.common.ExitCode import org.gradle.api.tasks.SourceTask import org.jetbrains.kotlin.doc.KDocArguments import java.util.HashSet import org.jetbrains.kotlin.doc.KDocCompiler import org.gradle.api.tasks.TaskAction import org.gradle.api.file.SourceDirectorySet -import org.jetbrains.jet.cli.jvm.K2JVMCompiler -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.jet.cli.common.messages.MessageCollector -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.gradle.api.logging.Logger import org.gradle.api.logging.Logging import org.apache.commons.lang.StringUtils import org.apache.commons.io.FileUtils import org.gradle.api.Project import org.jetbrains.jet.config.Services -import org.jetbrains.jet.cli.js.K2JSCompiler -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.js.K2JSCompiler +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.codehaus.groovy.runtime.MethodClosure -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments -import org.jetbrains.jet.cli.common.CLICompiler +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.CLICompiler import com.intellij.ide.highlighter.JavaFileType import org.jetbrains.jet.plugin.JetFileType import org.jetbrains.jet.utils.LibraryUtils diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java index c712f697f7e..6509d1eecce 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JSCompilerMojo.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.maven; import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.jet.cli.js.K2JSCompiler; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.js.K2JSCompiler; import org.jetbrains.jet.utils.LibraryUtils; import java.io.File; diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java index 3b0bc543265..49f36d45b2c 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/K2JVMCompileMojo.java @@ -23,8 +23,8 @@ import org.apache.maven.artifact.Artifact; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.logging.Log; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.cli.jvm.K2JVMCompiler; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import java.io.File; import java.io.IOException; diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java index 39d493d1271..5f51923bae0 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java @@ -24,13 +24,13 @@ import org.apache.maven.plugin.MojoFailureException; import org.apache.maven.plugin.logging.Log; import org.apache.maven.project.MavenProject; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.CLICompiler; -import org.jetbrains.jet.cli.common.ExitCode; -import org.jetbrains.jet.cli.common.KotlinVersion; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.jet.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.CLICompiler; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.common.KotlinVersion; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.jet.config.Services; import java.io.File; diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java index f9a39c90013..acecc74f46d 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinTestCompileMojo.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.maven; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.cli.jvm.K2JVMCompiler; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import java.util.List;