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 a949640d4b5..e05665448e7 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,15 +24,15 @@ import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.codegen.CodegenTestFiles; -import org.jetbrains.kotlin.codegen.GenerationUtils; -import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.kotlin.psi.JetFile; -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.JetCoreEnvironment; +import org.jetbrains.kotlin.codegen.CodegenTestFiles; +import org.jetbrains.kotlin.codegen.GenerationUtils; +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil; +import org.jetbrains.kotlin.plugin.JetFileType; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.utils.Printer; import org.junit.Assert; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java index fd373447f46..0e866c07331 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; @@ -31,6 +30,7 @@ import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import java.util.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java index 5a30b43b40f..84e2889feda 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.codegen; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.org.objectweb.asm.Type; -import org.jetbrains.org.objectweb.asm.commons.Method; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.util.slicedmap.*; +import org.jetbrains.kotlin.util.slicedMap.*; +import org.jetbrains.org.objectweb.asm.Type; +import org.jetbrains.org.objectweb.asm.commons.Method; import java.util.Collection; import java.util.Map; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java index 754e73a15e2..b892fd96125 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -19,9 +19,6 @@ package org.jetbrains.kotlin.codegen.binding; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.BasicWritableSlice; -import org.jetbrains.jet.util.slicedmap.Slices; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.SamType; import org.jetbrains.kotlin.codegen.state.GenerationState; @@ -35,6 +32,9 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.util.slicedMap.BasicWritableSlice; +import org.jetbrains.kotlin.util.slicedMap.Slices; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import org.jetbrains.org.objectweb.asm.Type; import java.util.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java index bc8f8b6d743..bc50ff563fe 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.codegen.state; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; @@ -35,6 +34,7 @@ import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import java.io.File; import java.util.Collection; diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index 343de93bd01..b6a68deb0d6 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -18,7 +18,7 @@ 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.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.serialization.* import org.jetbrains.kotlin.descriptors.* @@ -27,16 +27,16 @@ import java.io.ByteArrayOutputStream import org.jetbrains.kotlin.builtins.BuiltInsSerializationUtil import com.intellij.openapi.Disposable import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys -import org.jetbrains.jet.config.CommonConfigurationKeys +import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.utils.recursePostOrder import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade -import org.jetbrains.jet.context.GlobalContext -import org.jetbrains.jet.analyzer.ModuleInfo +import org.jetbrains.kotlin.context.GlobalContext +import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters -import org.jetbrains.jet.analyzer.ModuleContent +import org.jetbrains.kotlin.analyzer.ModuleContent import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java index a3bd0a867ab..197f1321b19 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java @@ -23,11 +23,11 @@ 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.config.CompilerConfiguration; -import org.jetbrains.kotlin.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 org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.Services; import java.io.PrintStream; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java index 6d11b3f6206..e47210fabe1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLIConfigurationKeys.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.cli.common; -import org.jetbrains.jet.config.CompilerConfigurationKey; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.config.CompilerConfigurationKey; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java index 9893c0a01f2..35500be2999 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java @@ -25,7 +25,7 @@ import com.intellij.psi.util.PsiFormatUtil; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.diagnostics.*; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index cbd3aeb9864..5913e97decb 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -32,8 +32,7 @@ import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.CLICompiler; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; @@ -48,6 +47,7 @@ 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.config.CompilerConfiguration; import org.jetbrains.kotlin.config.Services; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.kotlin.js.config.Config; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java index 906b4a8b81a..48d43c83588 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cli.jvm; -import org.jetbrains.jet.config.CompilerConfigurationKey; +import org.jetbrains.kotlin.config.CompilerConfigurationKey; import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java index 036f40315f0..f127e98d823 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java @@ -20,8 +20,6 @@ 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.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.cli.common.CLICompiler; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.ExitCode; @@ -31,6 +29,8 @@ import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData; import org.jetbrains.kotlin.cli.jvm.compiler.*; import org.jetbrains.kotlin.cli.jvm.repl.ReplFromTerminal; import org.jetbrains.kotlin.codegen.CompilationException; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.config.Services; import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java index a4bd4b62013..2206e65b7e3 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java @@ -30,8 +30,6 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.LightClassConstructionContext; @@ -48,6 +46,8 @@ import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.Collection; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index 54deae801c2..e82733a24af 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -36,18 +36,6 @@ import kotlin.modules.AllModules; import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.codegen.ClassFileFactory; -import org.jetbrains.kotlin.codegen.GeneratedClassLoader; -import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.kotlin.utils.KotlinPaths; -import org.jetbrains.kotlin.utils.PathUtil; -import org.jetbrains.kotlin.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; @@ -57,6 +45,18 @@ 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 org.jetbrains.kotlin.codegen.ClassFileFactory; +import org.jetbrains.kotlin.codegen.GeneratedClassLoader; +import org.jetbrains.kotlin.codegen.state.GenerationState; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.plugin.JetFileType; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.utils.KotlinPaths; +import org.jetbrains.kotlin.utils.PathUtil; +import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.*; import java.lang.reflect.Method; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java index a182b2941a1..0a7fed7e3bc 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java @@ -40,11 +40,8 @@ import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.CompilerModeProvider; -import org.jetbrains.jet.OperationModeProvider; -import org.jetbrains.jet.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.CompilerModeProvider; +import org.jetbrains.kotlin.OperationModeProvider; import org.jetbrains.kotlin.asJava.JavaElementFinder; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.LightClassGenerationSupport; @@ -53,10 +50,13 @@ 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 org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; import org.jetbrains.kotlin.parsing.JetParserDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer; import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index 0d0beada565..188584d5b3a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -30,10 +30,7 @@ import kotlin.modules.AllModules; import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.context.ContextPackage; -import org.jetbrains.jet.plugin.MainFunctionDetector; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.asJava.FilteredJvmDiagnostics; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.CompilerPlugin; @@ -44,6 +41,8 @@ import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.Progress; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.context.ContextPackage; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackage; @@ -52,6 +51,7 @@ import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvid import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.plugin.MainFunctionDetector; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.BindingTrace; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java index 5bc63e40bf5..2f199049fdd 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil; import jline.console.ConsoleReader; import jline.console.history.FileHistory; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index 53c229182f9..5df3256d71a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -32,10 +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.config.CompilerConfiguration; -import org.jetbrains.jet.context.ContextPackage; -import org.jetbrains.jet.context.GlobalContextImpl; -import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; @@ -49,12 +45,16 @@ import org.jetbrains.kotlin.codegen.ClassBuilderFactories; import org.jetbrains.kotlin.codegen.CompilationErrorHandler; import org.jetbrains.kotlin.codegen.KotlinCodegenFacade; import org.jetbrains.kotlin.codegen.state.GenerationState; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.context.ContextPackage; +import org.jetbrains.kotlin.context.GlobalContextImpl; import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.di.InjectorForReplWithJava; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.parsing.JetParserDefinition; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.kotlin.resolve.*; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java index 9a55fa1ce60..59b23439551 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.jet.context.GlobalContextImpl; +import org.jetbrains.kotlin.context.GlobalContextImpl; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; @@ -80,7 +80,7 @@ public class InjectorForJavaDescriptorResolver { ) { this.project = project; this.bindingTrace = bindingTrace; - this.globalContext = org.jetbrains.jet.context.ContextPackage.GlobalContext(); + this.globalContext = org.jetbrains.kotlin.context.ContextPackage.GlobalContext(); this.lockBasedStorageManager = globalContext.getStorageManager(); this.module = org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM.createJavaModule(""); this.javaClassFinder = new JavaClassFinderImpl(); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java index 48be8df52b7..e1855885cb2 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEval import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl; import org.jetbrains.kotlin.load.java.components.JavaSourceElementFactoryImpl; import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.context.LazyResolveToken; +import org.jetbrains.kotlin.context.LazyResolveToken; import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.kotlin.resolve.AnnotationResolver; @@ -51,7 +51,7 @@ import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java index 1a56f948285..cc3e5d29bf4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; @@ -54,13 +54,13 @@ import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java index 8669eaeebfd..dbcad59102b 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; @@ -53,13 +53,13 @@ import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java index b494fb3e1b9..da9bea384e4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.load.java; -import org.jetbrains.jet.util.slicedmap.Slices; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.util.slicedMap.Slices; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.List; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java index 11b60a4ad1a..dfa1b1b3fb9 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaPackageImpl; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.kotlin.resolve.jvm.JavaClassFinderPostConstruct; import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java index e1906ea22b4..f5bb53c0875 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.load.java.components; import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.Slices; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.util.slicedMap.Slices; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import javax.inject.Inject; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt index de8651c859a..d0f956ddbfb 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt @@ -16,21 +16,21 @@ package org.jetbrains.kotlin.resolve.jvm -import org.jetbrains.jet.analyzer.AnalyzerFacade -import org.jetbrains.jet.analyzer.ResolverForModule +import org.jetbrains.kotlin.analyzer.AnalyzerFacade +import org.jetbrains.kotlin.analyzer.ResolverForModule import org.jetbrains.kotlin.resolve.lazy.ResolveSession -import org.jetbrains.jet.analyzer.PlatformAnalysisParameters -import org.jetbrains.jet.analyzer.ResolverForProject +import org.jetbrains.kotlin.analyzer.PlatformAnalysisParameters +import org.jetbrains.kotlin.analyzer.ResolverForProject import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService import com.intellij.openapi.project.Project -import org.jetbrains.jet.context.GlobalContext +import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.lazy.ModuleClassResolverImpl import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl -import org.jetbrains.jet.analyzer.ModuleInfo -import org.jetbrains.jet.analyzer.ModuleContent +import org.jetbrains.kotlin.analyzer.ModuleInfo +import org.jetbrains.kotlin.analyzer.ModuleContent import org.jetbrains.kotlin.di.InjectorForLazyResolveWithJava import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer import com.intellij.psi.search.GlobalSearchScope diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java index 55e5d03c9c8..c260ca4d57d 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java @@ -23,9 +23,9 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.descriptors.PackageFragmentProvider; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerForJvm; diff --git a/compiler/frontend/src/org/jetbrains/jet/CompilerModeProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/CompilerModeProvider.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/CompilerModeProvider.java rename to compiler/frontend/src/org/jetbrains/kotlin/CompilerModeProvider.java index 0dcf42cb98c..dd58cdf61ec 100644 --- a/compiler/frontend/src/org/jetbrains/jet/CompilerModeProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/CompilerModeProvider.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; +package org.jetbrains.kotlin; public class CompilerModeProvider implements OperationModeProvider { public static final OperationMode COMPILER_MODE = new OperationMode("compiler mode"); diff --git a/compiler/frontend/src/org/jetbrains/jet/JetNodeType.java b/compiler/frontend/src/org/jetbrains/kotlin/JetNodeType.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/JetNodeType.java rename to compiler/frontend/src/org/jetbrains/kotlin/JetNodeType.java index 28807abb34f..3daa75ab5c3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/JetNodeType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/JetNodeType.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin; import com.intellij.lang.ASTNode; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetElementImpl; -import org.jetbrains.jet.plugin.JetLanguage; import java.lang.reflect.Constructor; diff --git a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java b/compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java rename to compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.java index 31f22709d19..e74569f27d6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/JetNodeTypes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/JetNodeTypes.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.plugin.JetLanguage; public interface JetNodeTypes { IFileElementType JET_FILE = new IFileElementType(JetLanguage.INSTANCE); diff --git a/compiler/frontend/src/org/jetbrains/jet/OperationMode.java b/compiler/frontend/src/org/jetbrains/kotlin/OperationMode.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/OperationMode.java rename to compiler/frontend/src/org/jetbrains/kotlin/OperationMode.java index ca2476924e2..b7b0f161fb2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/OperationMode.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/OperationMode.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; +package org.jetbrains.kotlin; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/OperationModeProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/OperationModeProvider.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/OperationModeProvider.java rename to compiler/frontend/src/org/jetbrains/kotlin/OperationModeProvider.java index 08cb9849224..7de7ab3592d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/OperationModeProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/OperationModeProvider.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; +package org.jetbrains.kotlin; import com.intellij.openapi.components.ServiceManager; diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt rename to compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.kt index ca012e0a779..09eb88563ab 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalysisResult.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.analyzer +package org.jetbrains.kotlin.analyzer import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.resolve.BindingContext diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt rename to compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.kt index e183a009fa9..7d56224af85 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerFacade.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.analyzer +package org.jetbrains.kotlin.analyzer import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.name.Name @@ -23,7 +23,7 @@ import java.util.HashMap import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import com.intellij.openapi.project.Project -import org.jetbrains.jet.context.GlobalContext +import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerUtil.kt similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt rename to compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerUtil.kt index 2404e4d9e3a..2e39f41dfb2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/analyzer/AnalyzerUtil.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.analyzer +package org.jetbrains.kotlin.analyzer import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.resolve.scopes.JetScope diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index bc95c801cb2..06b900e4585 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -27,7 +27,6 @@ import kotlin.Function3; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableInitState; import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState; @@ -52,6 +51,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.plugin.MainFunctionDetector; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java index 234167b3090..e285076eedc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -18,8 +18,6 @@ package org.jetbrains.kotlin.cfg.pseudocode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.cfg.JetControlFlowProcessor; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.ReadValueInstruction; @@ -32,6 +30,8 @@ import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.java index 5967b5c2994..8c463478765 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/CheckerTestUtil.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.checkers; +package org.jetbrains.kotlin.checkers; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java index 2e7c63c958e..50d853ddc18 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.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.checkers; +package org.jetbrains.kotlin.checkers; import com.google.common.collect.Maps; import com.intellij.psi.PsiElement; @@ -22,7 +22,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; @@ -38,14 +39,13 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.Collection; import java.util.Map; -import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.lexer.JetTokens.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; public class DebugInfoUtil { private static final TokenSet MAY_BE_UNRESOLVED = TokenSet.create(IN_KEYWORD, NOT_IN); diff --git a/compiler/frontend/src/org/jetbrains/jet/config/CommonConfigurationKeys.java b/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/config/CommonConfigurationKeys.java rename to compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.java index 0ff9a06ebdd..31f45ff769f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/config/CommonConfigurationKeys.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/config/CommonConfigurationKeys.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.config; +package org.jetbrains.kotlin.config; import org.jetbrains.kotlin.parsing.JetScriptDefinition; diff --git a/compiler/frontend/src/org/jetbrains/jet/config/CompilerConfiguration.java b/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/config/CompilerConfiguration.java rename to compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.java index 35a0db766d5..1a53dc19f5c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/config/CompilerConfiguration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfiguration.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.config; +package org.jetbrains.kotlin.config; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/config/CompilerConfigurationKey.java b/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfigurationKey.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/config/CompilerConfigurationKey.java rename to compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfigurationKey.java index f295373f1a7..5dfb87366a0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/config/CompilerConfigurationKey.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/config/CompilerConfigurationKey.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.config; +package org.jetbrains.kotlin.config; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NonNls; diff --git a/compiler/frontend/src/org/jetbrains/jet/context/context.kt b/compiler/frontend/src/org/jetbrains/kotlin/context/context.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/context/context.kt rename to compiler/frontend/src/org/jetbrains/kotlin/context/context.kt index b924996f30a..dc67d74b2d0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/context/context.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/context/context.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.context +package org.jetbrains.kotlin.context import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.storage.ExceptionTracker diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index 6c39d4a5ad5..4273b32989c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; @@ -35,14 +35,14 @@ import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index 9a024624072..f49307d9792 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.resolve.BindingTrace; @@ -36,14 +36,14 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index 869b54d7ead..7ced8c0b7c0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; -import org.jetbrains.jet.context.LazyResolveToken; +import org.jetbrains.kotlin.context.LazyResolveToken; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index 32c79f02900..a19f827ddcd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; @@ -36,14 +36,14 @@ import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index 3edb353989d..135f55eaf32 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -23,14 +23,14 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.resolve.calls.CallResolver; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider.Empty; import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; @@ -93,7 +93,7 @@ public class InjectorForMacros { this.expressionTypingComponents = new ExpressionTypingComponents(); this.expressionTypingServices = new ExpressionTypingServices(getExpressionTypingComponents()); this.callResolver = new CallResolver(); - this.globalContext = org.jetbrains.jet.context.ContextPackage.GlobalContext(); + this.globalContext = org.jetbrains.kotlin.context.ContextPackage.GlobalContext(); this.storageManager = globalContext.getStorageManager(); this.empty = Empty.INSTANCE$; this.annotationResolver = new AnnotationResolver(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java index 1623202684e..425f37f53b2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; @@ -36,14 +36,14 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt index 97eefce9e40..9d5ed884af2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.PsiNameIdentifierOwner import com.intellij.psi.tree.TokenSet -import org.jetbrains.jet.JetNodeTypes +import org.jetbrains.kotlin.JetNodeTypes import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.lexer.JetKeywordToken import org.jetbrains.kotlin.lexer.JetTokens diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java index 5ea4428226b..5ff2723393d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/lexer/KDocTokens.java @@ -27,7 +27,7 @@ import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.kdoc.parser.KDocParser; import org.jetbrains.kotlin.kdoc.psi.impl.KDocImpl; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public interface KDocTokens { ILazyParseableElementType KDOC = new ILazyParseableElementType("KDoc", JetLanguage.INSTANCE) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocElementImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocElementImpl.java index 7adac8485d4..7e088d58585 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocElementImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocElementImpl.java @@ -20,7 +20,7 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement; import com.intellij.lang.ASTNode; import com.intellij.lang.Language; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public abstract class KDocElementImpl extends ASTWrapperPsiElement { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.java index c423d09c1f7..750aad7fa50 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/kdoc/psi/impl/KDocImpl.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.kdoc.lexer.KDocTokens; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public class KDocImpl extends LazyParseablePsiElement implements KDoc { public KDocImpl(CharSequence buffer) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetToken.java b/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetToken.java index 5ba9e0dc2b0..ae71d4283ac 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetToken.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/lexer/JetToken.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.lexer; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public class JetToken extends IElementType { public JetToken(@NotNull @NonNls String debugName) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java index 6176e238dd0..5bab703e121 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetExpressionParsing.java @@ -21,8 +21,8 @@ import com.intellij.lang.PsiBuilder; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeType; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeType; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; @@ -30,10 +30,10 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import static org.jetbrains.jet.JetNodeTypes.*; +import static org.jetbrains.kotlin.JetNodeTypes.*; +import static org.jetbrains.kotlin.lexer.JetTokens.*; import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.REGULAR_ANNOTATIONS_ALLOW_SHORTS; import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.REGULAR_ANNOTATIONS_ONLY_WITH_BRACKETS; -import static org.jetbrains.kotlin.lexer.JetTokens.*; public class JetExpressionParsing extends AbstractJetParsing { private static final TokenSet WHEN_CONDITION_RECOVERY_SET = TokenSet.create(RBRACE, IN_KEYWORD, NOT_IN, IS_KEYWORD, NOT_IS, ELSE_KEYWORD); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java index 01f2827c6fd..29b4ca6add1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParserDefinition.java @@ -30,14 +30,14 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeType; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeType; +import org.jetbrains.kotlin.JetNodeTypes; +import org.jetbrains.kotlin.lexer.JetLexer; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.kotlin.lexer.JetLexer; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.JetLanguage; public class JetParserDefinition implements ParserDefinition { public static final String STD_SCRIPT_SUFFIX = "kts"; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java index b58d4073b4d..c2d23aa7a2b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetParsing.java @@ -22,15 +22,15 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeType; +import org.jetbrains.kotlin.JetNodeType; import org.jetbrains.kotlin.lexer.JetKeywordToken; import java.util.HashMap; import java.util.Map; -import static org.jetbrains.jet.JetNodeTypes.*; -import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.*; +import static org.jetbrains.kotlin.JetNodeTypes.*; import static org.jetbrains.kotlin.lexer.JetTokens.*; +import static org.jetbrains.kotlin.parsing.JetParsing.AnnotationParsingMode.*; public class JetParsing extends AbstractJetParsing { private static final Logger LOG = Logger.getInstance(JetParsing.class); diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java b/compiler/frontend/src/org/jetbrains/kotlin/plugin/JetFileType.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java rename to compiler/frontend/src/org/jetbrains/kotlin/plugin/JetFileType.java index 7d05c86985c..6a332c3d12f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/JetFileType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/plugin/JetFileType.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.plugin; +package org.jetbrains.kotlin.plugin; import com.intellij.openapi.fileTypes.LanguageFileType; import com.intellij.openapi.util.IconLoader; diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/JetLanguage.java b/compiler/frontend/src/org/jetbrains/kotlin/plugin/JetLanguage.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/plugin/JetLanguage.java rename to compiler/frontend/src/org/jetbrains/kotlin/plugin/JetLanguage.java index 64fc2edef7e..a77910ad58b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/JetLanguage.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/plugin/JetLanguage.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,10 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.plugin; import com.intellij.lang.Language; +import org.jetbrains.annotations.NotNull; public class JetLanguage extends Language { public static final JetLanguage INSTANCE = new JetLanguage(); @@ -26,6 +27,7 @@ public class JetLanguage extends Language { super("jet"); } + @NotNull @Override public String getDisplayName() { return NAME; diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java b/compiler/frontend/src/org/jetbrains/kotlin/plugin/MainFunctionDetector.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java rename to compiler/frontend/src/org/jetbrains/kotlin/plugin/MainFunctionDetector.java index c535783e92e..06835cc96fa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/plugin/MainFunctionDetector.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,12 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin; +package org.jetbrains.kotlin.plugin; import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; @@ -29,7 +30,6 @@ import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java index 587591327e6..3c86d4a2f97 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotationEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotationEntry.java index 640206ae052..060373ca793 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotationEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotationEntry.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.psi.stubs.KotlinAnnotationEntryStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetArrayAccessExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetArrayAccessExpression.java index a636abf934e..28550e9e455 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetArrayAccessExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetArrayAccessExpression.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpression.java index 87fb3fe32fc..74bc07f50e0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpression.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public class JetBinaryExpression extends JetExpressionImpl implements JetOperationExpression { public JetBinaryExpression(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpressionWithTypeRHS.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpressionWithTypeRHS.java index 06c6c9871bd..2208fed498e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpressionWithTypeRHS.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBinaryExpressionWithTypeRHS.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public class JetBinaryExpressionWithTypeRHS extends JetExpressionImpl implements JetOperationExpression { public JetBinaryExpressionWithTypeRHS(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragment.kt index 6355e404e24..85f1c283dc4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetBlockCodeFragment.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.jet.JetNodeTypes +import org.jetbrains.kotlin.JetNodeTypes public class JetBlockCodeFragment( project: Project, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallExpression.java index bd4a5977740..6fe25326edf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallExpression.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableReferenceExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableReferenceExpression.java index f7ff1edbec3..2f78897e8a2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableReferenceExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCallableReferenceExpression.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public class JetCallableReferenceExpression extends JetExpressionImpl { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCatchClause.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCatchClause.java index 2c0ee81f4d4..ff1dba1e6fc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCatchClause.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCatchClause.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java index a60eba6ce68..b20663c7f4a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java @@ -26,13 +26,13 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; +import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java index 6b6d9264444..759a165ce24 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassBody.java @@ -23,10 +23,10 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Arrays; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt index 10c3a9d1ba8..17f671ce6b5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt @@ -23,7 +23,7 @@ import com.intellij.psi.impl.source.tree.FileElement import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.tree.IElementType import com.intellij.testFramework.LightVirtualFile -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import java.util.HashSet import com.intellij.openapi.util.Key import org.jetbrains.kotlin.types.JetType diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java index 573ad9851db..b0fb2f3b266 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; -import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; -import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentPackage; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; +import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentPackage; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperCall.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperCall.java index ac06888ecdb..a960d9bb921 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToSuperCall.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToThisCall.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToThisCall.java index e62cee6886c..0acc52606e9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToThisCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDelegatorToThisCall.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java index c1d3cd93c45..881d83911e2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImpl.java @@ -25,7 +25,7 @@ import com.intellij.psi.PsiReference; import com.intellij.psi.PsiReferenceService; import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public class JetElementImpl extends ASTWrapperPsiElement implements JetElement { public JetElementImpl(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java index 51a05b971ea..d8541c94bc2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetElementImplStub.java @@ -21,15 +21,11 @@ import com.intellij.lang.ASTNode; import com.intellij.lang.Language; import com.intellij.psi.*; import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiElementVisitor; -import com.intellij.psi.PsiFile; -import com.intellij.psi.StubBasedPsiElement; import com.intellij.psi.stubs.IStubElementType; import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType; -import org.jetbrains.jet.plugin.JetLanguage; import java.util.Arrays; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragment.kt index 1fa1f84e6c6..180d6ed85f6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionCodeFragment.kt @@ -18,10 +18,7 @@ package org.jetbrains.kotlin.psi import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.jet.JetNodeTypes -import com.intellij.psi.JavaCodeFragment -import com.intellij.psi.PsiType -import com.intellij.psi.PsiClass +import org.jetbrains.kotlin.JetNodeTypes public class JetExpressionCodeFragment( project: Project, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImpl.java index 1cd1bab88b7..5f25f52a344 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionImpl.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeType; +import org.jetbrains.kotlin.JetNodeType; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionWithLabel.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionWithLabel.java index e953b754c09..76bb273aab5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionWithLabel.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetExpressionWithLabel.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public class JetExpressionWithLabel extends JetExpressionImpl { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java index 2382eaf0aa0..26c2e29c679 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java @@ -30,13 +30,13 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; import org.jetbrains.kotlin.psi.stubs.elements.JetPlaceHolderStubElementType; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.JetLanguage; import java.util.Arrays; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFinallySection.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFinallySection.java index 708c55f33fd..5ff5c779229 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFinallySection.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFinallySection.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public class JetFinallySection extends JetElementImpl implements JetStatementExpression { public JetFinallySection(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetForExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetForExpression.java index 4d749544812..a25e7e50e44 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetForExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetForExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public class JetForExpression extends JetLoopExpression { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralExpression.java index 73f687eda5e..e190171e445 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteralExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java index 6741a5bc0c3..0f49e44cb09 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIfExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIfExpression.java index 35f0a72d0d9..b4f7517505e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIfExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIfExpression.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public class JetIfExpression extends JetExpressionImpl { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetInstanceExpressionWithLabel.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetInstanceExpressionWithLabel.java index 139a86f9eae..920d43ca2ec 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetInstanceExpressionWithLabel.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetInstanceExpressionWithLabel.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public abstract class JetInstanceExpressionWithLabel extends JetExpressionWithLabel { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIsExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIsExpression.java index 2f376d5d4eb..08d2027c88c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIsExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetIsExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public class JetIsExpression extends JetExpressionImpl implements JetOperationExpression { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLoopExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLoopExpression.java index d1db4b484c2..81329897850 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLoopExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetLoopExpression.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public abstract class JetLoopExpression extends JetExpressionImpl implements JetStatementExpression { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java index 3219c9b118f..b718b8dcd53 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java @@ -22,7 +22,7 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java index b414aa9b3e7..cf0cbbaca2b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java @@ -21,10 +21,10 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; -import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java index 8e4f0723be8..9ddde361226 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectDeclaration.java @@ -24,11 +24,11 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub; -import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectLiteralExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectLiteralExpression.java index bb8c2945fe2..9aa8948fb06 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectLiteralExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetObjectLiteralExpression.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public class JetObjectLiteralExpression extends JetExpressionImpl { public JetObjectLiteralExpression(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java index ae1068b4041..68274253dc4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java @@ -27,16 +27,16 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.JetNodeTypes.PROPERTY_DELEGATE; +import static org.jetbrains.kotlin.JetNodeTypes.PROPERTY_DELEGATE; import static org.jetbrains.kotlin.lexer.JetTokens.*; public class JetProperty extends JetTypeParameterListOwnerStub diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt index fa467ca11d2..992aa8c8eec 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt @@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.LocalTimeCounter import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.lexer.JetKeywordToken -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder.Target import com.intellij.openapi.util.Key import java.io.PrintWriter diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java index 597969ac4f2..b7a8a967099 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java @@ -34,17 +34,17 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.kdoc.psi.api.KDocElement; -import org.jetbrains.kotlin.parsing.JetExpressionParsing; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.SpecialNames; +import org.jetbrains.kotlin.parsing.JetExpressionParsing; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.types.expressions.OperatorConventions; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.lexer.JetToken; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collection; import java.util.HashSet; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateExpression.java index 911b9983d0f..c790fe2067a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetStringTemplateExpression.java @@ -22,7 +22,7 @@ import com.intellij.psi.LiteralTextEscaper; import com.intellij.psi.PsiLanguageInjectionHost; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public class JetStringTemplateExpression extends JetExpressionImpl implements PsiLanguageInjectionHost { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSuperExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSuperExpression.java index d3407ce73ca..4bfa2494e01 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSuperExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSuperExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public class JetSuperExpression extends JetInstanceExpressionWithLabel implements JetStatementExpression { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTryExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTryExpression.java index dd4bd2909df..b4ac80f51cd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTryExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTryExpression.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java index 1992a1bd35f..4803a043e7c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.psi; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.types.JetType; public class JetTypeCodeFragment extends JetCodeFragment { public JetTypeCodeFragment(Project project, String name, CharSequence text, PsiElement context) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerNotStubbed.java index a2a2c6b5269..f82e2508b2a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameterListOwnerNotStubbed.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeReference.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeReference.java index 6530e69d5b7..739f6d123aa 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeReference.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeReference.java @@ -30,7 +30,7 @@ import static org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes.ANNOTA /** * Type reference element. - * Underlying token is {@link org.jetbrains.jet.JetNodeTypes#TYPE_REFERENCE} + * Underlying token is {@link org.jetbrains.kotlin.JetNodeTypes#TYPE_REFERENCE} */ public class JetTypeReference extends JetElementImplStub> { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java index a379506d9c3..642309735bc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.name.FqName; public class JetTypedef extends JetTypeParameterListOwnerNotStubbed { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetUnaryExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetUnaryExpression.java index 1afb330aba5..aeacea970ce 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetUnaryExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetUnaryExpression.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public abstract class JetUnaryExpression extends JetExpressionImpl implements JetOperationExpression { public JetUnaryExpression(ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgument.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgument.java index df4487fef52..bf5c24d5ae0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgument.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgument.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.impl.source.tree.LeafPsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public class JetValueArgument extends JetElementImpl implements ValueArgument { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentList.java index 04fcb5785b3..901aa8a373a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentList.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentName.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentName.java index 693b993de8e..0c5c658e29d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentName.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetValueArgumentName.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public class JetValueArgumentName extends JetElementImpl { public JetValueArgumentName(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionInRange.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionInRange.java index c71857ff044..0f0052d1687 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionInRange.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionInRange.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public class JetWhenConditionInRange extends JetWhenCondition { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionIsPattern.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionIsPattern.java index 07dcadaa1c8..8d84d08ab1c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionIsPattern.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenConditionIsPattern.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; public class JetWhenConditionIsPattern extends JetWhenCondition { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java index e503bf83973..15b2d43499a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpressionBase.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpressionBase.java index c19d5a630ad..2f6a451a9f3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpressionBase.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhileExpressionBase.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; public abstract class JetWhileExpressionBase extends JetLoopExpression { public JetWhileExpressionBase(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java index dd1bfc5f67f..436d8830a86 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFileElementType.java @@ -29,9 +29,9 @@ import com.intellij.util.io.StringRef; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.parsing.JetParser; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl; -import org.jetbrains.jet.plugin.JetLanguage; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java index fd9d2e784e1..35c2dc46d09 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementType.java @@ -27,11 +27,11 @@ import com.intellij.util.ArrayFactory; import com.intellij.util.ReflectionUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetElementImplStub; import org.jetbrains.kotlin.psi.JetFunction; import org.jetbrains.kotlin.psi.JetProperty; -import org.jetbrains.jet.plugin.JetLanguage; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java index 62e56cbb64e..8bed79d669d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetStubElementTypes.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi.stubs.elements; import com.intellij.psi.tree.TokenSet; import org.jetbrains.kotlin.psi.*; -import static org.jetbrains.jet.JetNodeTypes.SELF_TYPE; +import static org.jetbrains.kotlin.JetNodeTypes.SELF_TYPE; public interface JetStubElementTypes { JetFileElementType FILE = new JetFileElementType(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java index d48033c82fc..9ff81c0c6b5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java @@ -23,8 +23,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.util.Box; -import org.jetbrains.jet.util.slicedmap.*; import org.jetbrains.kotlin.cfg.TailRecursionKind; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; @@ -42,11 +40,13 @@ import org.jetbrains.kotlin.types.Approximation; import org.jetbrains.kotlin.types.DeferredType; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.CaptureKind; +import org.jetbrains.kotlin.util.Box; +import org.jetbrains.kotlin.util.slicedMap.*; import java.util.Collection; import java.util.Collections; -import static org.jetbrains.jet.util.slicedmap.RewritePolicy.DO_NOTHING; +import static org.jetbrains.kotlin.util.slicedMap.RewritePolicy.DO_NOTHING; public interface BindingContext { BindingContext EMPTY = new BindingContext() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java index 16cdc5d6403..3bb636fd557 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java @@ -22,7 +22,6 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; @@ -33,6 +32,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetTypeInfo; import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTrace.java index c3e68783845..b7782bc95b1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTrace.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.diagnostics.DiagnosticSink; +import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java index 2f1e7b0bd2e..5f3c6fe0664 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.resolve; import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.util.slicedmap.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression; +import org.jetbrains.kotlin.util.slicedMap.*; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java index 98abcb013ae..da0e522992b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Mutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.ScriptDescriptor; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index ead39e161d7..b1c12bdf79b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -22,9 +22,6 @@ import com.intellij.psi.PsiElement; import com.intellij.util.containers.Queue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.Box; -import org.jetbrains.jet.util.ReenteringLazyValueComputationException; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; @@ -36,6 +33,9 @@ import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.util.Box; +import org.jetbrains.kotlin.util.ReenteringLazyValueComputationException; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import javax.inject.Inject; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt index da214e04ffe..adb1665f38d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.resolve -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice -import org.jetbrains.jet.util.slicedmap.WritableSlice +import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice +import org.jetbrains.kotlin.util.slicedMap.WritableSlice import com.google.common.collect.ImmutableMap import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java index de8c84aeb9b..9afb44a0aad 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.rendering.Renderers; @@ -40,6 +39,7 @@ import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import javax.inject.Inject; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java index 8d492e777f7..db48e3e785f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java @@ -22,10 +22,10 @@ import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.util.slicedmap.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression; +import org.jetbrains.kotlin.util.slicedMap.*; import java.util.Collection; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java index 3c93c636b76..862c9263ce7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.resolve; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.Collection; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java index b587079f4d2..7b3455f2d9c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.resolve; import com.google.common.base.Predicate; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.GlobalContext; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceEntryFilter.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceEntryFilter.java index 1b3962c4362..914ebf18234 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceEntryFilter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceEntryFilter.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; public interface TraceEntryFilter { boolean accept(@Nullable WritableSlice slice, Object key); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index c41dab9aab4..a1808dba009 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.types.Variance.* import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider import kotlin.platform.platformStatic import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.context.LazinessToken +import org.jetbrains.kotlin.context.LazinessToken import org.jetbrains.kotlin.resolve.lazy.LazyEntity import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java index 1105607a830..7866a9eab53 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.calls.smartcasts; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java index 3ec48e5b508..98d148bfcff 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java @@ -20,7 +20,7 @@ import com.google.common.collect.Sets; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index dd787e718e7..e4c197b8585 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument -import org.jetbrains.jet.JetNodeTypes +import org.jetbrains.kotlin.JetNodeTypes import java.math.BigInteger import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java index b3f9be04c71..8da4faad7c4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -26,7 +26,7 @@ import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt index 554c399f61e..8a5ebfbf541 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt @@ -21,8 +21,8 @@ import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.BindingTrace -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice -import org.jetbrains.jet.util.slicedmap.WritableSlice +import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice +import org.jetbrains.kotlin.util.slicedMap.WritableSlice import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics public class LockBasedLazyResolveStorageManager(private val storageManager: StorageManager): StorageManager by storageManager, LazyResolveStorageManager { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java index 1c29f55242f..77d34657eeb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.types; import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.util.Box; -import org.jetbrains.jet.util.ReenteringLazyValueComputationException; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; +import org.jetbrains.kotlin.util.Box; +import org.jetbrains.kotlin.util.ReenteringLazyValueComputationException; import static org.jetbrains.kotlin.resolve.BindingContext.DEFERRED_TYPE; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index fad45f29f29..fb8f34b2523 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -22,7 +22,6 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; @@ -62,6 +61,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import org.jetbrains.kotlin.utils.ThrowingList; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java index b80b3205077..676175d39de 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java @@ -24,7 +24,6 @@ import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; @@ -35,6 +34,7 @@ import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java index 5a825d5f14c..c1c96ccf609 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java index 0235880edad..8a72caecc3b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java @@ -23,7 +23,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalyzerPackage; +import org.jetbrains.kotlin.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java index 42ff92703e4..1527232b81a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java @@ -24,8 +24,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; @@ -49,6 +48,7 @@ import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetTypeInfo; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java index 2e380c33378..ef321eed206 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.types.expressions; import com.intellij.openapi.progress.ProcessCanceledException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.ReenteringLazyValueComputationException; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; @@ -28,6 +27,7 @@ import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.types.DeferredType; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetTypeInfo; +import org.jetbrains.kotlin.util.ReenteringLazyValueComputationException; import org.jetbrains.kotlin.utils.KotlinFrontEndException; import static org.jetbrains.kotlin.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java index dcee59d848d..3c31855f45a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java @@ -20,7 +20,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; @@ -37,6 +36,7 @@ import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import javax.inject.Inject; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java index 5db1fe9d8ac..92b9015788b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java @@ -20,7 +20,7 @@ import com.google.common.base.Predicates; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt b/compiler/frontend/src/org/jetbrains/kotlin/types/reflect/ReflectionTypes.kt similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt rename to compiler/frontend/src/org/jetbrains/kotlin/types/reflect/ReflectionTypes.kt index 1c841ab85f1..5e94736ab33 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/reflect/ReflectionTypes.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.reflect +package org.jetbrains.kotlin.types.reflect import kotlin.properties.Delegates import org.jetbrains.kotlin.descriptors.* diff --git a/compiler/frontend/src/org/jetbrains/jet/util/Box.java b/compiler/frontend/src/org/jetbrains/kotlin/util/Box.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/util/Box.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/Box.java index 002f13d3808..f7efdfe8e03 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/Box.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/Box.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.util; +package org.jetbrains.kotlin.util; public class Box { private final T data; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/ReenteringLazyValueComputationException.java b/compiler/frontend/src/org/jetbrains/kotlin/util/ReenteringLazyValueComputationException.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/util/ReenteringLazyValueComputationException.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/ReenteringLazyValueComputationException.java index fbb29e23298..5be947c2021 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/ReenteringLazyValueComputationException.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/ReenteringLazyValueComputationException.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.util; +package org.jetbrains.kotlin.util; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/BasicWritableSlice.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/BasicWritableSlice.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/BasicWritableSlice.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/BasicWritableSlice.java index a124bcbf1a9..0e8fc7ff6e3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/BasicWritableSlice.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/BasicWritableSlice.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/DelegatingSlice.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/DelegatingSlice.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/DelegatingSlice.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/DelegatingSlice.java index 37c95a71578..71a69887ec7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/DelegatingSlice.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/DelegatingSlice.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/MapSupplier.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MapSupplier.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/MapSupplier.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MapSupplier.java index a02a572bd26..7b023237359 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/MapSupplier.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MapSupplier.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import com.google.common.collect.Maps; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/MutableSlicedMap.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MutableSlicedMap.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/MutableSlicedMap.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MutableSlicedMap.java index 16450f60c7e..1f16928afd7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/MutableSlicedMap.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/MutableSlicedMap.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/ReadOnlySlice.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/ReadOnlySlice.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/ReadOnlySlice.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/ReadOnlySlice.java index 9e54627018f..d12b83b5331 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/ReadOnlySlice.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/ReadOnlySlice.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; public interface ReadOnlySlice { SlicedMapKey makeKey(K key); diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/RemovableSlice.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/RemovableSlice.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/RemovableSlice.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/RemovableSlice.java index d67eb7665a6..f15fc4853ab 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/RemovableSlice.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/RemovableSlice.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; public interface RemovableSlice extends WritableSlice { diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/RewritePolicy.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/RewritePolicy.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/RewritePolicy.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/RewritePolicy.java index e4ee5c80db2..99cc41e2584 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/RewritePolicy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/RewritePolicy.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; public interface RewritePolicy { diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMap.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMap.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMap.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMap.java index 96866d7bc23..23f2a261fb2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMap.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMap.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.java index e5e3e0aee1b..fdf61422231 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapImpl.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableMap; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapKey.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapKey.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapKey.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapKey.java index e0ed846b95d..1cefeff2a6c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapKey.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/SlicedMapKey.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/Slices.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/Slices.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java index 693e816088a..633e7064e5c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/Slices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/TrackingSlicedMap.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/TrackingSlicedMap.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.java index b1bcc5aaa02..acc5bf6042e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/TrackingSlicedMap.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/TrackingSlicedMap.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/WritableSlice.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/WritableSlice.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/util/slicedmap/WritableSlice.java rename to compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/WritableSlice.java index 7a8472d6d87..70469089a25 100644 --- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/WritableSlice.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/WritableSlice.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.util.slicedmap; +package org.jetbrains.kotlin.util.slicedMap; public interface WritableSlice extends ReadOnlySlice { // True to put, false to skip diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java index 0825ee72f56..563b51b7251 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java @@ -24,10 +24,10 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.impl.light.AbstractLightClass; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.JetLanguage; /** * This class serves as a workaround for usages of {@link JavaElementFinder#findClasses} which eventually only need names of files diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java index 2e410b5c811..86f992d7e4f 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -42,7 +42,6 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; @@ -50,6 +49,7 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java index d1973cc5540..35ef5a07645 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java @@ -34,11 +34,11 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetFile; import javax.swing.*; import java.util.Collection; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java index 3a5d95b924e..f1044d598e7 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightField.java @@ -27,8 +27,8 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.JetDeclaration; -import org.jetbrains.jet.plugin.JetLanguage; // Copied from com.intellij.psi.impl.light.LightField public abstract class KotlinLightField extends LightElement diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt index f7f611becca..5e771dab8e3 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightMethodForDeclaration.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.impl.light.LightMethod import com.intellij.psi.* import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage import kotlin.properties.Delegates import com.intellij.psi.util.CachedValuesManager import com.intellij.psi.util.PsiModificationTracker diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java index e266fd56f09..e69c039e035 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightModifierList.java @@ -23,7 +23,7 @@ import com.intellij.psi.impl.light.LightModifierList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public abstract class KotlinLightModifierList extends LightModifierList { public KotlinLightModifierList(PsiManager psiManager, @NotNull String[] modifiers) { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java index f410445ceff..7d3aede673f 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java @@ -23,9 +23,9 @@ import com.intellij.psi.PsiParameter; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.plugin.JetLanguage; import java.util.List; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java index db63bce7f1f..e29e1935fa7 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java @@ -21,9 +21,9 @@ import com.intellij.psi.*; import com.intellij.psi.impl.light.AbstractLightClass; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.JetTypeParameter; import org.jetbrains.kotlin.psi.JetTypeParameterListOwner; -import org.jetbrains.jet.plugin.JetLanguage; public class KotlinLightTypeParameter extends AbstractLightClass implements PsiTypeParameter, KotlinLightElement { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt index ddb5203a116..2080c8b5f9f 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameterListBuilder.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiManager -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage import com.intellij.psi.impl.light.LightTypeParameterListBuilder import com.intellij.psi.scope.PsiScopeProcessor import com.intellij.psi.ResolveState diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java index 12d185168aa..9363dc079cb 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java @@ -33,9 +33,9 @@ import com.intellij.util.containers.ContainerUtil; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; +import org.jetbrains.kotlin.psi.*; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 03878973a6b..018dc693437 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -47,10 +47,10 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.diagnostics.Diagnostic; @@ -66,13 +66,13 @@ import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; import org.jetbrains.jet.test.util.UtilPackage; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; -import org.jetbrains.jet.util.slicedmap.SlicedMap; -import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; +import org.jetbrains.kotlin.util.slicedMap.SlicedMap; +import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java index 80f0aad7032..311e8616729 100644 --- a/compiler/tests/org/jetbrains/jet/ScriptTest.java +++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java @@ -21,8 +21,8 @@ import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.CompilationException; -import org.jetbrains.jet.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index dba16788a8e..0f5003c265c 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.ClassFileFactory; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.InlineTestUtil; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 1ad5544ccf5..0b314831945 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -26,9 +26,9 @@ import org.jetbrains.jet.ConfigurationKind; 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.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java index bc50c9a2920..dab24aa8a48 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java @@ -22,7 +22,7 @@ import com.intellij.openapi.Disposable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 0c198c9ff7e..4121bf61cfa 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -24,8 +24,8 @@ import org.jetbrains.jet.ConfigurationKind; 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.config.CompilerConfiguration; +import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java index 9213ccf51c0..a8411316152 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 80e2c5e4730..9df479e0d62 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -27,11 +27,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.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 68037feadeb..260ebc92688 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.jvm.compiler import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade -import org.jetbrains.jet.context.GlobalContext +import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.jet.JetTestUtils import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters @@ -29,16 +29,16 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.* import org.junit.Assert import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.config.CompilerConfiguration +import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModule -import org.jetbrains.jet.analyzer.ResolverForProject -import org.jetbrains.jet.analyzer.ModuleInfo +import org.jetbrains.kotlin.analyzer.ResolverForProject +import org.jetbrains.kotlin.analyzer.ModuleInfo import java.util.HashMap -import org.jetbrains.jet.analyzer.ModuleContent +import org.jetbrains.kotlin.analyzer.ModuleContent import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles 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 829b41e8694..270accd7bd4 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.TimeUtils; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.resolve.BindingTraceContext; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java index e23ab07967b..9b256bd73b5 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt b/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt index d8133ef5490..c33a81acf4f 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi import org.junit.Assert import org.jetbrains.jet.JetLiteFixture import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.config.CompilerConfiguration +import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 0829806bc72..bb397857891 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -26,7 +26,7 @@ import com.intellij.psi.PsiQualifiedNamedElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; diff --git a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt index 39706e5b849..dbe5f5b6865 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment -import org.jetbrains.jet.config.CompilerConfiguration +import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 789b38b7e29..b8a0220ebda 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt index 5c2a2909467..1679e76effd 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.resolve.annotation -import org.jetbrains.jet.analyzer.AnalysisResult +import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.JetTestUtils diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java index e1ab511a62a..8db59473dc3 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.test.util; 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.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 78ffd73e752..324a0a7b1e4 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java index 9d320fc1791..2011b8e8e2a 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java @@ -22,7 +22,7 @@ import com.intellij.psi.impl.compiled.ClsElementImpl; 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.kotlin.checkers.KotlinMultiFileTestWithWithJava; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java index 4344ccc52e4..6fdae927ee6 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.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; 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 3b89465b650..68b04d84910 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java @@ -24,7 +24,7 @@ import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import java.io.File; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java index a2d9b5553cb..9aaf378c576 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.config.CompilerConfiguration; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; import java.io.File; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java index 727d9a31d0a..143dedd8f39 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java @@ -23,17 +23,17 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl; import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java rename to compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java index c632fa0947d..4e3d687c2d5 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.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.checkers; +package org.jetbrains.kotlin.checkers; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -28,12 +28,18 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.context.SimpleGlobalContext; +import org.jetbrains.jet.test.util.DescriptorValidator; +import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.context.GlobalContext; +import org.jetbrains.kotlin.context.SimpleGlobalContext; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.diagnostics.*; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; @@ -46,22 +52,16 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; -import org.jetbrains.jet.test.util.DescriptorValidator; -import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; import org.jetbrains.kotlin.utils.UtilsPackage; -import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import java.io.File; import java.util.*; -import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE; import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE_ALL; +import static org.jetbrains.kotlin.diagnostics.Errors.*; public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest { diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java rename to compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java index 9d80bf4ee8f..e71d2550ed0 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithJsStdLib.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,26 +14,26 @@ * limitations under the License. */ -package org.jetbrains.jet.checkers; +package org.jetbrains.kotlin.checkers; 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.config.CompilerConfiguration; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; +import org.jetbrains.kotlin.js.config.EcmaVersion; +import org.jetbrains.kotlin.js.config.LibrarySourcesConfigWithCaching; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; -import org.jetbrains.kotlin.builtins.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; import java.util.List; import java.util.Map; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithStdLib.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithStdLib.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithStdLib.java rename to compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithStdLib.java index ba4e5e8fb03..bd3e8167b88 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithStdLib.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithStdLib.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.checkers; +package org.jetbrains.kotlin.checkers; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java rename to compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java index 65c7f402fe2..7eafd61645a 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.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.checkers; +package org.jetbrains.kotlin.checkers; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; @@ -32,6 +32,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.diagnostics.*; import org.jetbrains.kotlin.psi.JetDeclaration; @@ -39,7 +40,6 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.types.Flexibility; -import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.junit.Assert; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java rename to compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java index 71702bf8901..b50f00d2e3e 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.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.checkers; +package org.jetbrains.kotlin.checkers; import com.google.common.collect.Lists; import com.intellij.openapi.util.text.StringUtil; @@ -23,12 +23,12 @@ import com.intellij.util.containers.ContainerUtil; 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.kotlin.checkers.CheckerTestUtil.DiagnosedRange; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.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/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java index a0e17938740..d05ca8d4094 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.checkers; +package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java rename to compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java index 3a825e9d836..9a813da57a4 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.checkers; +package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java rename to compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java index 472f00140dd..3668cc7b48c 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/JetDiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.checkers; +package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners; diff --git a/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java rename to compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java index c2e77b3fb1d..24f7e58ec51 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/KotlinMultiFileTestWithWithJava.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.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.checkers; +package org.jetbrains.kotlin.checkers; import com.google.common.io.Files; import com.intellij.openapi.Disposable; @@ -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.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt similarity index 99% rename from compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt rename to compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.kt index 1fc8f94f1ae..c68cc8f698c 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/LazyOperationsLog.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,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.checkers +package org.jetbrains.kotlin.checkers import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name diff --git a/compiler/tests/org/jetbrains/jet/checkers/LoggingStorageManager.kt b/compiler/tests/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt similarity index 98% rename from compiler/tests/org/jetbrains/jet/checkers/LoggingStorageManager.kt rename to compiler/tests/org/jetbrains/kotlin/checkers/LoggingStorageManager.kt index 838204df6c9..5f57db84e64 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LoggingStorageManager.kt +++ b/compiler/tests/org/jetbrains/kotlin/checkers/LoggingStorageManager.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,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.checkers +package org.jetbrains.kotlin.checkers -import org.jetbrains.jet.checkers.LoggingStorageManager.CallData +import org.jetbrains.kotlin.checkers.LoggingStorageManager.CallData import org.jetbrains.kotlin.storage.StorageManager import java.lang.reflect.* import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 5bbe3596865..44a16dfeedc 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -23,16 +23,16 @@ import com.intellij.psi.PsiErrorElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.checkers.CheckerTestUtil; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.checkers.CheckerTestUtil; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.AnalyzingUtils; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.Variance; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.io.IOException; import java.util.ArrayList; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java index 1e9f45079a4..958bfe07e8d 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java @@ -24,17 +24,17 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.Progress; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.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/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index df4a27eaa57..59b31977214 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/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.config.CompilerConfiguration; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.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.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.name.FqName; 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/kotlin/codegen/GenerationUtils.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java index 00733a5af6e..8ba76751bef 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerationUtils.java @@ -20,7 +20,7 @@ import com.google.common.base.Predicates; 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.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java index 411ac582b33..4e46f19ad30 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java @@ -25,11 +25,17 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; +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 org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.config.CommonConfigurationKeys; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; @@ -37,12 +43,6 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.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/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java index 92f376242e4..01b2e43f43c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/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.kotlin.codegen.CodegenTestCase; -import org.jetbrains.kotlin.codegen.GenerationUtils; -import org.jetbrains.kotlin.codegen.InlineTestUtil; -import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.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 org.jetbrains.kotlin.codegen.CodegenTestCase; +import org.jetbrains.kotlin.codegen.GenerationUtils; +import org.jetbrains.kotlin.codegen.InlineTestUtil; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index 38f6d07d84f..041c1227a27 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.resolve.TypeResolver; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.kotlin.resolve.AnnotationResolver; @@ -38,13 +38,13 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -98,7 +98,7 @@ public class InjectorForTests { this.annotationResolver = new AnnotationResolver(); this.qualifiedExpressionResolver = new QualifiedExpressionResolver(); this.flexibleTypeCapabilitiesProvider = new FlexibleTypeCapabilitiesProvider(); - this.globalContext = org.jetbrains.jet.context.ContextPackage.GlobalContext(); + this.globalContext = org.jetbrains.kotlin.context.ContextPackage.GlobalContext(); this.storageManager = globalContext.getStorageManager(); this.lazinessToken = new LazinessToken(); this.dynamicTypesSettings = new DynamicTypesSettings(); diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java index 7af2a3bc860..2b3dbe6ee79 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java @@ -24,8 +24,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.ParsingTestCase; import com.intellij.util.PathUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.psi.IfNotParsed; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetPsiFactory; diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index 3dbb5779053..3f3f3feccac 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -28,7 +28,7 @@ import com.intellij.testFramework.UsefulTestCase import java.io.File import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM -import org.jetbrains.jet.context.GlobalContext +import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java index 2b9bedea686..4abbcd5d407 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java @@ -21,15 +21,15 @@ import com.google.common.base.Predicates; 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.context.ContextPackage; +import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.context.ContextPackage; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import java.util.Collection; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java index f5265f8ad27..c87af37f605 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java @@ -20,18 +20,18 @@ 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.context.ContextPackage; -import org.jetbrains.jet.context.GlobalContextImpl; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.context.ContextPackage; +import org.jetbrains.kotlin.context.GlobalContextImpl; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.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/kotlin/resolve/lazy/lazyResolveTestUtil.kt b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtil.kt index 92c50539134..6d8f35cd5e7 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtil.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/lazyResolveTestUtil.kt @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.resolve.lazy import com.intellij.openapi.project.Project import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.context.GlobalContext +import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade -import org.jetbrains.jet.analyzer.ModuleInfo +import org.jetbrains.kotlin.analyzer.ModuleInfo import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters -import org.jetbrains.jet.analyzer.ModuleContent +import org.jetbrains.kotlin.analyzer.ModuleContent public fun createResolveSessionForFiles( project: Project, diff --git a/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java index f74a2f38ea8..106d9bc40c5 100644 --- a/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/storage/StorageManagerTest.java @@ -22,7 +22,7 @@ import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.util.ReenteringLazyValueComputationException; +import org.jetbrains.kotlin.util.ReenteringLazyValueComputationException; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/jet/util/slicemap/TrackingSliceMapTest.java b/compiler/tests/org/jetbrains/kotlin/util/slicedMap/TrackingSliceMapTest.java similarity index 91% rename from compiler/tests/org/jetbrains/jet/util/slicemap/TrackingSliceMapTest.java rename to compiler/tests/org/jetbrains/kotlin/util/slicedMap/TrackingSliceMapTest.java index 1fd98c62b01..df6e1925e76 100644 --- a/compiler/tests/org/jetbrains/jet/util/slicemap/TrackingSliceMapTest.java +++ b/compiler/tests/org/jetbrains/kotlin/util/slicedMap/TrackingSliceMapTest.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,13 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.util.slicemap; +package org.jetbrains.kotlin.util.slicedMap; import junit.framework.TestCase; import org.jetbrains.kotlin.resolve.BindingTraceContext; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; -import org.jetbrains.jet.util.slicedmap.Slices; -import org.jetbrains.jet.util.slicedmap.WritableSlice; public class TrackingSliceMapTest extends TestCase { public void testSimpleSlice() { diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index 9d488cf6368..89e10f5baa6 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.generators.injectors import com.intellij.openapi.project.Project -import org.jetbrains.jet.context.GlobalContext -import org.jetbrains.jet.context.GlobalContextImpl +import org.jetbrains.kotlin.context.GlobalContext +import org.jetbrains.kotlin.context.GlobalContextImpl import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.resolve.* @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider -import org.jetbrains.jet.context.LazyResolveToken +import org.jetbrains.kotlin.context.LazyResolveToken import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverPostConstruct import org.jetbrains.kotlin.resolve.lazy.ScopeProvider @@ -144,7 +144,7 @@ private fun generatorForJavaDescriptorResolver() = parameter() publicField(useAsContext = true, - init = GivenExpression("org.jetbrains.jet.context.ContextPackage.GlobalContext()")) + init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()")) publicField(name = "module", init = GivenExpression(javaClass().getName() + ".createJavaModule(\"\")")) publicField() @@ -215,7 +215,7 @@ private fun generatorForMacro() = publicField() field(useAsContext = true, - init = GivenExpression("org.jetbrains.jet.context.ContextPackage.GlobalContext()")) + init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()")) field() } @@ -230,7 +230,7 @@ private fun generatorForTests() = publicField() publicField() - field(init = GivenExpression("org.jetbrains.jet.context.ContextPackage.GlobalContext()"), + field(init = GivenExpression("org.jetbrains.kotlin.context.ContextPackage.GlobalContext()"), useAsContext = true) field() diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 129bfc58e07..e790455aab9 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.generators.tests.generator.SimpleTestClassModel import java.io.File import java.util.regex.Pattern import junit.framework.TestCase -import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest +import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTest import org.jetbrains.jet.resolve.AbstractResolveTest import org.jetbrains.kotlin.parsing.AbstractJetParsingTest import org.jetbrains.kotlin.codegen.generated.AbstractBlackBoxCodegenTest @@ -40,8 +40,8 @@ import org.jetbrains.jet.jvm.compiler.AbstractWriteSignatureTest import org.jetbrains.kotlin.cli.AbstractKotlincExecutableTest import org.jetbrains.jet.repl.AbstractReplInterpreterTest import org.jetbrains.kotlin.cfg.AbstractControlFlowTest -import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest -import org.jetbrains.jet.checkers.AbstractJetJsCheckerTest +import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest +import org.jetbrains.kotlin.checkers.AbstractJetJsCheckerTest import org.jetbrains.jet.plugin.quickfix.AbstractQuickFixTest import org.jetbrains.jet.completion.AbstractJSBasicCompletionTest import org.jetbrains.jet.completion.AbstractKeywordCompletionTest @@ -84,7 +84,7 @@ import org.jetbrains.jet.resolve.AbstractReferenceResolveInLibrarySourcesTest import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest import org.jetbrains.jet.completion.AbstractCompiledKotlinInJavaCompletionTest import org.jetbrains.jet.completion.AbstractKotlinSourceInJavaCompletionTest -import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTestWithStdLib +import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithStdLib import org.jetbrains.jet.plugin.codeInsight.AbstractInsertImportOnPasteTest import org.jetbrains.jet.plugin.codeInsight.AbstractLineMarkersTest import org.jetbrains.jet.resolve.AbstractReferenceToJavaWithWrongFileStructureTest @@ -129,7 +129,7 @@ import org.jetbrains.jet.plugin.decompiler.textBuilder.AbstractDecompiledTextTes import org.jetbrains.jet.completion.AbstractMultiFileSmartCompletionTest import org.jetbrains.jet.completion.handlers.AbstractCompletionCharFilterTest import org.jetbrains.jet.resolve.AbstractPartialBodyResolveTest -import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTestWithJsStdLib +import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest import org.jetbrains.jet.types.AbstractJetTypeBindingTest import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java index 98837f04307..8a208148407 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java @@ -24,25 +24,25 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.analyzer.AnalyzerPackage; +import org.jetbrains.kotlin.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.cfg.JetFlowInformationProvider; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotated; import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.di.InjectorForBodyResolve; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.ChainedScope; import org.jetbrains.kotlin.resolve.scopes.JetScope; -import org.jetbrains.kotlin.types.TypeConstructor; -import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.StorageManager; -import org.jetbrains.kotlin.di.InjectorForBodyResolve; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeUtils; import java.util.Collection; import java.util.Collections; diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt index 688d0f84913..1d17c2680e7 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull import java.util.ArrayList import java.util.HashMap import com.intellij.psi.PsiElement -import org.jetbrains.jet.JetNodeTypes +import org.jetbrains.kotlin.JetNodeTypes import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt index c54e5ac10ce..1a895413bfb 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.caches.resolve -import org.jetbrains.jet.analyzer.ModuleInfo +import org.jetbrains.kotlin.analyzer.ModuleInfo import com.intellij.psi.search.GlobalSearchScope import com.intellij.openapi.project.Project import com.intellij.openapi.roots.OrderEntry diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt index 1a003039d50..ab27ccd93ec 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt @@ -17,20 +17,20 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.kotlin.resolve.lazy.ResolveSession -import org.jetbrains.jet.analyzer.ResolverForModule -import org.jetbrains.jet.analyzer.PlatformAnalysisParameters -import org.jetbrains.jet.analyzer.AnalyzerFacade +import org.jetbrains.kotlin.analyzer.ResolverForModule +import org.jetbrains.kotlin.analyzer.PlatformAnalysisParameters +import org.jetbrains.kotlin.analyzer.AnalyzerFacade import com.intellij.openapi.project.Project -import org.jetbrains.jet.context.GlobalContext -import org.jetbrains.jet.analyzer.ResolverForProject +import org.jetbrains.kotlin.context.GlobalContext +import org.jetbrains.kotlin.analyzer.ResolverForProject import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl -import org.jetbrains.jet.analyzer.ModuleInfo -import org.jetbrains.jet.analyzer.ModuleContent +import org.jetbrains.kotlin.analyzer.ModuleInfo +import org.jetbrains.kotlin.analyzer.ModuleContent import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider import org.jetbrains.kotlin.types.DynamicTypesAllowed diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt index bd5e4388afa..058b6827d1b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.project.Project -import org.jetbrains.jet.analyzer.AnalysisResult +import org.jetbrains.kotlin.analyzer.AnalysisResult import com.intellij.openapi.diagnostic.Logger import com.intellij.util.containers.SLRUCache import com.intellij.psi.util.PsiModificationTracker diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index 936aa0be8f5..d2b33a0186b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -20,14 +20,14 @@ import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.project.Project -import org.jetbrains.jet.analyzer.AnalysisResult +import org.jetbrains.kotlin.analyzer.AnalysisResult import com.intellij.psi.util.CachedValuesManager import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import com.intellij.util.containers.SLRUCache import com.intellij.psi.util.PsiModificationTracker import com.intellij.openapi.project.DumbService import org.jetbrains.kotlin.resolve.DelegatingBindingTrace -import org.jetbrains.jet.context.SimpleGlobalContext +import org.jetbrains.kotlin.context.SimpleGlobalContext import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.psi.util.CachedValueProvider @@ -55,7 +55,7 @@ import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.analyzer.analyzeInContext +import org.jetbrains.kotlin.analyzer.analyzeInContext import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.resolve.scopes.ChainedScope diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt index f392ecf0dc8..79fb1d2734c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ModuleDependencyMapper.kt @@ -25,15 +25,15 @@ import org.jetbrains.jet.plugin.project.ResolveSessionForBodies import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import com.intellij.openapi.roots.JdkOrderEntry -import org.jetbrains.jet.analyzer.AnalyzerFacade -import org.jetbrains.jet.analyzer.ResolverForModule +import org.jetbrains.kotlin.analyzer.AnalyzerFacade +import org.jetbrains.kotlin.analyzer.ResolverForModule import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.storage.ExceptionTracker import org.jetbrains.kotlin.load.java.structure.JavaClass -import org.jetbrains.jet.analyzer.ResolverForProject -import org.jetbrains.jet.analyzer.ModuleContent -import org.jetbrains.jet.analyzer.EmptyResolverForProject -import org.jetbrains.jet.context.GlobalContextImpl +import org.jetbrains.kotlin.analyzer.ResolverForProject +import org.jetbrains.kotlin.analyzer.ModuleContent +import org.jetbrains.kotlin.analyzer.EmptyResolverForProject +import org.jetbrains.kotlin.context.GlobalContextImpl fun createModuleResolverProvider( project: Project, diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt index 9ce3b950232..340043d2151 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.analyzer.AnalysisResult +import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode public trait ResolutionFacade { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt index 0033a5218f9..7e15bcd1055 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/globalContextUtils.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.caches.resolve -import org.jetbrains.jet.context.GlobalContextImpl +import org.jetbrains.kotlin.context.GlobalContextImpl import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.storage.ExceptionTracker import com.intellij.openapi.progress.ProcessCanceledException diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt index 7f5b6af82dc..fdf502d2f6a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.analyzer.AnalysisResult +import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt index ce953531d5c..c5c89926f1e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt @@ -29,7 +29,7 @@ import com.intellij.psi.PsiDocumentManager import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.resolve.DescriptorUtils import java.util.Collections -import org.jetbrains.jet.analyzer.analyzeInContext +import org.jetbrains.kotlin.analyzer.analyzeInContext import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny import java.util.LinkedHashSet import org.jetbrains.kotlin.resolve.ImportPath diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt index e87c0880b08..0339b5e4544 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClassFileViewProvider.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager import com.intellij.psi.SingleRootFileViewProvider -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage import kotlin.properties.Delegates public class JetClassFileViewProvider( diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java index 5e049c6fa4f..8902d4e2c31 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/JetSourceNavigationHelper.java @@ -37,8 +37,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; -import org.jetbrains.jet.context.ContextPackage; -import org.jetbrains.jet.context.GlobalContextImpl; +import org.jetbrains.kotlin.context.ContextPackage; +import org.jetbrains.kotlin.context.GlobalContextImpl; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java index 37b20548b31..4ba04529bd8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsHeaderLibraryDetectionUtil.java @@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.CommonProcessors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index 3035b63ce28..15da08842ab 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -21,7 +21,7 @@ import com.intellij.lang.annotation.Annotator; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.checkers.DebugInfoUtil; +import org.jetbrains.kotlin.checkers.DebugInfoUtil; import org.jetbrains.kotlin.psi.JetCodeFragment; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetReferenceExpression; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java index f65361b951b..acbff67ed3f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java @@ -24,7 +24,7 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.psi.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt index 112e12be4be..2f7230dcda8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt @@ -33,7 +33,7 @@ import com.intellij.psi.PsiFile import com.intellij.psi.PsiReference import com.intellij.xml.util.XmlStringUtil import org.jetbrains.annotations.TestOnly -import org.jetbrains.jet.analyzer.AnalysisResult +import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Severity diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinProblemHighlightFilter.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinProblemHighlightFilter.kt index eed0d9036c8..21329c29718 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinProblemHighlightFilter.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/KotlinProblemHighlightFilter.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.highlighter import com.intellij.codeInsight.daemon.ProblemHighlightFilter import com.intellij.psi.PsiFile -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.ide.projectView.impl.ProjectRootsUtil class KotlinProblemHighlightFilter : ProblemHighlightFilter() { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt index 027cd7e6db8..6699535bf02 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/AnalyzerFacadeProvider.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.plugin.project -import org.jetbrains.jet.analyzer.AnalyzerFacade +import org.jetbrains.kotlin.analyzer.AnalyzerFacade import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters -import org.jetbrains.jet.analyzer.ResolverForModule +import org.jetbrains.kotlin.analyzer.ResolverForModule import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.jet.plugin.caches.resolve.JsAnalyzerFacade diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java index 314a26ee9cf..af82c20bea6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ProjectStructureUtil.java @@ -36,7 +36,7 @@ import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.jet.plugin.framework.JsLibraryStdDetectionUtil; import org.jetbrains.jet.plugin.versions.KotlinRuntimeLibraryCoreUtil; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index d6c68b676ed..030e4868a11 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -36,8 +36,8 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.context.ContextPackage; -import org.jetbrains.jet.context.GlobalContextImpl; +import org.jetbrains.kotlin.context.ContextPackage; +import org.jetbrains.kotlin.context.GlobalContextImpl; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 727e684e556..f2eae750a84 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -136,7 +136,7 @@ - { diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt index 3816f1765c8..d8a82078ef3 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -21,7 +21,7 @@ import com.intellij.debugger.engine.evaluation.TextWithImports import com.intellij.psi.PsiElement import com.intellij.openapi.project.Project import com.intellij.psi.JavaCodeFragment -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import org.jetbrains.kotlin.psi.JetExpressionCodeFragment import com.intellij.psi.PsiCodeBlock import com.intellij.debugger.engine.evaluation.CodeFragmentKind diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt index 7d7bba9aea7..95425859cb7 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.codegen.ClassBuilderFactories import org.jetbrains.kotlin.codegen.KotlinCodegenFacade import com.intellij.testFramework.LightVirtualFile -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.impl.PsiFileFactoryImpl import com.intellij.psi.PsiFileFactory diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt b/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt index 5c52da474b0..9660a463530 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/KotlinSmartEnterHandler.kt @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetFunctionLiteral import com.intellij.psi.tree.TokenSet -import org.jetbrains.jet.JetNodeTypes +import org.jetbrains.kotlin.JetNodeTypes import org.jetbrains.kotlin.psi.JetLoopExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java b/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java index 3d1cf8674eb..8dad93422d3 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/editor/KotlinTypedHandler.java @@ -43,7 +43,7 @@ import com.intellij.psi.impl.source.tree.LeafPsiElement; import com.intellij.psi.tree.TokenSet; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinWordSelectionFilter.kt b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinWordSelectionFilter.kt index e5cbb6fabdf..d8fcd1a4cae 100644 --- a/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinWordSelectionFilter.kt +++ b/idea/src/org/jetbrains/jet/plugin/editor/wordSelection/KotlinWordSelectionFilter.kt @@ -18,10 +18,10 @@ package org.jetbrains.jet.plugin.editor.wordSelection import com.intellij.openapi.util.Condition import com.intellij.psi.PsiElement -import org.jetbrains.jet.JetNodeTypes.* +import org.jetbrains.kotlin.JetNodeTypes.* import org.jetbrains.kotlin.psi.JetContainerNode import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage public class KotlinWordSelectionFilter : Condition{ override fun value(e: PsiElement): Boolean { diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java index 2636300f4b7..67a7924f6a9 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java @@ -32,14 +32,14 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.kdoc.lexer.KDocTokens; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.JetNodeTypes.*; +import static org.jetbrains.kotlin.JetNodeTypes.*; import static org.jetbrains.kotlin.lexer.JetTokens.*; import static org.jetbrains.jet.plugin.formatter.NodeIndentStrategy.strategy; diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java index 7bfb5d1f2b1..1d22ac54edd 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetCodeStyleSettingsProvider.java @@ -25,7 +25,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; import com.intellij.psi.codeStyle.CustomCodeStyleSettings; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public class JetCodeStyleSettingsProvider extends CodeStyleSettingsProvider { diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java index eea72e4464c..db2b46db636 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetFormattingModelBuilder.java @@ -26,7 +26,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.codeStyle.CodeStyleSettings; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public class JetFormattingModelBuilder implements FormattingModelBuilder { @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java index 3032980d169..06e3f4175b5 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/formatter/JetLanguageCodeStyleSettingsProvider.java @@ -23,7 +23,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public class JetLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider { @NotNull diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt b/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt index 298da4d0d53..7638dbd5936 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/formatter/KotlinSpacingBuilder.kt @@ -21,7 +21,7 @@ import com.intellij.formatting.* import com.intellij.psi.codeStyle.CodeStyleSettings import java.util.ArrayList import com.intellij.psi.tree.IElementType -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage import com.intellij.psi.formatter.common.AbstractBlock import com.intellij.lang.ASTNode import com.intellij.formatting.DependentSpacingRule.Trigger diff --git a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt index 3619b07cb6a..36ede202392 100644 --- a/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt +++ b/idea/src/org/jetbrains/jet/plugin/formatter/kotlinSpacingRules.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.plugin.formatter -import org.jetbrains.jet.JetNodeTypes.* +import org.jetbrains.kotlin.JetNodeTypes.* import org.jetbrains.kotlin.lexer.JetTokens.* import com.intellij.psi.tree.TokenSet import com.intellij.psi.formatter.FormatterUtil import com.intellij.psi.tree.IElementType import com.intellij.psi.codeStyle.CodeStyleSettings -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage import com.intellij.formatting.Spacing import com.intellij.lang.ASTNode import com.intellij.formatting.ASTBlock diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt index 8a7f0fb1769..a785323cd22 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/ErrorDuringFileAnalyzeNotificationProvider.kt @@ -21,7 +21,7 @@ import com.intellij.ui.EditorNotificationPanel import com.intellij.openapi.util.Key import com.intellij.openapi.vfs.VirtualFile import com.intellij.openapi.fileEditor.FileEditor -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.psi.PsiManager import com.intellij.openapi.project.Project import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java index 0a60b70cbf8..555cdb95190 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetColorSettingsPage.java @@ -25,7 +25,7 @@ import com.intellij.openapi.options.colors.ColorSettingsPage; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.plugin.JetBundle; import org.jetbrains.jet.plugin.JetIcons; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; import javax.swing.*; import java.lang.reflect.Field; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt index 5a8b79130e2..4c8e9aa65f2 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/AddBracesIntention.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.JetExpressionImpl import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.openapi.editor.Editor import com.intellij.lang.ASTNode -import org.jetbrains.jet.JetNodeTypes +import org.jetbrains.kotlin.JetNodeTypes import com.intellij.psi.PsiWhiteSpace public class AddBracesIntention : JetSelfTargetingIntention("add.braces", javaClass()) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt index a99aa6939b2..66722a85547 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.codeInsight.ShortenReferences -import org.jetbrains.jet.JetNodeTypes +import org.jetbrains.kotlin.JetNodeTypes import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java index 46fcec712c5..b2f56e53ef5 100644 --- a/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java +++ b/idea/src/org/jetbrains/jet/plugin/internal/KotlinBytecodeToolWindow.java @@ -35,7 +35,7 @@ import com.intellij.ui.content.ContentFactory; import com.intellij.ui.content.ContentManager; import com.intellij.util.Alarm; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.codegen.ClassBuilderFactories; import org.jetbrains.kotlin.codegen.CompilationErrorHandler; import org.jetbrains.kotlin.codegen.KotlinCodegenFacade; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java index 3267e15f5b3..9b481728176 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java @@ -45,7 +45,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.AnalyzingUtils; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import javax.swing.*; import java.awt.*; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java index 3428c8998af..b722a844748 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/JetTemplateContextType.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public abstract class JetTemplateContextType extends TemplateContextType { protected JetTemplateContextType(@NotNull @NonNls String id, @NotNull String presentableName, @Nullable java.lang.Class baseContextType) { diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java index f136fd34de3..04e35722b0a 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java @@ -29,7 +29,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiNamedElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.*; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/IncorrectSourceRootNameNotification.java b/idea/src/org/jetbrains/jet/plugin/quickfix/IncorrectSourceRootNameNotification.java index f33bd359cf6..53f7dabd82b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/IncorrectSourceRootNameNotification.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/IncorrectSourceRootNameNotification.java @@ -24,7 +24,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootManager; -import com.intellij.openapi.roots.ModuleRootModel; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.Key; import com.intellij.openapi.vfs.VfsUtil; @@ -34,11 +33,10 @@ import com.intellij.ui.EditorNotificationPanel; import com.intellij.ui.EditorNotifications; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.jet.plugin.JetPluginUtil; import java.io.IOException; -import java.util.StringTokenizer; public class IncorrectSourceRootNameNotification extends EditorNotifications.Provider { private static final Key KEY = Key.create("move.kotlin.file.under.kotlin.source.root"); diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt index ba852d813f5..f6baedf76a5 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromUsageFix.kt @@ -24,7 +24,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.PsiElement import com.intellij.psi.PsiDirectory -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt index 7d24aae88d7..cbd1ec9d8bd 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage import org.jetbrains.jet.plugin.caches.resolve.* import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage import org.jetbrains.kotlin.plugin.util.IdeDescriptorRenderers diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java index eb3d6b3693c..abf02ccda2d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java @@ -54,7 +54,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.kotlin.psi.JetTypeCodeFragment; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetConstructorParameterTableModel.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetConstructorParameterTableModel.java index 8f12e10cdcb..f9157762813 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetConstructorParameterTableModel.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetConstructorParameterTableModel.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase; import com.intellij.util.ui.ColumnInfo; import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetFunctionParameterTableModel.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetFunctionParameterTableModel.java index ad3222bc551..8a55b30f56c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetFunctionParameterTableModel.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetFunctionParameterTableModel.java @@ -24,7 +24,7 @@ import com.intellij.refactoring.changeSignature.ParameterTableModelItemBase; import com.intellij.util.ui.ColumnInfo; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetPsiFactory; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt index b5b5825064a..635c48b9a13 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinFunctionSignatureComponent.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction.ui import com.intellij.openapi.project.Project -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.refactoring.ui.MethodSignatureComponent public class KotlinFunctionSignatureComponent( diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java index 10741c7a3c6..c8f3d26291c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java @@ -59,7 +59,7 @@ import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 8de8f3ec6be..61b41734ffd 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -34,8 +34,8 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.analyzer.AnalyzerPackage; +import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index af3c54b314e..ddba33b2264 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.refactoring.util.ConflictsUtil import org.jetbrains.kotlin.psi.psiUtil.getPackage import com.intellij.psi.PsiFileFactory -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.openapi.project.Project import java.io.File import com.intellij.openapi.vfs.LocalFileSystem diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt index 6a3b8039920..d0f3c7b4ecc 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt @@ -25,7 +25,7 @@ import org.jetbrains.jet.plugin.references.JetSimpleNameReference import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.kotlin.psi.psiUtil.isAncestor diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index 5754eb52182..7a6b606f3a5 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.plugin.MainFunctionDetector; +import org.jetbrains.kotlin.plugin.MainFunctionDetector; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java index d8558e203d7..1d11716874c 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.plugin.MainFunctionDetector; +import org.jetbrains.kotlin.plugin.MainFunctionDetector; import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java index 76777abaac9..f344ddf8bd0 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationType.java @@ -20,7 +20,7 @@ import com.intellij.execution.configurations.*; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetIcons; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; public class JetRunConfigurationType extends ConfigurationTypeBase { public static JetRunConfigurationType getInstance() { diff --git a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt index 45cf60d053d..5053f7b3ac0 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinLightPropertyAccessorsReferenceSearcher.kt @@ -23,7 +23,7 @@ import com.intellij.psi.search.SearchScope import com.intellij.psi.search.UsageSearchContext import com.intellij.psi.search.searches.MethodReferencesSearch import com.intellij.util.Processor -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.psi.JetProperty diff --git a/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java b/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java index 316542f66c0..1f2e3e9476e 100644 --- a/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/versions/UnsupportedAbiVersionNotificationPanelProvider.java @@ -47,7 +47,7 @@ import com.intellij.ui.EditorNotifications; import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.jet.plugin.configuration.ConfigureKotlinInProjectUtils; import org.jetbrains.jet.plugin.configuration.KotlinJavaModuleConfigurator; import org.jetbrains.jet.plugin.configuration.KotlinProjectConfigurator; diff --git a/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java b/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java index c508575da35..ce9e2d71667 100644 --- a/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java +++ b/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java @@ -34,7 +34,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.testing.SettingsConfigurator; diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatSettingsUtil.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatSettingsUtil.java index bc948cf4c1c..d65e2ec3be2 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetFormatSettingsUtil.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatSettingsUtil.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.formatter; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.testFramework.LightPlatformTestCase; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings; import org.jetbrains.jet.testing.SettingsConfigurator; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java index 86fbe925e1e..670a8d409d3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.checkers.DebugInfoUtil; +import org.jetbrains.kotlin.checkers.DebugInfoUtil; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.diagnostics.Errors; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt index 95f052b0ea6..d89f83ee08f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.codeInsight.smartEnter import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.openapi.actionSystem.IdeActions -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import org.jetbrains.jet.test.util.trimIndent import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index fa304c82473..49281426d45 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.debugger.evaluate -import org.jetbrains.jet.checkers.AbstractJetPsiCheckerTest +import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest import org.jetbrains.jet.completion.AbstractJvmBasicCompletionTest import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import com.intellij.psi.PsiElement diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt index 662fbd71b00..2ec42750a09 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt @@ -24,7 +24,7 @@ import com.intellij.debugger.engine.ContextUtil import com.intellij.debugger.engine.SuspendContextImpl import org.jetbrains.jet.plugin.debugger.* import org.junit.Assert -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.openapi.util.io.FileUtil import java.io.File import org.jetbrains.jet.InTextDirectivesUtils diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java index 3fbbf6a0023..5db49236f83 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibraryRegressionTest.java @@ -24,8 +24,8 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.plugin.JetFileType; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; public class NavigateToLibraryRegressionTest extends LightCodeInsightFixtureTestCase { diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index cbb2bf7e296..ebaa94abf24 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.resolve.MemberComparator import org.jetbrains.kotlin.resolve.descriptorUtil.module -import org.jetbrains.jet.context.GlobalContext +import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.plugin.decompiler.stubBuilder.KotlinClsStubBuilder diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java index d661baf31c9..50443afa45f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Diagnostic; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java b/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java index 8dd240a8d81..da96d770676 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java @@ -19,12 +19,9 @@ package org.jetbrains.jet.plugin.navigation; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; -import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.plugin.JetFileType; -import java.io.File; import java.util.List; public abstract class AbstractGotoSuperTest extends LightCodeInsightFixtureTestCase { diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt b/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt index ee4511e2885..2223d23a59a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt @@ -20,7 +20,7 @@ import com.intellij.psi.impl.PsiManagerImpl import com.intellij.psi.PsiManager import com.intellij.openapi.vfs.VirtualFileFilter import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.openapi.project.Project import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.VfsUtilCore diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt index fe49f464cfb..787db4d00f3 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt @@ -42,7 +42,7 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode -import org.jetbrains.jet.plugin.JetFileType +import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.openapi.util.io.FileUtil public abstract class AbstractPartialBodyResolveTest : JetLightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java b/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java index c6fe739068f..67746f10537 100644 --- a/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java +++ b/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java @@ -16,13 +16,10 @@ package org.jetbrains.jet.testing; -import com.intellij.lang.Language; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import kotlin.Pair; -import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.plugin.JetLanguage; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/idea/tests/org/jetbrains/jet/checkers/AbstractJetJsCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java similarity index 93% rename from idea/tests/org/jetbrains/jet/checkers/AbstractJetJsCheckerTest.java rename to idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.java index 7eff77e09b4..937695d57b7 100644 --- a/idea/tests/org/jetbrains/jet/checkers/AbstractJetJsCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetJsCheckerTest.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.checkers; +package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; diff --git a/idea/tests/org/jetbrains/jet/checkers/AbstractJetPsiCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java similarity index 96% rename from idea/tests/org/jetbrains/jet/checkers/AbstractJetPsiCheckerTest.java rename to idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.java index f1a2e9a01c9..60bd5626243 100644 --- a/idea/tests/org/jetbrains/jet/checkers/AbstractJetPsiCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/AbstractJetPsiCheckerTest.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.checkers; +package org.jetbrains.kotlin.checkers; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.spellchecker.inspections.SpellCheckingInspection; diff --git a/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java similarity index 98% rename from idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java index 5b65c60ca36..5aa89ce2465 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetJsCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.checkers; +package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners; diff --git a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java similarity index 99% rename from idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java rename to idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java index a1e67a1fad3..2d7f5999454 100644 --- a/idea/tests/org/jetbrains/jet/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.checkers; +package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; import org.jetbrains.jet.JUnit3RunnerWithInners; diff --git a/idea/tests/org/jetbrains/jet/checkers/KotlinAndJavaCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java similarity index 97% rename from idea/tests/org/jetbrains/jet/checkers/KotlinAndJavaCheckerTest.java rename to idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java index 5585e0fa367..aa9cdac10b7 100644 --- a/idea/tests/org/jetbrains/jet/checkers/KotlinAndJavaCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.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.checkers; +package org.jetbrains.kotlin.checkers; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.nullable.NullableStuffInspection; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java index f77a8f9e226..37eb269b741 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; @@ -37,14 +37,14 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.context.LazinessToken; +import org.jetbrains.kotlin.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java index f4252623142..b15fa0a1724 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java @@ -23,10 +23,10 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.context.ContextPackage; -import org.jetbrains.jet.context.GlobalContextImpl; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.context.ContextPackage; +import org.jetbrains.kotlin.context.GlobalContextImpl; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentProvider; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java index 94c4c74e8fd..e7b7d9c423e 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfig.java @@ -28,10 +28,10 @@ import kotlin.Function2; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.kotlin.utils.LibraryUtils; import org.jetbrains.kotlin.js.JavaScript; +import org.jetbrains.kotlin.plugin.JetFileType; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.utils.LibraryUtils; import java.io.File; import java.util.ArrayList; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java index 16bc56e3548..7aaade817cd 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java @@ -26,7 +26,7 @@ import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.kotlin.psi.JetFile; 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 183c19bc44c..a540b85ebce 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,11 +30,11 @@ import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.jet.plugin.JetFileType; +import org.jetbrains.kotlin.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; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java index db1a4d90e18..6d459ce84cb 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java @@ -31,7 +31,7 @@ import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.analyzer.AnalysisResult; +import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.backend.common.output.SimpleOutputFile; import org.jetbrains.kotlin.backend.common.output.SimpleOutputFileCollection; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index 1aa1d5d827c..169f12e602a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.resolve.DescriptorUtils; import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index 17226cd3ff6..20537a2f784 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -23,7 +23,6 @@ import com.intellij.psi.PsiElement; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.config.EcmaVersion; @@ -36,6 +35,7 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index 6681f88896e..e7dee983f7f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -20,7 +20,6 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.MemberDescriptor; @@ -32,6 +31,7 @@ import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.types.reflect.ReflectionTypes; import java.util.HashMap; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java index 610c539b041..48b30d2fb96 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.js.translate.general; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.js.config.Config; @@ -43,6 +42,7 @@ import org.jetbrains.kotlin.js.translate.test.JSTester; import org.jetbrains.kotlin.js.translate.test.QUnitTester; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.mutator.AssignToExpressionMutator; +import org.jetbrains.kotlin.plugin.MainFunctionDetector; import org.jetbrains.kotlin.psi.JetDeclarationWithBody; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index d323fb26353..b041d9a76b7 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -18,7 +18,7 @@ import org.junit.Test 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.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils @@ -29,7 +29,7 @@ import kotlin.test.fail import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.resolve.DescriptorUtils import java.util.HashSet -import org.jetbrains.jet.config.CommonConfigurationKeys +import org.jetbrains.kotlin.config.CommonConfigurationKeys import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM import org.jetbrains.kotlin.builtins.KotlinBuiltIns @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.js.config.EcmaVersion import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS import com.intellij.openapi.Disposable import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport -import org.jetbrains.jet.context.GlobalContext +import org.jetbrains.kotlin.context.GlobalContext private val ANALYZE_PACKAGE_ROOTS_FOR_JVM = listOf("kotlin") private val ANALYZE_PACKAGE_ROOTS_FOR_JS = listOf("kotlin", "jquery", "html5") 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 68cbb3fb89b..45705fcbe38 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 @@ -5,7 +5,7 @@ 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.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.cli.common.messages.MessageCollector /** 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 e2bf6fd290c..ad37038ce45 100644 --- a/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt +++ b/libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt @@ -3,7 +3,7 @@ package test.kotlin 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 org.jetbrains.kotlin.config.CompilerConfiguration import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer import com.intellij.openapi.vfs.CharsetToolkit @@ -11,7 +11,7 @@ import com.intellij.psi.PsiFileFactory import com.intellij.psi.impl.PsiFileFactoryImpl import com.intellij.testFramework.LightVirtualFile import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.plugin.JetLanguage +import org.jetbrains.kotlin.plugin.JetLanguage import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.doc.highlighter2.splitPsi import org.junit.After 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 1235461e6e1..260c1ee8ee1 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 @@ -27,7 +27,7 @@ import org.codehaus.groovy.runtime.MethodClosure 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.kotlin.plugin.JetFileType import org.jetbrains.kotlin.utils.LibraryUtils val DEFAULT_ANNOTATIONS = "org.jebrains.kotlin.gradle.defaultAnnotations"