From 8affc3130333a07184baf763cb37117768f97982 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 11 Jan 2015 02:47:46 +0300 Subject: [PATCH] Rename jet -> kotlin in descriptor.loader.java, frontend.java Split package 'lang/resolve/java' into two semantically different packages: 'resolve/jvm' and 'load/java'. Also rename 'lang/resolve/kotlin' to 'load/kotlin' --- ...m.jvmSignature.KotlinToJvmSignatureMapper} | 0 .../kotlin/codegen/AbstractClassBuilder.java | 2 +- .../kotlin/codegen/AnnotationCodegen.java | 2 +- .../org/jetbrains/kotlin/codegen/AsmUtil.java | 22 ++++++---- .../kotlin/codegen/CallableMethod.java | 8 ++-- .../kotlin/codegen/ClassBuilder.java | 2 +- .../kotlin/codegen/ClassBuilderFactories.java | 2 +- .../kotlin/codegen/ClassBuilderFactory.java | 2 +- .../kotlin/codegen/ClassFileFactory.java | 2 +- .../kotlin/codegen/ClosureCodegen.java | 8 ++-- .../codegen/CollectionStubMethodGenerator.kt | 4 +- .../codegen/DelegatingClassBuilder.java | 2 +- .../kotlin/codegen/ExpressionCodegen.java | 18 ++++---- .../jetbrains/kotlin/codegen/FieldInfo.java | 2 +- .../kotlin/codegen/FunctionCodegen.java | 18 ++++---- .../codegen/FunctionGenerationStrategy.java | 2 +- .../codegen/ImplementationBodyCodegen.java | 24 +++++----- .../kotlin/codegen/JvmCodegenUtil.java | 8 ++-- .../codegen/JvmSerializerExtension.java | 2 +- .../kotlin/codegen/MemberCodegen.java | 10 ++--- .../kotlin/codegen/PackageCodegen.java | 20 ++++----- .../kotlin/codegen/PackagePartCodegen.java | 2 +- .../kotlin/codegen/PlatformStaticGenerator.kt | 6 +-- .../kotlin/codegen/PropertyCodegen.java | 8 ++-- .../kotlin/codegen/SamCodegenUtil.java | 2 +- .../org/jetbrains/kotlin/codegen/SamType.java | 4 +- .../kotlin/codegen/SamWrapperCodegen.java | 12 ++--- .../kotlin/codegen/ScriptCodegen.java | 10 ++--- .../SignatureCollectingClassBuilderFactory.kt | 8 ++-- .../jetbrains/kotlin/codegen/StackValue.java | 8 ++-- .../kotlin/codegen/TraitImplBodyCodegen.java | 2 +- .../binding/CodegenAnnotatingVisitor.java | 4 +- .../codegen/binding/PsiCodegenPredictor.java | 4 +- .../codegen/context/ConstructorContext.java | 2 +- .../codegen/context/FieldOwnerContext.java | 2 +- .../kotlin/codegen/context/LocalLookup.java | 2 +- .../inline/AnonymousObjectTransformer.java | 2 +- .../kotlin/codegen/inline/InlineCodegen.java | 8 ++-- .../codegen/inline/InlineCodegenUtil.java | 12 ++--- .../kotlin/codegen/inline/LambdaInfo.java | 2 +- .../codegen/inline/LocalVarRemapper.java | 2 +- .../kotlin/codegen/inline/MethodInliner.java | 10 ++--- .../kotlin/codegen/inline/ParameterInfo.java | 2 +- .../codegen/inline/RemappingClassBuilder.java | 2 +- .../codegen/intrinsics/ArrayIterator.java | 6 +-- .../kotlin/codegen/intrinsics/Clone.java | 2 +- .../kotlin/codegen/intrinsics/Concat.java | 4 +- .../codegen/intrinsics/CopyToArray.java | 2 +- .../kotlin/codegen/intrinsics/Equals.kt | 2 +- .../kotlin/codegen/intrinsics/HashCode.kt | 2 +- .../codegen/intrinsics/IdentityEquals.java | 2 +- .../codegen/intrinsics/IntrinsicMethods.java | 2 +- .../codegen/intrinsics/IteratorNext.java | 2 +- .../codegen/intrinsics/JavaClassFunction.java | 2 +- .../codegen/intrinsics/JavaClassProperty.java | 2 +- .../intrinsics/MonitorInstruction.java | 2 +- .../kotlin/codegen/intrinsics/StringPlus.kt | 4 +- .../OptimizationClassBuilder.java | 2 +- .../OptimizationClassBuilderFactory.java | 2 +- .../boxing/BoxingInterpreter.java | 2 +- .../signature/BothSignatureWriter.java | 6 +-- .../KotlinToJvmSignatureMapperImpl.kt | 4 +- ...FactoryForDuplicateSignatureDiagnostics.kt | 4 +- .../kotlin/codegen/state/JetTypeMapper.java | 18 ++++---- .../MappingClassesForWhenByEnumCodegen.java | 4 +- .../src/BuiltInsSerializer.kt | 6 +-- .../messages/AnalyzerWithCompilerReport.java | 10 ++--- .../kotlin/cli/jvm/JVMConfigurationKeys.java | 2 +- .../kotlin/cli/jvm/K2JVMCompiler.java | 2 +- .../CliLightClassGenerationSupport.java | 4 +- .../jvm/compiler/CliVirtualFileFinder.java | 6 +-- .../compiler/CliVirtualFileFinderFactory.java | 4 +- .../jvm/compiler/CompileEnvironmentUtil.java | 2 +- .../cli/jvm/compiler/JetCoreEnvironment.java | 4 +- .../compiler/KotlinToJVMBytecodeCompiler.java | 10 ++--- .../kotlin/cli/jvm/repl/ReplClassLoader.java | 2 +- .../kotlin/cli/jvm/repl/ReplInterpreter.java | 4 +- ...ng.resolve.ExternalOverridabilityCondition | 2 +- .../asJava}/JetJavaMirrorMarker.java | 4 +- .../di/InjectorForJavaDescriptorResolver.java | 42 +++++++++--------- ...InjectorForJavaDescriptorResolverUtil.java | 2 +- .../di/InjectorForLazyResolveWithJava.java | 44 +++++++++---------- .../kotlin/di/InjectorForReplWithJava.java | 44 +++++++++---------- .../di/InjectorForTopDownAnalyzerForJvm.java | 44 +++++++++---------- .../load}/java/JavaBindingContext.java | 4 +- .../load}/java/JavaClassFinderImpl.java | 14 +++--- .../java/JavaClassFinderPostConstruct.kt | 4 +- .../JavaFlexibleTypeCapabilitiesProvider.kt | 8 ++-- .../JavaSourceElementFactoryImpl.kt | 13 +++--- .../java/components}/LazyResolveBasedCache.kt | 12 ++--- .../PsiBasedExternalAnnotationResolver.java | 14 +++--- .../PsiBasedMethodSignatureChecker.java | 10 ++--- .../components}/TraceBasedErrorReporter.java | 8 ++-- .../TraceBasedExternalSignatureResolver.java | 26 +++++------ .../TraceBasedJavaResolverCache.java | 20 ++++----- .../sam/SamAdapterConstructorDescriptor.java | 8 ++-- .../sam/SamAdapterFunctionDescriptor.java | 8 ++-- .../SamAdapterOverridabilityCondition.java | 4 +- .../java/sam/SamConversionResolverImpl.kt | 16 +++---- .../java/sam/SingleAbstractMethodUtils.java | 20 ++++----- .../structure/impl/JavaAnnotationImpl.java | 12 ++--- .../impl/JavaAnnotationOwnerImpl.java | 6 +-- .../structure/impl/JavaArrayTypeImpl.java | 8 ++-- .../java/structure/impl/JavaClassImpl.java | 10 ++--- .../structure/impl/JavaClassifierImpl.java | 6 +-- .../impl/JavaClassifierTypeImpl.java | 8 ++-- .../structure/impl/JavaConstructorImpl.java | 14 +++--- ...JavaElementCollectionFromPsiArrayUtil.java | 6 +-- .../java/structure/impl/JavaElementImpl.java | 6 +-- .../java/structure/impl/JavaElementUtil.java | 10 ++--- .../java/structure/impl/JavaFieldImpl.java | 8 ++-- .../java/structure/impl/JavaMemberImpl.java | 10 ++--- .../java/structure/impl/JavaMethodImpl.java | 16 +++---- .../impl/JavaModifierListOwnerImpl.java | 6 +-- .../java/structure/impl/JavaPackageImpl.kt | 13 +++--- .../structure/impl/JavaPrimitiveTypeImpl.java | 6 +-- .../JavaPropertyInitializerEvaluatorImpl.java | 8 ++-- .../java/structure/impl/JavaTypeImpl.java | 8 ++-- .../structure/impl/JavaTypeParameterImpl.java | 8 ++-- .../structure/impl/JavaTypeProviderImpl.java | 10 ++--- .../impl/JavaTypeSubstitutorImpl.java | 10 ++--- .../impl/JavaValueParameterImpl.java | 10 ++--- .../structure/impl/JavaWildcardTypeImpl.java | 10 ++--- .../structure/impl/annotationArgumentsImpl.kt | 6 +-- .../load}/kotlin/FileBasedKotlinClass.java | 10 ++--- .../kotlin/JavaDeclarationCheckerProvider.kt | 8 ++-- .../load}/kotlin/KotlinBinaryClassCache.java | 4 +- .../load}/kotlin/PackagePartClassUtils.java | 16 +++---- .../load}/kotlin/VirtualFileFinder.java | 4 +- .../kotlin/VirtualFileFinderFactory.java | 4 +- .../load}/kotlin/VirtualFileKotlinClass.kt | 6 +-- .../kotlin/VirtualFileKotlinClassFinder.kt | 8 ++-- .../incremental/IncrementalCacheUtil.kt | 10 ++--- .../IncrementalPackageFragmentProvider.kt | 12 ++--- .../incremental/cache/IncrementalCache.kt | 8 +--- .../cache/IncrementalCacheProvider.kt | 6 +-- .../resolve => kotlin/load}/kotlin/native.kt | 6 +-- .../java => kotlin/resolve/jvm}/AsmTypes.java | 4 +- .../resolve/jvm}/JavaPsiFacadeImpl.java | 4 +- .../resolve/jvm}/JavaResolverUtils.java | 6 +-- .../resolve/jvm}/JvmAnalyzerFacade.kt | 8 ++-- .../resolve/jvm}/KotlinFinderMarker.java | 4 +- .../resolve/jvm}/KotlinJavaPsiFacade.java | 8 ++-- .../jvm}/TopDownAnalyzerFacadeForJVM.java | 10 ++--- .../ConflictingJvmDeclarationsData.kt | 8 ++-- .../diagnostics/DefaultErrorMessagesJvm.java | 4 +- .../resolve/jvm}/diagnostics/ErrorsJvm.java | 4 +- .../jvm}/diagnostics/JvmDeclarationOrigin.kt | 9 ++-- .../jvm}/jvmSignature/JvmClassSignature.java | 4 +- .../jvmSignature/JvmMethodParameterKind.java | 4 +- .../JvmMethodParameterSignature.java | 4 +- .../jvm}/jvmSignature/JvmMethodSignature.java | 4 +- .../KotlinToJvmSignatureMapper.kt | 4 +- .../AlternativeFieldSignatureData.java | 8 ++-- .../AlternativeMethodSignatureData.java | 22 +++++----- ...AlternativeSignatureMismatchException.java | 4 +- .../CollectionClassMapping.java | 4 +- .../ElementAlternativeSignatureData.java | 6 +-- .../PropagationHeuristics.java | 4 +- .../SignaturesPropagationData.java | 30 ++++++------- .../jvm}/kotlinSignature/SignaturesUtil.java | 10 ++--- .../TypeTransformingVisitor.java | 16 +++---- .../jvm/types}/KotlinToJavaTypesMap.java | 12 ++--- .../jvm/types}/PrimitiveTypesUtil.java | 6 +-- .../FakeLightClassForFileOfPackage.java | 1 - .../kotlin/asJava/JavaElementFinder.java | 8 ++-- .../asJava/KotlinJavaFileStubProvider.java | 2 +- .../KotlinLightClassBuilderFactory.java | 2 +- ...otlinLightClassForExplicitDeclaration.java | 3 +- .../asJava/KotlinLightClassForPackage.java | 3 +- .../kotlin/asJava/LightClassUtil.java | 8 ++-- .../kotlin/asJava/StubClassBuilder.java | 6 +-- .../asJava/duplicateJvmSignatureUtil.kt | 6 +-- .../jetbrains/jet/PackageClassNameTest.java | 2 +- .../checkers/AbstractJetDiagnosticsTest.java | 2 +- .../jet/checkers/LazyOperationsLog.kt | 6 +-- ...bstractCompileKotlinAgainstKotlinTest.java | 2 +- .../jvm/compiler/AbstractLoadJavaTest.java | 2 +- .../AbstractSdkAnnotationsValidityTest.java | 4 +- .../jvm/compiler/CompileEnvironmentTest.java | 2 +- .../jvm/compiler/ExpectedLoadErrorsUtil.java | 2 +- .../IdeaJdkAnnotationsReflectedTest.java | 2 +- .../jet/jvm/compiler/KotlinClassFinderTest.kt | 4 +- .../MultiModuleJavaAnalysisCustomTest.kt | 6 +-- .../jet/lang/resolve/lazy/JvmResolveUtil.java | 2 +- .../resolve/lazy/LazyResolveTestUtil.java | 2 +- .../lang/resolve/lazy/lazyResolveTestUtil.kt | 4 +- .../resolve/JetExpectedResolveDataUtil.java | 4 +- .../org/jetbrains/kotlin/cli/CliBaseTest.java | 2 +- .../jetbrains/kotlin/cli/CliCommonTest.java | 2 +- .../kotlin/cli/jvm/K2JvmCliTest.java | 2 +- .../codegen/AbstractLineNumberTest.java | 2 +- .../kotlin/codegen/AnnotationGenTest.java | 4 +- .../kotlin/codegen/ClassGenTest.java | 4 +- .../kotlin/codegen/CodegenTestCase.java | 4 +- .../GenerateNotNullAssertionsTest.java | 2 +- .../kotlin/codegen/InlineTestUtil.java | 6 +-- .../kotlin/codegen/InnerClassInfoGenTest.java | 2 +- .../codegen/KotlinClassAnnotationTest.java | 2 +- .../codegen/KotlinPackageAnnotationTest.java | 4 +- .../KotlinSyntheticClassAnnotationTest.java | 10 ++--- .../kotlin/codegen/PropertyGenTest.java | 2 +- ...eticMethodForAnnotatedPropertyGenTest.java | 4 +- .../AbstractBlackBoxCodegenTest.java | 2 +- .../jetbrains/kotlin/di/InjectorForTests.java | 2 +- .../AbstractDescriptorRendererTest.kt | 4 +- .../load}/java/AbiVersionUtil.java | 4 +- .../load}/java/JavaClassFinder.java | 8 ++-- .../load}/java/JavaVisibilities.java | 4 +- .../resolve => kotlin/load}/java/JvmAbi.java | 4 +- .../load}/java/JvmAnnotationNames.java | 5 ++- .../components}/DescriptorResolverUtils.java | 6 +-- .../load/java/components}/ErrorReporter.java | 6 +-- .../ExternalAnnotationResolver.java | 8 ++-- .../ExternalSignatureResolver.java | 10 ++--- .../java/components}/JavaResolverCache.java | 12 ++--- .../components}/MethodSignatureChecker.java | 6 +-- .../java/components}/SamConversionResolver.kt | 10 ++--- .../load/java/components}/TypeUsage.java | 4 +- .../JavaCallableMemberDescriptor.java | 4 +- .../descriptors}/JavaClassDescriptor.java | 4 +- .../JavaConstructorDescriptor.java | 4 +- .../descriptors}/JavaMethodDescriptor.java | 4 +- .../descriptors}/JavaPropertyDescriptor.java | 4 +- .../descriptors}/SamAdapterDescriptor.java | 4 +- .../descriptors}/SamConstructorDescriptor.kt | 4 +- .../lazy/LazyJavaPackageFragmentProvider.kt | 8 ++-- .../load}/java/lazy/ModuleClassResolver.kt | 8 ++-- .../load}/java/lazy/annotationUtils.kt | 12 ++--- .../load}/java/lazy/context.kt | 22 +++++----- .../LazyJavaAnnotationDescriptor.kt | 24 +++++----- .../descriptors/LazyJavaClassDescriptor.kt | 18 ++++---- .../descriptors/LazyJavaClassMemberScope.kt | 18 ++++---- .../lazy/descriptors/LazyJavaMemberScope.kt | 32 +++++++------- .../descriptors/LazyJavaPackageFragment.kt | 8 ++-- .../descriptors/LazyJavaStaticClassScope.kt | 8 ++-- .../lazy/descriptors/LazyJavaStaticScope.kt | 8 ++-- .../LazyJavaTypeParameterDescriptor.kt | 12 ++--- .../LazyPackageFragmentScopeForJavaPackage.kt | 18 ++++---- .../java/lazy/descriptors/MemberIndex.kt | 8 ++-- .../load}/java/lazy/resolvers.kt | 16 +++---- .../java/lazy/types/LazyJavaTypeResolver.kt | 18 ++++---- .../java/sources/JavaSourceElementFactory.kt | 6 +-- .../load}/java/structure/JavaAnnotation.java | 4 +- .../java/structure/JavaAnnotationOwner.java | 4 +- .../load}/java/structure/JavaArrayType.java | 4 +- .../load}/java/structure/JavaClass.java | 4 +- .../load}/java/structure/JavaClassifier.java | 4 +- .../java/structure/JavaClassifierType.java | 4 +- .../load}/java/structure/JavaConstructor.java | 4 +- .../load}/java/structure/JavaElement.java | 4 +- .../load}/java/structure/JavaField.java | 4 +- .../load}/java/structure/JavaMember.java | 4 +- .../load}/java/structure/JavaMethod.java | 4 +- .../java/structure/JavaModifierListOwner.java | 4 +- .../java/structure/JavaNamedElement.java | 4 +- .../load}/java/structure/JavaPackage.kt | 4 +- .../java/structure/JavaPrimitiveType.java | 4 +- .../JavaPropertyInitializerEvaluator.java | 4 +- .../load}/java/structure/JavaType.java | 4 +- .../java/structure/JavaTypeParameter.java | 4 +- .../structure/JavaTypeParameterListOwner.java | 4 +- .../java/structure/JavaTypeProvider.java | 4 +- .../java/structure/JavaTypeSubstitutor.java | 4 +- .../java/structure/JavaValueParameter.java | 4 +- .../java/structure/JavaWildcardType.java | 4 +- .../java/structure/annotationArguments.kt | 4 +- ...tBinaryClassAnnotationAndConstantLoader.kt | 8 ++-- ...aryClassAnnotationAndConstantLoaderImpl.kt | 12 ++--- .../DeserializationComponentsForJava.kt | 6 +-- .../DeserializedDescriptorResolver.java | 12 ++--- .../kotlin/DeserializedResolverUtils.java | 6 +-- .../load}/kotlin/JavaClassDataFinder.kt | 6 +-- ...avaFlexibleTypeCapabilitiesDeserializer.kt | 6 +-- .../load}/kotlin/KotlinClassFinder.kt | 6 +-- .../load}/kotlin/KotlinJvmBinaryClass.java | 6 +-- .../load}/kotlin/MemberSignature.kt | 4 +- .../load/kotlin}/PackageClassUtils.java | 5 ++- .../load}/kotlin/SignatureDeserializer.java | 4 +- .../load}/kotlin/header/KotlinClassHeader.kt | 10 ++--- ...eadKotlinClassHeaderAnnotationVisitor.java | 16 +++---- .../kotlin/platform/JavaToKotlinClassMap.java | 4 +- .../resolve/jvm}/JavaDescriptorResolver.kt | 10 ++--- .../resolve/jvm}/JvmClassName.java | 5 ++- .../resolve/jvm}/JvmPrimitiveType.java | 4 +- .../generators/injectors/GenerateInjectors.kt | 30 ++++++------- .../kotlin/generators/tests/GenerateTests.kt | 2 +- .../jetbrains/jet/plugin/util/TypeUtils.kt | 4 +- .../IDELightClassGenerationSupport.java | 4 +- .../caches/resolve/JavaResolveExtension.kt | 12 ++--- .../caches/resolve/ModuleDependencyMapper.kt | 6 +-- .../jet/plugin/decompiler/DecompiledUtils.kt | 6 +-- .../navigation/DecompiledNavigationUtils.java | 6 +-- .../navigation/JetSourceNavigationHelper.java | 6 +-- .../stubBuilder/ClsStubBuilderContext.kt | 8 ++-- .../stubBuilder/KotlinClsStubBuilder.kt | 4 +- .../textBuilder/DecompiledTextFactory.kt | 8 ++-- .../textBuilder/DeserializerForDecompiler.kt | 4 +- .../textBuilder/LocalClassFinder.kt | 10 ++--- .../textBuilder/LoggingErrorReporter.kt | 4 +- .../DeprecatedAnnotationVisitor.java | 4 +- .../plugin/highlighter/IdeErrorMessages.java | 4 +- .../jet/plugin/highlighter/IdeRenderers.java | 4 +- .../plugin/project/AnalyzerFacadeProvider.kt | 6 +-- .../jet/plugin/project/TargetPlatform.java | 2 +- .../jet/plugin/stubindex/PackageIndexUtil.kt | 2 +- .../stubindex/StubIndexServiceImpl.java | 2 +- .../vfilefinder/IDEVirtualFileFinder.java | 4 +- .../IDEVirtualFileFinderFactory.java | 4 +- .../vfilefinder/KotlinClassFileIndex.java | 6 +-- idea/src/META-INF/extensions/kotlin2jvm.xml | 4 +- idea/src/META-INF/plugin.xml | 6 +-- .../plugin/completion/CompletionSession.kt | 2 +- .../smart/TypeInstantiationItems.kt | 6 +-- .../coverage/KotlinCoverageExtension.kt | 8 ++-- .../jet/plugin/debugger/JetPositionManager.kt | 4 +- .../debugger/KotlinSourcePositionProvider.kt | 2 +- ...PositionManagerLibraryClassFileSearcher.kt | 4 +- .../evaluate/KotlinEvaluationBuilder.kt | 6 +-- .../evaluate/KotlinRuntimeTypeEvaluator.kt | 2 +- .../DelegatedPropertyFieldDescriptor.kt | 2 +- ...otlinClassWithDelegatedPropertyRenderer.kt | 2 +- .../plugin/filters/JetExceptionFilter.java | 4 +- .../ktSignature/DeleteSignatureAction.java | 4 +- .../KotlinSignatureAnnotationIntention.java | 18 ++++---- .../KotlinSignatureInJavaMarkerProvider.java | 18 ++++---- .../ktSignature/KotlinSignatureUtil.java | 6 +-- .../quickfix/ImportInsertHelperImpl.java | 2 +- .../JetChangeSignatureHandler.java | 2 +- .../JetChangeSignatureUsageProcessor.java | 2 +- .../run/JetRunConfigurationProducer.java | 3 +- .../jet/plugin/util/DebuggerUtils.java | 4 +- .../versions/KotlinAbiVersionIndex.java | 4 +- .../versions/KotlinRuntimeLibraryUtil.java | 4 +- .../debugger/KotlinDebuggerTestCase.java | 2 +- .../AbstractInternalCompiledClassesTest.kt | 8 ++-- .../decompiler/InternalCompiledClassesTest.kt | 2 +- .../stubBuilder/ClsStubConsistencyTest.kt | 4 +- .../DecompiledTextConsistencyTest.kt | 6 +-- .../DecompiledTextForWrongAbiVersionTest.kt | 4 +- .../filters/JetExceptionFilterTest.java | 6 +-- .../plugin/javaFacade/JetJavaFacadeTest.java | 2 +- .../jvm}/AbstractJavaTypeSubstitutorTest.java | 14 +++--- .../JavaTypeSubstitutorTestGenerated.java | 2 +- .../kotlin/j2k/ExpressionConverter.kt | 2 +- .../org/jetbrains/kotlin/j2k/TypeVisitor.kt | 2 +- .../kotlin/jps/build/KotlinBuilder.kt | 4 +- .../jps/incremental/IncrementalCacheImpl.kt | 14 +++--- .../IncrementalCacheProviderImpl.kt | 4 +- .../jps/incremental/LocalFileKotlinClass.kt | 4 +- .../kotlin/jps/build/KotlinJpsBuildTest.java | 8 ++-- .../kotlin/jps/build/classFilesComparison.kt | 4 +- .../NoInternalVisibilityInStdLibTest.kt | 2 +- 353 files changed, 1197 insertions(+), 1205 deletions(-) rename compiler/backend/src/META-INF/services/{org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper => org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper} (100%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/jetAsJava => kotlin/asJava}/JetJavaMirrorMarker.java (87%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/JavaBindingContext.java (92%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/JavaClassFinderImpl.java (87%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/JavaClassFinderPostConstruct.kt (95%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/JavaFlexibleTypeCapabilitiesProvider.kt (85%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/JavaSourceElementFactoryImpl.kt (70%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/LazyResolveBasedCache.kt (90%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/PsiBasedExternalAnnotationResolver.java (81%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/PsiBasedMethodSignatureChecker.java (97%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/TraceBasedErrorReporter.java (89%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/TraceBasedExternalSignatureResolver.java (86%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/TraceBasedJavaResolverCache.java (79%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/sam/SamAdapterConstructorDescriptor.java (85%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/sam/SamAdapterFunctionDescriptor.java (85%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/sam/SamAdapterOverridabilityCondition.java (98%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/sam/SamConversionResolverImpl.kt (88%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/sam/SingleAbstractMethodUtils.java (97%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaAnnotationImpl.java (87%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaAnnotationOwnerImpl.java (81%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaArrayTypeImpl.java (80%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaClassImpl.java (94%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaClassifierImpl.java (87%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaClassifierTypeImpl.java (93%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaConstructorImpl.java (70%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java (98%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaElementImpl.java (88%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaElementUtil.java (89%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaFieldImpl.java (84%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaMemberImpl.java (88%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaMethodImpl.java (76%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaModifierListOwnerImpl.java (81%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaPackageImpl.kt (75%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaPrimitiveTypeImpl.java (85%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java (89%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaTypeImpl.java (92%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaTypeParameterImpl.java (89%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaTypeProviderImpl.java (85%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaTypeSubstitutorImpl.java (96%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaValueParameterImpl.java (86%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/JavaWildcardTypeImpl.java (81%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/impl/annotationArgumentsImpl.kt (95%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/FileBasedKotlinClass.java (97%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/JavaDeclarationCheckerProvider.kt (96%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/KotlinBinaryClassCache.java (97%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/PackagePartClassUtils.java (94%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/VirtualFileFinder.java (94%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/VirtualFileFinderFactory.java (92%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/VirtualFileKotlinClass.kt (94%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/VirtualFileKotlinClassFinder.kt (89%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/incremental/IncrementalCacheUtil.kt (84%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/incremental/IncrementalPackageFragmentProvider.kt (93%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/incremental/cache/IncrementalCache.kt (77%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/incremental/cache/IncrementalCacheProvider.kt (86%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/native.kt (94%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/AsmTypes.java (97%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/JavaPsiFacadeImpl.java (99%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/JavaResolverUtils.java (97%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/JvmAnalyzerFacade.kt (94%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/KotlinFinderMarker.java (87%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/KotlinJavaPsiFacade.java (97%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/TopDownAnalyzerFacadeForJVM.java (94%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/diagnostics/ConflictingJvmDeclarationsData.kt (82%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/diagnostics/DefaultErrorMessagesJvm.java (97%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/diagnostics/ErrorsJvm.java (96%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/diagnostics/JvmDeclarationOrigin.kt (91%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/jvmSignature/JvmClassSignature.java (93%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/jvmSignature/JvmMethodParameterKind.java (89%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/jvmSignature/JvmMethodParameterSignature.java (94%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/jvmSignature/JvmMethodSignature.java (96%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/jvmSignature/KotlinToJvmSignatureMapper.kt (92%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/AlternativeFieldSignatureData.java (93%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/AlternativeMethodSignatureData.java (96%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/AlternativeSignatureMismatchException.java (89%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/CollectionClassMapping.java (96%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/ElementAlternativeSignatureData.java (95%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/PropagationHeuristics.java (98%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/SignaturesPropagationData.java (96%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/SignaturesUtil.java (88%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/kotlinSignature/TypeTransformingVisitor.java (95%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/mapping => kotlin/resolve/jvm/types}/KotlinToJavaTypesMap.java (92%) rename compiler/frontend.java/src/org/jetbrains/{jet/lang/resolve/java/mapping => kotlin/resolve/jvm/types}/PrimitiveTypesUtil.java (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/AbiVersionUtil.java (90%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/JavaClassFinder.java (80%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/JavaVisibilities.java (98%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/JvmAbi.java (97%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/JvmAnnotationNames.java (97%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/DescriptorResolverUtils.java (96%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/ErrorReporter.java (86%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/ExternalAnnotationResolver.java (80%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/ExternalSignatureResolver.java (94%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/JavaResolverCache.java (80%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/MethodSignatureChecker.java (87%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/SamConversionResolver.kt (78%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/resolver => kotlin/load/java/components}/TypeUsage.java (91%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/descriptor => kotlin/load/java/descriptors}/JavaCallableMemberDescriptor.java (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/descriptor => kotlin/load/java/descriptors}/JavaClassDescriptor.java (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/descriptor => kotlin/load/java/descriptors}/JavaConstructorDescriptor.java (97%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/descriptor => kotlin/load/java/descriptors}/JavaMethodDescriptor.java (97%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/descriptor => kotlin/load/java/descriptors}/JavaPropertyDescriptor.java (94%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/descriptor => kotlin/load/java/descriptors}/SamAdapterDescriptor.java (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java/descriptor => kotlin/load/java/descriptors}/SamConstructorDescriptor.kt (93%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/LazyJavaPackageFragmentProvider.kt (94%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/ModuleClassResolver.kt (86%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/annotationUtils.kt (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/context.kt (79%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyJavaClassDescriptor.kt (90%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyJavaClassMemberScope.kt (95%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyJavaMemberScope.kt (93%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyJavaPackageFragment.kt (82%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyJavaStaticClassScope.kt (92%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyJavaStaticScope.kt (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt (82%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/descriptors/MemberIndex.kt (92%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/resolvers.kt (87%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/lazy/types/LazyJavaTypeResolver.kt (97%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/sources/JavaSourceElementFactory.kt (83%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaAnnotation.java (91%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaAnnotationOwner.java (90%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaArrayType.java (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaClass.java (94%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaClassifier.java (86%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaClassifierType.java (91%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaConstructor.java (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaElement.java (86%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaField.java (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaMember.java (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaMethod.java (90%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaModifierListOwner.java (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaNamedElement.java (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaPackage.kt (90%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaPrimitiveType.java (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaPropertyInitializerEvaluator.java (91%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaType.java (87%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaTypeParameter.java (91%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaTypeParameterListOwner.java (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaTypeProvider.java (90%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaTypeSubstitutor.java (94%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaValueParameter.java (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/JavaWildcardType.java (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/java/structure/annotationArguments.kt (93%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt (98%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt (93%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/DeserializationComponentsForJava.kt (90%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/DeserializedDescriptorResolver.java (89%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/DeserializedResolverUtils.java (95%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/JavaClassDataFinder.kt (90%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt (87%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/KotlinClassFinder.kt (84%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/KotlinJvmBinaryClass.java (93%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/MemberSignature.kt (94%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/load/kotlin}/PackageClassUtils.java (94%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/SignatureDeserializer.java (97%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/header/KotlinClassHeader.kt (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve => kotlin/load}/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java (94%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/JavaDescriptorResolver.kt (88%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/JvmClassName.java (96%) rename core/descriptor.loader.java/src/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/JvmPrimitiveType.java (96%) rename idea/tests/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/AbstractJavaTypeSubstitutorTest.java (91%) rename idea/tests/org/jetbrains/{jet/lang/resolve/java => kotlin/resolve/jvm}/JavaTypeSubstitutorTestGenerated.java (99%) diff --git a/compiler/backend/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper b/compiler/backend/src/META-INF/services/org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper similarity index 100% rename from compiler/backend/src/META-INF/services/org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper rename to compiler/backend/src/META-INF/services/org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java index 224fce67484..6c9edc05b76 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AbstractClassBuilder.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.*; public abstract class AbstractClassBuilder implements ClassBuilder { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index 03eef601bb5..a6d6e5a7432 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.constants.*; import org.jetbrains.jet.lang.resolve.constants.StringValue; -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.Flexibility; import org.jetbrains.kotlin.types.JetType; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 805d835bbc2..fca95ccc032 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -31,15 +31,19 @@ import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.load.java.JavaVisibilities; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.java.*; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaCallableMemberDescriptor; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.resolve.jvm.*; +import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.Approximation; import org.jetbrains.kotlin.types.JetType; @@ -58,10 +62,10 @@ import java.util.Set; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.ABI_VERSION_FIELD_NAME; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; -import static org.jetbrains.jet.lang.resolve.java.mapping.PrimitiveTypesUtil.asmTypeForPrimitive; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.ABI_VERSION_FIELD_NAME; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.resolve.jvm.types.PrimitiveTypesUtil.asmTypeForPrimitive; import static org.jetbrains.kotlin.types.TypeUtils.isNullableType; import static org.jetbrains.org.objectweb.asm.Opcodes.*; @@ -629,7 +633,7 @@ public class AsmUtil { @NotNull String assertMethodToCall ) { // Assertions are generated elsewhere for platform types - if (JavaPackage.getPLATFORM_TYPES()) return; + if (JvmPackage.getPLATFORM_TYPES()) return; if (!state.isCallAssertionsEnabled()) return; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java index 4994d5527ac..d92920f3bbc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallableMethod.java @@ -21,10 +21,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilder.java index 737c687f885..23fe2c4b93a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilder.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilder.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.FieldVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java index dd181791be3..b9dc1f6d137 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactories.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.ClassWriter; import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactory.java index 4fff259e18e..99902c82b16 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBuilderFactory.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; public interface ClassBuilderFactory { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index 6ffb196c124..e050ec2abb9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 5b196a3094c..5ed92c5b6de 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; @@ -49,8 +49,8 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConst; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class ClosureCodegen extends MemberCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index b7ece363213..3c258e3b63c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.* import org.jetbrains.kotlin.descriptors.impl.* import org.jetbrains.org.objectweb.asm.Opcodes.* -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.types.* @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.name.Name import java.util.ArrayList import org.jetbrains.kotlin.types.checker.JetTypeChecker import java.util.HashSet -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature /** * Generates exception-throwing stubs for methods from mutable collection classes not implemented in Kotlin classes which inherit only from diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DelegatingClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DelegatingClassBuilder.java index 35ce0b7ca3b..5af4e4b6030 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DelegatingClassBuilder.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DelegatingClassBuilder.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.FieldVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index cc7d15a4fc0..5b2431f82b6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -55,11 +55,11 @@ import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; -import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; +import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.*; import org.jetbrains.kotlin.types.Approximation; @@ -89,10 +89,10 @@ import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull; import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.TraitImpl; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.TraitImpl; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; import static org.jetbrains.org.objectweb.asm.Opcodes.ACC_PRIVATE; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java index 1b6e5dacf44..2491688e355 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.org.objectweb.asm.Type; public class FieldInfo { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index 7174d4af4f5..cffaa017749 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -43,11 +43,11 @@ import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; import org.jetbrains.jet.lang.resolve.constants.ArrayValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.JavaClassValue; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; -import org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations.NativeDeclarationsPackage; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeDeclarationsPackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.Approximation; import org.jetbrains.kotlin.types.TypesPackage; @@ -73,10 +73,10 @@ import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DEC import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.callableDescriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isFunctionLiteral; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.OLD_JET_VALUE_PARAMETER_ANNOTATION; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.Synthetic; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.OLD_JET_VALUE_PARAMETER_ANNOTATION; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.Synthetic; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class FunctionCodegen extends ParentCodegenAware { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java index 16a3c9d2c63..2e668bd4a16 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.JetDeclarationWithBody; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.MethodVisitor; public abstract class FunctionGenerationStrategy { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 0fbefca2c45..1dc436625e7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -45,14 +45,14 @@ import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaCallableMemberDescriptor; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmClassSignature; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmClassSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.checker.JetTypeChecker; @@ -74,10 +74,10 @@ import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNam import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.classDescriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.*; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.*; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.kotlin.types.Variance.INVARIANT; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 6dd5e553df5..453ad7c389f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -34,10 +34,10 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilPackage; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaPackageFragment; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackageFragmentProvider; +import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; +import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass; +import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; import org.jetbrains.kotlin.types.JetType; import java.io.File; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java index 6c7f97d5ec9..7065e89bed9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.serialization.StringTable; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.kotlin.SignatureDeserializer; +import org.jetbrains.kotlin.load.kotlin.SignatureDeserializer; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 73ea6341738..1957a6a90da 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.types.ErrorUtils; @@ -55,10 +55,10 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; import static org.jetbrains.kotlin.descriptors.SourceElement.NO_SOURCE; import static org.jetbrains.jet.lang.resolve.BindingContext.VARIABLE; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.TraitImpl; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.TraitImpl; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public abstract class MemberCodegen extends ParentCodegenAware { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index 91f30035d1a..79e08d538bc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -48,11 +48,11 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.MemberComparator; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackageFragmentProvider; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -67,11 +67,11 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses; import static org.jetbrains.kotlin.codegen.AsmUtil.method; import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.K_PACKAGE_IMPL_TYPE; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; -import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.*; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.K_PACKAGE_IMPL_TYPE; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType; +import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.*; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class PackageCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java index 3272943d7d6..5c7b9c0d92f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.org.objectweb.asm.Type; import static org.jetbrains.kotlin.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class PackagePartCodegen extends MemberCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt index fa7e24c1987..459be67198e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt @@ -20,11 +20,11 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin -import org.jetbrains.jet.lang.resolve.java.diagnostics.Synthetic +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin +import org.jetbrains.kotlin.resolve.jvm.diagnostics.Synthetic import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.org.objectweb.asm.MethodVisitor -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature import org.jetbrains.kotlin.codegen.context.MethodContext import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.backend.common.CodegenUtil diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index c3216a45c7a..bdd8bff66e0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -31,8 +31,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; @@ -51,8 +51,8 @@ import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface; import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.PROPERTY_METADATA_TYPE; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.PROPERTY_METADATA_TYPE; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class PropertyCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java index 8795ca0a0d1..3a507212d6a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor; +import org.jetbrains.kotlin.load.java.descriptors.SamAdapterDescriptor; public class SamCodegenUtil { @Nullable diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java index 0eb5c6d72a4..cddc32ea9f0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; -import org.jetbrains.jet.lang.resolve.java.sam.SingleAbstractMethodUtils; +import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; +import org.jetbrains.kotlin.load.java.sam.SingleAbstractMethodUtils; import org.jetbrains.kotlin.types.JetType; public class SamType { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java index 5708367f4ad..097e51f5a14 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java @@ -25,9 +25,9 @@ import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.JetType; @@ -38,9 +38,9 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.Collections; import static org.jetbrains.kotlin.codegen.AsmUtil.*; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class SamWrapperCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index 52bc94666ec..79413eb3145 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -41,9 +41,9 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.method; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLASS_FOR_SCRIPT; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForScriptDescriptor; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.org.objectweb.asm.Opcodes.*; // SCRIPT: script code generator diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt index 5edfa821e52..e2b19d8f827 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SignatureCollectingClassBuilderFactory.kt @@ -20,10 +20,10 @@ import com.intellij.psi.PsiElement import org.jetbrains.org.objectweb.asm.FieldVisitor import org.jetbrains.org.objectweb.asm.MethodVisitor import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData -import org.jetbrains.jet.lang.resolve.java.diagnostics.MemberKind -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin -import org.jetbrains.jet.lang.resolve.java.diagnostics.RawSignature +import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData +import org.jetbrains.kotlin.resolve.jvm.diagnostics.MemberKind +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin +import org.jetbrains.kotlin.resolve.jvm.diagnostics.RawSignature public abstract class SignatureCollectingClassBuilderFactory( private val delegate: ClassBuilderFactory diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index 30005191a9b..68e98ab712d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -31,9 +31,9 @@ import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.lexer.JetTokens; @@ -46,7 +46,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.*; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public abstract class StackValue { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java index 71a6669da1d..e37468df61c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import static org.jetbrains.kotlin.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class TraitImplBodyCodegen extends ClassBodyCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index e1ac217dfb9..255d6224fd9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -45,8 +45,8 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.EnumValue; import org.jetbrains.jet.lang.resolve.constants.NullValue; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.source.SourcePackage; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java index 54ebb972f84..471be1d8176 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.Name; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java index b1e14ed1d80..6980b4a404d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; public class ConstructorContext extends MethodContext { private static final StackValue LOCAL_1 = StackValue.local(1, OBJECT_TYPE); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java index 3f685dbec6a..948a5c2700b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import java.util.HashMap; import java.util.Map; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java index 6c7ebb67ecb..5bd75225209 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java index 77d794dcc3f..ad18a1285ef 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/AnonymousObjectTransformer.java @@ -34,7 +34,7 @@ import org.jetbrains.org.objectweb.asm.tree.VarInsnNode; import java.util.*; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; public class AnonymousObjectTransformer { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java index dd4d457eacb..83c761fb193 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -33,10 +33,10 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.builtins.InlineStrategy; import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java index 54973fa7f4f..fcd29c7ca29 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -35,12 +35,12 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.backend.common.output.OutputFile; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java index 87254376189..e6d040df004 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetFunctionLiteral; import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode; import org.jetbrains.org.objectweb.asm.tree.MethodNode; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java index 155bf81ecd8..dd4d248264f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LocalVarRemapper.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java index e8c82115daa..e9c357e610c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/MethodInliner.java @@ -24,11 +24,11 @@ import org.jetbrains.kotlin.codegen.ClosureCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.Method; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParameterInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParameterInfo.java index 5f29663c846..44fa33f9e17 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParameterInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ParameterInfo.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.inline; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; class ParameterInfo { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java index d0d5dadd910..00a3bf71c4b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/RemappingClassBuilder.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ClassBuilder; import org.jetbrains.kotlin.codegen.DelegatingClassBuilder; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.FieldVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java index 58b50fb7a90..e6d81bd0db9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetCallExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; @@ -37,8 +37,8 @@ import java.util.Iterator; import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; -import static org.jetbrains.jet.lang.resolve.java.mapping.PrimitiveTypesUtil.asmTypeForPrimitive; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType; +import static org.jetbrains.kotlin.resolve.jvm.types.PrimitiveTypesUtil.asmTypeForPrimitive; import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; public class ArrayIterator extends IntrinsicMethod { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java index 3619c28565b..aa51075c535 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java @@ -33,7 +33,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; public class Clone extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java index f51bd89b6ac..4e5aa83efd2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Concat.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -29,7 +29,7 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.genInvokeAppendMethod; import static org.jetbrains.kotlin.codegen.AsmUtil.genStringBuilderConstructor; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.JAVA_STRING_TYPE; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.JAVA_STRING_TYPE; public class Concat extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java index 7d138a84d12..b3701b7c458 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java @@ -28,7 +28,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType; public class CopyToArray extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt index e0dce14775b..c62d0834bb2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Equals.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.codegen.AsmUtil.genEqualsForExpressionsOnStack -import org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE +import org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE public class Equals : LazyIntrinsicMethod() { override fun generateImpl( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt index c69877d517e..a008b301315 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/HashCode.kt @@ -22,7 +22,7 @@ import org.jetbrains.org.objectweb.asm.Type import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.resolve.java.AsmTypes +import org.jetbrains.kotlin.resolve.jvm.AsmTypes public class HashCode : LazyIntrinsicMethod() { override fun generateImpl( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java index 2a3bcd30321..b9d0f51bbf1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IdentityEquals.java @@ -28,7 +28,7 @@ import org.jetbrains.org.objectweb.asm.Type; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; public class IdentityEquals extends LazyIntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java index 7178368661a..1fd704aab24 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.expressions.OperatorConventions; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java index c352d7ee333..5c69c38a33a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java index f2043959359..d9e7e296086 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java @@ -33,7 +33,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.putJavaLangClassInstance; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType; public class JavaClassFunction extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java index 22bb1635745..aa15b21f944 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassProperty.java @@ -30,7 +30,7 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.boxType; import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.getType; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType; public class JavaClassProperty extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java index 4b583418d34..2adffc21dd6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/MonitorInstruction.java @@ -34,7 +34,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; public class MonitorInstruction extends IntrinsicMethod { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt index e9d0bb42d41..ff408bf706d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/StringPlus.kt @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.codegen.ExpressionCodegen import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.org.objectweb.asm.Type -import org.jetbrains.jet.lang.resolve.java.AsmTypes.JAVA_STRING_TYPE -import org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE +import org.jetbrains.kotlin.resolve.jvm.AsmTypes.JAVA_STRING_TYPE +import org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE public class StringPlus : LazyIntrinsicMethod() { override fun generateImpl( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilder.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilder.java index 5ff69e44cd6..9ee1153bed1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilder.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilder.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ClassBuilder; import org.jetbrains.kotlin.codegen.DelegatingClassBuilder; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.MethodVisitor; public class OptimizationClassBuilder extends DelegatingClassBuilder { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilderFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilderFactory.java index cb4a77d8de3..fe1cb1219d8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilderFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationClassBuilderFactory.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ClassBuilder; import org.jetbrains.kotlin.codegen.ClassBuilderFactory; import org.jetbrains.kotlin.codegen.ClassBuilderMode; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; public class OptimizationClassBuilderFactory implements ClassBuilderFactory { private final ClassBuilderFactory delegate; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.java index 67e5db47729..ceea80fca0b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.codegen.RangeCodegenUtil; import org.jetbrains.kotlin.codegen.optimization.common.OptimizationBasicInterpreter; -import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java index fc7ef906ffe..fdcc31a37be 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.codegen.signature; import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.Method; import org.jetbrains.org.objectweb.asm.signature.SignatureVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt index 23387dc84ae..6588cd23073 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt @@ -20,8 +20,8 @@ import org.jetbrains.kotlin.codegen.ClassBuilderMode import org.jetbrains.kotlin.codegen.state.JetTypeMapper import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature public class KotlinToJvmSignatureMapperImpl : KotlinToJvmSignatureMapper { // We use empty BindingContext, because it is only used by JetTypeMapper for purposes irrelevant to the needs of this class diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt index 89ddd5b6212..e296598992c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt @@ -22,13 +22,13 @@ import org.jetbrains.kotlin.codegen.ClassBuilderFactory import org.jetbrains.kotlin.codegen.SignatureCollectingClassBuilderFactory import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.java.diagnostics.* +import org.jetbrains.kotlin.resolve.jvm.diagnostics.* import java.util.* import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERRIDE import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.codegen.ClassBuilderMode -import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor +import org.jetbrains.kotlin.load.java.descriptors.SamAdapterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.diagnostics.DiagnosticSink diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java index e2aa4f9d9a3..2477415dbc7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -41,15 +41,15 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.StringValue; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; -import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations.NativeDeclarationsPackage; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeDeclarationsPackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.SpecialNames; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java index 5d2c3d303c4..90d3ea6beb9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.codegen.ClassBuilder; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.constants.EnumValue; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -30,7 +30,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class MappingClassesForWhenByEnumCodegen { diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index 04227317df6..313d9f092a3 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -32,12 +32,12 @@ 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.jet.lang.resolve.java.JvmAnalyzerFacade +import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.analyzer.ModuleInfo -import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters +import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.jet.analyzer.ModuleContent -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils +import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys 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 d4cc16fc150..4a6adfbc9a9 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 @@ -36,11 +36,11 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedErrorReporter; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; +import org.jetbrains.kotlin.load.java.JavaBindingContext; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.load.java.components.TraceBasedErrorReporter; +import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass; import java.util.Collection; import java.util.List; 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 d4bb4ce7cfd..5fecf03dff4 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli.jvm; import org.jetbrains.jet.config.CompilerConfigurationKey; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; import java.io.File; import java.util.List; 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 cb993afd4fa..e437ae29d84 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; 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.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir; import org.jetbrains.kotlin.utils.PathUtil; 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 529184f44e0..88dc200e282 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 @@ -36,8 +36,8 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java index a7de083618e..c195bf96b43 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.cli.jvm.compiler; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClassFinder; +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClassFinder; import org.jetbrains.kotlin.name.FqName; public class CliVirtualFileFinder extends VirtualFileKotlinClassFinder implements VirtualFileFinder { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.java index dbec55f2eeb..747ebc0d41b 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinderFactory.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.cli.jvm.compiler; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; public final class CliVirtualFileFinderFactory implements VirtualFileFinderFactory { private final ClassPath classPath; 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 3616bd28c2d..54deae801c2 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 @@ -42,7 +42,7 @@ 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.jet.lang.resolve.java.PackageClassUtils; +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; 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 e9bd16abd0a..2ba99155d57 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 @@ -48,8 +48,8 @@ import org.jetbrains.kotlin.parsing.JetParserDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.CodeAnalyzerInitializer; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory; +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache; +import org.jetbrains.kotlin.load.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; 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 2d819e9d88e..b07b4c23918 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 @@ -44,11 +44,11 @@ import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackage; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackage; +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache; +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.kotlin.utils.KotlinPaths; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplClassLoader.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplClassLoader.java index 3b5ee81a53d..c1d689043b1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplClassLoader.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplClassLoader.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli.jvm.repl; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor; 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 3ce920096cd..bcb09e5c10a 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 @@ -46,8 +46,8 @@ import org.jetbrains.kotlin.parsing.JetParserDefinition; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.lazy.declarations.*; diff --git a/compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.ExternalOverridabilityCondition b/compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.ExternalOverridabilityCondition index 6953a3b18db..e12b13d2c4b 100644 --- a/compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.ExternalOverridabilityCondition +++ b/compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.ExternalOverridabilityCondition @@ -1 +1 @@ -org.jetbrains.jet.lang.resolve.java.sam.SamAdapterOverridabilityCondition +org.jetbrains.kotlin.load.java.sam.SamAdapterOverridabilityCondition diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/JetJavaMirrorMarker.java b/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/JetJavaMirrorMarker.java similarity index 87% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/JetJavaMirrorMarker.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/asJava/JetJavaMirrorMarker.java index 3d34fe153f8..e44974daf1f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jetAsJava/JetJavaMirrorMarker.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/asJava/JetJavaMirrorMarker.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.lang.resolve.java.jetAsJava; +package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiClass; 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 370b6114c8a..2c0b9691b36 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java @@ -21,26 +21,26 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; +import org.jetbrains.kotlin.load.java.JavaClassFinderImpl; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedExternalSignatureResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedJavaResolverCache; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedErrorReporter; -import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedMethodSignatureChecker; -import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; -import org.jetbrains.jet.lang.resolve.java.sam.SamConversionResolverImpl; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSourceElementFactoryImpl; -import org.jetbrains.jet.lang.resolve.java.lazy.SingleModuleClassResolver; -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolverPostConstruct; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializationComponentsForJava; -import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder; -import org.jetbrains.jet.lang.resolve.kotlin.BinaryClassAnnotationAndConstantLoaderImpl; +import org.jetbrains.kotlin.load.java.components.TraceBasedExternalSignatureResolver; +import org.jetbrains.kotlin.load.java.components.TraceBasedJavaResolverCache; +import org.jetbrains.kotlin.load.java.components.TraceBasedErrorReporter; +import org.jetbrains.kotlin.load.java.components.PsiBasedMethodSignatureChecker; +import org.jetbrains.kotlin.load.java.components.PsiBasedExternalAnnotationResolver; +import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; +import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl; +import org.jetbrains.kotlin.load.java.components.JavaSourceElementFactoryImpl; +import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverPostConstruct; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider; +import org.jetbrains.kotlin.load.java.lazy.GlobalJavaResolverContext; +import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver; +import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava; +import org.jetbrains.kotlin.load.kotlin.JavaClassDataFinder; +import org.jetbrains.kotlin.load.kotlin.BinaryClassAnnotationAndConstantLoaderImpl; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -82,9 +82,9 @@ public class InjectorForJavaDescriptorResolver { this.bindingTrace = bindingTrace; this.globalContext = org.jetbrains.jet.context.ContextPackage.GlobalContext(); this.lockBasedStorageManager = globalContext.getStorageManager(); - this.module = org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM.createJavaModule(""); + this.module = org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM.createJavaModule(""); this.javaClassFinder = new JavaClassFinderImpl(); - this.virtualFileFinder = org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder.SERVICE.getInstance(project); + this.virtualFileFinder = org.jetbrains.kotlin.load.kotlin.VirtualFileFinder.SERVICE.getInstance(project); this.traceBasedErrorReporter = new TraceBasedErrorReporter(); this.deserializedDescriptorResolver = new DeserializedDescriptorResolver(traceBasedErrorReporter); this.psiBasedExternalAnnotationResolver = new PsiBasedExternalAnnotationResolver(); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java index 2ea03388457..fcd75803375 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.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. 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 f0c727d04b1..b1449b15348 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -26,22 +26,22 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.jet.lang.resolve.java.lazy.ModuleClassResolver; -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedExternalSignatureResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.LazyResolveBasedCache; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedErrorReporter; -import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedMethodSignatureChecker; -import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; -import org.jetbrains.jet.lang.resolve.java.sam.SamConversionResolverImpl; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSourceElementFactoryImpl; -import org.jetbrains.jet.lang.resolve.java.JavaFlexibleTypeCapabilitiesProvider; +import org.jetbrains.kotlin.load.java.lazy.ModuleClassResolver; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.java.JavaClassFinderImpl; +import org.jetbrains.kotlin.load.java.components.TraceBasedExternalSignatureResolver; +import org.jetbrains.kotlin.load.java.components.LazyResolveBasedCache; +import org.jetbrains.kotlin.load.java.components.TraceBasedErrorReporter; +import org.jetbrains.kotlin.load.java.components.PsiBasedMethodSignatureChecker; +import org.jetbrains.kotlin.load.java.components.PsiBasedExternalAnnotationResolver; +import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; +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.jet.lang.resolve.java.JavaLazyAnalyzerPostConstruct; -import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; +import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; @@ -66,12 +66,12 @@ import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializationComponentsForJava; -import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder; -import org.jetbrains.jet.lang.resolve.kotlin.BinaryClassAnnotationAndConstantLoaderImpl; +import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider; +import org.jetbrains.kotlin.load.java.lazy.GlobalJavaResolverContext; +import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver; +import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava; +import org.jetbrains.kotlin.load.kotlin.JavaClassDataFinder; +import org.jetbrains.kotlin.load.kotlin.BinaryClassAnnotationAndConstantLoaderImpl; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -157,7 +157,7 @@ public class InjectorForLazyResolveWithJava { this.moduleContentScope = moduleContentScope; this.moduleClassResolver = moduleClassResolver; this.javaClassFinder = new JavaClassFinderImpl(); - this.virtualFileFinder = org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory.SERVICE.getInstance(project).create(moduleContentScope); + this.virtualFileFinder = org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory.SERVICE.getInstance(project).create(moduleContentScope); this.traceBasedErrorReporter = new TraceBasedErrorReporter(); this.deserializedDescriptorResolver = new DeserializedDescriptorResolver(traceBasedErrorReporter); this.psiBasedExternalAnnotationResolver = new PsiBasedExternalAnnotationResolver(); 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 1866f71da7a..8b1b722163c 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -27,23 +27,23 @@ import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFacto import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializationComponentsForJava; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedExternalSignatureResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.LazyResolveBasedCache; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedErrorReporter; -import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedMethodSignatureChecker; -import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; -import org.jetbrains.jet.lang.resolve.java.sam.SamConversionResolverImpl; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSourceElementFactoryImpl; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; +import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.java.JavaClassFinderImpl; +import org.jetbrains.kotlin.load.java.components.TraceBasedExternalSignatureResolver; +import org.jetbrains.kotlin.load.java.components.LazyResolveBasedCache; +import org.jetbrains.kotlin.load.java.components.TraceBasedErrorReporter; +import org.jetbrains.kotlin.load.java.components.PsiBasedMethodSignatureChecker; +import org.jetbrains.kotlin.load.java.components.PsiBasedExternalAnnotationResolver; +import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; +import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl; +import org.jetbrains.kotlin.load.java.components.JavaSourceElementFactoryImpl; import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.java.lazy.SingleModuleClassResolver; -import org.jetbrains.jet.lang.resolve.java.JavaLazyAnalyzerPostConstruct; -import org.jetbrains.jet.lang.resolve.java.JavaFlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver; +import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; +import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; +import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; @@ -82,11 +82,11 @@ import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver; -import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder; -import org.jetbrains.jet.lang.resolve.kotlin.BinaryClassAnnotationAndConstantLoaderImpl; +import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider; +import org.jetbrains.kotlin.load.java.lazy.GlobalJavaResolverContext; +import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver; +import org.jetbrains.kotlin.load.kotlin.JavaClassDataFinder; +import org.jetbrains.kotlin.load.kotlin.BinaryClassAnnotationAndConstantLoaderImpl; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -187,7 +187,7 @@ public class InjectorForReplWithJava { this.moduleContentScope = moduleContentScope; this.lazyTopDownAnalyzer = new LazyTopDownAnalyzer(); this.javaClassFinder = new JavaClassFinderImpl(); - this.virtualFileFinder = org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory.SERVICE.getInstance(project).create(moduleContentScope); + this.virtualFileFinder = org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory.SERVICE.getInstance(project).create(moduleContentScope); this.traceBasedErrorReporter = new TraceBasedErrorReporter(); this.deserializedDescriptorResolver = new DeserializedDescriptorResolver(traceBasedErrorReporter); this.psiBasedExternalAnnotationResolver = new PsiBasedExternalAnnotationResolver(); 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 e322985beff..dd952a259e1 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -27,23 +27,23 @@ import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFacto import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializationComponentsForJava; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedExternalSignatureResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.LazyResolveBasedCache; -import org.jetbrains.jet.lang.resolve.java.resolver.TraceBasedErrorReporter; -import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedMethodSignatureChecker; -import org.jetbrains.jet.lang.resolve.java.resolver.PsiBasedExternalAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; -import org.jetbrains.jet.lang.resolve.java.sam.SamConversionResolverImpl; -import org.jetbrains.jet.lang.resolve.java.resolver.JavaSourceElementFactoryImpl; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; +import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.java.JavaClassFinderImpl; +import org.jetbrains.kotlin.load.java.components.TraceBasedExternalSignatureResolver; +import org.jetbrains.kotlin.load.java.components.LazyResolveBasedCache; +import org.jetbrains.kotlin.load.java.components.TraceBasedErrorReporter; +import org.jetbrains.kotlin.load.java.components.PsiBasedMethodSignatureChecker; +import org.jetbrains.kotlin.load.java.components.PsiBasedExternalAnnotationResolver; +import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; +import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl; +import org.jetbrains.kotlin.load.java.components.JavaSourceElementFactoryImpl; import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.java.lazy.SingleModuleClassResolver; -import org.jetbrains.jet.lang.resolve.java.JavaLazyAnalyzerPostConstruct; -import org.jetbrains.jet.lang.resolve.java.JavaFlexibleTypeCapabilitiesProvider; -import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver; +import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; +import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; +import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; @@ -82,11 +82,11 @@ import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.java.lazy.GlobalJavaResolverContext; -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver; -import org.jetbrains.jet.lang.resolve.kotlin.JavaClassDataFinder; -import org.jetbrains.jet.lang.resolve.kotlin.BinaryClassAnnotationAndConstantLoaderImpl; +import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider; +import org.jetbrains.kotlin.load.java.lazy.GlobalJavaResolverContext; +import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver; +import org.jetbrains.kotlin.load.kotlin.JavaClassDataFinder; +import org.jetbrains.kotlin.load.kotlin.BinaryClassAnnotationAndConstantLoaderImpl; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; @@ -186,7 +186,7 @@ public class InjectorForTopDownAnalyzerForJvm { this.moduleContentScope = moduleContentScope; this.lazyTopDownAnalyzer = new LazyTopDownAnalyzer(); this.javaClassFinder = new JavaClassFinderImpl(); - this.virtualFileFinder = org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory.SERVICE.getInstance(project).create(moduleContentScope); + this.virtualFileFinder = org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory.SERVICE.getInstance(project).create(moduleContentScope); this.traceBasedErrorReporter = new TraceBasedErrorReporter(); this.deserializedDescriptorResolver = new DeserializedDescriptorResolver(traceBasedErrorReporter); this.psiBasedExternalAnnotationResolver = new PsiBasedExternalAnnotationResolver(); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java similarity index 92% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java index 5d698e6d1c0..7a3fc5501cb 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.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.lang.resolve.java; +package org.jetbrains.kotlin.load.java; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java similarity index 87% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.java index 1e21fe2d84a..11b60a4ad1a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderImpl.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.lang.resolve.java; +package org.jetbrains.kotlin.load.java; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; @@ -24,14 +24,16 @@ import com.intellij.psi.search.DelegatingGlobalSearchScope; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPackageImpl; +import org.jetbrains.kotlin.load.java.structure.JavaClass; +import org.jetbrains.kotlin.load.java.structure.JavaPackage; +import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl; +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.resolve.jvm.JavaClassFinderPostConstruct; +import org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade; import javax.annotation.PostConstruct; import javax.inject.Inject; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderPostConstruct.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt similarity index 95% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderPostConstruct.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt index 17018c884ca..260e9fdbffb 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderPostConstruct.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.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.lang.resolve.java +package org.jetbrains.kotlin.resolve.jvm import com.intellij.openapi.project.Project import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaFlexibleTypeCapabilitiesProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaFlexibleTypeCapabilitiesProvider.kt similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaFlexibleTypeCapabilitiesProvider.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaFlexibleTypeCapabilitiesProvider.kt index 24e04112c92..4469c5deda6 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaFlexibleTypeCapabilitiesProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaFlexibleTypeCapabilitiesProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java +package org.jetbrains.kotlin.load.java import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider import org.jetbrains.kotlin.types.FlexibleTypeCapabilities -import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver +import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver public class JavaFlexibleTypeCapabilitiesProvider : FlexibleTypeCapabilitiesProvider() { override fun getCapabilities(): FlexibleTypeCapabilities = LazyJavaTypeResolver.FlexibleJavaClassifierTypeCapabilities -} +} \ No newline at end of file diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSourceElementFactoryImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/JavaSourceElementFactoryImpl.kt similarity index 70% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSourceElementFactoryImpl.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/JavaSourceElementFactoryImpl.kt index 3f6f3461da2..dc85c96b806 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSourceElementFactoryImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/JavaSourceElementFactoryImpl.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,15 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.resolver +package org.jetbrains.kotlin.load.java.components import org.jetbrains.jet.lang.resolve.source.PsiSourceElement import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.java.structure.JavaElement -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementImpl -import org.jetbrains.jet.lang.resolve.java.sources.JavaSourceElementFactory -import org.jetbrains.kotlin.descriptors.SourceElement -import org.jetbrains.jet.lang.resolve.java.sources.JavaSourceElement +import org.jetbrains.kotlin.load.java.structure.JavaElement +import org.jetbrains.kotlin.load.java.structure.impl.JavaElementImpl +import org.jetbrains.kotlin.load.java.sources.JavaSourceElementFactory +import org.jetbrains.kotlin.load.java.sources.JavaSourceElement private class JavaSourceElementImpl(override val javaElement: JavaElement) : PsiSourceElement, JavaSourceElement { override val psi: PsiElement? diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/LazyResolveBasedCache.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/LazyResolveBasedCache.kt similarity index 90% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/LazyResolveBasedCache.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/LazyResolveBasedCache.kt index 4cf74d17d92..ab5bc737b03 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/LazyResolveBasedCache.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/LazyResolveBasedCache.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.resolver +package org.jetbrains.kotlin.load.java.components import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.java.structure.JavaElement -import org.jetbrains.jet.lang.resolve.java.structure.JavaField -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod +import org.jetbrains.kotlin.load.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.structure.JavaElement +import org.jetbrains.kotlin.load.java.structure.JavaField +import org.jetbrains.kotlin.load.java.structure.JavaMethod import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils import org.jetbrains.kotlin.name.FqName diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedExternalAnnotationResolver.java similarity index 81% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedExternalAnnotationResolver.java index c092a27e32f..4bd2daea519 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedExternalAnnotationResolver.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,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import com.intellij.codeInsight.ExternalAnnotationsManager; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiModifierListOwner; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaAnnotationImpl; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaAnnotationOwnerImpl; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotationOwner; +import org.jetbrains.kotlin.load.java.structure.impl.JavaAnnotationImpl; +import org.jetbrains.kotlin.load.java.structure.impl.JavaAnnotationOwnerImpl; +import org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil; import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedMethodSignatureChecker.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedMethodSignatureChecker.java index 09ad2cc6665..8bf3e270817 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedMethodSignatureChecker.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.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; @@ -28,9 +28,9 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; -import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesUtil; -import org.jetbrains.jet.lang.resolve.java.structure.*; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.SignaturesUtil; +import org.jetbrains.kotlin.load.java.structure.*; +import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.SubstitutionUtils; import org.jetbrains.kotlin.types.TypeSubstitution; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java index f4f1152f9f5..c3485f5f2bc 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.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.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; +import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedExternalSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java similarity index 86% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedExternalSignatureResolver.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java index f9984a83c3f..d08d93c49c0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedExternalSignatureResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.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.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; @@ -24,15 +24,15 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; -import org.jetbrains.jet.lang.resolve.java.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeFieldSignatureData; -import org.jetbrains.jet.lang.resolve.java.kotlinSignature.AlternativeMethodSignatureData; -import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesPropagationData; -import org.jetbrains.jet.lang.resolve.java.structure.JavaConstructor; -import org.jetbrains.jet.lang.resolve.java.structure.JavaField; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; +import org.jetbrains.kotlin.load.java.JavaBindingContext; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.AlternativeFieldSignatureData; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.AlternativeMethodSignatureData; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.SignaturesPropagationData; +import org.jetbrains.kotlin.load.java.structure.JavaConstructor; +import org.jetbrains.kotlin.load.java.structure.JavaField; +import org.jetbrains.kotlin.load.java.structure.JavaMember; +import org.jetbrains.kotlin.load.java.structure.JavaMethod; import org.jetbrains.kotlin.types.JetType; import javax.inject.Inject; @@ -95,7 +95,7 @@ public class TraceBasedExternalSignatureResolver implements ExternalSignatureRes returnType, typeParameters, hasSuperMethods); if (data.isAnnotated() && !data.hasErrors()) { - if (JavaPackage.getPLATFORM_TYPES()) { + if (JvmPackage.getPLATFORM_TYPES()) { // We only take parameter names from the @KotlinSignature return new AlternativeMethodSignature(returnType, receiverType, AlternativeMethodSignatureData.updateNames(valueParameters, data.getValueParameters()), @@ -120,7 +120,7 @@ public class TraceBasedExternalSignatureResolver implements ExternalSignatureRes new AlternativeFieldSignatureData(externalAnnotationResolver, field, returnType, project, isVar); if (data.isAnnotated() && !data.hasErrors()) { - if (JavaPackage.getPLATFORM_TYPES()) { + if (JvmPackage.getPLATFORM_TYPES()) { return new AlternativeFieldSignature(returnType, null); } return new AlternativeFieldSignature(data.getReturnType(), null); diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedJavaResolverCache.java similarity index 79% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedJavaResolverCache.java index 84aaa5de4c3..0a07b7b8307 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedJavaResolverCache.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.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import com.intellij.psi.PsiField; import org.jetbrains.annotations.NotNull; @@ -25,14 +25,14 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.java.structure.JavaElement; -import org.jetbrains.jet.lang.resolve.java.structure.JavaField; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementImpl; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaFieldImpl; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl; +import org.jetbrains.kotlin.load.java.structure.JavaClass; +import org.jetbrains.kotlin.load.java.structure.JavaElement; +import org.jetbrains.kotlin.load.java.structure.JavaField; +import org.jetbrains.kotlin.load.java.structure.JavaMethod; +import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl; +import org.jetbrains.kotlin.load.java.structure.impl.JavaElementImpl; +import org.jetbrains.kotlin.load.java.structure.impl.JavaFieldImpl; +import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl; import org.jetbrains.kotlin.name.FqName; import javax.inject.Inject; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterConstructorDescriptor.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterConstructorDescriptor.java index 2a4b0e9513d..88df44fe8ae 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterConstructorDescriptor.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterConstructorDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.sam; +package org.jetbrains.kotlin.load.java.sam; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaConstructorDescriptor; -import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor; +import org.jetbrains.kotlin.load.java.descriptors.JavaConstructorDescriptor; +import org.jetbrains.kotlin.load.java.descriptors.SamAdapterDescriptor; /* package */ class SamAdapterConstructorDescriptor extends JavaConstructorDescriptor implements SamAdapterDescriptor { private final JavaConstructorDescriptor declaration; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterFunctionDescriptor.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterFunctionDescriptor.java index 041d36cb26d..db1a506d2e8 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterFunctionDescriptor.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterFunctionDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.sam; +package org.jetbrains.kotlin.load.java.sam; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaMethodDescriptor; -import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor; +import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor; +import org.jetbrains.kotlin.load.java.descriptors.SamAdapterDescriptor; /* package */ class SamAdapterFunctionDescriptor extends JavaMethodDescriptor implements SamAdapterDescriptor { private final JavaMethodDescriptor declaration; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java index 80a0adbb37f..7e82ef8243d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.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.lang.resolve.java.sam; +package org.jetbrains.kotlin.load.java.sam; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamConversionResolverImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt similarity index 88% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamConversionResolverImpl.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt index 6ea1b0217e6..0f9b4076fbe 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamConversionResolverImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.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,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.sam +package org.jetbrains.kotlin.load.java.sam -import org.jetbrains.jet.lang.resolve.java.resolver.SamConversionResolver +import org.jetbrains.kotlin.load.java.components.SamConversionResolver import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.java.descriptor.* -import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaClassDescriptor +import org.jetbrains.kotlin.load.java.descriptors.* +import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod +import org.jetbrains.kotlin.load.java.structure.JavaMethod import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.java.sources.JavaSourceElement -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.sources.JavaSourceElement +import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.types.TypeUtils import java.util.ArrayList diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java index e040a832da2..2459e13b97c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.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,24 +14,24 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.sam; +package org.jetbrains.kotlin.load.java.sam; 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.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; -import org.jetbrains.jet.lang.resolve.java.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; -import org.jetbrains.jet.lang.resolve.java.descriptor.*; -import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver; -import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils; +import org.jetbrains.kotlin.load.java.descriptors.*; +import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver; +import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; import org.jetbrains.kotlin.types.*; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; @@ -102,7 +102,7 @@ public class SingleAbstractMethodUtils { JetType fixedProjections = fixProjections(substitute); if (fixedProjections == null) return null; - if (JavaPackage.getPLATFORM_TYPES() && !isSamConstructor) { + if (JvmPackage.getPLATFORM_TYPES() && !isSamConstructor) { return LazyJavaTypeResolver.FlexibleJavaClassifierTypeCapabilities.create(fixedProjections, TypeUtils.makeNullable(fixedProjections)); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationImpl.java similarity index 87% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationImpl.java index 85c1dec0633..05d4edee46c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationImpl.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,21 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotationArgument; +import org.jetbrains.kotlin.load.java.structure.JavaClass; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import java.util.Collection; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namedAnnotationArguments; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.namedAnnotationArguments; public class JavaAnnotationImpl extends JavaElementImpl implements JavaAnnotation { public JavaAnnotationImpl(@NotNull PsiAnnotation psiAnnotation) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationOwnerImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationOwnerImpl.java similarity index 81% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationOwnerImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationOwnerImpl.java index 09c2d0ee55a..dab67466412 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationOwnerImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaAnnotationOwnerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiModifierListOwner; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotationOwner; public interface JavaAnnotationOwnerImpl extends JavaAnnotationOwner { @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaArrayTypeImpl.java similarity index 80% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaArrayTypeImpl.java index a3aace71175..0cc059a6751 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaArrayTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaArrayTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiArrayType; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType; -import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.kotlin.load.java.structure.JavaArrayType; +import org.jetbrains.kotlin.load.java.structure.JavaType; public class JavaArrayTypeImpl extends JavaTypeImpl implements JavaArrayType { public JavaArrayTypeImpl(@NotNull PsiArrayType psiArrayType) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.java index 2b69b51ff97..943db6edf7f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassImpl.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.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.*; import com.intellij.psi.impl.PsiSubstitutorImpl; @@ -22,9 +22,9 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.asJava.JetJavaMirrorMarker; import org.jetbrains.kotlin.descriptors.Visibility; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; @@ -33,7 +33,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.*; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.*; public class JavaClassImpl extends JavaClassifierImpl implements JavaClass, JavaAnnotationOwnerImpl, JavaModifierListOwnerImpl { public JavaClassImpl(@NotNull PsiClass psiClass) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassifierImpl.java similarity index 87% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassifierImpl.java index 29444069602..cbca1c0ecaf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassifierImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiTypeParameter; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClassifier; +import org.jetbrains.kotlin.load.java.structure.JavaClassifier; public abstract class JavaClassifierImpl extends JavaElementImpl implements JavaClassifier { protected JavaClassifierImpl(@NotNull Psi psiClass) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassifierTypeImpl.java similarity index 93% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassifierTypeImpl.java index d91be1c9ca7..5cf409eb80b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassifierTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaClassifierTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.structure.*; import java.util.*; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.types; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.types; public class JavaClassifierTypeImpl extends JavaTypeImpl implements JavaClassifierType { private static class ResolutionResult { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaConstructorImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaConstructorImpl.java similarity index 70% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaConstructorImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaConstructorImpl.java index 3fc841825e6..421c5dfdb8c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaConstructorImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaConstructorImpl.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,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiMethod; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaConstructor; -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter; -import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter; +import org.jetbrains.kotlin.load.java.structure.JavaConstructor; +import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter; +import org.jetbrains.kotlin.load.java.structure.JavaValueParameter; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.typeParameters; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.valueParameters; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.typeParameters; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.valueParameters; public class JavaConstructorImpl extends JavaMemberImpl implements JavaConstructor { public JavaConstructorImpl(@NotNull PsiMethod psiMethod) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java index 9d44ea7db63..02db4767d67 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.Name; import java.util.ArrayList; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementImpl.java similarity index 88% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementImpl.java index c3ac686acad..6187dfaff42 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaElement; +import org.jetbrains.kotlin.load.java.structure.JavaElement; public abstract class JavaElementImpl implements JavaElement { private final Psi psiElement; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementUtil.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementUtil.java index a5365588c04..03c6cdc46d6 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaElementUtil.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.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiAnnotation; import com.intellij.psi.PsiModifier; @@ -24,14 +24,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.kotlin.descriptors.Visibility; -import org.jetbrains.jet.lang.resolve.java.JavaVisibilities; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; +import org.jetbrains.kotlin.load.java.JavaVisibilities; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; import org.jetbrains.kotlin.name.FqName; import java.util.Collection; import java.util.Collections; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.annotations; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.annotations; /* package */ class JavaElementUtil { private JavaElementUtil() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaFieldImpl.java similarity index 84% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaFieldImpl.java index 638377931a3..595cf24a85a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaFieldImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaFieldImpl.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.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiEnumConstant; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiField; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaField; -import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.kotlin.load.java.structure.JavaField; +import org.jetbrains.kotlin.load.java.structure.JavaType; public class JavaFieldImpl extends JavaMemberImpl implements JavaField { public JavaFieldImpl(@NotNull PsiField psiField) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMemberImpl.java similarity index 88% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMemberImpl.java index 19c0d275d8c..98ec01b2858 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMemberImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMember; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.Visibility; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; +import org.jetbrains.kotlin.load.java.structure.JavaClass; +import org.jetbrains.kotlin.load.java.structure.JavaMember; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMethodImpl.java similarity index 76% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMethodImpl.java index 092b49f3797..f3298b2e712 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaMethodImpl.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,23 +14,23 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiAnnotationMethod; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; -import org.jetbrains.jet.lang.resolve.java.structure.JavaType; -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter; -import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter; +import org.jetbrains.kotlin.load.java.structure.JavaMethod; +import org.jetbrains.kotlin.load.java.structure.JavaType; +import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter; +import org.jetbrains.kotlin.load.java.structure.JavaValueParameter; import org.jetbrains.kotlin.name.Name; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.typeParameters; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.valueParameters; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.typeParameters; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.valueParameters; public class JavaMethodImpl extends JavaMemberImpl implements JavaMethod { public JavaMethodImpl(@NotNull PsiMethod psiMethod) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaModifierListOwnerImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaModifierListOwnerImpl.java similarity index 81% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaModifierListOwnerImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaModifierListOwnerImpl.java index dc5144312e3..9abb0ff130b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaModifierListOwnerImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaModifierListOwnerImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiModifierListOwner; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaModifierListOwner; +import org.jetbrains.kotlin.load.java.structure.JavaModifierListOwner; public interface JavaModifierListOwnerImpl extends JavaModifierListOwner { @NotNull diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPackageImpl.kt similarity index 75% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPackageImpl.kt index 501cdf1c7d2..584c1c3a0d0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPackageImpl.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,15 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl +package org.jetbrains.kotlin.load.java.structure.impl import com.intellij.psi.PsiPackage -import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage +import org.jetbrains.kotlin.load.java.structure.JavaPackage import org.jetbrains.kotlin.name.FqName - -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes +import org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages +import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.name.Name import com.intellij.psi.search.GlobalSearchScope diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPrimitiveTypeImpl.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPrimitiveTypeImpl.java index 184de1fde16..5cfe4014402 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPrimitiveTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPrimitiveTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiPrimitiveType; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaPrimitiveType; +import org.jetbrains.kotlin.load.java.structure.JavaPrimitiveType; public class JavaPrimitiveTypeImpl extends JavaTypeImpl implements JavaPrimitiveType { public JavaPrimitiveTypeImpl(@NotNull PsiPrimitiveType psiPrimitiveType) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java index 1e2fc47be85..e335696b90c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.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.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiExpression; import com.intellij.psi.impl.JavaConstantExpressionEvaluator; @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.ConstantsPackage; -import org.jetbrains.jet.lang.resolve.java.structure.JavaField; -import org.jetbrains.jet.lang.resolve.java.structure.JavaPropertyInitializerEvaluator; +import org.jetbrains.kotlin.load.java.structure.JavaField; +import org.jetbrains.kotlin.load.java.structure.JavaPropertyInitializerEvaluator; public class JavaPropertyInitializerEvaluatorImpl implements JavaPropertyInitializerEvaluator { @Nullable diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeImpl.java similarity index 92% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeImpl.java index d859abdba9c..1b55598c529 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeImpl.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.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType; -import org.jetbrains.jet.lang.resolve.java.structure.JavaType; +import org.jetbrains.kotlin.load.java.structure.JavaArrayType; +import org.jetbrains.kotlin.load.java.structure.JavaType; public abstract class JavaTypeImpl implements JavaType { private final Psi psiType; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeParameterImpl.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeParameterImpl.java index 51c9f6fb1cc..bd89ad13ce3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeParameterImpl.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,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.Name; import java.util.Collection; -import static org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classifierTypes; +import static org.jetbrains.kotlin.load.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classifierTypes; public class JavaTypeParameterImpl extends JavaClassifierImpl implements JavaTypeParameter { public JavaTypeParameterImpl(@NotNull PsiTypeParameter psiTypeParameter) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeProviderImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeProviderImpl.java similarity index 85% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeProviderImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeProviderImpl.java index 6c45f61f0ad..80bd9685e83 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeProviderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeProviderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiManager; import com.intellij.psi.PsiType; import com.intellij.psi.PsiWildcardType; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.structure.JavaType; -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeProvider; -import org.jetbrains.jet.lang.resolve.java.structure.JavaWildcardType; +import org.jetbrains.kotlin.load.java.structure.JavaType; +import org.jetbrains.kotlin.load.java.structure.JavaTypeProvider; +import org.jetbrains.kotlin.load.java.structure.JavaWildcardType; public class JavaTypeProviderImpl implements JavaTypeProvider { private final PsiManager manager; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeSubstitutorImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeSubstitutorImpl.java similarity index 96% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeSubstitutorImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeSubstitutorImpl.java index 146d79a5e86..eb2c3ce8714 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeSubstitutorImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaTypeSubstitutorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.structure.*; import java.util.Collection; import java.util.HashMap; @@ -40,7 +40,7 @@ public class JavaTypeSubstitutorImpl implements JavaTypeSubstitutor { } @NotNull - // In case of raw type we get substition map like T -> null, + // In case of raw type we get substitution map like T -> null, // in this case we should substitute upper bound of T or, // if it does not exist, return java.lang.Object private JavaType correctSubstitutionForRawType(@NotNull JavaType original) { @@ -182,4 +182,4 @@ public class JavaTypeSubstitutorImpl implements JavaTypeSubstitutor { public String toString() { return getClass().getSimpleName() + ": " + substitutionMap; } -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaValueParameterImpl.java similarity index 86% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaValueParameterImpl.java index c451772b7f5..d54774cbed4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaValueParameterImpl.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.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiParameter; import com.intellij.psi.impl.compiled.ClsParameterImpl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; -import org.jetbrains.jet.lang.resolve.java.structure.JavaType; -import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; +import org.jetbrains.kotlin.load.java.structure.JavaType; +import org.jetbrains.kotlin.load.java.structure.JavaValueParameter; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaWildcardTypeImpl.java similarity index 81% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaWildcardTypeImpl.java index 76ddea9ca01..2436cb94a6d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaWildcardTypeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaWildcardTypeImpl.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.lang.resolve.java.structure.impl; +package org.jetbrains.kotlin.load.java.structure.impl; import com.intellij.psi.PsiType; import com.intellij.psi.PsiWildcardType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaType; -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeProvider; -import org.jetbrains.jet.lang.resolve.java.structure.JavaWildcardType; +import org.jetbrains.kotlin.load.java.structure.JavaType; +import org.jetbrains.kotlin.load.java.structure.JavaTypeProvider; +import org.jetbrains.kotlin.load.java.structure.JavaWildcardType; public class JavaWildcardTypeImpl extends JavaTypeImpl implements JavaWildcardType { public JavaWildcardTypeImpl(@NotNull PsiWildcardType psiWildcardType) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/annotationArgumentsImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt similarity index 95% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/annotationArgumentsImpl.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.kt index af06543717a..9162925e792 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/annotationArgumentsImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/annotationArgumentsImpl.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.structure.impl +package org.jetbrains.kotlin.load.java.structure.impl import com.intellij.psi.* -import org.jetbrains.jet.lang.resolve.java.structure.* +import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.name.Name abstract class JavaAnnotationArgumentImpl( diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/FileBasedKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/FileBasedKotlinClass.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.java index 06577b4dc28..515c37ed96e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/FileBasedKotlinClass.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/FileBasedKotlinClass.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.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import com.intellij.openapi.util.Ref; import kotlin.Function3; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; -import org.jetbrains.jet.lang.resolve.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader; +import org.jetbrains.kotlin.load.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt similarity index 96% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt index 3c66216f571..309baef2377 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.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.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider import org.jetbrains.jet.lang.resolve.AnnotationChecker @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.resolve.annotations.hasPlatformStaticAnnotation import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm +import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.diagnostics.DiagnosticSink @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetTypeParameter import org.jetbrains.jet.lang.resolve.annotations.hasIntrinsicAnnotation -import org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations.NativeFunChecker +import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeFunChecker import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.kotlin.descriptors.MemberDescriptor diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinBinaryClassCache.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinBinaryClassCache.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinBinaryClassCache.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinBinaryClassCache.java index 7d95255e7fe..72cf47e91d4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinBinaryClassCache.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinBinaryClassCache.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.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import com.intellij.ide.highlighter.JavaClassFileType; import com.intellij.openapi.Disposable; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.java index 0608a8e1bdf..afc9f481487 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/PackagePartClassUtils.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.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; @@ -22,22 +22,22 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.PathUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; -import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetProperty; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.org.objectweb.asm.Type; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName; +import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName; public class PackagePartClassUtils { public static int getPathHashCode(@NotNull VirtualFile file) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinder.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinder.java index d94f661eb3b..fbe0b664a77 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinder.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.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinderFactory.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinderFactory.java similarity index 92% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinderFactory.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinderFactory.java index 45d8912127a..93713a60a16 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinderFactory.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileFinderFactory.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.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.kt index 235718eeeb0..e65fc51777e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClass.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin import com.intellij.ide.highlighter.JavaClassFileType import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader 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/kotlin/load/kotlin/VirtualFileKotlinClassFinder.kt similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClassFinder.kt index 8b4f0c34d73..37ac419c3e3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/VirtualFileKotlinClassFinder.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl +import org.jetbrains.kotlin.load.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.name.ClassId diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalCacheUtil.kt similarity index 84% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalCacheUtil.kt index 16b077cff89..6cdbec20c73 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalCacheUtil.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin.incremental +package org.jetbrains.kotlin.load.kotlin.incremental -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.lang.resolve.java.JvmClassName +import org.jetbrains.kotlin.resolve.jvm.JvmClassName import java.util.HashMap import java.io.File -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils public fun IncrementalCache.getPackagesWithRemovedFiles(sourceFilesToCompile: Collection): Collection { return getRemovedPackageParts(sourceFilesToCompile).map { it.getPackageFqName() } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt similarity index 93% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt index c17772c90fe..df77fada476 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.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.lang.resolve.kotlin.incremental +package org.jetbrains.kotlin.load.kotlin.incremental import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor @@ -29,12 +29,12 @@ import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope import org.jetbrains.kotlin.serialization.* import org.jetbrains.kotlin.serialization.jvm.* -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.jetbrains.kotlin.storage.NotNullLazyValue -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils -import org.jetbrains.jet.lang.resolve.java.JvmClassName -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils +import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/cache/IncrementalCache.kt similarity index 77% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/cache/IncrementalCache.kt index c3c2c2698f4..89ee2c482ce 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/cache/IncrementalCache.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,8 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin.incremental.cache +package org.jetbrains.kotlin.load.kotlin.incremental.cache -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.lang.resolve.java.JvmClassName -import org.jetbrains.kotlin.psi.JetFile -import java.util.HashMap import java.io.File public trait IncrementalCache { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCacheProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/cache/IncrementalCacheProvider.kt similarity index 86% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCacheProvider.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/cache/IncrementalCacheProvider.kt index 9da8b4d2e54..24d516bfa87 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCacheProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/cache/IncrementalCacheProvider.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,8 +14,8 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin.incremental.cache +package org.jetbrains.kotlin.load.kotlin.incremental.cache public trait IncrementalCacheProvider { public fun getIncrementalCache(moduleId: String): IncrementalCache -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt index 044f1f1d721..92a6325b377 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.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.lang.resolve.kotlin.nativeDeclarations +package org.jetbrains.kotlin.load.kotlin.nativeDeclarations import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality -import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm +import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.lang.resolve.annotations.hasInlineAnnotation import org.jetbrains.jet.lang.resolve.diagnostics.SuppressDiagnosticsByAnnotations diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypes.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/AsmTypes.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypes.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/AsmTypes.java index d136b095749..ec84171e480 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/AsmTypes.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/AsmTypes.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.lang.resolve.java; +package org.jetbrains.kotlin.resolve.jvm; import org.jetbrains.annotations.NotNull; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaPsiFacadeImpl.java similarity index 99% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeImpl.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaPsiFacadeImpl.java index 160367d649a..aba7c499011 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPsiFacadeImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaPsiFacadeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-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.lang.resolve.java; +package org.jetbrains.kotlin.resolve.jvm; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ReadActionProcessor; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaResolverUtils.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaResolverUtils.java index 0d658b58b92..5daaa7dd5c5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JavaResolverUtils.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.lang.resolve.java; +package org.jetbrains.kotlin.resolve.jvm; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.SourceElement; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.types.TypeConstructor; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.TypeProjectionImpl; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt index d0c9822656f..aee4d282704 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.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.lang.resolve.java +package org.jetbrains.kotlin.resolve.jvm import org.jetbrains.jet.analyzer.AnalyzerFacade import org.jetbrains.jet.analyzer.ResolverForModule @@ -26,8 +26,8 @@ import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFacto import com.intellij.openapi.project.Project import org.jetbrains.jet.context.GlobalContext import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.java.lazy.ModuleClassResolverImpl +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 diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/KotlinFinderMarker.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinFinderMarker.java similarity index 87% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/KotlinFinderMarker.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinFinderMarker.java index ccf169e5aaf..ed554e9d9ad 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/KotlinFinderMarker.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinFinderMarker.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.lang.resolve.java; +package org.jetbrains.kotlin.resolve.jvm; public interface KotlinFinderMarker { } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/KotlinJavaPsiFacade.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/KotlinJavaPsiFacade.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.java index 077104719c4..f7c072584c8 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/KotlinJavaPsiFacade.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/KotlinJavaPsiFacade.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.lang.resolve.java; +package org.jetbrains.kotlin.resolve.jvm; import com.intellij.core.CoreJavaFileManager; import com.intellij.openapi.components.ServiceManager; @@ -70,7 +70,7 @@ public class KotlinJavaPsiFacade { public Boolean invoke(PsiElementFinder finder) { if (finder instanceof KotlinFinderMarker) return false; - if (finder.getClass().getName().equals("org.jetbrains.jet.lang.resolve.java.JavaPsiFacadeImpl$PsiElementFinderImpl")) { + if (finder.getClass().getName().equals("org.jetbrains.kotlin.resolve.jvm.JavaPsiFacadeImpl$PsiElementFinderImpl")) { // TODO: Replace with instanceof check in idea 14 return false; } @@ -189,4 +189,4 @@ public class KotlinJavaPsiFacade { } } } -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java index a9df884670d..7adda7ee707 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.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.lang.resolve.java; +package org.jetbrains.kotlin.resolve.jvm; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; @@ -32,9 +32,9 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; +import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache; +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ConflictingJvmDeclarationsData.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/ConflictingJvmDeclarationsData.kt similarity index 82% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ConflictingJvmDeclarationsData.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/ConflictingJvmDeclarationsData.kt index d5bfd5cfcda..5d1a30368c4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ConflictingJvmDeclarationsData.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/ConflictingJvmDeclarationsData.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,13 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.diagnostics - -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin +package org.jetbrains.kotlin.resolve.jvm.diagnostics public class ConflictingJvmDeclarationsData( public val classInternalName: String?, public val classOrigin: JvmDeclarationOrigin, public val signature: RawSignature, public val signatureOrigins: Collection -) \ No newline at end of file +) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java similarity index 97% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java index 7ec419a5f25..97a09d54a03 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.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.lang.resolve.java.diagnostics; +package org.jetbrains.kotlin.resolve.jvm.diagnostics; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/ErrorsJvm.java similarity index 96% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/ErrorsJvm.java index 84e6616f0b3..631fc04c936 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/ErrorsJvm.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.lang.resolve.java.diagnostics; +package org.jetbrains.kotlin.resolve.jvm.diagnostics; import com.intellij.psi.PsiElement; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt similarity index 91% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.kt index 848c532e122..af874c7cded 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/JvmDeclarationOrigin.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.lang.resolve.java.diagnostics +package org.jetbrains.kotlin.resolve.jvm.diagnostics import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor @@ -22,12 +22,11 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.psi.JetClassOrObject -import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOriginKind.* +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind.* import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -public enum class MemberKind { FIELD; METHOD } +public enum class MemberKind { FIELD METHOD } public data class RawSignature(public val name: String, public val desc: String, public val kind: MemberKind) diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmClassSignature.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmClassSignature.java similarity index 93% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmClassSignature.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmClassSignature.java index 36b4ba0efc6..0a8286338a3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmClassSignature.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmClassSignature.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.lang.resolve.java.jvmSignature; +package org.jetbrains.kotlin.resolve.jvm.jvmSignature; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodParameterKind.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodParameterKind.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodParameterKind.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodParameterKind.java index 530b9302109..e0874b33468 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodParameterKind.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodParameterKind.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.lang.resolve.java.jvmSignature; +package org.jetbrains.kotlin.resolve.jvm.jvmSignature; public enum JvmMethodParameterKind { VALUE, diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodParameterSignature.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodParameterSignature.java similarity index 94% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodParameterSignature.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodParameterSignature.java index d1f610b3c29..b76ba43431e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodParameterSignature.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodParameterSignature.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.lang.resolve.java.jvmSignature; +package org.jetbrains.kotlin.resolve.jvm.jvmSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodSignature.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodSignature.java similarity index 96% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodSignature.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodSignature.java index 38adb807d32..2a7afbed5f7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/JvmMethodSignature.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/JvmMethodSignature.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.lang.resolve.java.jvmSignature; +package org.jetbrains.kotlin.resolve.jvm.jvmSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/KotlinToJvmSignatureMapper.kt similarity index 92% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/KotlinToJvmSignatureMapper.kt index a311c9158f7..504b5c66aa9 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/jvmSignature/KotlinToJvmSignatureMapper.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.lang.resolve.java.jvmSignature +package org.jetbrains.kotlin.resolve.jvm.jvmSignature import org.jetbrains.kotlin.descriptors.FunctionDescriptor diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java similarity index 93% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java index 49c6ceafe8b..6cb2577c61d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import com.intellij.openapi.project.Project; import com.intellij.util.containers.ComparatorUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.load.java.components.ExternalAnnotationResolver; +import org.jetbrains.kotlin.load.java.structure.JavaField; import org.jetbrains.kotlin.psi.JetProperty; -import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.structure.JavaField; import org.jetbrains.kotlin.types.JetType; import java.util.HashMap; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.java similarity index 96% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.java index 99a8314b640..f9f9776dcaa 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.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.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiNamedElement; @@ -22,29 +22,29 @@ import com.intellij.util.containers.ComparatorUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.SourceElement; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.java.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; -import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; +import org.jetbrains.kotlin.load.java.components.ExternalAnnotationResolver; +import org.jetbrains.kotlin.load.java.structure.JavaMember; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; +import static org.jetbrains.kotlin.load.java.components.TypeUsage.MEMBER_SIGNATURE_CONTRAVARIANT; +import static org.jetbrains.kotlin.load.java.components.TypeUsage.UPPER_BOUND; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.MEMBER_SIGNATURE_CONTRAVARIANT; -import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.UPPER_BOUND; public class AlternativeMethodSignatureData extends ElementAlternativeSignatureData { private final JetNamedFunction altFunDeclaration; @@ -120,7 +120,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD @NotNull List methodTypeParameters, @Nullable JetType returnType ) { - if (JavaPackage.getPLATFORM_TYPES()) return; + if (JvmPackage.getPLATFORM_TYPES()) return; TypeSubstitutor substitutor = JavaResolverUtils.createSubstitutorForTypeParameters(originalToAltTypeParameters); for (ValueParameterDescriptor parameter : valueParameters) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeSignatureMismatchException.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeSignatureMismatchException.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeSignatureMismatchException.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeSignatureMismatchException.java index d0a54171409..826dade07f1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeSignatureMismatchException.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeSignatureMismatchException.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.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; class AlternativeSignatureMismatchException extends RuntimeException { AlternativeSignatureMismatchException(String format, Object... params) { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/CollectionClassMapping.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.java similarity index 96% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/CollectionClassMapping.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.java index 3c6bb9730cf..bd3cc888f20 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/CollectionClassMapping.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/CollectionClassMapping.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.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import com.google.common.collect.ImmutableBiMap; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/ElementAlternativeSignatureData.java similarity index 95% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/ElementAlternativeSignatureData.java index d2376fe5563..0e4e14a3228 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/ElementAlternativeSignatureData.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.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiErrorElement; @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.MEMBER_SIGNATURE_COVARIANT; +import static org.jetbrains.kotlin.load.java.components.TypeUsage.MEMBER_SIGNATURE_COVARIANT; public abstract class ElementAlternativeSignatureData { private String error; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java similarity index 98% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java index 7d6be90c615..091c9f4dd38 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.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.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import com.google.common.collect.Lists; import com.intellij.openapi.util.Condition; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java similarity index 96% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java index e553a0fc1c2..486fabf1a1d 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.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.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; @@ -30,14 +30,14 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.JavaPackage; -import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaMethodDescriptor; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmSignaturePackage; -import org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper; -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; +import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; +import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmSignaturePackage; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper; +import org.jetbrains.kotlin.load.java.components.TypeUsage; +import org.jetbrains.kotlin.load.java.structure.JavaMethod; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -48,9 +48,8 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; -import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.*; +import static org.jetbrains.kotlin.load.java.components.TypeUsage.*; import static org.jetbrains.kotlin.types.Variance.INVARIANT; -import static org.jetbrains.kotlin.types.Variance.OUT_VARIANCE; public class SignaturesPropagationData { @@ -154,7 +153,7 @@ public class SignaturesPropagationData { private JetType modifyReturnTypeAccordingToSuperMethods( @NotNull JetType autoType // type built by JavaTypeTransformer ) { - if (JavaPackage.getPLATFORM_TYPES()) return autoType; + if (JvmPackage.getPLATFORM_TYPES()) return autoType; List typesFromSuperMethods = ContainerUtil.map(superFunctions, new Function() { @@ -168,7 +167,7 @@ public class SignaturesPropagationData { } private List modifyTypeParametersAccordingToSuperMethods(List autoTypeParameters) { - if (JavaPackage.getPLATFORM_TYPES()) return autoTypeParameters; + if (JvmPackage.getPLATFORM_TYPES()) return autoTypeParameters; List result = Lists.newArrayList(); @@ -391,7 +390,7 @@ public class SignaturesPropagationData { ) { if (autoType.isError()) return autoType; - if (JavaPackage.getPLATFORM_TYPES()) return autoType; + if (JvmPackage.getPLATFORM_TYPES()) return autoType; boolean resultNullable = typeMustBeNullable(autoType, typesFromSuper, howThisTypeIsUsed); ClassifierDescriptor resultClassifier = modifyTypeClassifier(autoType, typesFromSuper); @@ -664,7 +663,6 @@ public class SignaturesPropagationData { } private static boolean isArrayType(@NotNull JetType type) { - KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance(); return KotlinBuiltIns.isArray(type) || KotlinBuiltIns.isPrimitiveArray(type); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesUtil.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesUtil.java similarity index 88% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesUtil.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesUtil.java index a2576305c35..35309a79deb 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.components.ExternalAnnotationResolver; +import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.FqName; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.*; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.*; public class SignaturesUtil { private SignaturesUtil() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java similarity index 95% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java index db82ccd9d85..0f270143197 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.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.lang.resolve.java.kotlinSignature; +package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,10 +26,10 @@ import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.TypeResolver; -import org.jetbrains.jet.lang.resolve.java.JavaPackage; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; -import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap; -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; +import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; +import org.jetbrains.kotlin.load.java.components.TypeUsage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.*; @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; -import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.TYPE_ARGUMENT; +import static org.jetbrains.kotlin.load.java.components.TypeUsage.TYPE_ARGUMENT; import static org.jetbrains.kotlin.types.Variance.INVARIANT; public class TypeTransformingVisitor extends JetVisitor { @@ -134,7 +134,7 @@ public class TypeTransformingVisitor extends JetVisitor { List arguments = originalType.getArguments(); if (arguments.size() != type.getTypeArgumentsAsTypes().size()) { - if (JavaPackage.getPLATFORM_TYPES()) return originalType; + if (JvmPackage.getPLATFORM_TYPES()) return originalType; throw new AlternativeSignatureMismatchException("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them", DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(originalType), arguments.size(), type.getText(), @@ -188,7 +188,7 @@ public class TypeTransformingVisitor extends JetVisitor { if (type instanceof JetUserType) { JetTypeProjection typeProjection = ((JetUserType) type).getTypeArguments().get(i); altProjectionKind = TypeResolver.resolveProjectionKind(typeProjection.getProjectionKind()); - if (altProjectionKind != projectionKind && projectionKind != Variance.INVARIANT && !JavaPackage.getPLATFORM_TYPES()) { + if (altProjectionKind != projectionKind && projectionKind != Variance.INVARIANT && !JvmPackage.getPLATFORM_TYPES()) { throw new AlternativeSignatureMismatchException("Projection kind mismatch, actual: %s, in alternative signature: %s", projectionKind, altProjectionKind); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java similarity index 92% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java index 6d457f53afb..50ba9491965 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.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.lang.resolve.java.mapping; +package org.jetbrains.kotlin.resolve.jvm.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.AsmTypes; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; @@ -32,7 +32,7 @@ import org.jetbrains.org.objectweb.asm.Type; import java.util.HashMap; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.java.mapping.PrimitiveTypesUtil.asmTypeForPrimitive; +import static org.jetbrains.kotlin.resolve.jvm.types.PrimitiveTypesUtil.asmTypeForPrimitive; public class KotlinToJavaTypesMap extends JavaToKotlinClassMapBuilder { private static KotlinToJavaTypesMap instance = null; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/PrimitiveTypesUtil.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/PrimitiveTypesUtil.java similarity index 89% rename from compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/PrimitiveTypesUtil.java rename to compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/PrimitiveTypesUtil.java index a1645a215cf..1083692417e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/PrimitiveTypesUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/PrimitiveTypesUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.mapping; +package org.jetbrains.kotlin.resolve.jvm.types; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.org.objectweb.asm.Type; -import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; import static org.jetbrains.org.objectweb.asm.Type.*; 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 bb0cc810b34..0825ee72f56 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java @@ -26,7 +26,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java index 6935468fc04..15516d3b1a4 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java @@ -32,13 +32,13 @@ import com.intellij.util.SmartList; import com.intellij.util.containers.SLRUCache; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.NamePackage; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetEnumEntry; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.java.KotlinFinderMarker; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.NamePackage; +import org.jetbrains.kotlin.resolve.jvm.KotlinFinderMarker; import java.util.Collection; import java.util.List; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java index 240dbe952a1..cf8561d5085 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -55,7 +55,7 @@ import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java index 5183e214f2f..acf345e112a 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassBuilderFactory.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ClassBuilder; import org.jetbrains.kotlin.codegen.ClassBuilderFactory; import org.jetbrains.kotlin.codegen.ClassBuilderMode; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; /*package*/ class KotlinLightClassBuilderFactory implements ClassBuilderFactory { private final Stack stubStack; 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 8f3c57a2676..9d0e59bde10 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -47,8 +47,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.types.JetType; 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 0cacdc8c018..d1973cc5540 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java @@ -36,8 +36,7 @@ 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.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java index 163db49dd9e..58fc38159b8 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java @@ -37,11 +37,11 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.utils.KotlinVfsUtil; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java index 08d5274fef1..cea2ce03d77 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java @@ -25,10 +25,10 @@ import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AbstractClassBuilder; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.FieldVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt index 59972b59f5b..0150c20c9ae 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt @@ -24,9 +24,9 @@ import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.kotlin.diagnostics.Diagnostic -import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm.* -import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOriginKind.* +import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.* +import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKind.* import org.jetbrains.kotlin.diagnostics.Errors.* import org.jetbrains.kotlin.diagnostics.DiagnosticFactory.* import org.jetbrains.kotlin.psi.JetParameter diff --git a/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java b/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java index 4545f256529..dc9ab63948d 100644 --- a/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java +++ b/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.junit.Test; -import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassName; +import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassName; import static org.junit.Assert.assertEquals; public class PackageClassNameTest { diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index aa77bc72201..15ae77853f4 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt index b3cf2ed24d2..d7d516d83e7 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt @@ -21,11 +21,11 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.descriptors.Named import java.util.IdentityHashMap import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaTypeImpl -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl +import org.jetbrains.kotlin.load.java.structure.impl.JavaTypeImpl +import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import java.util.ArrayList import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.jet.lang.resolve.java.structure.JavaNamedElement +import org.jetbrains.kotlin.load.java.structure.JavaNamedElement import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index aa37008b807..dba16788a8e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.codegen.InlineTestUtil; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 4882cb49b93..e7ef5ac94f0 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index 8f2cce6e123..7dd8d01cf4c 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -27,8 +27,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.ResolvePackage; -import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; -import org.jetbrains.jet.lang.resolve.java.kotlinSignature.TypeTransformingVisitor; +import org.jetbrains.kotlin.load.java.JavaBindingContext; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.TypeTransformingVisitor; import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java index bdc5badfd7c..a58b6ec027a 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java @@ -21,7 +21,7 @@ import junit.framework.TestCase; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.common.ExitCode; import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java index 831be4da4c5..bd1acd8092e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; +import org.jetbrains.kotlin.load.java.JavaBindingContext; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java index 74cbc37ff3b..3a7e74270d7 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java @@ -28,7 +28,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.lang.resolve.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.compiler.CoreExternalAnnotationsManager; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt index e331928a223..6f20399d37d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt @@ -22,10 +22,10 @@ import java.io.File import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.ConfigurationKind import org.jetbrains.jet.TestJdkKind -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import com.intellij.psi.JavaPsiFacade import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl +import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import kotlin.test.assertEquals import kotlin.test.assertNotNull import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 3aaa3469647..2ec75efc5ae 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.jvm.compiler -import org.jetbrains.jet.lang.resolve.java.JvmAnalyzerFacade +import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.JetTestUtils import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters +import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.kotlin.psi.JetFile import java.io.File import com.intellij.psi.search.GlobalSearchScope @@ -34,7 +34,7 @@ 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.jet.lang.resolve.java.JvmResolverForModule +import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModule import org.jetbrains.jet.analyzer.ResolverForProject import org.jetbrains.jet.analyzer.ModuleInfo import java.util.HashMap diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java index 2e43616c2c1..46e94b7f360 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index b210b68aa7a..14680b6c968 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; +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; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt index 01bfa0db38a..774073af4d0 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt @@ -20,10 +20,10 @@ 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.jet.lang.resolve.java.JvmAnalyzerFacade +import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.jet.analyzer.ModuleInfo import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters +import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.jet.analyzer.ModuleContent public fun createResolveSessionForFiles( diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java index fffe701c02f..9871b6c1d45 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java @@ -25,8 +25,8 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; +import org.jetbrains.kotlin.load.java.structure.JavaClass; +import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index 91ac41a4886..0f5903da238 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java @@ -23,7 +23,7 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.jet.test.Tmpdir; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.cli.common.CLICompiler; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java index 1a89a67884a..1c690533b38 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cli; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java index fdff92d811a..8e7c4f1297a 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.cli.jvm; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.CliBaseTest; import org.junit.Assert; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index 452183cf362..8dfb0c7c68e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java index 1d370b4a649..2df47bfc4f9 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import java.lang.annotation.*; import java.lang.reflect.*; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java index e6a1c4624e9..47181e41611 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import java.lang.reflect.Field; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 0752d0f98ef..4eb1010d3fe 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; @@ -51,7 +51,7 @@ import java.net.URL; import java.util.List; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*; -import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName; +import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName; public abstract class CodegenTestCase extends UsefulTestCase { protected JetCoreEnvironment myEnvironment; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index 78abdf1069c..df4a27eaa57 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +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; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java index 194cac2270a..322a29e83a3 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.codegen; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.org.objectweb.asm.*; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java index 0a002fcef75..64ac3942f6c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.org.objectweb.asm.ClassReader; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java index ffe2f829bf3..a0d0a17cc6b 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.serialization.ClassData; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java index 19528714003..4f478c78e0e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; import org.jetbrains.kotlin.serialization.deserialization.NameResolver; import org.jetbrains.kotlin.serialization.PackageData; import org.jetbrains.kotlin.serialization.ProtoBuf; -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import java.lang.annotation.Annotation; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java index e645c6b5b77..659cd7b332f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java @@ -20,8 +20,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.AbiVersionUtil; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; @@ -29,9 +29,9 @@ import java.lang.annotation.Annotation; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.ABI_VERSION_FIELD_NAME; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.*; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.ABI_VERSION_FIELD_NAME; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass.Kind.*; public class KotlinSyntheticClassAnnotationTest extends CodegenTestCase { public static final FqName PACKAGE_NAME = new FqName("test"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java index 866043ba9d4..3d60b95bd63 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.org.objectweb.asm.Opcodes; import java.lang.reflect.*; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java index 2eceee5de92..b21718766ac 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.backend.common.output.OutputFile; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java index 11130fa6724..92f376242e4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -42,7 +42,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.compileJava; -import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassFqName; +import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName; public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { public void doTest(@NotNull String filename) { diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index 7f1b45fa187..ee287f48b7d 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; -import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index 9d8e18b2019..126f075d808 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -27,12 +27,12 @@ import org.jetbrains.jet.ConfigurationKind import com.intellij.testFramework.UsefulTestCase import java.io.File import org.jetbrains.jet.lang.resolve.lazy.ResolveSession -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM import org.jetbrains.jet.context.GlobalContext import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport -import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider +import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/AbiVersionUtil.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AbiVersionUtil.java similarity index 90% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/AbiVersionUtil.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AbiVersionUtil.java index dea8acc2a17..8ffb8e1b74f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/AbiVersionUtil.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/AbiVersionUtil.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.lang.resolve.java; +package org.jetbrains.kotlin.load.java; public final class AbiVersionUtil { public static final int INVALID_VERSION = -1; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java similarity index 80% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java index 07f3ee83a25..29a06b68430 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaClassFinder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java; +package org.jetbrains.kotlin.load.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage; +import org.jetbrains.kotlin.load.java.structure.JavaClass; +import org.jetbrains.kotlin.load.java.structure.JavaPackage; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java similarity index 98% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java index 8479ec7d15f..46e75b97004 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.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.lang.resolve.java; +package org.jetbrains.kotlin.load.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java similarity index 97% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java index 04f1d7d0376..87be3fafecf 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.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.lang.resolve.java; +package org.jetbrains.kotlin.load.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java similarity index 97% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java index 18fd217a674..fdd7d999cf9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.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.lang.resolve.java; +package org.jetbrains.kotlin.load.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import java.util.Arrays; import java.util.HashSet; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java similarity index 96% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java index fcfb1bc7df0..55e3e6f382a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.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.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import kotlin.Function1; import kotlin.Unit; @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.resolve.OverridingUtil; -import org.jetbrains.jet.lang.resolve.java.structure.*; +import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ErrorReporter.java similarity index 86% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ErrorReporter.java index c1150581858..faab00ecdd1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ErrorReporter.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; public interface ErrorReporter { void reportIncompatibleAbiVersion(@NotNull KotlinJvmBinaryClass kotlinClass, int actualVersion); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java similarity index 80% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java index 562afa16f8e..124f0a8e572 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalAnnotationResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotation; +import org.jetbrains.kotlin.load.java.structure.JavaAnnotationOwner; import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalSignatureResolver.java similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalSignatureResolver.java index 384d071cfcc..afdb5df5462 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/ExternalSignatureResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.java.structure.JavaField; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; +import org.jetbrains.kotlin.load.java.structure.JavaField; +import org.jetbrains.kotlin.load.java.structure.JavaMember; +import org.jetbrains.kotlin.load.java.structure.JavaMethod; import org.jetbrains.kotlin.types.JetType; import java.util.Collections; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaResolverCache.java similarity index 80% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaResolverCache.java index bedf6d6e161..3b825a6f16b 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/JavaResolverCache.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.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -22,10 +22,10 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.java.structure.JavaElement; -import org.jetbrains.jet.lang.resolve.java.structure.JavaField; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; +import org.jetbrains.kotlin.load.java.structure.JavaClass; +import org.jetbrains.kotlin.load.java.structure.JavaElement; +import org.jetbrains.kotlin.load.java.structure.JavaField; +import org.jetbrains.kotlin.load.java.structure.JavaMethod; import org.jetbrains.kotlin.name.FqName; public interface JavaResolverCache { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/MethodSignatureChecker.java similarity index 87% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/MethodSignatureChecker.java index a9f9ebcd872..3acd769be06 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/MethodSignatureChecker.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; +import org.jetbrains.kotlin.load.java.structure.JavaMethod; import java.util.List; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/SamConversionResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt similarity index 78% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/SamConversionResolver.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt index 0d7f0407928..ce413cfabcd 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/SamConversionResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.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,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.resolver +package org.jetbrains.kotlin.load.java.components import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor -import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor +import org.jetbrains.kotlin.load.java.structure.JavaMethod +import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor +import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor public trait SamConversionResolver { public fun resolveSamConstructor(name: Name, scope: JetScope): SamConstructorDescriptor? diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeUsage.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java similarity index 91% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeUsage.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.java index 91559f8e58c..cac8bd962f5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TypeUsage.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/TypeUsage.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.lang.resolve.java.resolver; +package org.jetbrains.kotlin.load.java.components; /** * We convert Java types differently, depending on where they occur in the Java code diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaCallableMemberDescriptor.java similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaCallableMemberDescriptor.java index 9e67d93a964..83381073306 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaCallableMemberDescriptor.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.lang.resolve.java.descriptor; +package org.jetbrains.kotlin.load.java.descriptors; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaClassDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassDescriptor.java similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaClassDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassDescriptor.java index 2e35bf21039..47906d20c2a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaClassDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaClassDescriptor.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.lang.resolve.java.descriptor; +package org.jetbrains.kotlin.load.java.descriptors; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ClassDescriptor; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaConstructorDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaConstructorDescriptor.java similarity index 97% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaConstructorDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaConstructorDescriptor.java index 172ee2b824c..c6b977de6e2 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaConstructorDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaConstructorDescriptor.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.lang.resolve.java.descriptor; +package org.jetbrains.kotlin.load.java.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java similarity index 97% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.java index b7df91fd394..92bb1269271 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaMethodDescriptor.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.lang.resolve.java.descriptor; +package org.jetbrains.kotlin.load.java.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.java index 2d75e3897a4..0fff0babcb1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaPropertyDescriptor.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.lang.resolve.java.descriptor; +package org.jetbrains.kotlin.load.java.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamAdapterDescriptor.java similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamAdapterDescriptor.java index 7576a8bd38b..390f93f49b7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamAdapterDescriptor.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.lang.resolve.java.descriptor; +package org.jetbrains.kotlin.load.java.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt similarity index 93% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt index 39bb69d5dcb..bbb68bcc72d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.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.lang.resolve.java.descriptor +package org.jetbrains.kotlin.load.java.descriptors import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.kt index 6102ccef28e..2e9c442b9d9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/LazyJavaPackageFragmentProvider.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,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy +package org.jetbrains.kotlin.load.java.lazy import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.storage.MemoizedFunctionToNullable import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.* +import org.jetbrains.kotlin.load.java.lazy.descriptors.* import org.jetbrains.kotlin.descriptors.PackageFragmentProvider import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.emptyOrSingletonList diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/ModuleClassResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt similarity index 86% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/ModuleClassResolver.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.kt index 25b17f432c0..1552842fe7a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/ModuleClassResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/ModuleClassResolver.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy +package org.jetbrains.kotlin.load.java.lazy import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver +import org.jetbrains.kotlin.load.java.structure.JavaClass +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.descriptors.ClassDescriptor import kotlin.properties.Delegates import javax.inject.Inject diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/annotationUtils.kt similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/annotationUtils.kt index ba72f5f4beb..da8054d45bf 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/annotationUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy +package org.jetbrains.kotlin.load.java.lazy -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation -import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner +import org.jetbrains.kotlin.load.java.structure.JavaAnnotation +import org.jetbrains.kotlin.load.java.structure.JavaAnnotationOwner import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames -import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.resolveAnnotation +import org.jetbrains.kotlin.load.java.JvmAnnotationNames +import org.jetbrains.kotlin.load.java.lazy.descriptors.resolveAnnotation class LazyJavaAnnotations( c: LazyJavaResolverContext, diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt similarity index 79% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt index b2091dd8e6e..154e8d384aa 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/context.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy +package org.jetbrains.kotlin.load.java.lazy import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver +import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter -import org.jetbrains.jet.lang.resolve.java.JavaClassFinder -import org.jetbrains.jet.lang.resolve.java.resolver.* -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedDescriptorResolver -import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder -import org.jetbrains.jet.lang.resolve.java.structure.JavaPropertyInitializerEvaluator -import org.jetbrains.jet.lang.resolve.java.sources.JavaSourceElementFactory -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameterListOwner +import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter +import org.jetbrains.kotlin.load.java.JavaClassFinder +import org.jetbrains.kotlin.load.java.components.* +import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver +import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder +import org.jetbrains.kotlin.load.java.structure.JavaPropertyInitializerEvaluator +import org.jetbrains.kotlin.load.java.sources.JavaSourceElementFactory +import org.jetbrains.kotlin.load.java.structure.JavaTypeParameterListOwner open class GlobalJavaResolverContext( val storageManager: StorageManager, diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt index 9eb34d0999c..cdb46671048 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.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,29 +14,29 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.resolve.java.structure.* +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.jet.lang.resolve.constants.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.* -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames -import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage +import org.jetbrains.kotlin.load.java.JvmAnnotationNames.* +import org.jetbrains.kotlin.load.java.JvmAnnotationNames +import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils +import org.jetbrains.kotlin.load.java.components.TypeUsage import org.jetbrains.kotlin.utils.valuesToMap import org.jetbrains.kotlin.utils.keysToMapExceptNulls -import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes +import org.jetbrains.kotlin.load.java.lazy.types.toAttributes import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.jet.lang.resolve.resolveTopLevelClass -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName -import org.jetbrains.jet.lang.resolve.java.PLATFORM_TYPES +import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName +import org.jetbrains.kotlin.resolve.jvm.PLATFORM_TYPES private object DEPRECATED_IN_JAVA : JavaLiteralAnnotationArgument { override val name: Name? = null @@ -45,7 +45,7 @@ private object DEPRECATED_IN_JAVA : JavaLiteralAnnotationArgument { fun LazyJavaResolverContext.resolveAnnotation(annotation: JavaAnnotation): LazyJavaAnnotationDescriptor? { val classId = annotation.getClassId() - if (classId == null || JvmAnnotationNames.isSpecialAnnotation(classId, !PLATFORM_TYPES)) return null + if (classId == null || isSpecialAnnotation(classId, !PLATFORM_TYPES)) return null return LazyJavaAnnotationDescriptor(this, annotation) } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt similarity index 90% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt index 3cd6df0bf20..f9eb5620b22 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.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,24 +14,24 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorBase import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.TypeConstructor -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.resolve.java.lazy.child -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage -import org.jetbrains.jet.lang.resolve.java.lazy.resolveAnnotations -import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.lazy.child +import org.jetbrains.kotlin.load.java.components.TypeUsage +import org.jetbrains.kotlin.load.java.lazy.resolveAnnotations +import org.jetbrains.kotlin.load.java.lazy.types.toAttributes import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.utils.* -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor +import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.types.AbstractClassTypeConstructor diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt similarity index 95% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt index 0fd77669748..4495080fa80 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,26 +14,26 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.java.structure.* -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.structure.* +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage +import org.jetbrains.kotlin.load.java.components.TypeUsage import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl import java.util.Collections import org.jetbrains.kotlin.utils.* import java.util.ArrayList -import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes +import org.jetbrains.kotlin.load.java.lazy.types.toAttributes import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.resolve.java.JavaVisibilities -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaConstructorDescriptor -import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils +import org.jetbrains.kotlin.load.java.JavaVisibilities +import org.jetbrains.kotlin.load.java.descriptors.JavaConstructorDescriptor +import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt similarity index 93% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt index 9687e13d1ad..eaedf806e72 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.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,35 +14,35 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod -import org.jetbrains.jet.lang.resolve.java.structure.JavaField -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaMethodDescriptor +import org.jetbrains.kotlin.load.java.structure.JavaMethod +import org.jetbrains.kotlin.load.java.structure.JavaField +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.resolve.java.lazy.child +import org.jetbrains.kotlin.load.java.lazy.child import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl -import org.jetbrains.jet.lang.resolve.java.lazy.resolveAnnotations -import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage +import org.jetbrains.kotlin.load.java.lazy.resolveAnnotations +import org.jetbrains.kotlin.load.java.structure.JavaArrayType +import org.jetbrains.kotlin.load.java.components.TypeUsage import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.resolve.java.lazy.hasNotNullAnnotation -import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeAttributes -import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter +import org.jetbrains.kotlin.load.java.lazy.hasNotNullAnnotation +import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeAttributes +import org.jetbrains.kotlin.load.java.structure.JavaValueParameter import java.util.ArrayList import java.util.LinkedHashSet import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPropertyDescriptor +import org.jetbrains.kotlin.load.java.descriptors.JavaPropertyDescriptor import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl -import org.jetbrains.jet.lang.resolve.java.resolver.ExternalSignatureResolver +import org.jetbrains.kotlin.load.java.components.ExternalSignatureResolver import org.jetbrains.kotlin.utils.* -import org.jetbrains.jet.lang.resolve.java.PLATFORM_TYPES +import org.jetbrains.kotlin.resolve.jvm.PLATFORM_TYPES import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude.NonExtensions diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt similarity index 82% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.kt index 1df5942f8a4..19ad7448c61 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaPackageFragment.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.structure.JavaPackage import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl import kotlin.properties.Delegates diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticClassScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt similarity index 92% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticClassScope.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt index 3213aa968b0..b1bb02671b3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticClassScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.name.* -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.DescriptorFactory.* import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt index 2c63cd36561..618647440a9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.* -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.structure.JavaMethod import org.jetbrains.kotlin.types.JetType public abstract class LazyJavaStaticScope( diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt similarity index 82% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt index 3e3799deec7..e62e5bd856e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter +import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes +import org.jetbrains.kotlin.load.java.components.TypeUsage +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.lazy.types.toAttributes import org.jetbrains.kotlin.descriptors.SourceElement class LazyJavaTypeParameterDescriptor( diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt index c617c4b80a7..64d09e985fe 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.* -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.java.lazy.findClassInJava -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils +import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext +import org.jetbrains.kotlin.load.java.structure.JavaPackage +import org.jetbrains.kotlin.load.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.lazy.findClassInJava +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.utils.addIfNotNull -import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptorKindExclude +import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptorKindExclude import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter public class LazyPackageFragmentScopeForJavaPackage( diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/MemberIndex.kt similarity index 92% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/MemberIndex.kt index 909cf3fdcc9..ae4594cc6c4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/MemberIndex.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.descriptors +package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.java.structure.* -import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils +import org.jetbrains.kotlin.load.java.structure.* +import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils import org.jetbrains.kotlin.utils.valuesToMap import java.util.HashSet diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt similarity index 87% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt index 19d142de725..470a27cf674 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/resolvers.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy +package org.jetbrains.kotlin.load.java.lazy -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter -import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaTypeParameterDescriptor +import org.jetbrains.kotlin.load.java.structure.JavaTypeParameter +import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaTypeParameterDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameterListOwner +import org.jetbrains.kotlin.load.java.structure.JavaTypeParameterListOwner //TODO: (module refactoring) usages of this interface should be replaced by ModuleClassResolver trait LazyJavaClassResolver { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt similarity index 97% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt index 8a914614c26..ad6b5baee1e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,27 +14,27 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java.lazy.types +package org.jetbrains.kotlin.load.java.lazy.types -import org.jetbrains.jet.lang.resolve.java.structure.* +import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.* -import org.jetbrains.jet.lang.resolve.java.resolver.* +import org.jetbrains.kotlin.load.java.components.TypeUsage.* +import org.jetbrains.kotlin.load.java.components.* import org.jetbrains.kotlin.types.Variance.* import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.utils.sure import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.java.lazy.* +import org.jetbrains.kotlin.load.java.lazy.* import org.jetbrains.kotlin.storage.* import java.util.HashSet import org.jetbrains.kotlin.types.checker.JetTypeChecker -import org.jetbrains.jet.lang.resolve.java.PLATFORM_TYPES -import org.jetbrains.jet.lang.resolve.java.lazy.types.JavaTypeFlexibility.* +import org.jetbrains.kotlin.resolve.jvm.PLATFORM_TYPES +import org.jetbrains.kotlin.load.java.lazy.types.JavaTypeFlexibility.* import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames +import org.jetbrains.kotlin.load.java.JvmAnnotationNames import kotlin.platform.platformStatic class LazyJavaTypeResolver( diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sources/JavaSourceElementFactory.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/sources/JavaSourceElementFactory.kt similarity index 83% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sources/JavaSourceElementFactory.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/sources/JavaSourceElementFactory.kt index 1a419c7c29a..7a08d8c6b70 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sources/JavaSourceElementFactory.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/sources/JavaSourceElementFactory.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.lang.resolve.java.sources +package org.jetbrains.kotlin.load.java.sources -import org.jetbrains.jet.lang.resolve.java.structure.JavaElement +import org.jetbrains.kotlin.load.java.structure.JavaElement import org.jetbrains.kotlin.descriptors.SourceElement public trait JavaSourceElementFactory { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaAnnotation.java similarity index 91% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaAnnotation.java index a8cd8689568..a34475ef991 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaAnnotation.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaAnnotationOwner.java similarity index 90% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaAnnotationOwner.java index 37ece63402f..3c0e420d2ff 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaAnnotationOwner.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaArrayType.java similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaArrayType.java index 42b4ab16b79..81cbde92815 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaArrayType.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaArrayType.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClass.java similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClass.java index fdf128d4aef..746f41d5598 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClass.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClassifier.java similarity index 86% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClassifier.java index 9ad7255c9ba..cd261d31217 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifier.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClassifier.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; public interface JavaClassifier extends JavaNamedElement { } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClassifierType.java similarity index 91% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClassifierType.java index 8049f5d8c5d..90cdbe54576 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClassifierType.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaClassifierType.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaConstructor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaConstructor.java similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaConstructor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaConstructor.java index 02af44db5bb..7fab8785043 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaConstructor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaConstructor.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElement.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaElement.java similarity index 86% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElement.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaElement.java index 8c55e8d0225..484fca10c48 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaElement.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaElement.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; public interface JavaElement { } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaField.java similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaField.java index ad60d7e9d67..1f2dde98e7b 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaField.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaField.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMember.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaMember.java similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMember.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaMember.java index 66097b0121f..a124c00d02f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMember.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaMember.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaMethod.java similarity index 90% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaMethod.java index 910abf96902..3f4727dd251 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaMethod.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaMethod.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaModifierListOwner.java similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaModifierListOwner.java index 4581af0553c..79f9e69ff8f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaModifierListOwner.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.Visibility; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaNamedElement.java similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaNamedElement.java index 227e74e8c3c..dfbf49de4ab 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaNamedElement.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.Name; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPackage.kt similarity index 90% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPackage.kt index 79343b54c88..b6e2947babf 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPackage.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.lang.resolve.java.structure +package org.jetbrains.kotlin.load.java.structure import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveType.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPrimitiveType.java similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveType.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPrimitiveType.java index 3d94d09b437..a745dabb516 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPrimitiveType.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPrimitiveType.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPropertyInitializerEvaluator.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPropertyInitializerEvaluator.java similarity index 91% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPropertyInitializerEvaluator.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPropertyInitializerEvaluator.java index 1cdf1905306..7d00aca71e0 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPropertyInitializerEvaluator.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPropertyInitializerEvaluator.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaType.java similarity index 87% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaType.java index 203ef73856c..1cb6db7dc66 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaType.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaType.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeParameter.java similarity index 91% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeParameter.java index 627f09fc1d1..7693b2484a1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameter.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeParameter.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterListOwner.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeParameterListOwner.java similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterListOwner.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeParameterListOwner.java index 9715a74df40..43867dbe8ed 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeParameterListOwner.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeParameterListOwner.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeProvider.java similarity index 90% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeProvider.java index b1d63f7e68a..5cc105fe626 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeProvider.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeProvider.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeSubstitutor.java similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeSubstitutor.java index ac8ef4c1b23..8b41527bc3d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaTypeSubstitutor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaTypeSubstitutor.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaValueParameter.java similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaValueParameter.java index 0632c9d40cf..144563dff30 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaValueParameter.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardType.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaWildcardType.java similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardType.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaWildcardType.java index 57c2ec7f545..ff9752502d7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaWildcardType.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaWildcardType.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.lang.resolve.java.structure; +package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/annotationArguments.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/annotationArguments.kt similarity index 93% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/annotationArguments.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/annotationArguments.kt index 8fa70ceb9a5..cc57a65d5ab 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/annotationArguments.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/annotationArguments.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.lang.resolve.java.structure +package org.jetbrains.kotlin.load.java.structure import org.jetbrains.kotlin.name.Name diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt similarity index 98% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt index 99fa0c315a5..c12d818bb36 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.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.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin import org.jetbrains.kotlin.name.ClassId import java.util.ArrayList @@ -24,13 +24,13 @@ import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.* import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter +import org.jetbrains.kotlin.load.java.components.ErrorReporter import org.jetbrains.kotlin.name.FqName import java.util.HashMap import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames +import org.jetbrains.kotlin.load.java.JvmAnnotationNames public abstract class AbstractBinaryClassAnnotationAndConstantLoader( storageManager: StorageManager, diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt similarity index 93% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt index 6a82502868a..5659230e9ac 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin -import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils -import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.AnnotationArrayArgumentVisitor +import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils +import org.jetbrains.kotlin.load.java.components.ErrorReporter +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass.AnnotationArrayArgumentVisitor import org.jetbrains.kotlin.types.ErrorUtils -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.javaClassIdToKotlinClassId +import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils.javaClassIdToKotlinClassId import org.jetbrains.kotlin.storage.StorageManager import java.util.* import org.jetbrains.kotlin.descriptors.* diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt similarity index 90% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.kt index 5e8b081e08a..5294cf5b3d0 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializationComponentsForJava.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider +import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java similarity index 89% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java index 7ca536dfc42..5914ca19456 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.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.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import kotlin.Function0; import org.jetbrains.annotations.NotNull; @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.serialization.deserialization.DeserializationCompone import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; +import org.jetbrains.kotlin.load.java.components.ErrorReporter; +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; @@ -34,8 +34,8 @@ import javax.inject.Inject; import java.util.Collection; import java.util.Collections; -import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kind.CLASS; -import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kind.PACKAGE_FACADE; +import static org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.Kind.CLASS; +import static org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.Kind.PACKAGE_FACADE; public final class DeserializedDescriptorResolver { private final ErrorReporter errorReporter; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedResolverUtils.java similarity index 95% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedResolverUtils.java index 5e7b5315326..ef8dce515b0 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedResolverUtils.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.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.*; import java.util.ArrayList; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.kt similarity index 90% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.kt index 0c2dd5d322b..c00f8f2d8c1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaClassDataFinder.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder import org.jetbrains.kotlin.serialization.ClassData import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader public class JavaClassDataFinder( private val kotlinClassFinder: KotlinClassFinder, diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt similarity index 87% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt index c3eb761ce28..d53ba8682ca 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.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,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver +import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver import org.jetbrains.kotlin.types.FlexibleTypeCapabilities import org.jetbrains.kotlin.types diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt similarity index 84% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.kt index 7978d219a18..7328a4f71f6 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinClassFinder.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.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.name.ClassId public trait KotlinClassFinder { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.java similarity index 93% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.java index da680dc12ed..f54fe2c79d7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmBinaryClass.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.Name; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/MemberSignature.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/MemberSignature.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.kt index 8aad4e0056a..98402b0d574 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/MemberSignature.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/MemberSignature.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.lang.resolve.kotlin +package org.jetbrains.kotlin.load.kotlin import kotlin.platform.platformStatic import org.jetbrains.kotlin.name.Name diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/PackageClassUtils.java similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/PackageClassUtils.java index f18694c16db..6c8a1cef4b3 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/PackageClassUtils.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.lang.resolve.java; +package org.jetbrains.kotlin.load.kotlin; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/SignatureDeserializer.java similarity index 97% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/SignatureDeserializer.java index 7281c45677c..afaef0c8b0b 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/SignatureDeserializer.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.lang.resolve.kotlin; +package org.jetbrains.kotlin.load.kotlin; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassHeader.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassHeader.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.kt index 7234885e5c4..ce76d70dc80 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/KotlinClassHeader.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/KotlinClassHeader.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin.header +package org.jetbrains.kotlin.load.kotlin.header -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass -import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil +import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass +import org.jetbrains.kotlin.load.java.AbiVersionUtil public class KotlinClassHeader( public val kind: KotlinClassHeader.Kind, @@ -45,4 +45,4 @@ public class KotlinClassHeader( public fun KotlinClassHeader.isCompatibleClassKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.CLASS public fun KotlinClassHeader.isCompatiblePackageFacadeKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.PACKAGE_FACADE -public fun KotlinClassHeader.isCompatibleSyntheticClassKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.SYNTHETIC_CLASS \ No newline at end of file +public fun KotlinClassHeader.isCompatibleSyntheticClassKind(): Boolean = isCompatibleAbiVersion && kind == KotlinClassHeader.Kind.SYNTHETIC_CLASS diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java similarity index 94% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java index 148c3a7d8f1..1d5837c6089 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.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,21 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.kotlin.header; +package org.jetbrains.kotlin.load.kotlin.header; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; +import org.jetbrains.kotlin.load.java.AbiVersionUtil; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.Name; import java.util.*; -import static org.jetbrains.jet.lang.resolve.java.AbiVersionUtil.isAbiVersionCompatible; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.*; -import static org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.*; -import static org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader.Kind.*; +import static org.jetbrains.kotlin.load.java.AbiVersionUtil.isAbiVersionCompatible; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.*; +import static org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass.*; +import static org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.Kind.*; public class ReadKotlinClassHeaderAnnotationVisitor implements AnnotationVisitor { private static final Map HEADER_KINDS = new HashMap(); diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java index 72ea794aa90..c853b140eca 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; -import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; +import org.jetbrains.kotlin.load.java.components.TypeUsage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.types.JetType; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt similarity index 88% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt index 59b3eb3f891..1b66c929c82 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.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,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.java +package org.jetbrains.kotlin.resolve.jvm import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.java.structure.* -import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider +import org.jetbrains.kotlin.load.java.structure.* +import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.java.sources.JavaSourceElement +import org.jetbrains.kotlin.load.java.sources.JavaSourceElement public var PLATFORM_TYPES: Boolean = true diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmClassName.java similarity index 96% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmClassName.java index 6861f53e594..659b170512d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmClassName.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.lang.resolve.java; +package org.jetbrains.kotlin.resolve.jvm; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java similarity index 96% rename from core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java rename to core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.java index d34b212a449..43615804c6d 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JvmPrimitiveType.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.lang.resolve.java; +package org.jetbrains.kotlin.resolve.jvm; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index 314a55593d5..593be971fd6 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -22,11 +22,11 @@ import org.jetbrains.jet.context.GlobalContextImpl import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.jet.lang.resolve.* -import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver -import org.jetbrains.jet.lang.resolve.java.resolver.* -import org.jetbrains.jet.lang.resolve.java.sam.SamConversionResolverImpl -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder +import org.jetbrains.kotlin.load.java.JavaClassFinderImpl +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver +import org.jetbrains.kotlin.load.java.components.* +import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices @@ -34,19 +34,19 @@ import org.jetbrains.kotlin.generators.di.* import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils import org.jetbrains.kotlin.resolve.calls.CallResolver -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl +import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEvaluatorImpl import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.resolve.java.lazy.ModuleClassResolver -import org.jetbrains.jet.lang.resolve.kotlin.DeserializationComponentsForJava -import org.jetbrains.jet.lang.resolve.java.lazy.SingleModuleClassResolver -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM -import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider +import org.jetbrains.kotlin.load.java.lazy.ModuleClassResolver +import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava +import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM +import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer -import org.jetbrains.jet.lang.resolve.java.JavaFlexibleTypeCapabilitiesProvider +import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider import org.jetbrains.jet.context.LazyResolveToken -import org.jetbrains.jet.lang.resolve.java.JavaLazyAnalyzerPostConstruct -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolverPostConstruct +import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverPostConstruct import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider import org.jetbrains.kotlin.types.DynamicTypesAllowed diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 73729edfcfe..129bfc58e07 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -112,7 +112,7 @@ import org.jetbrains.jet.plugin.structureView.AbstractKotlinFileStructureTest import org.jetbrains.kotlin.j2k.AbstractJavaToKotlinConverterSingleFileTest import org.jetbrains.kotlin.jps.build.AbstractIncrementalJpsTest import org.jetbrains.kotlin.asJava.AbstractKotlinLightClassTest -import org.jetbrains.jet.lang.resolve.java.AbstractJavaTypeSubstitutorTest +import org.jetbrains.kotlin.resolve.jvm.AbstractJavaTypeSubstitutorTest import org.jetbrains.jet.plugin.intentions.declarations.AbstractJoinLinesTest import org.jetbrains.kotlin.codegen.AbstractScriptCodegenTest import org.jetbrains.jet.plugin.parameterInfo.AbstractFunctionParameterInfoTest diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/TypeUtils.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/util/TypeUtils.kt index beff813fd43..1d5581b77c9 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/TypeUtils.kt +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/TypeUtils.kt @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.types.JetTypeImpl import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.types.ErrorUtils -import org.jetbrains.jet.lang.resolve.java.kotlinSignature.CollectionClassMapping +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.CollectionClassMapping import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames +import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.types.isFlexible import org.jetbrains.kotlin.types.flexibility import java.util.LinkedHashSet diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index 3288cffe4f8..2e042862b4e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -44,8 +44,8 @@ import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt index ab08b5c1e70..0c8c48e5ff9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt @@ -18,17 +18,17 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.jet.plugin.project.TargetPlatform import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.java.JvmResolverForModule +import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModule import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.psi.PsiMethod import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.asJava.KotlinLightMethod -import org.jetbrains.jet.lang.resolve.java.resolveMethod -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaConstructorImpl -import org.jetbrains.jet.lang.resolve.java.resolveConstructor +import org.jetbrains.kotlin.resolve.jvm.resolveMethod +import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl +import org.jetbrains.kotlin.load.java.structure.impl.JavaConstructorImpl +import org.jetbrains.kotlin.resolve.jvm.resolveConstructor public object JavaResolveExtension : CacheExtension<(PsiElement) -> Pair> { override val platform: TargetPlatform = TargetPlatform.JVM 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 91ebb4f943c..f392ecf0dc8 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 @@ -22,14 +22,14 @@ import com.intellij.openapi.module.ModuleManager import org.jetbrains.kotlin.utils.keysToMap import com.intellij.openapi.roots.LibraryOrderEntry import org.jetbrains.jet.plugin.project.ResolveSessionForBodies -import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters -import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl +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.psi.* import org.jetbrains.kotlin.storage.ExceptionTracker -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +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 diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt index 02fb042a82c..c405a4aa023 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/DecompiledUtils.kt @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.decompiler import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import com.intellij.psi.ClassFileViewProvider -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass +import org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass import com.intellij.ide.highlighter.JavaClassFileType public fun isKotlinCompiledFile(file: VirtualFile): Boolean { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java index 5895a98f5c8..fb6ed6d4081 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java @@ -26,9 +26,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; 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 10fc092d8c5..0e14959916f 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 @@ -47,9 +47,9 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt index c5a40204f89..d9cd2003101 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt @@ -21,12 +21,12 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder -import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter -import org.jetbrains.jet.lang.resolve.kotlin.AbstractBinaryClassAnnotationAndConstantLoader +import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder +import org.jetbrains.kotlin.load.java.components.ErrorReporter +import org.jetbrains.kotlin.load.kotlin.AbstractBinaryClassAnnotationAndConstantLoader import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.storage.LockBasedStorageManager -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.name.SpecialNames diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt index bdbd70e05a4..509ec33ad0c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt @@ -22,8 +22,8 @@ import com.intellij.util.indexing.FileContent import com.intellij.psi.stubs.PsiFileStub import com.intellij.openapi.vfs.VirtualFile import com.intellij.psi.impl.compiled.ClassFileStubBuilder -import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassFinder diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt index 9caccb4ada6..51ee33d29e1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder import com.intellij.openapi.util.TextRange import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder @@ -29,9 +29,9 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike import org.jetbrains.kotlin.types.isFlexible -import org.jetbrains.jet.lang.resolve.java.JvmAbi -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.java.JvmAbi +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.types.flexibility private val FILE_ABI_VERSION_MARKER: String = "FILE_ABI" diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt index 5ca5b70584b..8abd600f64a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt @@ -20,14 +20,14 @@ import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor -import org.jetbrains.jet.lang.resolve.kotlin.* +import org.jetbrains.kotlin.load.kotlin.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.storage.LockBasedStorageManager import java.util.Collections import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt index ce31158dfb7..63b6f2a28a6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder -import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder -import org.jetbrains.jet.lang.resolve.java.structure.JavaClass +import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder +import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass -import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass +import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils import org.jetbrains.jet.plugin.decompiler.isKotlinWithCompatibleAbiVersion -import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt index 1596c8f7ce1..5b7d8ca4f57 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder -import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter +import org.jetbrains.kotlin.load.java.components.ErrorReporter import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import com.intellij.openapi.diagnostic.Logger class LoggingErrorReporter(private val log: Logger) : ErrorReporter { 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 bef921c9cee..d947b799b76 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 @@ -34,14 +34,14 @@ import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; +import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.DEFAULT_ANNOTATION_MEMBER_NAME; public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisitor { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java index 5c42c3896d6..5125f356e1a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java @@ -28,8 +28,8 @@ import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.RENDER_CLASS_OR_OBJECT; import static org.jetbrains.kotlin.diagnostics.rendering.Renderers.STRING; import static org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TextElementType; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm.ACCIDENTAL_OVERRIDE; -import static org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm.CONFLICTING_JVM_DECLARATIONS; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.ACCIDENTAL_OVERRIDE; +import static org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm.CONFLICTING_JVM_DECLARATIONS; import static org.jetbrains.jet.plugin.highlighter.HtmlTabledDescriptorRenderer.tableForTypes; import static org.jetbrains.jet.plugin.highlighter.IdeRenderers.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java index 1dde4343981..83fb62fe89b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData; -import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsData; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.Renderer; 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 00d2ee39b6c..027cd7e6db8 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 @@ -17,9 +17,9 @@ package org.jetbrains.jet.plugin.project import org.jetbrains.jet.analyzer.AnalyzerFacade -import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters +import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.jet.analyzer.ResolverForModule -import org.jetbrains.jet.lang.resolve.java.JvmAnalyzerFacade +import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.jet.plugin.caches.resolve.JsAnalyzerFacade public object AnalyzerFacadeProvider { @@ -32,4 +32,4 @@ public object AnalyzerFacadeProvider { else -> throw IllegalArgumentException("Unsupported platfrom: $targetPlatform") } } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java index 473e6248fd1..0245a1fc62f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; -import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; +import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesAllowed; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt index a1e4d3c27c5..8bd158ac309 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.name.FqName import kotlin.platform.platformStatic import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import com.intellij.psi.util.CachedValuesManager import com.intellij.psi.util.CachedValueProvider.Result import com.intellij.psi.util.PsiModificationTracker diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java index cd85c60e9d3..153d5d559ad 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java @@ -21,7 +21,7 @@ import com.intellij.psi.stubs.StubElement; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.stubs.*; import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService; -import org.jetbrains.jet.lang.resolve.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java index 4778caba4e0..2072f841458 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java @@ -26,8 +26,8 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClassFinder; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClassFinder; import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinderFactory.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinderFactory.java index 053d0a7697c..be041d29abe 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinderFactory.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinderFactory.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.vfilefinder; import com.intellij.openapi.project.Project; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; public class IDEVirtualFileFinderFactory implements VirtualFileFinderFactory { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java index 89c7ac8629b..474353da189 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java @@ -22,9 +22,9 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.indexing.*; import com.intellij.util.io.KeyDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache; -import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader; import org.jetbrains.kotlin.name.FqName; import java.io.DataInput; diff --git a/idea/src/META-INF/extensions/kotlin2jvm.xml b/idea/src/META-INF/extensions/kotlin2jvm.xml index 7d7eada4ad4..075d8e5faf0 100644 --- a/idea/src/META-INF/extensions/kotlin2jvm.xml +++ b/idea/src/META-INF/extensions/kotlin2jvm.xml @@ -2,8 +2,8 @@ org.jetbrains.kotlin - + - + diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index aa723d39d03..9eadc73fc1c 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -139,8 +139,8 @@ - + @@ -154,7 +154,7 @@ - - className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") + className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.cache.") || className == "org.jetbrains.kotlin.config.Services" }, compilerServices diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index dd7578f9f1c..ea16f56a11f 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -28,20 +28,20 @@ import org.jetbrains.kotlin.serialization.jvm.BitEncoding import java.util.Arrays import org.jetbrains.org.objectweb.asm.* import com.intellij.util.io.EnumeratorStringDescriptor -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames -import org.jetbrains.jet.lang.resolve.java.JvmClassName +import org.jetbrains.kotlin.load.java.JvmAnnotationNames +import org.jetbrains.kotlin.resolve.jvm.JvmClassName import java.util.HashSet -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import java.util.HashMap -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import com.intellij.openapi.util.io.FileUtil import java.security.MessageDigest import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.jps.builders.storage.StorageProvider import java.io.IOException -import org.jetbrains.jet.lang.resolve.java.JvmAbi -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.java.JvmAbi +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt index 9fdc78be502..34eb8261fac 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache public class IncrementalCacheProviderImpl(caches: Map): IncrementalCacheProvider { private val idToCache = caches.mapKeys { it.key.getId()!! } diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 0a7dee9ad5b..202f0ce01fa 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.name.ClassId import java.io.File diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 1dc8b222646..c30fbd6c73e 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -24,16 +24,16 @@ import com.intellij.util.io.ZipUtil; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.codegen.AsmUtil; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.builders.impl.BuildDataPathsImpl; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaExtensionService; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.codegen.AsmUtil; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt index 853343ed937..21046e7ad22 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt @@ -35,8 +35,8 @@ import java.io.ByteArrayInputStream import org.jetbrains.kotlin.serialization.DebugProtoBuf import java.util.Arrays import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind // Set this to true if you want to dump all bytecode (test will fail in this case) val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index 31e2022ff25..ec6468d295c 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import java.util.HashSet import org.jetbrains.jet.config.CommonConfigurationKeys import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys -import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.kotlin.js.config.LibrarySourcesConfig