From f37e2f173d3908469f614494b70427cb8ec41d16 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 8 Jan 2015 21:20:12 +0300 Subject: [PATCH] Rename package jet -> kotlin in util, util-runtime org.jetbrains.jet.config -> org.jetbrains.kotlin.config org.jetbrains.jet.utils -> org.jetbrains.kotlin.utils Also move coreLib.kt to package 'org.jetbrains.kotlin.utils' --- .../kotlin/android/tests/ant/AntRunner.java | 2 +- .../tests/CodegenTestsOnAndroidGenerator.java | 2 +- .../kotlin/backend/common/CodegenUtilKt.kt | 2 +- .../kotlin/backend/common/bridges/bridges.kt | 2 +- .../jetbrains/jet/codegen/PackageCodegen.java | 2 +- ...FactoryForDuplicateSignatureDiagnostics.kt | 2 +- .../src/BuiltInsSerializer.kt | 2 +- .../kotlin/cli/common/CLICompiler.java | 2 +- .../jetbrains/kotlin/cli/js/K2JSCompiler.java | 4 +- .../kotlin/cli/jvm/K2JVMCompiler.java | 8 ++-- .../CliLightClassGenerationSupport.java | 2 +- .../jvm/compiler/CompileEnvironmentUtil.java | 6 +-- .../cli/jvm/compiler/JetCoreEnvironment.java | 2 +- .../compiler/KotlinToJVMBytecodeCompiler.java | 2 +- .../kotlin/cli/jvm/repl/ReplFromTerminal.java | 2 +- .../kotlin/cli/jvm/repl/ReplInterpreter.java | 2 +- .../resolve/kotlin/VirtualFileKotlinClass.kt | 2 +- .../kotlin/VirtualFileKotlinClassFinder.kt | 2 +- .../IncrementalPackageFragmentProvider.kt | 2 +- .../cfg/PseudocodeVariableDataCollector.kt | 2 +- .../instructions/InstructionWithNext.kt | 2 +- .../jumps/AbstractJumpInstruction.kt | 4 +- .../jumps/ConditionalJumpInstruction.kt | 4 +- .../jumps/NondeterministicJumpInstruction.kt | 4 +- .../lang/diagnostics/PositioningStrategies.kt | 3 +- .../jet/lang/parsing/AbstractJetParsing.java | 2 +- .../jetbrains/jet/lang/psi/TypeRefHelpers.kt | 2 +- .../jet/lang/resolve/DeclarationResolver.java | 2 +- .../jet/lang/resolve/OverrideResolver.java | 2 +- .../lang/resolve/TypeHierarchyResolver.java | 2 +- .../jet/lang/resolve/TypeResolver.kt | 4 +- .../calls/tasks/ResolutionTaskHolder.kt | 2 +- .../lang/resolve/calls/tasks/dynamicCalls.kt | 2 +- .../jet/lang/resolve/calls/util/callUtil.kt | 23 +--------- .../jet/lang/resolve/lazy/LazyImportScope.kt | 2 +- .../CliDeclarationProviderFactoryService.kt | 2 +- .../DeclarationProviderFactoryService.kt | 3 +- .../descriptors/AbstractLazyMemberScope.kt | 4 +- .../descriptors/LazyScriptClassMemberScope.kt | 2 +- .../lazy/descriptors/LazyScriptDescriptor.kt | 2 +- .../lang/resolve/scopes/JetScopeUtils.java | 2 +- .../lang/resolve/scopes/WritableScopeImpl.kt | 2 +- .../scopes/WritableScopeWithImports.kt | 2 +- .../lang/resolve/scopes/WriteThroughScope.kt | 2 +- .../resolve/scopes/receivers/Qualifier.kt | 2 +- .../jet/lang/types/BoundsSubstitutor.java | 2 +- .../BasicExpressionTypingVisitor.java | 2 +- .../ExpressionTypingVisitorDispatcher.java | 2 +- .../jetbrains/jet/storage/ExceptionTracker.kt | 2 +- .../jet/util/slicedmap/TrackingSlicedMap.java | 2 +- .../kotlin/asJava/LightClassUtil.java | 4 +- .../kotlin/asJava/lightClassUtils.kt | 2 +- .../tests/org/jetbrains/jet/JetTestUtils.java | 4 +- .../org/jetbrains/jet/MockLibraryUtil.java | 4 +- .../tests/org/jetbrains/jet/ScriptTest.java | 4 +- .../checkers/AbstractJetDiagnosticsTest.java | 2 +- .../KotlinMultiFileTestWithWithJava.java | 2 +- .../jet/checkers/LazyOperationsLog.kt | 2 +- .../jet/codegen/AbstractBytecodeTextTest.java | 2 +- .../jet/codegen/AbstractLineNumberTest.java | 2 +- .../codegen/AbstractScriptCodegenTest.java | 2 +- .../org/jetbrains/jet/codegen/BridgeTest.kt | 2 +- .../jet/codegen/CodegenTestCase.java | 2 +- .../jet/codegen/CodegenTestUtil.java | 2 +- .../jet/codegen/InnerClassInfoGenTest.java | 2 +- .../jet/codegen/OuterClassGenTest.java | 2 +- .../AbstractBlackBoxCodegenTest.java | 2 +- ...bstractCompileKotlinAgainstKotlinTest.java | 2 +- ...ompileKotlinAgainstCustomBinariesTest.java | 2 +- ...solveDescriptorsFromExternalLibraries.java | 2 +- .../tests/org/jetbrains/jet/test/Tmpdir.java | 2 +- .../util/RecursiveDescriptorComparator.java | 2 +- .../RecursiveDescriptorProcessorTest.java | 2 +- .../jet/types/AbstractJetTypeBindingTest.kt | 2 +- .../cli/AbstractKotlincExecutableTest.java | 2 +- .../org/jetbrains/kotlin/cli/CliBaseTest.java | 2 +- .../kotlin/integration/AntTaskJvmTest.java | 2 +- .../KotlinIntegrationTestBase.java | 2 +- .../org/jetbrains/jet/utils/BitSetUtils.java | 44 ------------------- .../config/IncrementalCompilation.java | 4 +- .../{jet => kotlin}/config/Services.kt | 4 +- .../utils/CachedValueProperty.kt | 10 +++-- .../{jet => kotlin}/utils/HashSetUtil.java | 4 +- .../utils/KotlinFrontEndException.kt | 6 +-- .../{jet => kotlin}/utils/KotlinPaths.java | 4 +- .../utils/KotlinPathsFromHomeDir.java | 4 +- .../{jet => kotlin}/utils/KotlinVfsUtil.java | 4 +- .../{jet => kotlin}/utils/LibraryUtils.kt | 6 +-- .../{jet => kotlin}/utils/PathUtil.java | 4 +- .../{jet => kotlin}/utils/PrintingLogger.java | 4 +- .../{jet => kotlin}/utils/Profiler.java | 4 +- .../{jet => kotlin}/utils/ThreadSafe.java | 4 +- .../{jet => kotlin}/utils/ThrowingList.java | 7 +-- .../{jet => kotlin}/utils/addToStdlib.kt | 4 +- .../{jet => kotlin}/utils/concurrent.kt | 4 +- .../{jet => kotlin}/utils/fileUtils.kt | 7 ++- .../{jet => kotlin}/utils/intellijUtil.kt | 4 +- .../{jet => kotlin}/utils/strings.kt | 4 +- .../lazy/LazyJavaPackageFragmentProvider.kt | 2 +- .../LazyJavaAnnotationDescriptor.kt | 4 +- .../descriptors/LazyJavaClassDescriptor.kt | 4 +- .../descriptors/LazyJavaClassMemberScope.kt | 2 +- .../lazy/descriptors/LazyJavaMemberScope.kt | 2 +- .../descriptors/LazyJavaStaticClassScope.kt | 2 +- .../LazyPackageFragmentScopeForJavaPackage.kt | 2 +- .../java/lazy/descriptors/MemberIndex.kt | 2 +- .../java/lazy/types/LazyJavaTypeResolver.kt | 2 +- .../jet/lang/descriptors/Visibilities.java | 2 +- .../impl/CompositePackageFragmentProvider.kt | 2 +- .../EnumEntrySyntheticClassDescriptor.java | 4 +- .../lang/descriptors/impl/SubpackagesScope.kt | 2 +- .../jet/lang/resolve/OverridingUtil.java | 2 +- .../calls/inference/ConstraintSystemImpl.kt | 4 -- .../resolve/calls/inference/TypeBoundsImpl.kt | 4 +- .../jet/lang/resolve/name/FqName.java | 2 +- .../jet/lang/resolve/name/FqNameUnsafe.java | 2 +- .../resolve/scopes/AbstractScopeAdapter.kt | 2 +- .../jet/lang/resolve/scopes/ChainedScope.kt | 2 +- .../jet/lang/resolve/scopes/FilteringScope.kt | 2 +- .../jet/lang/resolve/scopes/JetScope.kt | 6 +-- .../jet/lang/resolve/scopes/JetScopeImpl.kt | 2 +- .../scopes/StaticScopeForKotlinClass.kt | 2 +- .../lang/resolve/scopes/SubstitutingScope.kt | 2 +- .../jetbrains/jet/lang/types/ErrorUtils.java | 2 +- .../jetbrains/jet/lang/types/TypeUtils.java | 4 +- .../org/jetbrains/jet/lang/types/TypeUtils.kt | 2 +- .../jet/renderer/DescriptorRendererImpl.java | 2 +- .../descriptors/serialization/ClassData.java | 2 +- .../serialization/NameSerializationUtil.java | 2 +- .../serialization/PackageData.java | 2 +- .../serialization/TypeDeserializer.kt | 2 +- .../descriptors/DeserializedAnnotations.kt | 2 +- .../DeserializedClassDescriptor.kt | 2 +- .../descriptors/DeserializedMemberScope.kt | 4 +- .../DeserializedPackageMemberScope.kt | 2 +- .../jet/storage/LockBasedStorageManager.java | 6 +-- .../jetbrains/{jet => kotlin}/utils/DFS.java | 4 +- .../{jet => kotlin}/utils/Printer.java | 4 +- .../{jet => kotlin}/utils/WrappedValues.java | 4 +- .../{jet => kotlin}/utils/collections.kt | 6 +-- .../{jet => kotlin}/utils/coreLib.kt | 4 +- .../{jet => kotlin}/utils/exceptionUtils.kt | 6 +-- .../{jet => kotlin}/utils/fileUtils.kt | 4 +- .../{jet => kotlin}/utils/functions.kt | 4 +- .../{jet => kotlin}/utils/strings.kt | 4 +- .../di/DependencyInjectorGenerator.java | 2 +- .../kotlin/generators/di/ImportManager.java | 2 +- .../di/InjectionLogicGenerator.java | 4 +- .../evaluate/GenerateOperationsMap.kt | 2 +- .../frontend/GenerateKeywordStrings.java | 2 +- .../tests/generator/SimpleTestClassModel.java | 2 +- .../generator/SimpleTestMethodModel.java | 2 +- .../tests/generator/SingleClassTestModel.java | 2 +- .../tests/generator/TestGenerator.java | 2 +- .../tests/generator/TestMethodModel.java | 2 +- .../compilerRunner/CompilerEnvironment.java | 6 +-- .../compilerRunner/CompilerRunnerUtil.java | 4 +- .../KotlinModuleXmlBuilderFactory.java | 4 +- .../resolve/lazy/PartialBodyResolveFilter.kt | 4 +- .../jetbrains/jet/plugin/util/FuzzyType.kt | 2 +- .../jet/plugin/caches/JetShortNamesCache.kt | 2 +- .../plugin/caches/resolve/IdeaModuleInfos.kt | 4 +- .../caches/resolve/KotlinCacheService.kt | 2 +- .../resolve/LibraryDependenciesCache.kt | 4 +- .../caches/resolve/ModuleDependencyMapper.kt | 4 +- .../DescriptorToDeclarationUtil.kt | 4 +- .../jet/plugin/decompiler/JetClsFile.kt | 2 +- .../stubBuilder/TypeClsStubBuilder.kt | 2 +- .../textBuilder/missingDependencies.kt | 2 +- .../framework/JavaRuntimeDetectionUtil.java | 4 +- .../framework/JsLibraryStdDetectionUtil.java | 4 +- .../references/BuiltInsReferenceResolver.java | 2 +- .../jet/plugin/references/JetReference.kt | 2 +- .../jet/plugin/references/referenceUtil.kt | 2 +- .../jet/plugin/PluginStartupComponent.java | 4 +- .../jet/plugin/actions/JavaToKotlinAction.kt | 2 +- .../internal/CheckPartialBodyResolveAction.kt | 2 +- .../jet/plugin/caches/KotlinIndicesHelper.kt | 4 +- .../KotlinCopyPasteReferenceProcessor.kt | 4 +- .../plugin/completion/CompletionSession.kt | 4 +- .../smart/TypeInstantiationItems.kt | 2 +- .../KotlinJavaModuleConfigurator.java | 2 +- .../KotlinJsModuleConfigurator.java | 2 +- .../JSLibraryStdPresentationProvider.java | 4 +- .../JavaRuntimePresentationProvider.java | 4 +- .../jet/plugin/quickfix/AutoImportFix.kt | 2 +- .../JetSingleIntentionActionFactory.kt | 2 +- .../callableBuilder/CallableBuilder.kt | 2 +- ...assFromReferenceExpressionActionFactory.kt | 4 +- ...eateClassFromTypeReferenceActionFactory.kt | 4 +- .../CreateCallableFromUsageFix.kt | 6 +-- .../CreateLocalVariableActionFactory.kt | 4 +- .../CreateParameterActionFactory.kt | 2 +- .../extractableAnalysisUtil.kt | 4 +- ...MoveKotlinTopLevelDeclarationsProcessor.kt | 4 +- .../versions/KotlinRuntimeLibraryUtil.java | 4 +- .../versions/KotlinUpdatePluginComponent.kt | 2 +- .../JetLightCodeInsightFixtureTestCase.java | 2 +- .../AbstractOverrideImplementTest.java | 4 +- .../configuration/ConfigureKotlinTest.java | 2 +- .../AbstractJetPositionManagerTest.java | 2 +- .../NavigateFromLibrarySourcesTest.kt | 2 +- .../stubBuilder/AbstractClsStubBuilderTest.kt | 4 +- .../filters/JetExceptionFilterTest.java | 2 +- .../AbstractJetExtractionTest.kt | 2 +- .../kotlin/j2k/JavaToKotlinTranslator.kt | 2 +- .../jetbrains/kotlin/jps/build/JpsUtils.java | 2 +- .../kotlin/jps/build/KotlinBuilder.kt | 12 ++--- .../KotlinBuilderModuleScriptGenerator.java | 2 +- .../jps/build/AbstractIncrementalJpsTest.kt | 4 +- .../build/AbstractKotlinJpsBuildTestCase.java | 2 +- .../kotlin/jps/build/KotlinJpsBuildTest.java | 2 +- .../kotlin/jps/build/classFilesComparison.kt | 2 +- .../js/config/LibrarySourcesConfig.java | 6 +-- .../LibrarySourcesConfigWithCaching.java | 2 +- .../kotlin/js/test/rhino/RhinoUtils.java | 2 +- .../kotlin/js/facade/K2JSTranslator.java | 2 +- .../NoInternalVisibilityInStdLibTest.kt | 2 +- .../test/kotlin/test/kotlin/psiUtilsTest.kt | 2 +- .../jetbrains/kotlin/gradle/tasks/Tasks.kt | 4 +- .../kotlin/maven/K2JSCompilerMojo.java | 2 +- .../kotlin/maven/KotlinCompileMojoBase.java | 2 +- 222 files changed, 322 insertions(+), 389 deletions(-) delete mode 100644 compiler/util/src/org/jetbrains/jet/utils/BitSetUtils.java rename compiler/util/src/org/jetbrains/{jet => kotlin}/config/IncrementalCompilation.java (90%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/config/Services.kt (94%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/CachedValueProperty.kt (80%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/HashSetUtil.java (93%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/KotlinFrontEndException.kt (84%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/KotlinPaths.java (93%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/KotlinPathsFromHomeDir.java (96%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/KotlinVfsUtil.java (96%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/LibraryUtils.kt (99%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/PathUtil.java (98%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/PrintingLogger.java (96%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/Profiler.java (98%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/ThreadSafe.java (91%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/ThrowingList.java (90%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/addToStdlib.kt (96%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/concurrent.kt (93%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/fileUtils.kt (82%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/intellijUtil.kt (89%) rename compiler/util/src/org/jetbrains/{jet => kotlin}/utils/strings.kt (95%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/DFS.java (98%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/Printer.java (97%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/WrappedValues.java (96%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/collections.kt (97%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/coreLib.kt (91%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/exceptionUtils.kt (93%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/fileUtils.kt (92%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/functions.kt (91%) rename core/util.runtime/src/org/jetbrains/{jet => kotlin}/utils/strings.kt (91%) diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java index 4d741805bec..3568edba447 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.android.tests.ant; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.openapi.util.SystemInfo; -import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.kotlin.android.tests.OutputUtils; import org.jetbrains.kotlin.android.tests.PathManager; import org.jetbrains.kotlin.android.tests.run.RunResult; import org.jetbrains.kotlin.android.tests.run.RunUtils; +import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.ArrayList; import java.util.List; 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 2da79810474..b03b64d0667 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 @@ -29,11 +29,11 @@ import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.utils.Printer; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil; +import org.jetbrains.kotlin.utils.Printer; import org.junit.Assert; import java.io.File; diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt index c872f4417db..824b22d0b60 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.types.JetType import kotlin.platform.platformStatic import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.utils.keysToMapExceptNulls +import org.jetbrains.kotlin.utils.keysToMapExceptNulls import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.MemberComparator import java.util.Comparator diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt index bff02d3a144..d33d9e26d42 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/bridges.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.backend.common.bridges -import org.jetbrains.jet.utils.DFS +import org.jetbrains.kotlin.utils.DFS import java.util.HashSet public trait FunctionHandle { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java index d38e79e11e7..61bdd557685 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/PackageCodegen.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.codegen.context.FieldOwnerContext; import org.jetbrains.jet.codegen.context.MethodContext; import org.jetbrains.jet.codegen.context.PackageContext; import org.jetbrains.jet.codegen.state.GenerationState; -import org.jetbrains.jet.config.IncrementalCompilation; +import org.jetbrains.kotlin.config.IncrementalCompilation; import org.jetbrains.jet.descriptors.serialization.BitEncoding; import org.jetbrains.jet.descriptors.serialization.DescriptorSerializer; import org.jetbrains.jet.descriptors.serialization.PackageData; diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/jet/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt index fdeda9427fe..3e976f1eb16 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt +++ b/compiler/backend/src/org/jetbrains/jet/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.java.diagnostics.* import java.util.* import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DELEGATION import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERRIDE -import org.jetbrains.jet.utils.addIfNotNull +import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.codegen.ClassBuilderMode import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index 646ef4aac17..ea12c3989f7 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.jet.config.CommonConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.utils.recursePostOrder +import org.jetbrains.kotlin.utils.recursePostOrder import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.resolve.java.JvmAnalyzerFacade import org.jetbrains.jet.context.GlobalContext 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 968663747e3..a3bd0a867ab 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java @@ -24,7 +24,7 @@ import com.sampullara.cli.Args; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.config.Services; +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; 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 b9274844ec5..5c7397f25b8 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -34,10 +34,10 @@ 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.config.Services; +import org.jetbrains.kotlin.config.Services; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.CLICompiler; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; 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 5e0e11a04e0..7f961956192 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java @@ -23,12 +23,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.CompilationException; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.config.Services; +import org.jetbrains.kotlin.config.Services; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; -import org.jetbrains.jet.utils.KotlinPaths; -import org.jetbrains.jet.utils.KotlinPathsFromHomeDir; -import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.utils.KotlinPaths; +import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir; +import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.cli.common.CLICompiler; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.ExitCode; 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 6082a68fcd1..f2e62f2a8f3 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 @@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.jet.util.slicedmap.WritableSlice; -import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.LightClassConstructionContext; 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 847df218dd3..219b03c1a9f 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 @@ -45,9 +45,9 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.utils.KotlinPaths; -import org.jetbrains.jet.utils.PathUtil; -import org.jetbrains.jet.utils.UtilsPackage; +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; 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 0b804269086..3f5565dc584 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 @@ -53,7 +53,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory; import org.jetbrains.jet.lang.resolve.lazy.declarations.CliDeclarationProviderFactoryService; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.asJava.JavaElementFinder; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.LightClassGenerationSupport; 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 120e829ee2e..72a5b5bb196 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 @@ -51,7 +51,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache; import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; -import org.jetbrains.jet.utils.KotlinPaths; +import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.asJava.FilteredJvmDiagnostics; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.CompilerPlugin; 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 66a734669c4..5bc63e40bf5 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 @@ -22,7 +22,7 @@ import jline.console.ConsoleReader; import jline.console.history.FileHistory; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; import java.io.PrintWriter; 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 1663e53d081..a1946e8f96e 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 @@ -56,7 +56,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; -import org.jetbrains.jet.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt index ae5b0fe2ca7..4fe7963d81e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.jet.lang.resolve.name.ClassId import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader -import org.jetbrains.jet.utils.* +import org.jetbrains.kotlin.utils.* import java.io.IOException diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt index 060d12c5789..2faccf62423 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl -import org.jetbrains.kotlin.util.sure +import org.jetbrains.kotlin.utils.sure import org.jetbrains.jet.lang.resolve.name.ClassId public abstract class VirtualFileKotlinClassFinder : VirtualFileFinder { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt index 9e88665df76..f1440c11dab 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -29,7 +29,7 @@ import org.jetbrains.jet.storage.StorageManager import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope import org.jetbrains.jet.descriptors.serialization.* import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver -import org.jetbrains.jet.utils.addToStdlib.singletonOrEmptyList +import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.jetbrains.jet.storage.NotNullLazyValue import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils import org.jetbrains.jet.lang.resolve.java.JvmClassName diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariableDataCollector.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariableDataCollector.kt index 20721dc34b6..47e17db2a93 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariableDataCollector.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/PseudocodeVariableDataCollector.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.cfg.pseudocodeTraverser.* import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.jet.lang.cfg.pseudocode.instructions.special.VariableDeclarationInstruction -import org.jetbrains.jet.utils.addToStdlib.* +import org.jetbrains.kotlin.utils.addToStdlib.* import java.util.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt index 3ad6762bc73..947eb5cfd58 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.cfg.pseudocode.instructions import org.jetbrains.jet.lang.psi.JetElement -import org.jetbrains.jet.utils.emptyOrSingletonList +import org.jetbrains.kotlin.utils.emptyOrSingletonList public abstract class InstructionWithNext( element: JetElement, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt index e4ec3ab67a6..b3ffe00fc8a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstructionImpl import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction -import org.jetbrains.jet.utils.emptyOrSingletonList +import org.jetbrains.kotlin.utils.emptyOrSingletonList public abstract class AbstractJumpInstruction( element: JetElement, @@ -46,4 +46,4 @@ public abstract class AbstractJumpInstruction( override val nextInstructions: Collection get() = emptyOrSingletonList(resolvedTarget) -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt index 7750c019e46..724af8b2b6a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor -import org.jetbrains.jet.utils.emptyOrSingletonList +import org.jetbrains.kotlin.utils.emptyOrSingletonList public class ConditionalJumpInstruction( element: JetElement, @@ -69,4 +69,4 @@ public class ConditionalJumpInstruction( override fun createCopy(newLabel: Label, lexicalScope: LexicalScope): AbstractJumpInstruction = ConditionalJumpInstruction(element, onTrue, lexicalScope, newLabel, conditionValue) -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt index a3814e9272d..c71258964b5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl -import org.jetbrains.jet.utils.emptyOrSingletonList +import org.jetbrains.kotlin.utils.emptyOrSingletonList public class NondeterministicJumpInstruction( element: JetElement, @@ -87,4 +87,4 @@ public class NondeterministicJumpInstruction( private fun createCopy(newTargetLabels: List