From e88f89d1c60da4a632e0630f12794f251768b89d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 10 Jan 2015 14:36:11 +0300 Subject: [PATCH] Rename jet -> kotlin in descriptors: built-ins org.jetbrains.jet.lang.types.lang -> org.jetbrains.kotlin.builtins --- .../org/jetbrains/kotlin/backend/common/CodegenUtil.java | 2 +- .../kotlin/backend/common/DataClassMethodGenerator.java | 2 +- .../src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java | 2 +- .../backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java | 4 ++-- .../src/org/jetbrains/kotlin/codegen/ClosureCodegen.java | 2 +- .../kotlin/codegen/CollectionStubMethodGenerator.kt | 2 +- .../src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java | 2 +- .../src/org/jetbrains/kotlin/codegen/FunctionCodegen.java | 2 +- .../jetbrains/kotlin/codegen/ImplementationBodyCodegen.java | 2 +- .../src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java | 2 +- .../src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java | 6 +++--- .../src/org/jetbrains/kotlin/codegen/StackValue.java | 2 +- .../jetbrains/kotlin/codegen/binding/CodegenBinding.java | 2 +- .../org/jetbrains/kotlin/codegen/inline/InlineCodegen.java | 4 ++-- .../jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java | 6 +++--- .../kotlin/codegen/intrinsics/IntrinsicMethods.java | 6 +++--- .../jetbrains/kotlin/codegen/intrinsics/IteratorNext.java | 2 +- .../codegen/optimization/boxing/BoxingInterpreter.java | 2 +- .../org/jetbrains/kotlin/codegen/state/JetTypeMapper.java | 2 +- compiler/builtins-serializer/src/BuiltInsSerializer.kt | 2 +- .../kotlin/cli/jvm/compiler/CommandLineScriptUtils.java | 2 +- .../org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java | 2 +- .../jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java | 2 +- .../kotlinSignature/AlternativeMethodSignatureData.java | 2 +- .../kotlinSignature/ElementAlternativeSignatureData.java | 2 +- .../resolve/java/kotlinSignature/PropagationHeuristics.java | 2 +- .../java/kotlinSignature/SignaturesPropagationData.java | 2 +- .../java/kotlinSignature/TypeTransformingVisitor.java | 2 +- .../jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java | 4 ++-- .../lang/resolve/java/sam/SingleAbstractMethodUtils.java | 2 +- .../kotlin/di/InjectorForJavaDescriptorResolverUtil.java | 2 +- .../jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java | 2 +- .../org/jetbrains/kotlin/di/InjectorForReplWithJava.java | 2 +- .../kotlin/di/InjectorForTopDownAnalyzerForJvm.java | 2 +- .../src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt | 2 +- .../jet/lang/descriptors/impl/ScriptDescriptorImpl.java | 2 +- .../jetbrains/jet/lang/diagnostics/rendering/Renderers.java | 2 +- .../jet/lang/evaluate/ConstantExpressionEvaluator.kt | 2 +- .../src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt | 2 +- .../org/jetbrains/jet/lang/resolve/AnnotationResolver.java | 2 +- .../jet/lang/resolve/CompileTimeConstantUtils.java | 2 +- .../org/jetbrains/jet/lang/resolve/DeclarationResolver.java | 2 +- .../jet/lang/resolve/DelegatedPropertyResolver.java | 2 +- .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 2 +- .../jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java | 2 +- .../jetbrains/jet/lang/resolve/InlineDescriptorUtils.java | 2 +- .../org/jetbrains/jet/lang/resolve/OverrideResolver.java | 2 +- .../src/org/jetbrains/jet/lang/resolve/TypeResolver.kt | 2 +- .../jet/lang/resolve/calls/ArgumentTypeResolver.java | 2 +- .../org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt | 2 +- .../jet/lang/resolve/calls/CallExpressionResolver.java | 2 +- .../jetbrains/jet/lang/resolve/calls/CallResolverUtil.java | 2 +- .../jetbrains/jet/lang/resolve/calls/CandidateResolver.java | 2 +- .../calls/extensions/InlineCallResolverExtension.java | 4 ++-- .../resolve/calls/results/OverloadingConflictResolver.java | 2 +- .../jet/lang/resolve/calls/smartcasts/DataFlowValue.java | 2 +- .../lang/resolve/calls/smartcasts/DataFlowValueFactory.java | 2 +- .../lang/resolve/calls/tasks/TracingStrategyForInvoke.java | 2 +- .../jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt | 2 +- .../jetbrains/jet/lang/resolve/checkTraitRequirements.kt | 2 +- .../lang/resolve/constants/CompileTimeConstantChecker.java | 2 +- .../resolve/diagnostics/DiagnosticsWithSuppression.java | 2 +- .../jet/lang/resolve/extension/InlineAnalyzerExtension.java | 4 ++-- .../lang/resolve/lazy/descriptors/LazyClassDescriptor.java | 2 +- .../lang/resolve/lazy/descriptors/LazyClassMemberScope.kt | 2 +- .../lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt | 2 +- .../jet/lang/resolve/scopes/receivers/ScriptReceiver.java | 2 +- .../org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java | 2 +- .../src/org/jetbrains/jet/lang/types/SubstitutionUtils.java | 2 +- .../types/expressions/BasicExpressionTypingVisitor.java | 2 +- .../types/expressions/ClosureExpressionsTypingVisitor.java | 2 +- .../types/expressions/ControlStructureTypingVisitor.java | 2 +- .../jetbrains/jet/lang/types/expressions/DataFlowUtils.java | 2 +- .../lang/types/expressions/ExpressionTypingComponents.java | 2 +- .../lang/types/expressions/ExpressionTypingServices.java | 2 +- .../jet/lang/types/expressions/ExpressionTypingUtils.java | 2 +- .../expressions/ExpressionTypingVisitorForStatements.java | 2 +- .../lang/types/expressions/ForLoopConventionsChecker.java | 2 +- .../types/expressions/PatternMatchingTypingVisitor.java | 2 +- .../jet/lang/types/expressions/TypeReconstructionUtil.java | 2 +- .../src/org/jetbrains/jet/plugin/MainFunctionDetector.java | 2 +- .../org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java | 2 +- .../jetbrains/kotlin/cfg/JetFlowInformationProvider.java | 2 +- .../frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java | 2 +- .../cfg/pseudocode/JetControlFlowInstructionsGenerator.java | 2 +- .../org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt | 2 +- .../org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt | 2 +- .../src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java | 2 +- .../org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java | 2 +- .../src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java | 2 +- .../kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java | 2 +- .../src/org/jetbrains/kotlin/di/InjectorForMacros.java | 2 +- .../kotlin/di/InjectorForTopDownAnalyzerBasic.java | 2 +- .../frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java | 2 +- .../src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java | 2 +- .../asJava/KotlinLightClassForExplicitDeclaration.java | 2 +- .../src/org/jetbrains/kotlin/asJava/LightClassUtil.java | 2 +- compiler/tests/org/jetbrains/jet/ScriptTest.java | 2 +- .../jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java | 2 +- .../checkers/AbstractJetDiagnosticsTestWithJsStdLib.java | 2 +- .../jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt | 2 +- .../org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java | 2 +- .../org/jetbrains/jet/resolve/ExpectedResolveData.java | 2 +- .../jetbrains/jet/resolve/JetExpectedResolveDataUtil.java | 2 +- .../typeApproximation/CapturedTypeApproximationTest.kt | 2 +- .../org/jetbrains/jet/test/util/DescriptorValidator.java | 2 +- .../jet/test/util/RecursiveDescriptorComparator.java | 2 +- .../jet/types/JetDefaultModalityModifiersTest.java | 2 +- compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java | 2 +- .../tests/org/jetbrains/jet/types/JetOverridingTest.java | 2 +- .../tests/org/jetbrains/jet/types/JetTypeCheckerTest.java | 2 +- .../tests/org/jetbrains/jet/types/TypeSubstitutorTest.java | 2 +- compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java | 2 +- .../org/jetbrains/kotlin/codegen/CodegenTestFiles.java | 2 +- .../tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java | 2 +- .../tests/org/jetbrains/kotlin/di/InjectorForTests.java | 2 +- .../kotlin/serialization/builtins/BuiltInsSerializerTest.kt | 4 ++-- .../kotlin/serialization/builtins/LoadBuiltinsTest.java | 2 +- .../jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java | 2 +- .../java/lazy/descriptors/LazyJavaClassDescriptor.kt | 2 +- .../resolve/java/lazy/descriptors/LazyJavaMemberScope.kt | 2 +- .../lazy/descriptors/LazyJavaTypeParameterDescriptor.kt | 2 +- .../lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt | 2 +- .../jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java | 4 ++-- .../resolve/java/mapping/JavaToKotlinClassMapBuilder.java | 2 +- .../org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt | 2 +- .../jet/lang/descriptors/SimpleFunctionDescriptor.java | 2 +- .../descriptors/impl/AbstractTypeParameterDescriptor.java | 2 +- .../jet/lang/descriptors/impl/ModuleDescriptorImpl.kt | 2 +- .../jet/lang/descriptors/impl/PropertyDescriptorImpl.java | 2 +- .../lang/descriptors/impl/PropertySetterDescriptorImpl.java | 2 +- .../lang/descriptors/impl/SimpleFunctionDescriptorImpl.java | 4 ++-- .../lang/descriptors/impl/TypeParameterDescriptorImpl.java | 2 +- .../org/jetbrains/jet/lang/resolve/DescriptorFactory.java | 2 +- .../src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java | 2 +- .../lang/resolve/calls/inference/CapturedTypeConstructor.kt | 4 ++-- .../lang/resolve/calls/inference/ConstraintSystemImpl.kt | 4 ++-- .../jet/lang/resolve/constants/AnnotationValue.java | 2 +- .../jetbrains/jet/lang/resolve/constants/ArrayValue.java | 2 +- .../jetbrains/jet/lang/resolve/constants/BooleanValue.java | 2 +- .../org/jetbrains/jet/lang/resolve/constants/ByteValue.java | 2 +- .../org/jetbrains/jet/lang/resolve/constants/CharValue.java | 2 +- .../jet/lang/resolve/constants/CompileTimeConstant.java | 2 +- .../jetbrains/jet/lang/resolve/constants/ConstantUtils.kt | 4 ++-- .../jetbrains/jet/lang/resolve/constants/DoubleValue.java | 2 +- .../org/jetbrains/jet/lang/resolve/constants/EnumValue.java | 2 +- .../jetbrains/jet/lang/resolve/constants/ErrorValue.java | 2 +- .../jetbrains/jet/lang/resolve/constants/FloatValue.java | 2 +- .../org/jetbrains/jet/lang/resolve/constants/IntValue.java | 2 +- .../lang/resolve/constants/IntegerValueTypeConstant.java | 2 +- .../lang/resolve/constants/IntegerValueTypeConstructor.java | 2 +- .../jet/lang/resolve/constants/JavaClassValue.java | 2 +- .../org/jetbrains/jet/lang/resolve/constants/LongValue.java | 2 +- .../org/jetbrains/jet/lang/resolve/constants/NullValue.java | 2 +- .../jetbrains/jet/lang/resolve/constants/ShortValue.java | 2 +- .../jetbrains/jet/lang/resolve/constants/StringValue.java | 2 +- .../jetbrains/jet/lang/types/CapturedTypeApproximation.kt | 4 ++-- .../src/org/jetbrains/jet/lang/types/CommonSupertypes.java | 2 +- .../src/org/jetbrains/jet/lang/types/ErrorUtils.java | 2 +- .../src/org/jetbrains/jet/lang/types/TypeSubstitutor.java | 2 +- .../src/org/jetbrains/jet/lang/types/TypeUtils.java | 2 +- .../src/org/jetbrains/jet/lang/types/TypeUtils.kt | 2 +- .../jet/lang/types/checker/TypeCheckingProcedure.java | 2 +- .../src/org/jetbrains/jet/lang/types/dynamicTypes.kt | 2 +- .../builtins}/BuiltInsAnnotationAndConstantLoader.kt | 4 ++-- .../lang => kotlin/builtins}/BuiltInsSerializationUtil.kt | 4 ++-- .../lang => kotlin/builtins}/BuiltinsPackageFragment.kt | 4 ++-- .../lang/types/lang => kotlin/builtins}/InlineOption.java | 4 ++-- .../lang/types/lang => kotlin/builtins}/InlineStrategy.java | 4 ++-- .../lang/types/lang => kotlin/builtins}/InlineUtil.java | 4 ++-- .../lang/types/lang => kotlin/builtins}/KotlinBuiltIns.java | 6 +++--- .../lang/types/lang => kotlin/builtins}/PrimitiveType.java | 4 ++-- .../jetbrains/kotlin/renderer/DescriptorRendererImpl.java | 2 +- .../jetbrains/kotlin/serialization/AnnotationSerializer.kt | 2 +- .../kotlin/serialization/DescriptorSerializer.java | 2 +- .../serialization/deserialization/AnnotationDeserializer.kt | 2 +- .../descriptors/DeserializedTypeParameterDescriptor.java | 2 +- .../kotlin/generators/evaluate/GenerateOperationsMap.kt | 2 +- .../src/org/jetbrains/jet/plugin/util/TypeUtils.kt | 4 ++-- .../decompiler/navigation/JetSourceNavigationHelper.java | 2 +- .../jet/plugin/decompiler/navigation/MemberMatching.java | 2 +- .../plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt | 2 +- .../jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt | 2 +- .../decompiler/textBuilder/DeserializerForDecompiler.kt | 2 +- .../jet/plugin/highlighter/DeprecatedAnnotationVisitor.java | 2 +- .../plugin/highlighter/FunctionsHighlightingVisitor.java | 2 +- .../jet/plugin/quickfix/KotlinSuppressIntentionAction.kt | 2 +- .../jet/plugin/references/BuiltInsReferenceResolver.java | 2 +- .../plugin/actions/JetAddFunctionToClassifierAction.java | 2 +- .../plugin/actions/internal/FindImplicitNothingAction.kt | 2 +- .../jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java | 2 +- .../jet/plugin/codeInsight/GotoSuperActionHandler.java | 2 +- .../plugin/codeInsight/OverrideImplementMethodsHandler.java | 2 +- .../surroundWith/expression/KotlinExpressionSurrounder.java | 2 +- .../surroundWith/expression/KotlinNotSurrounder.java | 2 +- .../jetbrains/jet/plugin/completion/AllClassesCompletion.kt | 2 +- .../jetbrains/jet/plugin/completion/CompletionSorting.kt | 2 +- .../org/jetbrains/jet/plugin/completion/CompletionUtils.kt | 2 +- .../org/jetbrains/jet/plugin/completion/ExpectedInfos.kt | 2 +- .../jetbrains/jet/plugin/completion/LookupElementFactory.kt | 2 +- .../jet/plugin/completion/LookupElementsCollector.kt | 2 +- .../jet/plugin/completion/handlers/GenerateLambda.kt | 2 +- .../jetbrains/jet/plugin/completion/smart/KeywordValues.kt | 2 +- .../jetbrains/jet/plugin/completion/smart/LambdaItems.kt | 2 +- .../jet/plugin/completion/smart/SmartCompletion.kt | 2 +- .../jet/plugin/completion/smart/TypeInstantiationItems.kt | 2 +- idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt | 2 +- .../org/jetbrains/jet/plugin/debugger/JetPositionManager.kt | 4 ++-- .../intentions/ConvertAssertToIfWithThrowIntention.kt | 2 +- .../jet/plugin/intentions/ConvertToBlockBodyAction.kt | 2 +- .../intentions/ConvertToConcatenatedStringIntention.kt | 2 +- .../jet/plugin/intentions/ConvertToExpressionBodyAction.kt | 2 +- .../plugin/intentions/ConvertToStringTemplateIntention.kt | 2 +- .../plugin/intentions/ReplaceWithOperatorAssignIntention.kt | 2 +- .../attributeCallReplacements/ReplaceContainsIntention.kt | 2 +- .../parameterInfo/JetFunctionParameterInfoHandler.java | 2 +- .../jet/plugin/quickfix/AddFunctionToSupertypeFix.java | 2 +- .../plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java | 2 +- .../jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java | 2 +- .../jet/plugin/quickfix/ChangeFunctionSignatureFix.java | 2 +- .../createFromUsage/callableBuilder/CallableBuilder.kt | 2 +- .../createFromUsage/callableBuilder/CallableInfo.kt | 2 +- .../quickfix/createFromUsage/callableBuilder/typeUtils.kt | 2 +- ...CreateClassFromCallWithConstructorCalleeActionFactory.kt | 2 +- .../CreateClassFromConstructorCallActionFactory.kt | 2 +- .../createFunction/CreateBinaryOperationActionFactory.kt | 2 +- .../CreateFunctionOrPropertyFromCallActionFactory.kt | 2 +- .../createFunction/CreateHasNextFunctionActionFactory.kt | 2 +- .../createFunction/CreateInvokeFunctionActionFactory.kt | 2 +- .../createFunction/CreateIteratorFunctionActionFactory.kt | 2 +- .../CreatePropertyDelegateAccessorsActionFactory.kt | 2 +- .../createFunction/CreateSetFunctionActionFactory.kt | 2 +- .../createVariable/CreateParameterActionFactory.kt | 2 +- .../CreateParameterByNamedArgumentActionFactory.kt | 2 +- .../jetbrains/jet/plugin/refactoring/JetNameSuggester.java | 2 +- .../jet/plugin/refactoring/JetRefactoringUtil.java | 2 +- .../jet/plugin/refactoring/changeSignature/JetChangeInfo.kt | 2 +- .../changeSignature/usages/JetFunctionDefinitionUsage.java | 2 +- .../extractFunction/ExtractableCodeDescriptor.kt | 2 +- .../refactoring/extractFunction/extractableAnalysisUtil.kt | 2 +- .../introduceVariable/KotlinIntroduceVariableHandler.java | 2 +- .../plugin/codeInsight/AbstractOverrideImplementTest.java | 2 +- .../decompiler/textBuilder/DecompiledTextConsistencyTest.kt | 4 ++-- .../refactoring/changeSignature/JetChangeSignatureTest.java | 2 +- .../plugin/references/BuiltInsReferenceResolverTest.java | 2 +- j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt | 2 +- .../compiler/backend/js/ast/metadata/metadataProperties.kt | 2 +- .../kotlin/di/InjectorForTopDownAnalyzerForJs.java | 2 +- .../kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java | 2 +- .../kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt | 2 +- .../src/org/jetbrains/kotlin/js/inline/JsInliner.java | 2 +- .../kotlin/js/translate/callTranslator/FunctionCallCases.kt | 2 +- .../org/jetbrains/kotlin/js/translate/context/Namer.java | 2 +- .../kotlin/js/translate/context/StandardClasses.java | 2 +- .../kotlin/js/translate/declaration/ClassTranslator.java | 2 +- .../kotlin/js/translate/expression/CatchTranslator.kt | 2 +- .../kotlin/js/translate/expression/ExpressionVisitor.java | 2 +- .../js/translate/expression/LiteralFunctionTranslator.kt | 2 +- .../translate/intrinsic/functions/factories/ArrayFIF.java | 2 +- .../intrinsic/functions/factories/TopLevelFIF.java | 4 ++-- .../intrinsic/functions/patterns/NamePredicate.java | 2 +- .../js/translate/reference/CallExpressionTranslator.java | 4 ++-- .../kotlin/js/translate/utils/FunctionBodyTranslator.java | 2 +- .../kotlin/js/translate/utils/JsDescriptorUtils.java | 2 +- .../kotlin/js/translate/utils/TranslationUtils.java | 2 +- .../src/test/kotlin/NoInternalVisibilityInStdLibTest.kt | 2 +- 266 files changed, 298 insertions(+), 298 deletions(-) rename core/descriptors/src/org/jetbrains/{jet/lang/types/lang => kotlin/builtins}/BuiltInsAnnotationAndConstantLoader.kt (97%) rename core/descriptors/src/org/jetbrains/{jet/lang/types/lang => kotlin/builtins}/BuiltInsSerializationUtil.kt (96%) rename core/descriptors/src/org/jetbrains/{jet/lang/types/lang => kotlin/builtins}/BuiltinsPackageFragment.kt (98%) rename core/descriptors/src/org/jetbrains/{jet/lang/types/lang => kotlin/builtins}/InlineOption.java (88%) rename core/descriptors/src/org/jetbrains/{jet/lang/types/lang => kotlin/builtins}/InlineStrategy.java (89%) rename core/descriptors/src/org/jetbrains/{jet/lang/types/lang => kotlin/builtins}/InlineUtil.java (98%) rename core/descriptors/src/org/jetbrains/{jet/lang/types/lang => kotlin/builtins}/KotlinBuiltIns.java (99%) rename core/descriptors/src/org/jetbrains/{jet/lang/types/lang => kotlin/builtins}/PrimitiveType.java (94%) diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java index b0b682c326e..61f86fd12f9 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; import java.util.*; diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java index 1ed40f4e484..81ff5336d3e 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index bf6d002d8eb..079d99873d5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.types.Flexibility; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.TypesPackage; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.org.objectweb.asm.*; import java.lang.annotation.Retention; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 0e1969d690c..435e94da40c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -44,8 +44,8 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.Approximation; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypesPackage; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index a1940614f5f..644e1c1ecbc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.org.objectweb.asm.MethodVisitor; 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/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index 78e210d1f08..76eb3cb8e80 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.impl.* import org.jetbrains.org.objectweb.asm.Opcodes.* import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.* import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.descriptors.annotations.Annotations diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 741e4342bca..20d646d9458 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -67,7 +67,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.backend.common.CodegenUtil; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index dd7caee69a0..a3203fe5fde 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -51,7 +51,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations.NativeDeclaratio import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.Approximation; import org.jetbrains.jet.lang.types.TypesPackage; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.backend.common.bridges.Bridge; import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index a4a4120e946..8b886a5127c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -56,7 +56,7 @@ import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.backend.common.CodegenUtil; import org.jetbrains.kotlin.backend.common.CodegenUtilKt; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java index 4ff98476a18..212314a71ce 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java index 89b50a876ab..da0f3b0d48d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java @@ -26,13 +26,13 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitiveNumberClassDescriptor; -import static org.jetbrains.jet.lang.types.lang.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; +import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; public class RangeCodegenUtil { private static final ImmutableMap RANGE_TO_ELEMENT_TYPE; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index 2e6bae6d234..4376ded04f9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -35,7 +35,7 @@ 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.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java index 17d249445b7..bb311a50fbc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.util.slicedmap.BasicWritableSlice; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; 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 ec08c819310..f8d03a0771e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -37,8 +37,8 @@ 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.jet.lang.types.lang.InlineStrategy; -import org.jetbrains.jet.lang.types.lang.InlineUtil; +import org.jetbrains.kotlin.builtins.InlineStrategy; +import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; 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 97b9111f1d5..c58f21eb67e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -39,7 +39,7 @@ 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.jet.lang.types.lang.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; +import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; public class ArrayIterator extends IntrinsicMethod { @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 6f0958d1b84..1f93e96f026 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java @@ -26,13 +26,13 @@ import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import java.util.HashMap; import java.util.Map; -import static org.jetbrains.jet.lang.types.lang.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; +import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class IntrinsicMethods { 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 daa18260fb0..c352d7ee333 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IteratorNext.java @@ -27,7 +27,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; -import static org.jetbrains.jet.lang.types.lang.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; +import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; public class IteratorNext extends IntrinsicMethod { @NotNull 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 dd7cae6ba09..4109080872d 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 @@ -24,7 +24,7 @@ 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.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.tree.AbstractInsnNode; 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 3147beaac40..60ed111ad7b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -54,7 +54,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.Method; diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index 480da4c24dd..e4585aee5ff 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.serialization.* import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.name.Name import java.io.ByteArrayOutputStream -import org.jetbrains.jet.lang.types.lang.BuiltInsSerializationUtil +import org.jetbrains.kotlin.builtins.BuiltInsSerializationUtil import com.intellij.openapi.Disposable import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.jet.config.CommonConfigurationKeys diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java index 33f634c66fe..47c416cedd9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cli.jvm.compiler; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java index df08179d4dc..1fb2333d47d 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 @@ -54,7 +54,7 @@ import org.jetbrains.jet.lang.resolve.lazy.declarations.*; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java index 23d486f29fc..034ef3ea0b1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/TopDownAnalyzerFacadeForJVM.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache; import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerForJvm; import java.util.ArrayList; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java index 3a24c04181b..63ae94e02c0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.types.TypeSubstitutor; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java index 345e6b6e75a..8eaa1618d2e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetTypeElement; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.List; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java index abef12c5a32..f4c77328c5c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/PropagationHeuristics.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.types.JetTypeImpl; import org.jetbrains.jet.lang.types.TypeProjectionImpl; import org.jetbrains.jet.lang.types.Variance; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Arrays; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java index c2a418216df..b2480bb93e2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java index e5371e344db..0aeaf721e56 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java index 51aeab6e329..7ff84532ab2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/mapping/KotlinToJavaTypesMap.java @@ -24,8 +24,8 @@ 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.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.org.objectweb.asm.Type; import java.util.HashMap; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java index 5b639d60358..b87b5e37649 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SingleAbstractMethodUtils.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.*; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; 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 89a3e1a112e..ae9b8d705cf 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class InjectorForJavaDescriptorResolverUtil { @NotNull 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 23032b29cf1..68f1888b7da 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; 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 f8904910910..d800fde285e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; 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 56dd3441235..23e280e619d 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt index f6af254fd04..f62d6ceec8b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.ImportPath import org.jetbrains.jet.lang.PlatformToKotlinClassMap import com.intellij.openapi.project.Project import org.jetbrains.jet.context.GlobalContext -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl import java.util.ArrayList import org.jetbrains.kotlin.psi.JetFile diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java index f9a558c5f2b..dfc696e271e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.resolve.scopes.receivers.ScriptReceiver; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeSubstitutor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java index 5b073288b1a..86643e155f1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.Renderer; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt index ef7d58240b0..fb232ae7820 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.constants.* import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.types.expressions.OperatorConventions -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.jet.lang.types.TypeUtils diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt b/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt index a1e53d6b063..fb35e4ad92b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.types.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.annotations.Annotations import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java index e62eab1df11..a792c03867a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -47,7 +47,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.StorageManager; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java index 9f9d05be1fc..8a0b526e7bf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java index 1b7c514c68a..029550305d0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.resolveUtil.ResolveUtilPackage; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java index badc99e1150..fdd3163aa48 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.util.slicedmap.WritableSlice; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 7ac9348a4df..efd2135e6ec 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java index 3a7122d8bbb..7cc2b50c1ce 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java index cdce6d8be9a..3dc050e4c5b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMapping; import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.lang.InlineUtil; +import org.jetbrains.kotlin.builtins.InlineUtil; public class InlineDescriptorUtils { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java index e5e3c189c4f..c9a4b04b214 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.utils.HashSetUtil; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt index 8f438f193af..0e91c65671c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter import org.jetbrains.jet.lang.types.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.jet.lang.diagnostics.Errors.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java index b65ea514288..a3d771f43a0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.types.JetTypeInfo; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import javax.inject.Inject; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt index b80a2128b3a..bb5bafb5629 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallCompleter.kt @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.BindingContext.CONSTRAINT_SYSTEM_COMPLETER import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl import org.jetbrains.jet.lang.resolve.calls.context.CallCandidateResolutionContext diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java index 4db97880b8d..746d582bc63 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallExpressionResolver.java @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.types.expressions.BasicExpressionTypingVisitor; import org.jetbrains.jet.lang.types.expressions.DataFlowUtils; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java index c0fa9c08877..14e8b03b20b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolverUtil.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java index c7dd4bfddd1..21f0058bfc9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CandidateResolver.java @@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import javax.inject.Inject; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java index 2926f0b0daa..c5e008533af 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/InlineCallResolverExtension.java @@ -35,8 +35,8 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.InlineUtil; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.InlineUtil; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadingConflictResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadingConflictResolver.java index 79267cd3448..ade03f67ed8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadingConflictResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadingConflictResolver.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValue.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValue.java index 13130440a30..2d7b593b40c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValue.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValue.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls.smartcasts; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class DataFlowValue { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java index 5a1a2e740b2..62599b68267 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowValueFactory.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.*; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java index d6d3cabe429..3fd5ed9c44e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyForInvoke.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt index 56c4e449cc6..a0a1801734a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/dynamicCalls.kt @@ -50,7 +50,7 @@ import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.kotlin.psi.JetOperationReferenceExpression import org.jetbrains.jet.lang.resolve.DescriptorFactory import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.ValueArgument import java.util.ArrayList import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt index 96cf8e24b79..a9d492b28fd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.resolveUtil import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java index 942f03c7196..516340a4d67 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java index d3226b5bf46..1afee7dc7ea 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.constants.ArrayValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.StringValue; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java index acb58f6d4d0..fe0b05c8b3c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java @@ -25,8 +25,8 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.InlineUtil; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.InlineUtil; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java index 4d13ffe251e..6ef90f847fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -50,7 +50,7 @@ import org.jetbrains.jet.lang.types.AbstractClassTypeConstructor; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.NullableLazyValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt index 68cbb506e1f..63986c3555f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.types.DeferredType import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.storage.NullableLazyValue import java.util.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt index 6b263c0f225..29a0ef18589 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptDescriptor.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorNonRootImpl import org.jetbrains.jet.lang.descriptors.annotations.Annotations import org.jetbrains.jet.lang.descriptors.ScriptDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ScriptReceiver -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.impl.ReceiverParameterDescriptorImpl import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.utils.sure diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java index 589f7ec0e39..8cff57047ec 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; // SCRIPT: script receiver public class ScriptReceiver implements ThisReceiver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java index a5aab9aef1f..3f8d20b1b93 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java index f8d77fbba48..b83ef87cb65 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java @@ -22,7 +22,7 @@ import com.google.common.collect.Multimap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java index 99bcd9f596a..06934e70900 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java @@ -60,7 +60,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.utils.ThrowingList; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java index f7e808d73c8..7dc19f87050 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.util.slicedmap.WritableSlice; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java index 3bcb6ecd8a6..a96eab04b61 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java index 48ae307bc7c..6d1d0c5ecd9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingComponents.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingComponents.java index 1bbe8133925..8c49273403c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingComponents.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingComponents.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java index 194c132a4ca..92611941ce9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java @@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetTypeInfo; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java index 35adf1b0394..7538d19ace6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java @@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetTypeInfo; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java index 833b9c355f6..56b2714bc33 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.JetTypeInfo; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java index ac6ce2aab1e..d9479eeffd5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.util.slicedmap.WritableSlice; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java index 15bb5e79d7a..1976f9a9196 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java index 9a87404e6ae..229d7be5b9c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.PossiblyBareType; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import static org.jetbrains.jet.lang.diagnostics.Errors.NO_TYPE_ARGUMENTS_ON_RHS; diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java b/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java index 785d60f6b18..7e8cfd24d28 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java +++ b/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index e8ea90d9cf6..808edebafb3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 39ae289284b..1d9260ada3e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -59,7 +59,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.MainFunctionDetector; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java index fe42ead596e..269666e04c6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import static org.jetbrains.jet.lang.resolve.BindingContext.EXPRESSION_TYPE; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java index 7056df59c9b..ed9f26833f1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt index 9bdbb0b59a1..07ea21014da 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt @@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.types.checker.JetTypeChecker import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.util.SmartFMap -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.TypeUtils public trait TypePredicate: (JetType) -> Boolean { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt index bee9e091e9c..e81d143ac6d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.bindingContextUtil.* import org.jetbrains.jet.lang.resolve.calls.model.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.BindingContext import java.util.* import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index 52a67933442..8be406621de 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index 3d0b0b84eaf..efc5fef020a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.types.DynamicTypesSettings; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; import org.jetbrains.jet.lang.resolve.BodyResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index 3f07841a8bf..3e35fab7bcd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index 4091eb4e89e..d519d369709 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index d5a050ab38e..c833b707a25 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java index 7a5dff0f65b..ed706ffc83d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java index e925c392d0b..4484ecceefd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.name.SpecialNames; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java index 9ca90352f86..b7031ef9d75 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class JetTypeCodeFragment extends JetCodeFragment { public JetTypeCodeFragment(Project project, String name, CharSequence text, PsiElement context) { 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 a80fe03bfe0..8f4a0812eaf 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -52,7 +52,7 @@ import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; 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 8b17df21979..8b455aee0f5 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.KotlinVfsUtil; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java index 8759b6527cf..25ec564cf41 100644 --- a/compiler/tests/org/jetbrains/jet/ScriptTest.java +++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index 3a5e50cef6f..589e70a3ccd 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -48,7 +48,7 @@ import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.jet.test.util.DescriptorValidator; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java index 598f28988c1..ecfed00883f 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 7438fe2afbb..49662130d62 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -33,7 +33,7 @@ import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.java.JvmResolverForModule import org.jetbrains.jet.analyzer.ResolverForProject import org.jetbrains.jet.analyzer.ModuleInfo 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 be94485ce2a..9db9a18f561 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -28,7 +28,7 @@ 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.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import java.util.Collection; diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 4fcb89605d0..a564c8b3534 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java index 3278c7246db..06413ec764e 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt index 3ed82be6e53..73dc1650479 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.types.TypeSubstitutor import org.jetbrains.jet.lang.types.TypeProjectionImpl -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.Variance.* import org.jetbrains.jet.lang.types.typesApproximation.approximateCapturedTypes import org.jetbrains.jet.JetTestUtils diff --git a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java index d8dcb16a668..1ec22eb07fb 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.junit.Assert; import java.io.PrintStream; diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java index c08d07b0b37..82e653e82f8 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.MemberComparator; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.kotlin.utils.Printer; diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 15a4ec80acc..9c8d2c717c8 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index acb7d993bcd..db646d6983a 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.OverloadUtil; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index a89425ba616..b14e74580e5 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index e3304e27ebf..8d0bcbf24b8 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index d366a5c1a6b..d0054f051a8 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java index be7757027f5..ad13c08609e 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForTests; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 6071c2d3d2e..62a3a751b1e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.Variance; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.io.IOException; import java.util.ArrayList; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java index e46d0e41345..69b3cdfcab4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.org.objectweb.asm.Opcodes; import java.lang.reflect.Constructor; diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index 649e41e6639..db3c9093d39 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt index dfd96880f9c..32d4211fc50 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime import org.jetbrains.jet.JetTestUtils import org.jetbrains.kotlin.storage.LockBasedStorageManager import java.io.FileInputStream -import org.jetbrains.jet.lang.types.lang.BuiltinsPackageFragment -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.test.util.RecursiveDescriptorComparator import org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index 7ed1cba6a2e..119bc67e4a3 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java index e5835f1c1ba..943ba97347f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmPrimitiveType.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.PrimitiveType; import java.util.HashSet; import java.util.Set; 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/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt index 4cd502b6989..e67ed75f11f 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/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -29,7 +29,7 @@ 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.jet.lang.resolve.scopes.InnerClassesScopeWrapper -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.utils.* import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor import org.jetbrains.jet.lang.descriptors.annotations.Annotations 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/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt index ca796dc05e6..d23b58247e1 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/jet/lang/resolve/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -31,7 +31,7 @@ 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.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +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 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/jet/lang/resolve/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt index 9fd9aed3d10..7861583ef4e 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/jet/lang/resolve/java/lazy/descriptors/LazyJavaTypeParameterDescriptor.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +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 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/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt index 751bf845d23..37dc35c8836 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/jet/lang/resolve/java/lazy/types/LazyJavaTypeResolver.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.java.resolver.* import org.jetbrains.jet.lang.types.Variance.* import org.jetbrains.jet.lang.types.* import org.jetbrains.jet.lang.resolve.java.mapping.JavaToKotlinClassMap -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +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.* diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java index 986db04c493..0a037d161f1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMap.java @@ -27,8 +27,8 @@ import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import java.util.*; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java index 6786d357ab0..505cfcf5a1c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/mapping/JavaToKotlinClassMapBuilder.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.mapping; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.lang.annotation.Annotation; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt index 2bfd4b827f2..83dc8c03d4f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.lang.resolve.ImportPath import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.types.TypeSubstitutor import org.jetbrains.jet.lang.descriptors.impl.PackageViewDescriptorImpl -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns public trait ModuleDescriptor : DeclarationDescriptor { override fun getContainingDeclaration(): DeclarationDescriptor? = null diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java index 84f319e7501..cdeed16bcc8 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.lang.InlineStrategy; +import org.jetbrains.kotlin.builtins.InlineStrategy; /** * Simple functions are the ones with 'fun' keyword and function literals diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java index db320b44cd7..0f256ec8288 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ModuleDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ModuleDescriptorImpl.kt index 252d2dd3bc5..674a125b72b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ModuleDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ModuleDescriptorImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import kotlin.properties.Delegates import java.util.LinkedHashSet -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns public class ModuleDescriptorImpl( moduleName: Name, diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java index 9fa4417380c..653d2ee8356 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.types.DescriptorSubstitutor; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeSubstitutor; import org.jetbrains.jet.lang.types.Variance; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java index cf7e623d705..4bc74c51a05 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java index a2fe5ffc80d..1aaaa1e48c9 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java @@ -23,8 +23,8 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeSubstitutor; -import org.jetbrains.jet.lang.types.lang.InlineStrategy; -import org.jetbrains.jet.lang.types.lang.InlineUtil; +import org.jetbrains.kotlin.builtins.InlineStrategy; +import org.jetbrains.kotlin.builtins.InlineUtil; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java index 5449fc19e65..68796012716 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.TypeConstructorImpl; import org.jetbrains.jet.lang.types.Variance; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java index f2bf5471ca6..b3448f2f9ab 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.Variance; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java index 6ab0a84e1dd..f08171c7c03 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.LazyType; import org.jetbrains.jet.lang.types.TypeConstructor; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/CapturedTypeConstructor.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/CapturedTypeConstructor.kt index e29a8356e6f..a1811481196 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/CapturedTypeConstructor.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/CapturedTypeConstructor.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.descriptors.annotations.Annotations import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.lang.types.Variance.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.ErrorUtils import org.jetbrains.jet.lang.types.SubtypingRepresentatives import org.jetbrains.jet.lang.types.AbstractJetType @@ -89,4 +89,4 @@ public class CapturedType( public fun createCapturedType(typeProjection: TypeProjection): JetType = CapturedType(typeProjection) -public fun JetType.isCaptured(): Boolean = getConstructor() is CapturedTypeConstructor \ No newline at end of file +public fun JetType.isCaptured(): Boolean = getConstructor() is CapturedTypeConstructor diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt index e2c3a24dc8c..bab8b6d43cb 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystemImpl.kt @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.types.TypeProjectionImpl import org.jetbrains.jet.lang.types.TypeSubstitutor import org.jetbrains.jet.lang.types.ErrorUtils import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl.ConstraintKind import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedureCallbacks @@ -460,4 +460,4 @@ public class ConstraintSystemImpl : ConstraintSystem { val returnType = typeArguments.get(lastIndex).getType() return KotlinBuiltIns.getInstance().getFunctionType(functionType.getAnnotations(), receiverType, arguments, returnType) } -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java index 6de8be2b9db..72dada72993 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class AnnotationValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java index aa278a4fb36..57ef7dd7625 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java index f83621dcf16..ceaf6072d57 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.types.JetType; public class BooleanValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java index 7c030c6cd4d..56ca94ca171 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class ByteValue extends IntegerValueConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java index 4f6fb8af876..46434a03041 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.types.JetType; public class CharValue extends IntegerValueConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java index 205aa23a67e..ab76593d61f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public abstract class CompileTimeConstant { protected final T value; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ConstantUtils.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ConstantUtils.kt index 7e78546874c..c8ecf17129a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ConstantUtils.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ConstantUtils.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.constants import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.TypeUtils public fun createCompileTimeConstant( @@ -79,4 +79,4 @@ private fun getIntegerValue( builtIns.getCharType() -> IntValue(value.toInt(), canBeUsedInAnnotation, isPureIntConstant, usesVariableAsConstant) else -> defaultIntegerValue(value) } -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java index d342fe312f8..7f0f2ab39ac 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.types.JetType; public class DoubleValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java index b5c97152ab0..9af8b0cabd2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class EnumValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java index 60c9471184c..df8f37ee55e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public abstract class ErrorValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java index 102912ae4bc..3159d841aa0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.types.JetType; public class FloatValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java index 5d39377065d..3c1e4aa3ad7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class IntValue extends IntegerValueConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstant.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstant.java index 7bac4b2d574..c585bdc541d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstant.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstant.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java index ced9000bcd9..8da35f102c4 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java index d1b8bd25e21..7a6a3da2ee3 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class JavaClassValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java index 32c23057164..7261e6201a0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class LongValue extends IntegerValueConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java index 37085399151..7e7b0df4f5a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.types.JetType; public class NullValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java index 36bfee596c3..f3240fb100f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class ShortValue extends IntegerValueConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java index 316912f65f4..48fe25965c9 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.types.JetType; public class StringValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/CapturedTypeApproximation.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/CapturedTypeApproximation.kt index 65d66db3622..4e1f11eb4a5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/CapturedTypeApproximation.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/CapturedTypeApproximation.kt @@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.types.checker.JetTypeChecker import org.jetbrains.jet.lang.types.TypeProjection import org.jetbrains.jet.lang.types.TypeProjectionImpl -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.Variance import java.util.ArrayList import org.jetbrains.jet.lang.types.JetTypeImpl @@ -139,4 +139,4 @@ private fun approximateProjection(typeArgument: TypeArgument): ApproximationBoun return ApproximationBounds( lower = TypeArgument(typeArgument.typeParameter, inUpper, outLower), upper = TypeArgument(typeArgument.typeParameter, inLower, outUpper)) -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java b/core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java index cbef005d913..a78e806ea90 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java index b4ec29aab8c..493a7afea05 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.error.ErrorSimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.Printer; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java index cb2b818e24e..4187c63742e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.resolve.calls.inference.InferencePackage; import org.jetbrains.jet.lang.resolve.scopes.SubstitutingScope; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.types.typeUtil.TypeUtilPackage; import org.jetbrains.jet.lang.types.typesApproximation.TypesApproximationPackage; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java index 6c3781916ba..0538c6e94f4 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstructor; import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.DFS; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.kt index 2d6ac842ff3..2f43d5ca4a1 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.kt @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.types.Flexibility import org.jetbrains.jet.lang.types.TypeConstructor import org.jetbrains.kotlin.utils.toReadOnlyList import org.jetbrains.jet.lang.types.checker.JetTypeChecker -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.isDynamic fun JetType.getContainedTypeParameters(): Collection { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java index 5400d85ddfa..cb8e912241e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/dynamicTypes.kt b/core/descriptors/src/org/jetbrains/jet/lang/types/dynamicTypes.kt index 31e92afeebd..0d1937d3f0b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/dynamicTypes.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/dynamicTypes.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.types -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import kotlin.platform.platformStatic open class DynamicTypesSettings { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsAnnotationAndConstantLoader.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsAnnotationAndConstantLoader.kt rename to core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt index ad16b010c79..4c2e49cd8f6 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsAnnotationAndConstantLoader.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.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.types.lang +package org.jetbrains.kotlin.builtins import org.jetbrains.kotlin.serialization.* import org.jetbrains.kotlin.serialization.deserialization.* diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializationUtil.kt similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.kt rename to core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializationUtil.kt index aa78b4f1866..67073c3039f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsSerializationUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializationUtil.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.types.lang +package org.jetbrains.kotlin.builtins import org.jetbrains.jet.lang.resolve.name.* import kotlin.platform.platformStatic diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt rename to core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt index 27457403264..aae1bba3882 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltinsPackageFragment.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.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.types.lang +package org.jetbrains.kotlin.builtins import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope import org.jetbrains.jet.lang.descriptors.ModuleDescriptor diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineOption.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineOption.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineOption.java rename to core/descriptors/src/org/jetbrains/kotlin/builtins/InlineOption.java index 7d2601fd513..a9f9690e16c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineOption.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineOption.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.types.lang; +package org.jetbrains.kotlin.builtins; public enum InlineOption { LOCAL_CONTINUE_AND_BREAK, diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineStrategy.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineStrategy.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineStrategy.java rename to core/descriptors/src/org/jetbrains/kotlin/builtins/InlineStrategy.java index 871d419a22a..d1809a97038 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineStrategy.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineStrategy.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.types.lang; +package org.jetbrains.kotlin.builtins; public enum InlineStrategy { AS_FUNCTION, diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java rename to core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java index 2dbb9b20a3d..42c0c96fcfd 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/InlineUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.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.types.lang; +package org.jetbrains.kotlin.builtins; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java similarity index 99% rename from core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java rename to core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 2c999ed5fae..c847661e3ed 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.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.types.lang; +package org.jetbrains.kotlin.builtins; import kotlin.Function1; import kotlin.KotlinPackage; @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.io.InputStream; import java.util.*; -import static org.jetbrains.jet.lang.types.lang.PrimitiveType.*; +import static org.jetbrains.kotlin.builtins.PrimitiveType.*; public class KotlinBuiltIns { public static final Name BUILT_INS_PACKAGE_NAME = Name.identifier("kotlin"); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/PrimitiveType.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/types/lang/PrimitiveType.java rename to core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.java index 0ef2de15973..59551b0c3a4 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/PrimitiveType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.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.types.lang; +package org.jetbrains.kotlin.builtins; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.name.Name; diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java index e23b58b51be..b2b7b10af48 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.*; import org.jetbrains.jet.lang.types.ErrorUtils.UninferredParameterTypeConstructor; import org.jetbrains.jet.lang.types.error.MissingDependencyErrorClass; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.*; diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt index 8e4eda95f9a..845408b6b97 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.resolve.constants.* import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns public object AnnotationSerializer { public fun serializeAnnotation(annotation: AnnotationDescriptor, stringTable: StringTable): ProtoBuf.Annotation { diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index c902948860f..0c117f677c3 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.jet.lang.resolve.MemberComparator; import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; import java.util.Collection; diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt index cdc3dcf9c2d..c92212a2c19 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.constants.* import org.jetbrains.jet.lang.types.JetType diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java index aa6bf62addd..945f1b0a4be 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import org.jetbrains.jet.lang.descriptors.SourceElement; import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt index ddc5ef6bb70..ecd851e7bed 100644 --- a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt @@ -20,7 +20,7 @@ import java.io.File import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.types.TypeUtils 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 e9065334bbe..2bfb27aa822 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 @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.util import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.JetTypeImpl import org.jetbrains.jet.lang.types.TypeProjectionImpl import org.jetbrains.jet.lang.types.ErrorUtils @@ -93,4 +93,4 @@ public fun JetType.nullability(): TypeNullability { TypeUtils.isNullableType(this) -> TypeNullability.NULLABLE else -> TypeNullability.NOT_NULL } -} \ No newline at end of file +} 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 bd2a9310d18..b267c933534 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 @@ -57,7 +57,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java index 3779162d184..5af4c40f8fd 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/MemberMatching.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt index 520f8b9ca8e..cd89a3dde79 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.serialization.ProtoBuf.Type import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns fun createClassStub(parent: StubElement, classProto: ProtoBuf.Class, classId: ClassId, context: ClsStubBuilderContext) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt index e052b36a5f1..e59bdff7947 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetParameterList import org.jetbrains.kotlin.psi.stubs.impl.KotlinParameterStubImpl import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.kotlin.psi.JetNullableType -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetTypeArgumentList import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeProjectionStubImpl import org.jetbrains.kotlin.psi.JetFunctionType 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 173fa7d196b..40f3c140393 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 @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents import org.jetbrains.jet.lang.PlatformToKotlinClassMap -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl public fun DeserializerForDecompiler(classFile: VirtualFile): DeserializerForDecompiler { 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 b820eb038b0..ddbc3899114 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 @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java index 3903826a967..a86ce1e90d7 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/FunctionsHighlightingVisitor.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisitor { public FunctionsHighlightingVisitor(AnnotationHolder holder, BindingContext bindingContext) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt index 4c568d4684a..f9d5507ca75 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.codeInspection.SuppressIntentionAction import org.jetbrains.jet.plugin.util.JetPsiPrecedences import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index d4a499c8662..54ec6248846 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.asJava.LightClassUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java index 0eaf3786027..a357c801631 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.psi.JetClassBody; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt index 95b3c32a45d..fb8bcb23d1c 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt @@ -31,7 +31,7 @@ import javax.swing.SwingUtilities import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.CallableDescriptor import org.jetbrains.jet.lang.types.JetType import org.jetbrains.jet.lang.resolve.calls.callUtil.getCalleeExpressionIfAny diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java index 8f0148981c4..cded3849545 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; import java.util.List; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java index cef62235da2..8917a8826c0 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index 447f4c822cd..4ded2723c75 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.quickfix.QuickfixPackage; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurrounder.java index 2f2f7b86eb6..0e8aa96099b 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinExpressionSurrounder.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetCallExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetQualifiedExpression; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; public abstract class KotlinExpressionSurrounder implements Surrounder { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java index ccd6ffd0394..be9659eaba6 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinNotSurrounder.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetParenthesizedExpression; import org.jetbrains.kotlin.psi.JetPrefixExpression; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt index d81dc38e1e8..fd94bdb19a6 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.* import org.jetbrains.kotlin.asJava.KotlinLightClass import org.jetbrains.jet.lang.descriptors.ClassKind import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.project.ProjectStructureUtil import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt index 00669fcfeb4..94a2f091a2f 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.plugin.completion.* import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.name.isValidJavaFqName import org.jetbrains.jet.lang.resolve.ImportPath diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt index 675e3b84181..d851ed046d9 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt @@ -63,7 +63,7 @@ import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.psi.JetDeclarationWithBody -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler import org.jetbrains.kotlin.psi.JetLoopExpression diff --git a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt index dbca0341621..30f7f0e793e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.types.JetType import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetIfExpression -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetContainerNode import org.jetbrains.jet.lang.resolve.calls.callUtil.noErrorsInValueArguments import org.jetbrains.jet.lang.descriptors.Visibilities diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt index 39ca7d91cdf..d0d56f867be 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt @@ -24,7 +24,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.JetDescriptorIconProvider import org.jetbrains.jet.plugin.completion.handlers.* import org.jetbrains.kotlin.renderer.DescriptorRenderer diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt index 6333c4cbad6..d7543fddc73 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt @@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.completion.handlers.* import com.intellij.codeInsight.completion.PrefixMatcher import java.util.ArrayList diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt index 87b66e03917..737b55a9dc7 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt @@ -29,7 +29,7 @@ import com.intellij.codeInsight.template.Result import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.openapi.project.Project import com.intellij.psi.PsiDocumentManager import com.intellij.psi.util.PsiTreeUtil diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt index 79d0909dd77..2335c8c874b 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.completion.smart import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.jet.plugin.completion.ExpectedInfo -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.kotlin.psi.* import com.intellij.codeInsight.lookup.LookupElementDecorator diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt index 430a61b418a..5c44fdf292e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/LambdaItems.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.completion.smart import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementBuilder -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.completion.handlers.insertLambdaTemplate import com.intellij.openapi.util.TextRange import org.jetbrains.jet.plugin.completion.KotlinCompletionCharFilter diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt index 5cb35df22c3..a2bd9367dc2 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt @@ -25,7 +25,7 @@ import com.intellij.codeInsight.lookup.* import com.intellij.codeInsight.completion.* import java.util.* import org.jetbrains.jet.plugin.completion.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.util.makeNotNullable import org.jetbrains.jet.plugin.util.makeNullable import org.jetbrains.kotlin.renderer.DescriptorRenderer diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt index d265c35e158..71e74638859 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.completion.smart import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.completion.InsertHandler diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt index 03b72016eff..d0708fe38f2 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt @@ -26,7 +26,7 @@ import java.util.HashSet import com.intellij.codeInsight.lookup.LookupElementDecorator import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.jet.plugin.completion.* import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt index bbc0b0ccf72..1ca8ad8734c 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt @@ -54,8 +54,8 @@ import org.jetbrains.jet.lang.resolve.extension.InlineAnalyzerExtension import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.types.lang.InlineStrategy -import org.jetbrains.jet.lang.types.lang.InlineUtil +import org.jetbrains.kotlin.builtins.InlineStrategy +import org.jetbrains.kotlin.builtins.InlineUtil import org.jetbrains.jet.plugin.caches.resolve.IdeaModuleInfo import org.jetbrains.jet.plugin.caches.resolve.KotlinCacheService import org.jetbrains.jet.plugin.caches.resolve.* diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt index d6c72a8f74a..051b6d84e1c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.kotlin.psi.JetCallableReferenceExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import kotlin.properties.Delegates -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt index 0782c983eec..018e0b4c7df 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToBlockBodyAction.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public class ConvertToBlockBodyAction : PsiElementBaseIntentionAction() { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt index 1cd962552cb..dfe531478de 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt @@ -8,7 +8,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.BindingContextUtils -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt index 0b1adedc2c2..8b26efbc09c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.editor.Editor import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.openapi.util.TextRange import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt index 75e4658a88c..510edeefd98 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.util.PsiUtilCore -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt index daa3c8688a9..82bd5cac2ec 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.util.psi.patternMatching.matches import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt index 52a9ac664c2..9206365b17c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.openapi.editor.Editor import org.jetbrains.jet.lang.types.checker.JetTypeChecker -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java index 54809eca1f9..0f2e514fc70 100644 --- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java @@ -46,7 +46,7 @@ import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java index 79d72d0ab27..8ab70b4f920 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java index c3fc3795e0a..1b2b7a941b1 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeProjection; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java index 5f57248bcb2..f28335f9bab 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java index ba16e815136..c037050af0b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.JetNameSuggester; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 9faf266f85d..bb351973a11 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.types.* -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.refactoring.JetNameSuggester import kotlin.properties.Delegates diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt index 137c109d50c..8b789d86560 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableInfo.kt @@ -11,7 +11,7 @@ import org.jetbrains.jet.plugin.refactoring.EmptyValidator import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.util.supertypes import org.jetbrains.jet.lang.types.ErrorUtils -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt index 28efa9143ce..e6f322d4c0b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.types.TypeProjectionImpl import org.jetbrains.jet.lang.types.JetTypeImpl import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.jet.lang.resolve.bindingContextUtil.isUsedAsStatement -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetPropertyDelegate import org.jetbrains.kotlin.psi.JetProperty diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt index d830b06ada3..4b41f9fafc3 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromCallWithConstructorCalleeActionFactory.kt @@ -5,7 +5,7 @@ import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt index 30035b27d79..41f8f8e5d6f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromConstructorCallActionFactory.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt index 8cd7dd42727..62d9af3d46a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateBinaryOperationActionFactory.kt @@ -8,7 +8,7 @@ import org.jetbrains.jet.lang.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.jet.lang.types.Variance import java.util.Collections -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt index 0307c37994d..87e61717800 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateFunctionOrPropertyFromCallActionFactory.kt @@ -5,7 +5,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetQualifiedExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt index 6ed5488485b..e201934d59a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateHasNextFunctionActionFactory.kt @@ -8,7 +8,7 @@ import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.lang.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateHasNextFunctionActionFactory : JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt index 41b4e3f3112..56f97254043 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateInvokeFunctionActionFactory.kt @@ -7,7 +7,7 @@ import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.jet.lang.types.Variance import org.jetbrains.kotlin.psi.JetCallExpression -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import java.util.Collections diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt index 182ca9f232c..15ed011378b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateIteratorFunctionActionFactory.kt @@ -8,7 +8,7 @@ import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.lang.types.TypeProjectionImpl import java.util.Collections diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt index 1b43f756c1c..49164b4ce12 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreatePropertyDelegateAccessorsActionFactory.kt @@ -12,7 +12,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.descriptors.PropertyDescriptor import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallableInfo import com.intellij.util.SmartList import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt index 0295fca8c80..64b8437a69b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateSetFunctionActionFactory.kt @@ -8,7 +8,7 @@ import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.jet.lang.types.Variance import java.util.ArrayList import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import java.util.Collections import org.jetbrains.kotlin.psi.JetOperationExpression diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt index 96134013568..81cdf3f1111 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterActionFactory.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.kotlin.psi.JetClassInitializer import org.jetbrains.kotlin.psi.JetClassBody -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.getTypeParameters import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt index e64bad67421..75f55f20a44 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterByNamedArgumentActionFactory.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo import org.jetbrains.kotlin.psi.JetValueArgument import org.jetbrains.kotlin.psi.JetCallElement diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java index 6d286515ebb..04b19937e8f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.ErrorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetLexer; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java index b82a36e1874..52ee0af200e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java @@ -45,7 +45,7 @@ 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.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt index a9a691c97c7..076b69d3b31 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.JetLanguage import org.jetbrains.jet.plugin.caches.resolve.* diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java index 3c66b789dd3..3e401c9fee6 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java @@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeSubstitutor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.shorten.ShortenPackage; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt index 6457a46de00..879f567d664 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt @@ -20,7 +20,7 @@ import org.jetbrains.jet.lang.types.JetType import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.util.containers.MultiMap import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetThisExpression diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt index 66d44fc7544..98379d82c64 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt @@ -26,7 +26,7 @@ import java.util.* import org.jetbrains.jet.plugin.refactoring.createTempCopy import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.jet.plugin.refactoring.JetNameSuggester -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index ca694961076..be79ce90c24 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -47,7 +47,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; import org.jetbrains.jet.lang.types.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java index 000d21a9c2d..da8b9611b86 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import org.jetbrains.jet.testing.TagsTestDataUtil; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt index fef3a07863b..b0538e8a1a1 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils import com.intellij.openapi.project.Project import org.jetbrains.jet.lang.descriptors.ClassDescriptor import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.resolveTopLevelClass import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.descriptors.ModuleDescriptor @@ -84,4 +84,4 @@ class ProjectBasedResolverForDecompiler(project: Project) : ResolverForDecompile it is CallableMemberDescriptor && it.module != KotlinBuiltIns.getInstance().getBuiltInsModule() } sortBy MemberComparator.INSTANCE } -} \ No newline at end of file +} diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java index 570a1380949..32796c6d387 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java @@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.descriptors.Visibilities; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java index ae3a77e6a67..82a8304c942 100644 --- a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java @@ -21,7 +21,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.ResolveTestCase; import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.PluginTestCaseBase; import java.util.ArrayList; diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt index dbd6a36419f..a2779e14aaf 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.j2k.ast.* import org.jetbrains.jet.lang.types.expressions.OperatorConventions import com.intellij.psi.CommonClassNames.* import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.types.lang.PrimitiveType +import org.jetbrains.kotlin.builtins.PrimitiveType import org.jetbrains.kotlin.j2k.* import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.kotlin.psi.JetProperty diff --git a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt index 616f5cab39b..e638a71ef5e 100644 --- a/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt +++ b/js/js.dart-ast/src/com/google/dart/compiler/backend/js/ast/metadata/metadataProperties.kt @@ -17,7 +17,7 @@ package com.google.dart.compiler.backend.js.ast.metadata import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.types.lang.InlineStrategy +import org.jetbrains.kotlin.builtins.InlineStrategy import kotlin.properties.Delegates public var JsName.staticRef: JsNode? by MetadataProperty(default = null) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java index d57a072b271..b04f58cf204 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.lang.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java index c07d82c6e11..bfa515a546e 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/TopDownAnalyzerFacadeForJS.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerForJs; import org.jetbrains.kotlin.js.config.Config; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt index 44333d41a13..5c85c2febd3 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/KotlinJsDeclarationCheckerProvider.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticSink import org.jetbrains.jet.lang.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.types.TypeUtils import org.jetbrains.kotlin.js.PredefinedAnnotation import org.jetbrains.jet.lang.resolve.DescriptorUtils diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java index 6d060292a4e..0ca50df2f9f 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.lang.InlineStrategy; +import org.jetbrains.kotlin.builtins.InlineStrategy; import org.jetbrains.kotlin.js.inline.context.*; import org.jetbrains.kotlin.js.inline.exception.InlineRecursionException; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt index 2f4628701c4..422da443adc 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/FunctionCallCases.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.jet.lang.descriptors.CallableDescriptor import com.google.dart.compiler.backend.js.ast.JsNew import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.google.dart.compiler.backend.js.ast.JsLiteral import com.google.dart.compiler.backend.js.ast.JsName import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index 2f5a3a63258..5558914800d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java index 9759000b597..a9a7c5ebef0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StandardClasses.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.PrimitiveType; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java index a4d14a59946..72cf3663a43 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/ClassTranslator.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.JetObjectDeclaration; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.backend.common.CodegenUtil; import org.jetbrains.kotlin.backend.common.bridges.Bridge; import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt index 548e9340c52..bb373f8ad76 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.AbstractTranslator import org.jetbrains.kotlin.js.translate.general.Translation.patternTranslator diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java index 0362236a614..227e7cc121a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.NullValue; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.lang.InlineUtil; +import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt index b74afe9e9eb..ae39cf94af3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LiteralFunctionTranslator.kt @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.descriptors.MemberDescriptor import org.jetbrains.jet.lang.descriptors.Visibilities import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.inline.util.getInnerFunction -import org.jetbrains.jet.lang.types.lang.InlineUtil +import org.jetbrains.kotlin.builtins.InlineUtil import org.jetbrains.jet.lang.descriptors.FunctionDescriptor class LiteralFunctionTranslator(context: TranslationContext) : AbstractTranslator(context) { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java index 6308b93c6f8..9edd2deed55 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/ArrayFIF.java @@ -22,7 +22,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java index f39686f63cd..09e6ff43519 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -29,8 +29,8 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo; import org.jetbrains.kotlin.js.translate.context.Namer; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/NamePredicate.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/NamePredicate.java index db0a49e436a..b3ca1c222d6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/NamePredicate.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/NamePredicate.java @@ -24,7 +24,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.lang.PrimitiveType; +import org.jetbrains.kotlin.builtins.PrimitiveType; import java.util.Arrays; import java.util.Collection; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index 093d53dc05b..80e8dd67889 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java @@ -37,8 +37,8 @@ import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; -import org.jetbrains.jet.lang.types.lang.InlineStrategy; -import org.jetbrains.jet.lang.types.lang.InlineUtil; +import org.jetbrains.kotlin.builtins.InlineStrategy; +import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java index 40c8f0c9a28..f11b2a75a93 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetDeclarationWithBody; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.general.Translation; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java index b255368e15c..7831a98e138 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsDescriptorUtils.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import java.util.Collection; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java index 93eeacf3295..7ea98ad1250 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/TranslationUtils.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.jet.lang.types.TypeProjection; -import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.js.translate.context.TemporaryConstVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.Translation; diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index 45b586748d2..411440bd9b0 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -37,7 +37,7 @@ 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.jet.lang.types.lang.KotlinBuiltIns +import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.kotlin.js.config.LibrarySourcesConfig import org.jetbrains.kotlin.js.config.EcmaVersion