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 61f86fd12f9..3a66c6901af 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 @@ -22,17 +22,17 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -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.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt index 824b22d0b60..92e29776007 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtilKt.kt @@ -16,16 +16,16 @@ package org.jetbrains.kotlin.backend.common -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.types.JetType import kotlin.platform.platformStatic -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.utils.keysToMapExceptNulls import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.MemberComparator import java.util.Comparator -import org.jetbrains.jet.lang.types.isDynamic +import org.jetbrains.kotlin.types.isDynamic public object CodegenUtilKt { 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 81ff5336d3e..83330a59dea 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 @@ -18,14 +18,14 @@ package org.jetbrains.kotlin.backend.common; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetParameter; 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.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt index cd8502b77b0..9b6998663ac 100644 --- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt +++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/bridges/impl.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.backend.common.bridges -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.OverrideResolver import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils public fun generateBridgesForFunctionDescriptor( descriptor: FunctionDescriptor, diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java index 7740c4b68d1..e9b5c5360a1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForCallableDescriptor.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; public interface AccessorForCallableDescriptor { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java index e6d46703b5f..42b3bd9345c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java @@ -17,19 +17,19 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; +import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; public class AccessorForFunctionDescriptor extends SimpleFunctionDescriptorImpl implements AccessorForCallableDescriptor { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java index d601ec1829e..89569f6e430 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyBackingFieldInOuterClass.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.types.JetType; public class AccessorForPropertyBackingFieldInOuterClass extends AccessorForPropertyDescriptor { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java index d235c4a38de..636ae49efcd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java @@ -18,15 +18,15 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.PropertyGetterDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.PropertySetterDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.PropertyGetterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.PropertySetterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index 079d99873d5..03eef601bb5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -19,18 +19,18 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.constants.*; import org.jetbrains.jet.lang.resolve.constants.StringValue; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; -import org.jetbrains.jet.lang.resolve.name.FqName; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.types.Flexibility; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.TypesPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.org.objectweb.asm.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 435e94da40c..178d3c1c94e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -40,10 +40,10 @@ import org.jetbrains.jet.lang.resolve.java.*; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaCallableMemberDescriptor; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.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.kotlin.name.FqName; +import org.jetbrains.kotlin.types.Approximation; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypesPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.lexer.JetTokens; @@ -62,7 +62,7 @@ import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.ABI_VERSION_FIELD_NAME; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.jet.lang.resolve.java.mapping.PrimitiveTypesUtil.asmTypeForPrimitive; -import static org.jetbrains.jet.lang.types.TypeUtils.isNullableType; +import static org.jetbrains.kotlin.types.TypeUtils.isNullableType; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class AsmUtil { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java index 99e5a6bab94..a683f101ae2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallBasedArgumentGenerator.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java index b100c93861b..5a63c5f59e5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CallGenerator.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.org.objectweb.asm.Type; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java index 2fe545d8f12..0c2130d67ce 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java @@ -20,10 +20,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.context.ClassContext; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index 2b0cc3c6645..6ffb196c124 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 644e1c1ecbc..5b196a3094c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -27,15 +27,15 @@ import org.jetbrains.kotlin.codegen.context.ClassContext; import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index 76eb3cb8e80..b7ece363213 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -17,22 +17,22 @@ package org.jetbrains.kotlin.codegen import org.jetbrains.kotlin.codegen.state.GenerationState -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.* -import org.jetbrains.jet.lang.descriptors.impl.* +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.* +import org.jetbrains.kotlin.descriptors.impl.* import org.jetbrains.org.objectweb.asm.Opcodes.* import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.types.* +import org.jetbrains.kotlin.types.* import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.OverrideResolver import org.jetbrains.jet.lang.resolve.OverridingUtil import java.util.LinkedHashSet -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import java.util.ArrayList -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.checker.JetTypeChecker import java.util.HashSet import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java index 8c5cc9ec7e4..0aeac959461 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetParameter; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 20d646d9458..02dda2d83c8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -41,7 +41,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.codegen.when.SwitchCodegen; import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.evaluate.EvaluatePackage; import org.jetbrains.kotlin.psi.*; @@ -60,13 +60,13 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.*; -import org.jetbrains.jet.lang.types.Approximation; -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.kotlin.types.Approximation; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java index aaa6b0fe87b..1b6e5dacf44 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.java index d85665f7966..187cc74a6fd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FrameMap.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.Trinity; import gnu.trove.TObjectIntHashMap; import gnu.trove.TObjectIntIterator; import org.jetbrains.org.objectweb.asm.Type; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index a3203fe5fde..70e74188ef2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.codegen.context.PackageFacadeContext; import org.jetbrains.kotlin.codegen.optimization.OptimizationMethodVisitor; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -48,9 +48,9 @@ import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations.NativeDeclarationsPackage; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.Approximation; -import org.jetbrains.jet.lang.types.TypesPackage; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.types.Approximation; +import org.jetbrains.kotlin.types.TypesPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.backend.common.bridges.Bridge; import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; @@ -69,7 +69,7 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.isLocalNamedFun; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DECLARATION; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.callableDescriptorToDeclaration; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isFunctionLiteral; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java index 46c07422079..16a3c9d2c63 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionGenerationStrategy.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.JetDeclarationWithBody; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 8b886a5127c..81283c86e42 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.serialization.jvm.BitEncoding; import org.jetbrains.kotlin.serialization.ClassData; import org.jetbrains.kotlin.serialization.DescriptorSerializer; import org.jetbrains.kotlin.serialization.ProtoBuf; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DeclarationResolver; @@ -53,9 +53,9 @@ import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmClassSignature; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterKind; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.backend.common.CodegenUtil; @@ -78,7 +78,7 @@ import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.*; import static org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; -import static org.jetbrains.jet.lang.types.Variance.INVARIANT; +import static org.jetbrains.kotlin.types.Variance.INVARIANT; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class ImplementationBodyCodegen extends ClassBodyCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 4a7134d75ca..6dd5e553df5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.context.PackageContext; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilPackage; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; @@ -38,12 +38,12 @@ import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaPackageFragm import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass; import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackageFragmentProvider; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.io.File; -import static org.jetbrains.jet.lang.descriptors.Modality.ABSTRACT; -import static org.jetbrains.jet.lang.descriptors.Modality.FINAL; +import static org.jetbrains.kotlin.descriptors.Modality.ABSTRACT; +import static org.jetbrains.kotlin.descriptors.Modality.FINAL; public class JvmCodegenUtil { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java index cb9104eb6b1..a6687fe46da 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java @@ -17,19 +17,19 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java index 6e351ea2122..5a30b43b40f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializationBindings.java @@ -21,10 +21,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.Method; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.util.slicedmap.*; import java.util.Collection; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java index e26f52c2a85..6c7f97d5ec9 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmSerializerExtension.java @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.serialization.SerializerExtension; import org.jetbrains.kotlin.serialization.StringTable; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.kotlin.SignatureDeserializer; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.Method; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java index 1b637104c48..6977c5e2e65 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.org.objectweb.asm.Type; import java.util.Collection; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index 2805903e805..35b9951b423 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -27,19 +27,19 @@ import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil; import org.jetbrains.kotlin.codegen.inline.NameGenerator; import org.jetbrains.kotlin.codegen.inline.ReifiedTypeParametersUsages; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.name.SpecialNames; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.SpecialNames; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.org.objectweb.asm.MethodVisitor; @@ -52,8 +52,8 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; -import static org.jetbrains.jet.lang.descriptors.SourceElement.NO_SOURCE; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; +import static org.jetbrains.kotlin.descriptors.SourceElement.NO_SOURCE; import static org.jetbrains.jet.lang.resolve.BindingContext.VARIABLE; import static org.jetbrains.jet.lang.resolve.java.AsmTypes.*; import static org.jetbrains.jet.lang.resolve.java.diagnostics.DiagnosticsPackage.OtherOrigin; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index bb4dd5b79b8..959bb0639a1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -41,9 +41,9 @@ import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -53,7 +53,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt index 48227e807e2..fa7e24c1987 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PlatformStaticGenerator.kt @@ -16,19 +16,19 @@ package org.jetbrains.kotlin.codegen -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin import org.jetbrains.jet.lang.resolve.java.diagnostics.Synthetic -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature import org.jetbrains.kotlin.codegen.context.MethodContext import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.backend.common.CodegenUtil -import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor +import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor import kotlin.platform.platformStatic class PlatformStaticGenerator( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index cf13ec9c363..fa929f5eec0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorFactory; @@ -33,9 +33,9 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.FieldVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java index da0f3b0d48d..de01a2fea8c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.codegen; import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.psi.*; 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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java index 1a2a566120d..8795ca0a0d1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamCodegenUtil.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor; public class SamCodegenUtil { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java index 8fe33da66ca..0eb5c6d72a4 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamType.java @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; import org.jetbrains.jet.lang.resolve.java.sam.SingleAbstractMethodUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public class SamType { public static SamType create(@NotNull JetType originalType) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java index 839e862f6ee..5708367f4ad 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java @@ -20,17 +20,17 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; 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/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index c679f1e5882..52bc94666ec 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -23,10 +23,10 @@ import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.context.ScriptContext; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JvmAbi; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index 4376ded04f9..ff895954c84 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethod; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetArrayAccessExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java index 69d7252fdf7..3daeb7b1c92 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java @@ -20,9 +20,9 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.ValueArgument; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java index e4e63357737..ed0f882c8c6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CalculatedClosure.java @@ -20,11 +20,11 @@ import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java index f62b689a866..2e267dcddfc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -31,8 +31,8 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil; import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping; import org.jetbrains.kotlin.cfg.WhenChecker; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; @@ -47,17 +47,17 @@ import org.jetbrains.jet.lang.resolve.constants.EnumValue; import org.jetbrains.jet.lang.resolve.constants.NullValue; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.source.SourcePackage; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; import java.util.*; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; -import static org.jetbrains.jet.lang.resolve.name.SpecialNames.safeIdentifier; +import static org.jetbrains.kotlin.name.SpecialNames.safeIdentifier; import static org.jetbrains.kotlin.lexer.JetTokens.*; class CodegenAnnotatingVisitor extends JetVisitorVoid { 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 bb311a50fbc..2ca294eaab1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -22,14 +22,14 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.SamType; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; import org.jetbrains.kotlin.psi.*; 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.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.util.slicedmap.BasicWritableSlice; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java index 42dfff34f03..7ba6fd8ba92 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/MutableClosure.java @@ -20,9 +20,9 @@ import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; import java.util.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java index 3fa2e9e24b6..54ebb972f84 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java @@ -21,11 +21,11 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AsmUtil; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.org.objectweb.asm.Type; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java index a0d6bf3faad..f3d4446730f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/AnonymousClassContext.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; public class AnonymousClassContext extends ClassContext { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java index 15c612f81a7..222105e8c8b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClassContext.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLOSURE; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java index 81b1b6d70fc..57b00cd86f3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ClosureContext.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; class ClosureContext extends ClassContext { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java index d061510e4cf..2b98a0b2796 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java @@ -23,10 +23,10 @@ import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.NullableLazyValue; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java index 44329c3b9a2..b1e14ed1d80 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ConstructorContext.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.binding.MutableClosure; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import static org.jetbrains.jet.lang.resolve.java.AsmTypes.OBJECT_TYPE; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/EnclosedValueDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/EnclosedValueDescriptor.java index ea4ade4db65..3f8d626af6c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/EnclosedValueDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/EnclosedValueDescriptor.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.org.objectweb.asm.Type; public final class EnclosedValueDescriptor { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java index 25f694695b2..3f685dbec6a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java @@ -20,9 +20,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.binding.MutableClosure; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import java.util.HashMap; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java index 36c84524c6a..6c7ebb67ecb 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java @@ -22,10 +22,10 @@ import org.jetbrains.kotlin.codegen.JvmCodegenUtil; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; import static org.jetbrains.kotlin.codegen.AsmUtil.CAPTURED_RECEIVER_FIELD; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java index 6464a0a5571..990cad3a365 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageContext.java index ad3ad7e60a7..6ca56fa9a95 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageContext.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.org.objectweb.asm.Type; public class PackageContext extends FieldOwnerContext { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageFacadeContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageFacadeContext.java index 359a551673f..f9319ae9b0c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageFacadeContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/PackageFacadeContext.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.codegen.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.org.objectweb.asm.Type; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; public class PackageFacadeContext extends PackageContext { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/RootContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/RootContext.java index cd4aa600d00..b40d4e2abbf 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/RootContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/RootContext.java @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.codegen.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.OwnerKind; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorVisitor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.TypeSubstitutor; class RootContext extends CodegenContext { public RootContext() { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java index 7731efdffcc..b26b7d9b7c7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/ScriptContext.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.OwnerKind; import org.jetbrains.kotlin.codegen.binding.MutableClosure; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import java.util.List; 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 f8d03a0771e..a8e866550ea 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.context.PackageContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java index 16101ac5134..54973fa7f4f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -41,8 +41,8 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java index a3cccf91473..87254376189 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java @@ -23,9 +23,9 @@ import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; import org.jetbrains.kotlin.codegen.context.EnclosedValueDescriptor; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetFunctionLiteral; import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; import org.jetbrains.jet.lang.resolve.BindingContext; 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 c58f21eb67e..58b50fb7a90 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java @@ -20,14 +20,14 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetCallExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java index da45bb4a16c..7d138a84d12 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/CopyToArray.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java index 1f93e96f026..7178368661a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.codegen.intrinsics; import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java index 14fe44d4074..066b1cbc968 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.codegen.intrinsics; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; import java.util.Map; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java index aa9045b8420..487e2c9515f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassArray.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java index 72e07291f55..20690897a42 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/JavaClassFunction.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; 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/optimization/boxing/BoxingInterpreter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/boxing/BoxingInterpreter.java index 4109080872d..67e5db47729 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 @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.codegen.RangeCodegenUtil; import org.jetbrains.kotlin.codegen.optimization.common.OptimizationBasicInterpreter; import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java index 800f6570fcd..fc7ef906ffe 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/BothSignatureWriter.java @@ -27,8 +27,8 @@ import org.jetbrains.org.objectweb.asm.commons.Method; import org.jetbrains.org.objectweb.asm.signature.SignatureVisitor; import org.jetbrains.org.objectweb.asm.signature.SignatureWriter; import org.jetbrains.org.objectweb.asm.util.CheckSignatureAdapter; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.Variance; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.Variance; import java.util.ArrayList; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt index 8cee95cb306..23387dc84ae 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.signature import org.jetbrains.kotlin.codegen.ClassBuilderMode import org.jetbrains.kotlin.codegen.state.JetTypeMapper -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt index c999cff1997..9ed295d4466 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt @@ -20,12 +20,12 @@ import com.intellij.psi.PsiElement import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.codegen.ClassBuilderFactory import org.jetbrains.kotlin.codegen.SignatureCollectingClassBuilderFactory -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.java.diagnostics.* import java.util.* -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DELEGATION -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERRIDE +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERRIDE import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.codegen.ClassBuilderMode import org.jetbrains.jet.lang.resolve.java.descriptor.SamAdapterDescriptor diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java index 3abf90a91bd..dbd9db30fba 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.optimization.OptimizationClassBuilderFactory; import org.jetbrains.kotlin.codegen.when.MappingsClassesForWhenByEnum; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.reflect.ReflectionTypes; 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.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.io.File; import java.util.Collection; 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 60ed111ad7b..05216826efc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -27,10 +27,10 @@ import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; @@ -50,10 +50,10 @@ import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmMethodSignature; import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations.NativeDeclarationsPackage; -import org.jetbrains.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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.SpecialNames; +import org.jetbrains.kotlin.types.*; 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/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java index 9fa34bcffb8..83d6d7f83f5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java @@ -24,8 +24,8 @@ import org.jetbrains.kotlin.psi.JetWhenExpression; import org.jetbrains.jet.lang.resolve.BindingContext; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.org.objectweb.asm.Label; 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/when/WhenByEnumsMapping.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/WhenByEnumsMapping.java index 366eb0c183f..400ed1aa858 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/WhenByEnumsMapping.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/WhenByEnumsMapping.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen.when; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.constants.EnumValue; import java.util.HashMap; diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index e4585aee5ff..04227317df6 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -21,15 +21,15 @@ import com.intellij.openapi.util.Disposer import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.serialization.* -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import java.io.ByteArrayOutputStream import org.jetbrains.kotlin.builtins.BuiltInsSerializationUtil import com.intellij.openapi.Disposable import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.jet.config.CommonConfigurationKeys import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.utils.recursePostOrder import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.resolve.java.JvmAnalyzerFacade diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java index a8f264399b3..ccc0c6e33d7 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java @@ -26,8 +26,8 @@ import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java index 4b4c71f5c51..529184f44e0 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.java @@ -30,16 +30,16 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java index 0c3eb05ed85..a7de083618e 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliVirtualFileFinder.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClassFinder; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; public class CliVirtualFileFinder extends VirtualFileKotlinClassFinder implements VirtualFileFinder { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CommandLineScriptUtils.java index 47c416cedd9..f11d5beb1ba 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 @@ -17,14 +17,14 @@ 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.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.types.Variance.INVARIANT; +import static org.jetbrains.kotlin.types.Variance.INVARIANT; public class CommandLineScriptUtils { private static final Name ARGS_NAME = Name.identifier("args"); diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index f07a152b351..3616bd28c2d 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -43,7 +43,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.utils.PathUtil; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java index f9047d4c80b..7ed75832807 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.Progress; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.context.ContextPackage; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.psi.JetFile; @@ -49,7 +49,7 @@ import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackage; import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache; import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.asJava.FilteredJvmDiagnostics; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt index 510089a772d..48788018940 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/DelegatePackageMemberDeclarationProvider.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cli.jvm.repl import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter open class DelegatePackageMemberDeclarationProvider(var delegate: PackageMemberDeclarationProvider) : PackageMemberDeclarationProvider { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/EarlierLine.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/EarlierLine.java index 0aadf1e332e..27277a0fa76 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/EarlierLine.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/EarlierLine.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cli.jvm.repl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.org.objectweb.asm.Type; public class EarlierLine { 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 1fb2333d47d..39afbd0a813 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 @@ -39,9 +39,9 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.CompositePackageFragmentProvider; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.parsing.JetParserDefinition; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetScript; @@ -51,9 +51,9 @@ import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.lazy.declarations.*; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java index ef18547a3a9..5d698e6d1c0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaBindingContext.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.java; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java index c40072e262c..1e21fe2d84a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderImpl.java @@ -28,9 +28,9 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPackageImpl; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.jet.plugin.JetFileType; import javax.annotation.PostConstruct; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderPostConstruct.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderPostConstruct.kt index a9af2e1e38d..17018c884ca 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderPostConstruct.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinderPostConstruct.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java import com.intellij.openapi.project.Project import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import javax.inject.Inject import javax.annotation.PostConstruct import org.jetbrains.jet.lang.resolve.BindingTrace diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaFlexibleTypeCapabilitiesProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaFlexibleTypeCapabilitiesProvider.kt index 9f8c5208bc4..24e04112c92 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaFlexibleTypeCapabilitiesProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaFlexibleTypeCapabilitiesProvider.kt @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.java import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider -import org.jetbrains.jet.lang.types.FlexibleTypeCapabilities +import org.jetbrains.kotlin.types.FlexibleTypeCapabilities import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver public class JavaFlexibleTypeCapabilitiesProvider : FlexibleTypeCapabilitiesProvider() { override fun getCapabilities(): FlexibleTypeCapabilities = LazyJavaTypeResolver.FlexibleJavaClassifierTypeCapabilities -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java index 12e5c21e198..0d658b58b92 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaResolverUtils.java @@ -18,15 +18,15 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.java.structure.*; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeProjection; -import org.jetbrains.jet.lang.types.TypeProjectionImpl; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.TypeProjectionImpl; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.*; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt index f108ce1953a..d0c9822656f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnalyzerFacade.kt @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService import com.intellij.openapi.project.Project import org.jetbrains.jet.context.GlobalContext -import org.jetbrains.jet.lang.descriptors.impl.CompositePackageFragmentProvider +import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.java.lazy.ModuleClassResolverImpl -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.jet.analyzer.ModuleInfo import org.jetbrains.jet.analyzer.ModuleContent import org.jetbrains.kotlin.di.InjectorForLazyResolveWithJava 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 91c5a04066b..a9df884670d 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 @@ -25,8 +25,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.ImportPath; @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalPackageFragm 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.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerForJvm; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java index 0fc1e905092..eb906ec6a30 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/DefaultErrorMessagesJvm.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.diagnostics; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticFactoryToRendererMap; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java index 189c140e69c..dc13613f037 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/ErrorsJvm.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.diagnostics; import com.intellij.psi.PsiElement; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; import org.jetbrains.jet.lang.diagnostics.Errors; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt index a847b1fb186..848c532e122 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/diagnostics/JvmDeclarationOrigin.kt @@ -17,15 +17,15 @@ package org.jetbrains.jet.lang.resolve.java.diagnostics import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOriginKind.* -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor public enum class MemberKind { FIELD; METHOD } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt index c57502481dc..a311c9158f7 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/jvmSignature/KotlinToJvmSignatureMapper.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.java.jvmSignature -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor public trait KotlinToJvmSignatureMapper { public fun mapToJvmMethodSignature(function: FunctionDescriptor): JvmMethodSignature @@ -32,4 +32,4 @@ fun erasedSignaturesEqualIgnoringReturnTypes(subFunction: JvmMethodSignature, su p -> val (subParam, superParam) = p subParam.getAsmType() == superParam.getAsmType() } -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java index 6a5a0666eea..49c6ceafe8b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java @@ -19,12 +19,12 @@ package org.jetbrains.jet.lang.resolve.java.kotlinSignature; import com.intellij.openapi.project.Project; import com.intellij.util.containers.ComparatorUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.structure.JavaField; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.HashMap; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java index 63ae94e02c0..99a8314b640 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 @@ -22,22 +22,22 @@ import com.intellij.util.containers.ComparatorUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; -import org.jetbrains.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.TypeUtils; -import org.jetbrains.jet.lang.types.Variance; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.Variance; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/CollectionClassMapping.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/CollectionClassMapping.java index afd023f5ed3..3c6bb9730cf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/CollectionClassMapping.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/CollectionClassMapping.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.kotlinSignature; import com.google.common.collect.ImmutableBiMap; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.platform.JavaToKotlinClassMapBuilder; public class CollectionClassMapping extends JavaToKotlinClassMapBuilder { 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 8eaa1618d2e..d2376fe5563 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 @@ -20,12 +20,12 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiErrorElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; 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 f4c77328c5c..7d6be90c615 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 @@ -21,14 +21,14 @@ import com.intellij.openapi.util.Condition; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; -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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.JetTypeImpl; +import org.jetbrains.kotlin.types.TypeProjectionImpl; +import org.jetbrains.kotlin.types.Variance; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; 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 b2480bb93e2..e553a0fc1c2 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 @@ -25,10 +25,10 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; @@ -38,10 +38,10 @@ import org.jetbrains.jet.lang.resolve.java.jvmSignature.JvmSignaturePackage; import org.jetbrains.jet.lang.resolve.java.jvmSignature.KotlinToJvmSignatureMapper; import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; @@ -49,8 +49,8 @@ import java.util.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.*; -import static org.jetbrains.jet.lang.types.Variance.INVARIANT; -import static org.jetbrains.jet.lang.types.Variance.OUT_VARIANCE; +import static org.jetbrains.kotlin.types.Variance.INVARIANT; +import static org.jetbrains.kotlin.types.Variance.OUT_VARIANCE; public class SignaturesPropagationData { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesUtil.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesUtil.java index f56356b25ed..a2576305c35 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesUtil.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.resolver.ExternalAnnotationResolver; import org.jetbrains.jet.lang.resolve.java.structure.*; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import static org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.*; 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 5a65e22a1c1..db82ccd9d85 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 @@ -19,10 +19,10 @@ package org.jetbrains.jet.lang.resolve.java.kotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.TypeResolver; @@ -30,16 +30,16 @@ import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap; import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; import static org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.TYPE_ARGUMENT; -import static org.jetbrains.jet.lang.types.Variance.INVARIANT; +import static org.jetbrains.kotlin.types.Variance.INVARIANT; public class TypeTransformingVisitor extends JetVisitor { private static boolean strictMode = false; 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 1594332fbaa..6d457f53afb 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 @@ -18,12 +18,12 @@ package org.jetbrains.jet.lang.resolve.java.mapping; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.AsmTypes; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.platform.JavaToKotlinClassMapBuilder; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSourceElementFactoryImpl.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSourceElementFactoryImpl.kt index 13407ca2b2b..3f6f3461da2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSourceElementFactoryImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaSourceElementFactoryImpl.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.java.structure.JavaElement import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementImpl import org.jetbrains.jet.lang.resolve.java.sources.JavaSourceElementFactory -import org.jetbrains.jet.lang.descriptors.SourceElement +import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.jet.lang.resolve.java.sources.JavaSourceElement private class JavaSourceElementImpl(override val javaElement: JavaElement) : PsiSourceElement, JavaSourceElement { @@ -31,4 +31,4 @@ private class JavaSourceElementImpl(override val javaElement: JavaElement) : Psi public class JavaSourceElementFactoryImpl : JavaSourceElementFactory { override fun source(javaElement: JavaElement): JavaSourceElement = JavaSourceElementImpl(javaElement) -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/LazyResolveBasedCache.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/LazyResolveBasedCache.kt index f971e69f7d4..4cf74d17d92 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/LazyResolveBasedCache.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/LazyResolveBasedCache.kt @@ -16,19 +16,19 @@ package org.jetbrains.jet.lang.resolve.java.resolver -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.java.structure.JavaElement import org.jetbrains.jet.lang.resolve.java.structure.JavaField import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import javax.inject.Inject import kotlin.properties.Delegates import com.intellij.openapi.diagnostic.Logger -import org.jetbrains.jet.lang.resolve.name.tail -import org.jetbrains.jet.lang.resolve.name.each +import org.jetbrains.kotlin.name.tail +import org.jetbrains.kotlin.name.each public class LazyResolveBasedCache() : JavaResolverCache { class object { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java index 2c065607d3e..c092a27e32f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedExternalAnnotationResolver.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaAnnotationImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaAnnotationOwnerImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java index 42b20e1a330..09ad2cc6665 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/PsiBasedMethodSignatureChecker.java @@ -23,18 +23,18 @@ import com.intellij.psi.util.MethodSignatureUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.TypeConversionUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.java.kotlinSignature.SignaturesUtil; import org.jetbrains.jet.lang.resolve.java.structure.*; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.SubstitutionUtils; -import org.jetbrains.jet.lang.types.TypeSubstitution; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.SubstitutionUtils; +import org.jetbrains.kotlin.types.TypeSubstitution; +import org.jetbrains.kotlin.types.TypeSubstitutor; import javax.inject.Inject; import java.util.ArrayList; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java index d49865e7021..f4f1152f9f5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedErrorReporter.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.java.resolver; import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedExternalSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedExternalSignatureResolver.java index a8af95bcd54..f9984a83c3f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedExternalSignatureResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedExternalSignatureResolver.java @@ -19,10 +19,10 @@ package org.jetbrains.jet.lang.resolve.java.resolver; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; import org.jetbrains.jet.lang.resolve.java.JavaPackage; @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaConstructor; import org.jetbrains.jet.lang.resolve.java.structure.JavaField; import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import javax.inject.Inject; import java.util.Collections; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java index 82aa36128e0..84aaa5de4c3 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/TraceBasedJavaResolverCache.java @@ -19,10 +19,10 @@ package org.jetbrains.jet.lang.resolve.java.resolver; import com.intellij.psi.PsiField; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; @@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaFieldImpl; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import javax.inject.Inject; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java index fcc021599a9..80a0adbb37f 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamAdapterOverridabilityCondition.java @@ -18,12 +18,12 @@ package org.jetbrains.jet.lang.resolve.java.sam; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; import org.jetbrains.jet.lang.resolve.ExternalOverridabilityCondition; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeSubstitutor; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.TypeUtils; import java.util.List; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamConversionResolverImpl.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamConversionResolverImpl.kt index 9d172d4b82e..6ea1b0217e6 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamConversionResolverImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/sam/SamConversionResolverImpl.kt @@ -17,19 +17,19 @@ package org.jetbrains.jet.lang.resolve.java.sam import org.jetbrains.jet.lang.resolve.java.resolver.SamConversionResolver -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.java.descriptor.* import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaClassDescriptor -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.java.sources.JavaSourceElement import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor +import org.jetbrains.kotlin.types.TypeUtils import java.util.ArrayList -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.checker.JetTypeChecker public object SamConversionResolverImpl : SamConversionResolver { override fun resolveSamConstructor(name: Name, scope: JetScope): SamConstructorDescriptor? { 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 b87b5e37649..e040a832da2 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 @@ -18,24 +18,24 @@ package org.jetbrains.jet.lang.resolve.java.sam; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.jet.lang.resolve.java.JavaResolverUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.*; import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver; import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils; import org.jetbrains.jet.lang.resolve.java.structure.*; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; -import static org.jetbrains.jet.lang.types.Variance.INVARIANT; +import static org.jetbrains.kotlin.types.Variance.INVARIANT; public class SingleAbstractMethodUtils { private SingleAbstractMethodUtils() { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java index d3b287f8368..85c1dec0633 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaAnnotationImpl.java @@ -22,9 +22,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationArgument; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java index 7cccb816203..2b69b51ff97 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaClassImpl.java @@ -22,11 +22,11 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; import org.jetbrains.jet.lang.resolve.java.structure.*; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import java.util.Collection; import java.util.HashMap; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java index 529a57032d9..9d44ea7db63 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementCollectionFromPsiArrayUtil.java @@ -22,7 +22,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.structure.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import java.util.ArrayList; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java index 46c4334fc1f..a5365588c04 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaElementUtil.java @@ -22,11 +22,11 @@ import com.intellij.psi.PsiModifierList; import com.intellij.psi.PsiModifierListOwner; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.Visibilities; -import org.jetbrains.jet.lang.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.Visibilities; +import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.jet.lang.resolve.java.JavaVisibilities; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java index b85ac294844..19c0d275d8c 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMemberImpl.java @@ -20,12 +20,12 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMember; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java index 18b478ea4f1..092b49f3797 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaMethodImpl.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; import org.jetbrains.jet.lang.resolve.java.structure.JavaType; import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter; import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import java.util.List; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt index 9748cf0454c..501cdf1c7d2 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPackageImpl.kt @@ -18,12 +18,12 @@ package org.jetbrains.jet.lang.resolve.java.structure.impl import com.intellij.psi.PsiPackage import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.classes import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaElementCollectionFromPsiArrayUtil.packages import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import com.intellij.psi.search.GlobalSearchScope public class JavaPackageImpl(psiPackage: PsiPackage, private val scope: GlobalSearchScope) : JavaElementImpl(psiPackage), JavaPackage { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java index b49747434bd..68d7e589e01 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java @@ -21,7 +21,7 @@ import com.intellij.psi.impl.JavaConstantExpressionEvaluator; import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.ConstantsPackage; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java index 1e3b7545467..51c9f6fb1cc 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaTypeParameterImpl.java @@ -20,7 +20,7 @@ import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.structure.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java index 80db14d78c5..c451772b7f5 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/JavaValueParameterImpl.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; import org.jetbrains.jet.lang.resolve.java.structure.JavaType; import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/annotationArgumentsImpl.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/annotationArgumentsImpl.kt index b7142c12f05..af06543717a 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/annotationArgumentsImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/structure/impl/annotationArgumentsImpl.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.structure.impl import com.intellij.psi.* import org.jetbrains.jet.lang.resolve.java.structure.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name abstract class JavaAnnotationArgumentImpl( override val name: Name? diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/FileBasedKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/FileBasedKotlinClass.java index 641cb62d7ee..06577b4dc28 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/FileBasedKotlinClass.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/FileBasedKotlinClass.java @@ -23,10 +23,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; import org.jetbrains.jet.lang.resolve.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor; -import org.jetbrains.jet.lang.resolve.name.ClassId; -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.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.FieldVisitor; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt index b410b554748..d8965184ea4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaDeclarationCheckerProvider.kt @@ -22,25 +22,25 @@ import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.resolve.annotations.hasPlatformStaticAnnotation import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.diagnostics.DiagnosticSink -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.jet.lang.resolve.annotations.hasInlineAnnotation -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetTypeParameter import org.jetbrains.jet.lang.resolve.annotations.hasIntrinsicAnnotation import org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations.NativeFunChecker import org.jetbrains.kotlin.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.descriptors.MemberDescriptor +import org.jetbrains.kotlin.descriptors.MemberDescriptor public object JavaDeclarationCheckerProvider : AdditionalCheckerProvider { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java index 3991e8e0dbf..0608a8e1bdf 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/PackagePartClassUtils.java @@ -24,14 +24,14 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.org.objectweb.asm.Type; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java index dcfe36ff078..d94f661eb3b 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileFinder.java @@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; public interface VirtualFileFinder extends KotlinClassFinder { class SERVICE { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt index 4fe7963d81e..235718eeeb0 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.kotlin import com.intellij.ide.highlighter.JavaClassFileType import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.utils.* diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt index 2faccf62423..8b4f0c34d73 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClassFinder.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.kotlin import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl import org.jetbrains.kotlin.utils.sure -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId public abstract class VirtualFileKotlinClassFinder : VirtualFileFinder { override fun findKotlinClass(classId: ClassId): KotlinJvmBinaryClass? { diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt index 3ca6d1cc6c5..16b077cff89 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalCacheUtil.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin.incremental import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.lang.resolve.java.JvmClassName import java.util.HashMap import java.io.File diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt index f5b91f73357..c17772c90fe 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.lang.resolve.kotlin.incremental -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.psi.JetFile import com.intellij.util.containers.MultiMap import java.util.HashMap -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider -import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider +import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents public class IncrementalPackageFragmentProvider( diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt index fc5c41b91b4..c3c2c2698f4 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/incremental/cache/IncrementalCache.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.kotlin.incremental.cache -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.kotlin.psi.JetFile import java.util.HashMap diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt index 9f6fb67c966..f5547b49d9e 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/native.kt @@ -17,15 +17,15 @@ package org.jetbrains.jet.lang.resolve.kotlin.nativeDeclarations import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.AnnotationChecker import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticSink -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.Modality +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.jet.lang.resolve.java.diagnostics.ErrorsJvm import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.lang.resolve.annotations.hasInlineAnnotation diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java index 66268c780b9..370b6114c8a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.kotlin.storage.LockBasedStorageManager; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl; import com.intellij.psi.search.GlobalSearchScope; 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 ae9b8d705cf..2ea03388457 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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 9d4a327344e..2856bbf402e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.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.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; @@ -45,12 +45,12 @@ import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; 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 4fa2e54ed2a..4f13bedd642 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.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.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; @@ -48,12 +48,12 @@ import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider.AdditionalFileScopeProv import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; 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 a930a8ecf3e..37543ab8d44 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.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.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; @@ -47,12 +47,12 @@ import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt index b3d5e50e57b..f073172e6cb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.analyzer -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.ErrorUtils import kotlin.platform.platformStatic public data open class AnalysisResult protected ( diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt index 4830521c6df..61164f0fd82 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt @@ -17,15 +17,15 @@ package org.jetbrains.jet.analyzer import org.jetbrains.jet.lang.resolve.lazy.ResolveSession -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import java.util.HashMap import org.jetbrains.jet.lang.resolve.ImportPath import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import com.intellij.openapi.project.Project import org.jetbrains.jet.context.GlobalContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import java.util.ArrayList import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.search.GlobalSearchScope diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt index 4e37973cf21..6aed722d36d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt @@ -20,11 +20,11 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.di.InjectorForMacros import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.types.JetTypeInfo -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.types.JetTypeInfo +import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.jet.lang.resolve.BindingTrace diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java index 4fba3d2c8bb..c9f177b3a23 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java @@ -32,7 +32,7 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Severity; diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java index 7eef66be6b5..ecf232ef556 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java @@ -23,10 +23,10 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; @@ -36,8 +36,8 @@ import org.jetbrains.jet.lang.resolve.BindingContextUtils; 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.tasks.TasksPackage; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java index 1680eda75fc..8e2d6db322e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticParameters.java @@ -16,10 +16,10 @@ package org.jetbrains.jet.lang.diagnostics; +import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetProperty; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.kotlin.lexer.JetKeywordToken; +import org.jetbrains.kotlin.types.JetType; public interface DiagnosticParameters { DiagnosticParameter MODIFIER = new DiagnosticParameterImpl("MODIFIER"); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java index 788a26050fc..cdc67425d83 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/DiagnosticUtils.java @@ -26,7 +26,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java index 3dd1614b318..d5b2b9d3d42 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java @@ -22,13 +22,13 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement; import kotlin.Function1; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; 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/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java index 9eaff68b2b2..a988565aab8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.JetTypeConstraint; import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.renderer.MultiRenderer; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt index 62074839b2e..87b0e9e53ed 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DiagnosticRendererUtil.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.diagnostics.rendering import org.jetbrains.kotlin.renderer.Renderer -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject import org.jetbrains.kotlin.renderer.DescriptorRendererImpl 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 86643e155f1..a072e48e656 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 @@ -25,7 +25,7 @@ import com.intellij.psi.PsiElement; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetNamedDeclaration; @@ -33,9 +33,9 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.inference.*; import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; 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.kotlin.name.Name; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; 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/diagnostics/rendering/TabledDescriptorRenderer.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java index 3afbc0cf124..484ded0fecd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java @@ -21,13 +21,13 @@ import com.google.common.base.Predicates; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TextRenderer.TextElement; import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; 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 fb232ae7820..6ad6b7be27a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/evaluate/ConstantExpressionEvaluator.kt @@ -16,18 +16,18 @@ package org.jetbrains.jet.lang.evaluate -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* 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.kotlin.types.JetType +import org.jetbrains.kotlin.types.expressions.OperatorConventions 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 +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument import org.jetbrains.jet.JetNodeTypes import java.math.BigInteger 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 fb35e4ad92b..4b79b62074e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt @@ -17,13 +17,13 @@ package org.jetbrains.jet.lang.reflect import kotlin.properties.Delegates -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.types.* +import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.annotations.Annotations import java.util.ArrayList private val KOTLIN_REFLECT_FQ_NAME = FqName("kotlin.reflect") diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzerScriptParameter.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzerScriptParameter.java index 394dc8cee3a..832bc9f636f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzerScriptParameter.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzerScriptParameter.java @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; public class AnalyzerScriptParameter { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt index 31876cf5c38..b6549942a07 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.descriptors.MemberDescriptor +import org.jetbrains.kotlin.descriptors.MemberDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticSink -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor public trait AnnotationChecker { 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 a792c03867a..90ab9b9c973 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java @@ -22,10 +22,10 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationsImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; @@ -44,9 +44,9 @@ import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyAnnotationDescriptor; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyAnnotationsContextImpl; import org.jetbrains.jet.lang.resolve.scopes.JetScope; 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.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.StorageManager; @@ -57,8 +57,8 @@ import java.util.Map; import static org.jetbrains.jet.lang.diagnostics.Errors.NOT_AN_ANNOTATION_CLASS; import static org.jetbrains.jet.lang.resolve.BindingContext.ANNOTATION_DESCRIPTOR_TO_PSI_ELEMENT; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; -import static org.jetbrains.jet.lang.types.Variance.OUT_VARIANCE; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.Variance.OUT_VARIANCE; public class AnnotationResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtil.kt index a8162e393d5..4a32f0d803c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtil.kt @@ -16,12 +16,12 @@ package org.jetbrains.jet.lang.resolve.annotations -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor +import org.jetbrains.kotlin.descriptors.ClassKind public fun DeclarationDescriptor.hasInlineAnnotation(): Boolean { return getAnnotations().findAnnotation(FqName("kotlin.inline")) != null diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java index 817be40ea18..b26d748dac1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java @@ -23,8 +23,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.cfg.TailRecursionKind; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemCompleter; @@ -32,14 +32,14 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.Qualifier; -import org.jetbrains.jet.lang.types.Approximation; -import org.jetbrains.jet.lang.types.DeferredType; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.expressions.CaptureKind; +import org.jetbrains.kotlin.types.Approximation; +import org.jetbrains.kotlin.types.DeferredType; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.expressions.CaptureKind; import org.jetbrains.jet.util.Box; import org.jetbrains.jet.util.slicedmap.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java index bcdbe2c4d17..b2e2ce93d14 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java @@ -22,21 +22,21 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; 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.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.JetTypeInfo; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.JetTypeInfo; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import java.util.Collection; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DECLARATION; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION; import static org.jetbrains.jet.lang.diagnostics.Errors.AMBIGUOUS_LABEL; import static org.jetbrains.jet.lang.resolve.BindingContext.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt index 7fbc9d28181..ecab0cba34c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt @@ -18,14 +18,14 @@ package org.jetbrains.jet.lang.resolve.bindingContextUtil import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.psi.JetReturnExpression -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.BindingContext.LABEL_TARGET import org.jetbrains.jet.lang.resolve.BindingContext.FUNCTION import org.jetbrains.jet.lang.resolve.BindingContext.DECLARATION_TO_DESCRIPTOR import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java index 51b7954fa57..5d12fc14c95 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java @@ -22,10 +22,10 @@ import org.jetbrains.annotations.Mutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java index c0a3a5f43ec..eba0e5c04c7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.util.containers.Queue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; @@ -30,8 +30,8 @@ import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.*; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.util.Box; import org.jetbrains.jet.util.ReenteringLazyValueComputationException; @@ -40,10 +40,10 @@ import org.jetbrains.jet.util.slicedmap.WritableSlice; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; +import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.DEFERRED_TYPE; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; public class BodyResolver { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CodeAnalyzerInitializer.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CodeAnalyzerInitializer.kt index 38fe623ebed..770e0499ae6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CodeAnalyzerInitializer.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CodeAnalyzerInitializer.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer import com.intellij.openapi.project.Project import com.intellij.openapi.components.ServiceManager -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor public trait CodeAnalyzerInitializer { public fun initialize(trace: BindingTrace, module: ModuleDescriptor, codeAnalyzer: KotlinCodeAnalyzer?) @@ -37,4 +37,4 @@ public class DummyCodeAnalyzerInitializer: CodeAnalyzerInitializer { } public override fun createTrace(): BindingTrace = BindingTraceContext() -} \ No newline at end of file +} 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 8a0b526e7bf..88bd55fe2c3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java @@ -18,10 +18,10 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetParameter; @@ -29,10 +29,10 @@ import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.BooleanValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java index 82aa26e8788..353782e0c21 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java @@ -19,16 +19,16 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cfg.JetFlowInformationProvider; -import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import javax.inject.Inject; import java.util.Map; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; public class ControlFlowAnalyzer { private BindingTrace trace; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DataClassUtils.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DataClassUtils.kt index b00e15148d3..fd14fee3aa6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DataClassUtils.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DataClassUtils.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.dataClassUtils -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import java.util.regex.Pattern private val COMPONENT_FUNCTION_NAME_PREFIX = "component" @@ -38,4 +38,4 @@ public fun getComponentIndex(componentName: Name): Int = componentName.asString().substring(COMPONENT_FUNCTION_NAME_PREFIX.length).toInt() public fun createComponentName(index: Int): Name = - Name.identifier(COMPONENT_FUNCTION_NAME_PREFIX + index) \ No newline at end of file + Name.identifier(COMPONENT_FUNCTION_NAME_PREFIX + index) 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 029550305d0..09588d17ac7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java @@ -26,17 +26,17 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.impl.PackageLikeBuilder; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.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; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java index 1819f551228..cad1b9e204a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java @@ -21,14 +21,14 @@ import com.google.common.collect.Sets; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.SubstitutionUtils; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeProjection; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.SubstitutionUtils; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; 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 fdd3163aa48..361fd538a5f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.rendering.Renderers; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.CallResolver; @@ -29,15 +29,15 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; -import org.jetbrains.jet.lang.types.DeferredType; -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.ExpressionTypingContext; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.DeferredType; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.util.slicedmap.WritableSlice; @@ -49,9 +49,9 @@ import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getCalleeExpressionIfAny; import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.FROM_COMPLETER; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; -import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; -import static org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils.createFakeExpressionOfType; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; +import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.createFakeExpressionOfType; public class DelegatedPropertyResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java index c130431224b..63e4d6a5bff 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java @@ -21,18 +21,18 @@ import com.google.common.base.Predicates; import com.google.common.collect.Collections2; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetDelegationSpecifier; import org.jetbrains.kotlin.psi.JetDelegatorByExpressionSpecifier; import org.jetbrains.kotlin.psi.JetTypeReference; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import java.util.*; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DELEGATION; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION; import static org.jetbrains.jet.lang.diagnostics.Errors.MANY_IMPL_MEMBER_NOT_IMPLEMENTED; import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorEquivalenceForOverrides.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorEquivalenceForOverrides.kt index 76a17dad655..4cfa3d2ba06 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorEquivalenceForOverrides.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorEquivalenceForOverrides.kt @@ -16,12 +16,12 @@ package org.jetbrains.jet.lang.resolve -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.Visibilities -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo import org.jetbrains.jet.lang.resolve @@ -108,4 +108,4 @@ object DescriptorEquivalenceForOverrides { } } -} \ No newline at end of file +} 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 efd2135e6ec..41ff6442525 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -24,9 +24,9 @@ import com.intellij.psi.PsiElement; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.*; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.*; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.jet.lang.evaluate.EvaluatePackage; @@ -35,15 +35,15 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScopeUtils; 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.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; @@ -53,7 +53,7 @@ import org.jetbrains.kotlin.storage.StorageManager; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; +import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java index 046a6a3d51e..7300339d174 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.source.SourcePackage; @@ -29,8 +29,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DECLARATION; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; public final class DescriptorToSourceUtils { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java index 9a5badd3969..2b33d529df8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.extension.InlineAnalyzerExtension; 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 7cc2b50c1ce..f195bc4ad17 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java @@ -18,15 +18,15 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.FunctionDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; 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.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java index 8e1088f4942..6ecf1358f05 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java @@ -22,8 +22,8 @@ import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; import java.util.ArrayList; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java index a764d63bfe0..554f4988282 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java @@ -21,10 +21,10 @@ import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.ScriptDescriptorImpl; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; 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 3dc050e4c5b..84f2d6a2687 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMapping; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java index 4b2d8389957..eed7eae9544 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.SubpackagesScope; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.impl.SubpackagesScope; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; public class JetModuleUtil { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetVisibilityChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetVisibilityChecker.java index a6b1923ba2a..d0a5c1803d1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetVisibilityChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetVisibilityChecker.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; public class JetVisibilityChecker { /** diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java index a4ca4d6c569..34d61c34521 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java @@ -23,14 +23,14 @@ import com.intellij.psi.util.PsiTreeUtil; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.CompositePackageFragmentProvider; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.LazyImportScope; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.resolveUtil.ResolveUtilPackage; import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LibrarySourceHacks.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LibrarySourceHacks.java index 6918412993e..abb20a8ac02 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LibrarySourceHacks.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LibrarySourceHacks.java @@ -21,9 +21,9 @@ import com.intellij.openapi.util.Key; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import java.util.Collection; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java index aa929c26e81..99e124969da 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java @@ -24,14 +24,14 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.StringValue; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt index 472ea3c9b5b..cb28de46aff 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt @@ -18,13 +18,13 @@ package org.jetbrains.jet.lang.resolve import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider +import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor +import org.jetbrains.kotlin.name.FqName import java.util.HashMap -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name public class MutablePackageFragmentProvider(public val module: ModuleDescriptor) : PackageFragmentProvider { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NoSubpackagesInPackageScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NoSubpackagesInPackageScope.kt index 325414d028d..b1c93e1c242 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NoSubpackagesInPackageScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NoSubpackagesInPackageScope.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter import org.jetbrains.jet.lang.resolve.scopes.AbstractScopeAdapter import org.jetbrains.jet.lang.resolve.scopes.JetScope @@ -37,4 +37,4 @@ class NoSubpackagesInPackageScope(packageDescriptor: PackageViewDescriptor) : Ab override fun getOwnDeclaredDescriptors(): Collection { return workerScope.getOwnDeclaredDescriptors().filter { it !is PackageViewDescriptor } } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java index e7a3595b46c..f4015b2c87f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java @@ -20,14 +20,14 @@ import com.google.common.collect.Sets; import com.intellij.openapi.util.Pair; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetObjectDeclaration; import org.jetbrains.kotlin.psi.JetParameter; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; import javax.inject.Inject; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java index b9cbc06497f..aeefadb7355 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java @@ -17,13 +17,13 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypesPackage; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypesPackage; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.List; 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 c9a4b04b214..0b627b36f1b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java @@ -30,16 +30,16 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.utils.HashSetUtil; @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.utils.HashSetUtil; import javax.inject.Inject; import java.util.*; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.*; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveAbstractMembers; import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PossiblyBareType.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PossiblyBareType.java index 38b2d09a745..2ade73ca3c4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PossiblyBareType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PossiblyBareType.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.types.*; /** * Bare types are somewhat like raw types, but in Kotlin they are only allowed on the right-hand side of is/as. diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java index b0cfda6d95d..88e558f0dba 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java @@ -23,10 +23,10 @@ import com.google.common.collect.Sets; import org.jetbrains.annotations.Mutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.AbstractScopeAdapter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java index 3b5a1587e08..5fbb220e29d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java @@ -17,11 +17,11 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ScriptDescriptorImpl; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetProperty; @@ -30,18 +30,18 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.data.DataPackage; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.expressions.CoercionStrategy; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.expressions.CoercionStrategy; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import javax.inject.Inject; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; // SCRIPT: resolve symbols in scripts diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java index 8953772b5c1..e0917c335e1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java @@ -18,14 +18,14 @@ package org.jetbrains.jet.lang.resolve; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.ScriptDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetScript; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java index a8875963b8e..a06677b4991 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPackageDirective; import org.jetbrains.kotlin.psi.JetScript; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; public class ScriptNameUtil { private ScriptNameUtil() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java index 0e3a0639022..14ffc68a447 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java @@ -18,11 +18,11 @@ package org.jetbrains.jet.lang.resolve; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.psi.JetFile; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java index ab679846abc..c3513178708 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java @@ -24,9 +24,9 @@ import com.intellij.psi.PsiFile; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java index abdc236fd17..72e4ff8b06f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java @@ -20,12 +20,12 @@ import com.google.common.collect.Sets; import com.intellij.psi.PsiElement; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptorWithResolutionScopes; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; -import org.jetbrains.jet.lang.descriptors.impl.*; +import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider; +import org.jetbrains.kotlin.descriptors.impl.*; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java index ea27d901ac1..cda2765e7f3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import static org.jetbrains.jet.lang.diagnostics.Errors.REDECLARATION; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt index d0023c67b1d..5b574be44e8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve.typeBinding -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetTypeElement import org.jetbrains.kotlin.psi.JetCallableDeclaration @@ -25,9 +25,9 @@ import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.psi.JetTypeReference import java.util.AbstractList -import org.jetbrains.jet.lang.types.TypeProjection -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.types.TypeProjectionImpl +import org.jetbrains.kotlin.types.TypeProjection +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.types.TypeProjectionImpl trait TypeBinding { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java index 30ba250a65f..da8d69a5be9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java @@ -20,19 +20,19 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNameIdentifierOwner; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.impl.PackageLikeBuilder; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.name.SpecialNames; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WriteThroughScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.utils.DFS; import javax.inject.Inject; @@ -45,7 +45,7 @@ import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isObject; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.getDefaultClassVisibility; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.resolveVisibilityFromModifiers; -import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; +import static org.jetbrains.kotlin.name.SpecialNames.getClassObjectName; import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; public class TypeHierarchyResolver { 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 0e91c65671c..2dbf3f3bd90 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt @@ -16,18 +16,18 @@ package org.jetbrains.jet.lang.resolve -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.annotations.Annotations 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.kotlin.types.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.jet.lang.diagnostics.Errors.* import org.jetbrains.jet.lang.resolve.PossiblyBareType.type -import org.jetbrains.jet.lang.types.Variance.* +import org.jetbrains.kotlin.types.Variance.* import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider import kotlin.platform.platformStatic import org.jetbrains.kotlin.storage.StorageManager diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt index 7da6d4b6c1d..84280d5c926 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt @@ -16,32 +16,32 @@ package org.jetbrains.jet.lang.resolve.varianceChecker -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure.EnrichedProjectionKind.* -import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure.* -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure.EnrichedProjectionKind.* +import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure.* +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.typeBinding.TypeBinding import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.typeBinding.createTypeBinding import org.jetbrains.jet.lang.resolve.typeBinding.createTypeBindingForReturnType import org.jetbrains.kotlin.psi.JetCallableDeclaration -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.psi.JetTypeReference -import org.jetbrains.jet.lang.types.Variance.* +import org.jetbrains.kotlin.types.Variance.* import org.jetbrains.jet.lang.diagnostics.DiagnosticSink -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.impl.FunctionDescriptorImpl -import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl -import org.jetbrains.jet.lang.descriptors.impl.PropertyAccessorDescriptorImpl +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.PropertyAccessorDescriptorImpl import org.jetbrains.jet.lang.resolve.source.getPsi -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.JetTypeParameterListOwner import org.jetbrains.jet.lang.resolve.BindingContext import kotlin.platform.platformStatic 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 a3d771f43a0..2d96d217491 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 @@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.calls; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; @@ -31,11 +31,11 @@ import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstructor; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -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.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.JetTypeInfo; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import javax.inject.Inject; @@ -48,7 +48,7 @@ import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgum import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.DEPENDENT; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.types.TypeUtils.*; +import static org.jetbrains.kotlin.types.TypeUtils.*; public class ArgumentTypeResolver { 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 bb5bafb5629..26967d7a16f 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 @@ -16,16 +16,16 @@ package org.jetbrains.jet.lang.resolve.calls -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.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.kotlin.types.TypeUtils 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 @@ -42,9 +42,9 @@ import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext import org.jetbrains.jet.lang.resolve.calls.callUtil.* import org.jetbrains.jet.lang.resolve.BindingContextUtils import org.jetbrains.jet.lang.resolve.calls.context.CallResolutionContext -import org.jetbrains.jet.lang.types.expressions.DataFlowUtils +import org.jetbrains.kotlin.types.expressions.DataFlowUtils import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS 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 746d582bc63..75bce8779ca 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 @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -40,14 +40,14 @@ import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueConstant; import org.jetbrains.jet.lang.resolve.scopes.receivers.*; -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.TypeUtils; -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.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.JetTypeInfo; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.expressions.BasicExpressionTypingVisitor; +import org.jetbrains.kotlin.types.expressions.DataFlowUtils; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; @@ -58,7 +58,7 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiversPackage.createQualifier; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiversPackage.resolveAsStandaloneExpression; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; public class CallExpressionResolver { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java index dcce2efff84..386730699ae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallResolver.java @@ -21,7 +21,7 @@ import com.google.common.collect.Lists; import com.intellij.openapi.progress.ProgressIndicatorProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; @@ -37,12 +37,12 @@ import org.jetbrains.jet.lang.resolve.calls.tasks.*; import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollectors; import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.calls.util.DelegatingCall; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.lexer.JetTokens; import javax.inject.Inject; @@ -56,7 +56,7 @@ import static org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUt import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; import static org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults.Code.*; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; @SuppressWarnings("RedundantTypeArguments") public class CallResolver { 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 14e8b03b20b..203d0739fbb 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 @@ -18,19 +18,19 @@ package org.jetbrains.jet.lang.resolve.calls; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; 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.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; -import static org.jetbrains.jet.lang.types.TypeUtils.DONT_CARE; +import static org.jetbrains.kotlin.types.TypeUtils.DONT_CARE; public class CallResolverUtil { public static enum ResolveArgumentsMode { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java index 51c5aa5eb3c..9d22ea538e4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/CallTransformer.java @@ -22,9 +22,9 @@ import com.google.common.collect.Lists; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.ChainedTemporaryBindingTrace; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; @@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategyForInvoke; import org.jetbrains.jet.lang.resolve.calls.util.DelegatingCall; 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.kotlin.types.JetType; import java.util.Collection; import java.util.Collections; 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 21f0058bfc9..84888860364 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 @@ -23,7 +23,7 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.*; @@ -41,9 +41,9 @@ import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; 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.checker.JetTypeChecker; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import javax.inject.Inject; @@ -59,7 +59,7 @@ import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.IND import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; import static org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus.*; -import static org.jetbrains.jet.lang.types.TypeUtils.*; +import static org.jetbrains.kotlin.types.TypeUtils.*; public class CandidateResolver { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java index fdef69e7e31..fa135e8b36f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ValueArgumentsToParametersMapper.java @@ -21,15 +21,15 @@ import com.google.common.collect.Sets; import com.intellij.psi.impl.source.tree.LeafPsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.*; import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java index 957d8d5a122..3b3aa98667f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/BasicCallResolutionContext.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public class BasicCallResolutionContext extends CallResolutionContext { private BasicCallResolutionContext( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java index 13f928ba810..84f95d25487 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallCandidateResolutionContext.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public final class CallCandidateResolutionContext extends CallResolutionContext> { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java index 015e65b0078..96cc0815495 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/CallResolutionContext.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.DataFlowInfoForArgumentsImpl; import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public abstract class CallResolutionContext> extends ResolutionContext { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java index f24a1a5dd84..7a191c3f27c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/context/ResolutionContext.java @@ -22,8 +22,8 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; public abstract class ResolutionContext> { @NotNull @@ -129,4 +129,4 @@ public abstract class ResolutionContext { private SimpleResolutionContext( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtension.java index 3e0813cbcfc..bbaa2675f0b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtension.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.extensions; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsImpl; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtensionProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtensionProvider.java index 2751a5f4ea3..40b228e1d0f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtensionProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CallResolverExtensionProvider.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.calls.extensions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import java.lang.ref.WeakReference; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt index f6960c73fc8..d28f0756aae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CapturingInClosureExtension.kt @@ -16,21 +16,21 @@ package org.jetbrains.jet.lang.resolve.calls.extensions -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.BindingContext.CAPTURED_IN_CLOSURE -import org.jetbrains.jet.lang.types.expressions.CaptureKind +import org.jetbrains.kotlin.types.expressions.CaptureKind import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.* -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall class CapturingInClosureExtension : CallResolverExtension { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CompositeExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CompositeExtension.java index 64a8c7bffcb..1e4a6a3d09e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CompositeExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/CompositeExtension.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.extensions; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; 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 c5e008533af..54aad1684e8 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 @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetToken; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java index 603c4b959c8..49d26743586 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.calls.extensions; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.Visibilities; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.JetScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java index 90333b970ee..6f869504b0c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/extensions/ReifiedTypeParameterSubstitutionCheck.java @@ -18,16 +18,16 @@ package org.jetbrains.jet.lang.resolve.calls.extensions; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.typeUtil.TypeUtilPackage; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintType.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintType.java index 496cc7d4531..b189e3fa19b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintType.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintType.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.inference; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.text.MessageFormat; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java index 5b08a12a67b..3d58d966dd8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintsUtil.java @@ -20,9 +20,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; 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.checker.JetTypeChecker; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/InferenceErrorData.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/InferenceErrorData.java index b3d76b2c2b4..7ca766cf28c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/InferenceErrorData.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/InferenceErrorData.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.calls.inference; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.types.JetType; import java.util.List; @@ -52,4 +52,4 @@ public class InferenceErrorData { @NotNull List valueArgumentsTypes, @Nullable JetType receiverArgumentType, @NotNull JetType expectedType) { return new InferenceErrorData(descriptor, constraintSystem, valueArgumentsTypes, receiverArgumentType, expectedType); } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SubtypingConstraint.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SubtypingConstraint.java index ac4233f969e..3f4eb4ee225 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SubtypingConstraint.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/inference/SubtypingConstraint.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.calls.inference; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public class SubtypingConstraint { private final ConstraintType type; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt index 4f89ba8e708..b5c56c8a573 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ArgumentMapping.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.calls.model -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor public trait ArgumentMapping { public fun isError(): Boolean diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java index 48a36de112d..f9c5dff9cdc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/DelegatingResolvedCall.java @@ -18,15 +18,15 @@ package org.jetbrains.jet.lang.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus; import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.List; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java index 1f5b8968214..0ef8a6e7d5e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/MutableResolvedCall.java @@ -18,13 +18,13 @@ package org.jetbrains.jet.lang.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystem; import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.TypeSubstitutor; public interface MutableResolvedCall extends ResolvedCall { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java index d9add21009d..54733962258 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCall.java @@ -18,15 +18,15 @@ package org.jetbrains.jet.lang.resolve.calls.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus; import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.List; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java index e121bddd09a..accc6460423 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/ResolvedCallImpl.java @@ -20,9 +20,9 @@ import com.google.common.collect.Maps; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; @@ -34,9 +34,9 @@ import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate; import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeProjection; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.ArrayList; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt index 4a8ce8eac25..8961d7de943 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/model/VariableAsFunctionResolvedCall.kt @@ -16,15 +16,15 @@ package org.jetbrains.jet.lang.resolve.calls.model -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.psi.ValueArgument -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResults.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResults.java index 35d2ca1463c..aaa5ae05507 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResults.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResults.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.calls.results; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsImpl.java index 929de9b7da5..cec5da2deee 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsImpl.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.calls.results; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsUtil.java index 63175705f29..befaaccb0be 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/OverloadResolutionResultsUtil.java @@ -19,11 +19,11 @@ package org.jetbrains.jet.lang.resolve.calls.results; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.resolve.calls.context.ContextDependency; import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.Collection; 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 ade03f67ed8..0b2768a557c 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 @@ -20,13 +20,13 @@ import gnu.trove.THashSet; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; 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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java index e8d37959e9a..594a74321aa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/results/ResolutionResultsHandler.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.calls.results; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowInfo.java index c87e328a733..ee196ae1e30 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DataFlowInfo.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls.smartcasts; import com.google.common.collect.ImmutableMap; import com.google.common.collect.SetMultimap; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.Map; 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 2d7b593b40c..b6a12f78245 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 @@ -18,7 +18,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.kotlin.types.JetType; 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 62599b68267..3714e1edb62 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 @@ -20,14 +20,14 @@ import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; 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/smartcasts/DelegatingDataFlowInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DelegatingDataFlowInfo.java index 91f937c62b9..8f986e643b5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DelegatingDataFlowInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/DelegatingDataFlowInfo.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.calls.smartcasts; import com.google.common.collect.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import java.util.Map; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java index 24ebe234458..23f1ad62023 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/smartcasts/SmartCastUtils.java @@ -22,7 +22,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; @@ -31,9 +31,9 @@ import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; 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.TypeUtils; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java index 218ab5bf062..98d8a642277 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/AbstractTracingStrategy.java @@ -20,7 +20,7 @@ import com.google.common.collect.Sets; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -28,13 +28,13 @@ import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.inference.*; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.descriptorUtil.DescriptorUtilPackage; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.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.Variance; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.Variance; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; @@ -45,7 +45,7 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; import static org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqNameFromTopLevelClass; -import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; +import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; public abstract class AbstractTracingStrategy implements TracingStrategy { protected final JetExpression reference; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/CallableDescriptorCollectors.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/CallableDescriptorCollectors.kt index bdd33d4a6d9..c127d567e82 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/CallableDescriptorCollectors.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/CallableDescriptorCollectors.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.lang.resolve.calls.tasks.collectors -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.types.ErrorUtils -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.ErrorUtils +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.LibrarySourceHacks.filterOutMembersFromLibrarySource import org.jetbrains.jet.lang.resolve.DescriptorUtils.isStaticNestedClass @@ -171,4 +171,4 @@ private class FilteredCollector(private val delegate: Ca override fun toString(): String { return delegate.toString() } -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java index 2ab5d0abe7a..fa4cae4f516 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionCandidate.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.calls.tasks; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java index 6ee09c06404..59879312369 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTask.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingTrace; @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.MutableDataFlowInfoForArgument import org.jetbrains.jet.lang.resolve.calls.model.MutableResolvedCall; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt index 8eac21c7150..e147945abe5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/ResolutionTaskHolder.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.calls.tasks -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.kotlin.storage.StorageManager diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt index fa218beea81..5cc73c18a58 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TaskPrioritizer.kt @@ -19,20 +19,20 @@ package org.jetbrains.jet.lang.resolve.calls.tasks import com.google.common.collect.Lists import com.google.common.collect.Sets import com.intellij.openapi.progress.ProgressIndicatorProvider -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.Call import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollector import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollectors -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.JetScopeUtils import org.jetbrains.jet.lang.resolve.scopes.receivers.QualifierReceiver 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.kotlin.types.* +import org.jetbrains.kotlin.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java index 0e5e8e84da7..eb90086a941 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategy.java @@ -17,14 +17,14 @@ package org.jetbrains.jet.lang.resolve.calls.tasks; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.Collection; import java.util.List; 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 3fd5ed9c44e..cffbc8659a4 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 @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.calls.tasks; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java index f0e7c467790..0e9f6a1fd17 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/tasks/TracingStrategyImpl.java @@ -17,15 +17,15 @@ package org.jetbrains.jet.lang.resolve.calls.tasks; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.jet.lang.resolve.calls.util.FakeCallableDescriptorForObject; -import org.jetbrains.jet.lang.types.ErrorUtils; +import org.jetbrains.kotlin.types.ErrorUtils; 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 a0a1801734a..16aeb55f94f 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 @@ -17,39 +17,39 @@ package org.jetbrains.jet.lang.resolve.calls.tasks import org.jetbrains.kotlin.psi.Call -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.SourceElement -import org.jetbrains.jet.lang.descriptors.impl.ReceiverParameterDescriptorImpl -import org.jetbrains.jet.lang.types.DynamicType -import org.jetbrains.jet.lang.descriptors.Modality -import org.jetbrains.jet.lang.descriptors.Visibilities -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.SourceElement +import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl +import org.jetbrains.kotlin.types.DynamicType +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl +import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.types.JetType import kotlin.platform.platformStatic import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver -import org.jetbrains.jet.lang.types.isDynamic +import org.jetbrains.kotlin.types.isDynamic import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollector import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.calls.tasks.collectors.CallableDescriptorCollectors import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.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.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.ValueArgument import java.util.ArrayList diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/FakeCallableDescriptorForObject.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/FakeCallableDescriptorForObject.kt index 4798416debe..7a2c9b5e3c9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/FakeCallableDescriptorForObject.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/FakeCallableDescriptorForObject.kt @@ -16,18 +16,18 @@ package org.jetbrains.jet.lang.resolve.calls.util -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import java.util.Collections -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant -import org.jetbrains.jet.lang.descriptors.SourceElement -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.SourceElement +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.jet.lang.resolve.descriptorUtil.getClassObjectReferenceTarget public class FakeCallableDescriptorForObject( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt index 621c7af9314..9a0a7522c74 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/util/callUtil.kt @@ -16,10 +16,10 @@ package org.jetbrains.jet.lang.resolve.calls.callUtil -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.calls.model.ArgumentUnmapped -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatch import org.jetbrains.jet.lang.resolve.calls.model.ArgumentMatchStatus import org.jetbrains.kotlin.psi.* @@ -30,7 +30,7 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.jet.lang.resolve.BindingContext.RESOLVED_CALL import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor // resolved call 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 a9d492b28fd..f20420bdf44 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.lang.resolve.resolveUtil -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils 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 +import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes import org.jetbrains.jet.lang.resolve.BindingTrace fun checkTraitRequirements(c: Map, trace: BindingTrace) { 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 516340a4d67..3272c597536 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 @@ -26,9 +26,9 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.psi.JetConstantExpression; import org.jetbrains.kotlin.psi.JetElement; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; 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 1afee7dc7ea..52d095e7d01 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 @@ -30,7 +30,7 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.FilteringIterator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Severity; import org.jetbrains.kotlin.psi.JetAnnotated; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt index 294fcf9fb6d..9f96f699859 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.lang.resolve.diagnostics -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.diagnostics.Diagnostic import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetFunction -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1 import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory0 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 fe0b05c8b3c..bd3fd298638 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 @@ -18,13 +18,13 @@ package org.jetbrains.jet.lang.resolve.extension; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java index 44e96d26667..2ff5b758080 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ForceResolveUtil.java @@ -19,14 +19,14 @@ package org.jetbrains.jet.lang.resolve.lazy; import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeProjection; -import org.jetbrains.jet.lang.types.TypesPackage; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.TypesPackage; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java index 3f4f5716aa8..a9a00c146ac 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ImportsProvider.java @@ -21,7 +21,7 @@ import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetImportDirective; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java index 32729cb711b..90180a480e9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/KotlinCodeAnalyzer.java @@ -19,13 +19,13 @@ package org.jetbrains.jet.lang.resolve.lazy; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt index fa8420c9dcf..c2bb968262e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.lazy import com.google.common.collect.Sets -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetImportDirective @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.Importer import org.jetbrains.jet.lang.resolve.ImportsResolver import org.jetbrains.jet.lang.resolve.JetModuleUtil -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.* import org.jetbrains.kotlin.utils.Printer diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java index cb85f17b67e..e2795e25127 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSession.java @@ -27,9 +27,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; @@ -37,8 +37,8 @@ import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider; import org.jetbrains.jet.lang.resolve.lazy.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.storage.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java index 6492777a55c..e77c3944d12 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java @@ -21,16 +21,16 @@ import com.google.common.base.Predicates; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.psi.JetNamedDeclarationUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.name.NamePackage; -import org.jetbrains.jet.lang.resolve.name.SpecialNames; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.NamePackage; +import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java index 27e24b25025..81f9e75098b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ScopeProvider.java @@ -21,14 +21,14 @@ import com.intellij.psi.PsiElement; import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.NoSubpackagesInPackageScope; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.JetModuleUtil; import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfo.java index 07b148b33a7..7c5308b2c49 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassInfo.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.lazy.data; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.psi.*; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassLikeInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassLikeInfo.java index e1a965cbdfd..06e98f52aae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassLikeInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassLikeInfo.java @@ -20,9 +20,9 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java index fee6e6d241c..38046c994c6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetClassOrObjectInfo.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java index 73bfa17160a..04dfc3abdca 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetObjectInfo.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.lazy.data; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.psi.JetClassObject; import org.jetbrains.kotlin.psi.JetObjectDeclaration; import org.jetbrains.kotlin.psi.JetParameter; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt index 1c7dcf3c2aa..bbe8cf65003 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.lazy.data import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.jet.lang.resolve.ScriptNameUtil -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName public class JetScriptInfo( val script: JetScript diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/SyntheticClassObjectInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/SyntheticClassObjectInfo.java index 7ceae29f004..540b55c7eaa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/SyntheticClassObjectInfo.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/SyntheticClassObjectInfo.java @@ -19,10 +19,10 @@ package org.jetbrains.jet.lang.resolve.lazy.data; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java index bdf24712539..26f68cebd98 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractDeclarationProviderFactory.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.MemoizedFunctionToNullable; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt index 896ca5b9203..2126d37ff7c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils import org.jetbrains.jet.lang.resolve.lazy.data.JetClassInfoUtil import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils.safeNameForLazyResolve diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt index bbdb77235bd..fa2eeab928e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter public class CombinedPackageMemberDeclarationProvider(val providers: Collection) : PackageMemberDeclarationProvider { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProvider.kt index 3b9b96cd05f..6e2ecd70b3e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProvider.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter public trait DeclarationProvider { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactory.java index eceb8da1b2d..7149cb94137 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/DeclarationProviderFactory.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; public interface DeclarationProviderFactory { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java index d99125c0cc4..7cca955217b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedDeclarationProviderFactory.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPackageDirective; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt index 3d0c7ade98f..588c64c712e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/FileBasedPackageMemberDeclarationProvider.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations import kotlin.Function0 import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.kotlin.storage.StorageManager diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.kt index 2d859d766c2..0deb56109e2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/declarations/PackageMemberDeclarationProvider.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.lazy.declarations import org.jetbrains.annotations.ReadOnly import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName public trait PackageMemberDeclarationProvider : DeclarationProvider { public fun getAllDeclaredSubPackages(): Collection diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index 3f9a5b3d5e8..7fb49762426 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors import com.google.common.collect.Sets -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.AnnotationResolver import org.jetbrains.jet.lang.resolve.BindingTrace @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProvider -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull import org.jetbrains.kotlin.utils.Printer diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt index 95a25135073..506532c4dc4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyAnnotations.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.lazy.LazyEntity import org.jetbrains.kotlin.psi.JetAnnotationEntry import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.storage.StorageManager 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 6ef90f847fc..058a3c2a792 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 @@ -28,9 +28,9 @@ import org.jetbrains.annotations.Mutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorBase; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorBase; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -44,12 +44,12 @@ import org.jetbrains.jet.lang.resolve.lazy.data.JetClassInfoUtil; import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.jet.lang.resolve.lazy.data.SyntheticClassObjectInfo; import org.jetbrains.jet.lang.resolve.lazy.declarations.ClassMemberDeclarationProvider; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; -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.kotlin.types.AbstractClassTypeConstructor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; @@ -62,7 +62,7 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.CLASS_OBJECT_NOT_ALLOWED import static org.jetbrains.jet.lang.diagnostics.Errors.TYPE_PARAMETERS_IN_ENUM; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject; import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*; -import static org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName; +import static org.jetbrains.kotlin.name.SpecialNames.getClassObjectName; import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDescriptorWithResolutionScopes, LazyEntity { 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 63986c3555f..77470749483 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 @@ -17,25 +17,25 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors import com.google.common.collect.Lists -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.dataClassUtils.* import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.declarations.ClassMemberDeclarationProvider -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.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.kotlin.types.DeferredType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.storage.NullableLazyValue import java.util.* -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.DELEGATION -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERRIDE +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERRIDE import org.jetbrains.jet.lang.resolve.DelegationResolver.generateDelegatedMembers import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java index a6756b59b1d..38555435320 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageDescriptor.java @@ -17,15 +17,15 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; public class LazyPackageDescriptor extends PackageFragmentDescriptorImpl implements LazyEntity { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.kt index 00eb438f677..ec2cb7b2e3b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyPackageMemberScope.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter public class LazyPackageMemberScope( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassDescriptor.java index fba6b769b3d..b5e066e5f24 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassDescriptor.java @@ -17,14 +17,14 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.Visibilities; -import org.jetbrains.jet.lang.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.Visibilities; +import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo; import org.jetbrains.jet.lang.resolve.lazy.declarations.ClassMemberDeclarationProvider; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; public class LazyScriptClassDescriptor extends LazyClassDescriptor { public LazyScriptClassDescriptor( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt index f0bf0c39687..d2ed5ccfea5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.impl.ScriptDescriptorImpl +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.impl.ScriptDescriptorImpl import org.jetbrains.jet.lang.resolve.BindingTrace import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.data.JetScriptInfo import org.jetbrains.jet.lang.resolve.lazy.declarations.ClassMemberDeclarationProvider -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.kotlin.utils.toReadOnlyList 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 29a0ef18589..503c3e98050 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 @@ -19,27 +19,27 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.kotlin.psi.JetScript import org.jetbrains.jet.lang.resolve.lazy.LazyEntity -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.kotlin.descriptors.impl.DeclarationDescriptorNonRootImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.ScriptDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ScriptReceiver import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.descriptors.impl.ReceiverParameterDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.utils.sure import org.jetbrains.jet.lang.resolve.ScriptParameterResolver import org.jetbrains.jet.lang.resolve.ScriptBodyResolver -import org.jetbrains.jet.lang.descriptors.impl.ScriptCodeDescriptor -import org.jetbrains.jet.lang.types.DeferredType +import org.jetbrains.kotlin.descriptors.impl.ScriptCodeDescriptor +import org.jetbrains.kotlin.types.DeferredType import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl import org.jetbrains.jet.lang.resolve.scopes.ChainedScope import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil -import org.jetbrains.jet.lang.types.TypeSubstitutor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorVisitor import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler import org.jetbrains.jet.lang.resolve.scopes.WritableScope -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.jet.lang.resolve.source.toSourceElement public class LazyScriptDescriptor( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java index 3155d4216d7..63ed9ebb86c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java @@ -18,14 +18,14 @@ package org.jetbrains.jet.lang.resolve.lazy.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt index 2ce77f5cb91..6ec8978b7de 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import java.util.Collections diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java index d07d858fdf6..b6c602ee203 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java @@ -22,9 +22,9 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.TraceBasedRedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java index 0070eff492b..5978c8c5aeb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.scopes; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; public interface RedeclarationHandler { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.kt index e567779d4e0..683c9afda1e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve.scopes import com.google.common.collect.Multimap -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name public trait WritableScope : JetScope { public enum class LockLevel { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt index bda70c0b564..082139b089b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.scopes import com.google.common.collect.* -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.utils.Printer import java.util.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt index bc4aef49ad9..daa714e302d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.scopes import com.google.common.collect.Lists import com.google.common.collect.Sets -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer import java.util.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt index 119602def30..69c0d2a4ce0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt @@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.scopes import com.google.common.collect.Lists import com.google.common.collect.Multimap import com.google.common.collect.Sets -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer // Reads from: diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java index 9587e0fcafe..06721849075 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public class ExpressionReceiver extends AbstractReceiverValue implements ReceiverValue { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt index a907d2e5bbe..b2a29994e6f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt @@ -16,19 +16,19 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.ChainedScope import java.util.ArrayList import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.lang.resolve.BindingContext.* import org.jetbrains.jet.lang.diagnostics.Errors.* -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingContext +import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext import org.jetbrains.kotlin.psi.psiUtil.getTopmostParentQualifiedExpressionForSelector import org.jetbrains.jet.lang.resolve.descriptorUtil.getClassObjectReferenceTarget import org.jetbrains.kotlin.psi.JetExpression 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 8cff57047ec..2865629f217 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 @@ -17,8 +17,8 @@ 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.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; // SCRIPT: script receiver diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt index c787318c8bd..257bf11052c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.source import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.lang.descriptors.SourceElement +import org.jetbrains.kotlin.descriptors.SourceElement import com.intellij.psi.PsiElement public class KotlinSourceElement(override val psi: JetElement) : PsiSourceElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/PsiSourceElement.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/PsiSourceElement.kt index 4cb6592e931..107bf807bc1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/PsiSourceElement.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/PsiSourceElement.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve.source import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.SourceElement +import org.jetbrains.kotlin.descriptors.SourceElement public trait PsiSourceElement : SourceElement { public val psi: PsiElement? -} \ No newline at end of file +} diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java b/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java index 7e8cfd24d28..76b7de25508 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java +++ b/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java @@ -19,16 +19,16 @@ package org.jetbrains.jet.plugin; import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java index b3c1b639428..b63ad78897f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue; import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java index 226afc2051f..30bc65c9600 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue; import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index 808edebafb3..1fd52cfdcaa 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -31,8 +31,8 @@ import org.jetbrains.kotlin.cfg.pseudocode.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.AccessTarget; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.InstructionWithValue; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicKind; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -41,13 +41,13 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils; import org.jetbrains.jet.lang.resolve.calls.model.*; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.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.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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 1d9260ada3e..11f8adc3b21 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarat import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; @@ -57,8 +57,8 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.MainFunctionDetector; @@ -72,8 +72,8 @@ import static org.jetbrains.jet.lang.resolve.BindingContext.CAPTURED_IN_CLOSURE; import static org.jetbrains.jet.lang.resolve.BindingContext.TAIL_RECURSION_CALL; import static org.jetbrains.kotlin.cfg.TailRecursionKind.*; import static org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; -import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; public class JetFlowInformationProvider { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt index 29f64a2747a..e03bd4fbd89 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cfg import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.cfg.pseudocodeTraverser.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java index 48509245531..79e477ca122 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDec import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java index 269666e04c6..522f544c2a1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java @@ -18,15 +18,15 @@ package org.jetbrains.kotlin.cfg; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import static org.jetbrains.jet.lang.resolve.BindingContext.EXPRESSION_TYPE; 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 ed9f26833f1..a19c831efd2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java @@ -25,12 +25,12 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java index a1b88a8e4c7..57f95b74b5f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.ReadValueInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.WriteValueInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetElement; 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 07ea21014da..de7fdb457a8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/TypePredicate.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.cfg.pseudocode -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.util.SmartFMap import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils public trait TypePredicate: (JetType) -> Boolean { [suppress("PARAMETER_NAME_CHANGED_ON_OVERRIDE")] diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt index 0efb91a28f8..47d28b8140e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/accessInstructions.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.cfg.pseudocode.PseudoValueFactory import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt index ec3dec2d607..51f286cadc9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/operationInstructions.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicKind 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 e81d143ac6d..7f55c334040 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.* import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.bindingContextUtil.* import org.jetbrains.jet.lang.resolve.calls.model.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns @@ -28,9 +28,9 @@ import org.jetbrains.jet.lang.resolve.BindingContext import java.util.* import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.OverridingUtil -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor fun getReceiverTypePredicate(resolvedCall: ResolvedCall<*>, receiverValue: ReceiverValue): TypePredicate? { val callableDescriptor = resolvedCall.getResultingDescriptor() diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorWithResolutionScopes.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorWithResolutionScopes.java rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java index ad0efd0451e..6c27e11eb05 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/ClassDescriptorWithResolutionScopes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/LocalVariableDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableDescriptor.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/LocalVariableDescriptor.java rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableDescriptor.java index 2f723a6acb1..281122cb79a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/LocalVariableDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/LocalVariableDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.TypeSubstitutor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; public class LocalVariableDescriptor extends VariableDescriptorImpl { private final boolean isVar; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java index 323add56d1c..ba43cce665d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutableClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationsImpl; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationsImpl; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.util.ArrayList; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutablePackageFragmentDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutablePackageFragmentDescriptor.java rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java index 33e55022893..6533401671b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/MutablePackageFragmentDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/PackageLikeBuilder.java similarity index 80% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilder.java rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/PackageLikeBuilder.java index 7478999acc8..5010963275b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/PackageLikeBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; public interface PackageLikeBuilder { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilderDummy.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/PackageLikeBuilderDummy.java similarity index 83% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilderDummy.java rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/PackageLikeBuilderDummy.java index f64f02f74c4..4a867e387dc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/PackageLikeBuilderDummy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/PackageLikeBuilderDummy.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; public class PackageLikeBuilderDummy implements PackageLikeBuilder { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScopeBasedPackageLikeBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScopeBasedPackageLikeBuilder.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScopeBasedPackageLikeBuilder.java rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScopeBasedPackageLikeBuilder.java index 973ce2efa5a..f60a60c3f04 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScopeBasedPackageLikeBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScopeBasedPackageLikeBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; public class ScopeBasedPackageLikeBuilder implements PackageLikeBuilder { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScriptDescriptorImpl.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java rename to compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScriptDescriptorImpl.java index dfc696e271e..abbff983bc3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/ScriptDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScriptDescriptorImpl.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; 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.resolve.scopes.receivers.ScriptReceiver; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index 631ac081177..f625bb169ec 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.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.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; @@ -29,12 +29,12 @@ import org.jetbrains.jet.lang.resolve.BodyResolver; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index e8ae64e2bc8..4bc74837ddc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; 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.kotlin.types.DynamicTypesSettings; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; @@ -31,11 +31,11 @@ import org.jetbrains.jet.lang.resolve.BodyResolver; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index f5f5fee2d1d..5bbf8f3da26 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -19,23 +19,23 @@ package org.jetbrains.kotlin.di; 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.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.context.LazyResolveToken; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index 73a4a766838..96f729a3a64 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.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.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; @@ -30,12 +30,12 @@ import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider.Empty; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index 3f86f95e876..9c7c891cea9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; @@ -31,15 +31,15 @@ import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; import org.jetbrains.jet.lang.resolve.calls.CallCompleter; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java index c93cc35e3aa..1d8c4c2dacf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java @@ -20,22 +20,22 @@ import com.intellij.openapi.project.Project; 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.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.jet.lang.resolve.BodyResolver; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java index 377594cae1d..a60eba6ce68 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClass.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java index 1ec43cfcc17..594e98a3edf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetClassOrObject.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiNameIdentifierOwner; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt index 43ed099f6b8..10c3a9d1ba8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetCodeFragment.kt @@ -26,7 +26,7 @@ import com.intellij.testFramework.LightVirtualFile import org.jetbrains.jet.plugin.JetFileType import java.util.HashSet import com.intellij.openapi.util.Key -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType public abstract class JetCodeFragment( private val _project: Project, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java index 611c26c2e03..2382eaf0aa0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFile.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; import org.jetbrains.kotlin.psi.stubs.elements.JetPlaceHolderStubElementType; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.JetLanguage; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteral.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteral.java index 6e4eb246318..5c0feb032d7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteral.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionLiteral.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.lexer.JetTokens; public class JetFunctionLiteral extends JetFunctionNotStubbed { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java index d1e9eb1b90d..f4c07297917 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java @@ -24,8 +24,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; public class JetImportDirective extends JetElementImplStub { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java index a2b2191f120..b414aa9b3e7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java index af2cd0f1bfc..7980cb51f8f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNameReferenceExpression.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.stubs.KotlinNameReferenceExpressionStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; import static org.jetbrains.kotlin.lexer.JetTokens.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamed.java index 16f4ab8bb0c..2cbac402ccb 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamed.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.psi; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; public interface JetNamed { @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclaration.java index e3e918145ef..0d4194e4d9d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclaration.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.psi; import com.intellij.psi.PsiNameIdentifierOwner; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; public interface JetNamedDeclaration extends JetDeclaration, PsiNameIdentifierOwner, JetStatementExpression, JetNamed { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java index c5b5cbe87fd..7db34d5ac22 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java index 8f0e2c439f0..d486dc6b88c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationStub.java @@ -27,8 +27,8 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.stubs.KotlinStubWithFqName; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java index 69414157ee5..3626f0f3110 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationUtil.java @@ -20,9 +20,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; public final class JetNamedDeclarationUtil { @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPackageDirective.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPackageDirective.java index 42df9371753..f300fbd090e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPackageDirective.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPackageDirective.java @@ -24,9 +24,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.SpecialNames; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java index 4484ecceefd..82dbd3e718f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java @@ -38,10 +38,10 @@ import org.jetbrains.jet.JetNodeTypes; import org.jetbrains.kotlin.kdoc.psi.api.KDocElement; import org.jetbrains.jet.lang.parsing.JetExpressionParsing; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.SpecialNames; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt index eecde588d3e..c8c41e1d80a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetSimpleNameExpression.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.psi import com.intellij.lang.ASTNode import com.intellij.psi.PsiElement import com.intellij.psi.tree.IElementType -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.lexer.JetTokens public trait JetSimpleNameExpression : JetReferenceExpression { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java index b7031ef9d75..1992a1bd35f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeCodeFragment.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class JetTypeCodeFragment extends JetCodeFragment { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameter.java index 832dc7b47a8..11909299aa9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypeParameter.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.stubs.KotlinTypeParameterStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.types.Variance; +import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.lexer.JetTokens; public class JetTypeParameter extends JetNamedDeclarationStub { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java index de7e6924561..a379506d9c3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetTypedef.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; public class JetTypedef extends JetTypeParameterListOwnerNotStubbed { public JetTypedef(@NotNull ASTNode node) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt index 00abd616987..61005e5dd40 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt @@ -33,7 +33,7 @@ import com.intellij.psi.PsiPackage import com.intellij.psi.JavaDirectoryService import com.intellij.psi.PsiDirectory import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils import com.intellij.lang.ASTNode import com.intellij.psi.PsiWhiteSpace diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt index eff5528ca03..ed44d3533f0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi.stubs import com.intellij.psi.PsiNamedElement import com.intellij.psi.stubs.NamedStub -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.psi.stubs.StubElement import com.intellij.psi.stubs.PsiFileStub import org.jetbrains.kotlin.lexer.JetModifierKeywordToken diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java index db3a6f70f49..ec5e3f83c5f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetAnnotationEntryElementType.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetAnnotationEntry; import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.kotlin.psi.stubs.KotlinAnnotationEntryStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinAnnotationEntryStubImpl; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java index 667950b7570..8c5862f624f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetClassElementType.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.psi.stubs.KotlinClassStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinClassStubImpl; import org.jetbrains.kotlin.psi.stubs.impl.Utils; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.io.IOException; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java index 9ac807945d1..22d334e2d0e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetFunctionElementType.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.psi.stubs.KotlinFunctionStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinFunctionStubImpl; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java index ba7610a3047..940b952532d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl; import org.jetbrains.kotlin.psi.stubs.impl.Utils; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.io.IOException; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java index 587631723f5..186e0542d99 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.stubs.KotlinParameterStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinParameterStubImpl; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java index 9db68cd1331..595628d1804 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl; import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeParameterElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeParameterElementType.java index 1b8f455e77f..13a1bc2728e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeParameterElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetTypeParameterElementType.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetTypeParameter; import org.jetbrains.kotlin.psi.stubs.KotlinTypeParameterStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeParameterStubImpl; -import org.jetbrains.jet.lang.types.Variance; +import org.jetbrains.kotlin.types.Variance; import java.io.IOException; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt index a3a2f053cd7..1e6cfaf220d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt @@ -21,7 +21,7 @@ import com.intellij.util.io.StringRef import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.psi.stubs.KotlinClassStub import org.jetbrains.kotlin.psi.stubs.elements.JetClassElementType -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import java.util.ArrayList import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.java index c81fbe46eef..d514b8c741e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFileStubImpl.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.stubs.KotlinFileStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt index 1543b6ccef5..eccdd9fdaa5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinFunctionStubImpl.kt @@ -21,7 +21,7 @@ import com.intellij.util.io.StringRef import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.stubs.KotlinFunctionStub import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.psi.PsiElement public class KotlinFunctionStubImpl( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt index a3238ab0f40..df54573c903 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinObjectStubImpl.kt @@ -21,7 +21,7 @@ import com.intellij.util.io.StringRef import org.jetbrains.kotlin.psi.JetObjectDeclaration import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.psi.PsiElement diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt index c26a286c23c..22783b155cc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt @@ -21,7 +21,7 @@ import com.intellij.util.io.StringRef import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.stubs.KotlinParameterStub import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.psi.PsiElement public class KotlinParameterStubImpl( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt index 6d11bcc67fc..a8977edd350 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinPropertyStubImpl.kt @@ -21,7 +21,7 @@ import com.intellij.util.io.StringRef import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.psi.PsiElement public class KotlinPropertyStubImpl( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/BoundsSubstitutor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/BoundsSubstitutor.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/BoundsSubstitutor.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/BoundsSubstitutor.java index 34959109f7a..6ffc611ffed 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/BoundsSubstitutor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/BoundsSubstitutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import com.google.common.base.Function; import com.google.common.collect.Collections2; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.utils.DFS; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.java index 326f6d2659e..8942159e9c9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/CastDiagnosticsUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/CastDiagnosticsUtil.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import com.google.common.base.Predicate; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassKind; -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.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java index e5e8ec9eae1..22a84853c17 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.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; +package org.jetbrains.kotlin.types; import kotlin.Function0; import kotlin.Function1; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInfo.java b/compiler/frontend/src/org/jetbrains/kotlin/types/JetTypeInfo.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInfo.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/JetTypeInfo.java index a46a0746d7a..aaebeed61e0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/JetTypeInfo.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/JetTypeInfo.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; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/SubstitutionUtils.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/SubstitutionUtils.java index b83ef87cb65..70de4f1462f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/SubstitutionUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Maps; 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.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeReconstructionResult.java b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeReconstructionResult.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/TypeReconstructionResult.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/TypeReconstructionResult.java index e448835e1c9..de78b0beb74 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeReconstructionResult.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeReconstructionResult.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; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeUnifier.java b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeUnifier.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/TypeUnifier.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/TypeUnifier.java index 7570bc62e52..369ab09490f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/TypeUnifier.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/TypeUnifier.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; +package org.jetbrains.kotlin.types; import com.google.common.base.Predicate; import com.google.common.collect.Maps; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index 06934e70900..847cd39183d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Lists; import com.intellij.psi.PsiElement; @@ -22,10 +22,10 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; @@ -52,14 +52,14 @@ import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; 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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.util.slicedmap.WritableSlice; @@ -69,7 +69,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; +import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getStaticNestedClassesScope; @@ -77,11 +77,11 @@ import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.IND import static org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory.createDataFlowValue; import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; -import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; -import static org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils.createCallForSpecialConstruction; -import static org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils.*; -import static org.jetbrains.jet.lang.types.expressions.TypeReconstructionUtil.reconstructBareType; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; +import static org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils.createCallForSpecialConstruction; +import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.*; +import static org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil.reconstructBareType; import static org.jetbrains.kotlin.lexer.JetTokens.AS_KEYWORD; import static org.jetbrains.kotlin.lexer.JetTokens.AS_SAFE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/CaptureKind.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/CaptureKind.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/CaptureKind.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/CaptureKind.java index 0784f016bce..2fe819cdf01 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/CaptureKind.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/CaptureKind.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.expressions; +package org.jetbrains.kotlin.types.expressions; public enum CaptureKind { NOT_INLINE, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java index 7dc19f87050..7b74864267b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Lists; import com.intellij.psi.PsiElement; @@ -24,15 +24,15 @@ import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.*; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.util.slicedmap.WritableSlice; @@ -44,8 +44,8 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; -import static org.jetbrains.jet.lang.types.TypeUtils.*; -import static org.jetbrains.jet.lang.types.expressions.CoercionStrategy.COERCION_TO_UNIT; +import static org.jetbrains.kotlin.types.TypeUtils.*; +import static org.jetbrains.kotlin.types.expressions.CoercionStrategy.COERCION_TO_UNIT; public class ClosureExpressionsTypingVisitor extends ExpressionTypingVisitor { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/CoercionStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/CoercionStrategy.java similarity index 87% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/CoercionStrategy.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/CoercionStrategy.java index 8aea16b65b3..945628a6c6f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/CoercionStrategy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/CoercionStrategy.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.expressions; +package org.jetbrains.kotlin.types.expressions; public enum CoercionStrategy { NO_COERCION, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java index 06f7a5a96c7..6431eb5e118 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -24,11 +24,11 @@ import com.intellij.openapi.util.Ref; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; @@ -43,9 +43,9 @@ import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionCandidate; import org.jetbrains.jet.lang.resolve.calls.tasks.TracingStrategy; import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.lexer.JetTokens; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java index a96eab04b61..242d5247db5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Lists; import com.intellij.openapi.util.Pair; @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; @@ -34,8 +34,8 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; 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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; @@ -46,11 +46,11 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; -import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; -import static org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils.createCallForSpecialConstruction; -import static org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils.createDataFlowInfoForArgumentsForIfCall; -import static org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils.*; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; +import static org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils.createCallForSpecialConstruction; +import static org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils.createDataFlowInfoForArgumentsForIfCall; +import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.*; public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java index 6d1d0c5ecd9..946618bdf5b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Sets; import com.intellij.openapi.util.Ref; @@ -35,8 +35,8 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; 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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; @@ -45,7 +45,7 @@ import java.util.Set; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.types.TypeUtils.*; +import static org.jetbrains.kotlin.types.TypeUtils.*; public class DataFlowUtils { private DataFlowUtils() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingComponents.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingComponents.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java index f3cebf75f76..2a9a928a45d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingComponents.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.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.expressions; +package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.context.GlobalContext; @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; 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.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java index b389ac2ed1b..14f2c9ec54a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.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.expressions; +package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.BindingTrace; @@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.calls.context.ResolutionResultsCacheImpl; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public class ExpressionTypingContext extends ResolutionContext { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingFacade.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingFacade.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingFacade.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingFacade.java index 17c29e56930..3ec4b318734 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingFacade.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingFacade.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.types.JetTypeInfo; +import org.jetbrains.kotlin.types.JetTypeInfo; public interface ExpressionTypingFacade { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingInternals.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingInternals.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingInternals.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingInternals.java index e7b380e60ac..f74d66372ac 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingInternals.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingInternals.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.JetTypeInfo; +import org.jetbrains.kotlin.types.JetTypeInfo; /*package*/ interface ExpressionTypingInternals extends ExpressionTypingFacade { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java index 92611941ce9..8dab65f9179 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.base.Function; import com.intellij.openapi.project.Project; @@ -24,10 +24,10 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalyzerPackage; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ScriptDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; @@ -41,9 +41,9 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; 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.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.JetTypeInfo; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.JetTypeInfo; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; @@ -51,8 +51,8 @@ import javax.inject.Inject; import java.util.Iterator; import java.util.List; -import static org.jetbrains.jet.lang.types.TypeUtils.*; -import static org.jetbrains.jet.lang.types.expressions.CoercionStrategy.COERCION_TO_UNIT; +import static org.jetbrains.kotlin.types.TypeUtils.*; +import static org.jetbrains.kotlin.types.expressions.CoercionStrategy.COERCION_TO_UNIT; public class ExpressionTypingServices { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java index 7538d19ace6..39e2007ed61 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Lists; import com.intellij.openapi.project.Project; @@ -25,7 +25,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; @@ -35,17 +35,17 @@ import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.util.CallMaker; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; 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.JetTypeInfo; -import org.jetbrains.jet.lang.types.TypeUtils; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.JetTypeInfo; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.util.slicedmap.WritableSlice; @@ -57,7 +57,7 @@ import java.util.List; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.jet.lang.resolve.BindingContext.*; -import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; +import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; public class ExpressionTypingUtils { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitor.java similarity index 88% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitor.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitor.java index f8b6d950aa5..2d3d89693dc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetVisitor; -import org.jetbrains.jet.lang.types.JetTypeInfo; +import org.jetbrains.kotlin.types.JetTypeInfo; /*package*/ abstract class ExpressionTypingVisitor extends JetVisitor { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java index 3d006b5479d..2c44dd78027 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.intellij.openapi.progress.ProcessCanceledException; import org.jetbrains.annotations.NotNull; @@ -24,9 +24,9 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import org.jetbrains.jet.lang.types.DeferredType; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetTypeInfo; +import org.jetbrains.kotlin.types.DeferredType; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetTypeInfo; import org.jetbrains.jet.util.ReenteringLazyValueComputationException; import org.jetbrains.kotlin.utils.KotlinFrontEndException; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java index 56b2714bc33..8a8cb64e8f0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Sets; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; @@ -29,14 +29,14 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResultsUtil; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; -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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.JetTypeInfo; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; @@ -46,8 +46,8 @@ import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; import static org.jetbrains.jet.lang.resolve.BindingContext.VARIABLE_REASSIGNMENT; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; -import static org.jetbrains.jet.lang.types.TypeUtils.noExpectedType; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; @SuppressWarnings("SuspiciousMethodCalls") public class ExpressionTypingVisitorForStatements extends ExpressionTypingVisitor { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java index d9479eeffd5..a6e57803793 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory1; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetExpression; @@ -29,12 +29,12 @@ import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java index bdcd181f27e..231bdf2e6cd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Lists; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.context.ResolutionContext; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import java.util.Collection; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java index c9bb7c41f56..93b5c9a5cf0 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LocalClassifierAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.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,25 +14,25 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.base.Predicates; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.PackageLikeBuilder; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.descriptors.impl.PackageLikeBuilder; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.scopes.WritableScope; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerBasic; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/OperatorConventions.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/OperatorConventions.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/OperatorConventions.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/OperatorConventions.java index 1b93ed75d18..cff47aaea45 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/OperatorConventions.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/OperatorConventions.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.ImmutableBiMap; import com.google.common.collect.ImmutableSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java index 1976f9a9196..9eec72ab96c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/PatternMatchingTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.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.expressions; +package org.jetbrains.kotlin.types.expressions; import com.google.common.collect.Sets; import com.intellij.openapi.util.Ref; @@ -30,8 +30,8 @@ import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory; 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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; @@ -39,9 +39,9 @@ import java.util.Set; import static org.jetbrains.jet.lang.diagnostics.Errors.*; import static org.jetbrains.jet.lang.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.types.TypeUtils.NO_EXPECTED_TYPE; -import static org.jetbrains.jet.lang.types.TypeUtils.isIntersectionEmpty; -import static org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils.newWritableScopeImpl; +import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.isIntersectionEmpty; +import static org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils.newWritableScopeImpl; public class PatternMatchingTypingVisitor extends ExpressionTypingVisitor { protected PatternMatchingTypingVisitor(@NotNull ExpressionTypingInternals facade) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java index 229d7be5b9c..7ae5339e68c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/TypeReconstructionUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.expressions; +package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.psi.JetTypeReference; 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.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import static org.jetbrains.jet.lang.diagnostics.Errors.NO_TYPE_ARGUMENTS_ON_RHS; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java index a573ef75c39..bb0cc810b34 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/FakeLightClassForFileOfPackage.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetLanguage; /** diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java index 441161ee306..6935468fc04 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java @@ -37,8 +37,8 @@ import org.jetbrains.kotlin.psi.JetEnumEntry; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.KotlinFinderMarker; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.NamePackage; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.NamePackage; import java.util.Collection; import java.util.List; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JetLightPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JetLightPackage.java index 1f9324dac18..54f3e35cf34 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JetLightPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JetLightPackage.java @@ -21,7 +21,7 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.impl.file.PsiPackageImpl; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; public class JetLightPackage extends PsiPackageImpl { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java index c226462ce82..240dbe952a1 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.codegen.PackageCodegen; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.Progress; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPsiUtil; @@ -56,7 +56,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.org.objectweb.asm.Type; import java.util.Collection; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt index 6e353791e94..1efb15de5fc 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClass.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.asJava; import com.intellij.psi.PsiClass; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetClassOrObject public trait KotlinLightClass : PsiClass, KotlinLightElement { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java index fa2b3f83ea8..23685dd6d03 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java @@ -23,12 +23,12 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.reference.SoftReference; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.types.JetType; import java.util.Collection; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt index 4300326f210..d22cdc5c105 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForEnumEntry.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiManager -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetEnumEntry import com.intellij.psi.PsiEnumConstantInitializer import com.intellij.psi.PsiEnumConstant 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 8f4a0812eaf..8f3c57a2676 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -43,15 +43,15 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.types.JetType; 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/KotlinLightClassForPackage.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java index 87fdae293f6..0cacdc8c018 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForPackage.java @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.jetAsJava.JetJavaMirrorMarker; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetLanguage; import javax.swing.*; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java index dcad360b8cd..12d185168aa 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java @@ -34,7 +34,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetLanguage; import java.util.List; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java index 77c9a329f1f..a25aa732530 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.asJava; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; public class LightClassConstructionContext { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java index 6235e8a8d9f..3ab33bc36c2 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassGenerationSupport.java @@ -22,9 +22,9 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; import java.util.Collection; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt index 4ed19bc240b..ca8229db4c1 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.impl.java.stubs.PsiJavaFileStub -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName trait LightClassData 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 8b455aee0f5..163db49dd9e 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java @@ -40,7 +40,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.KotlinVfsUtil; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java index 07f7a9d5aeb..08d5274fef1 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/StubClassBuilder.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.codegen.AbstractClassBuilder; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.FieldVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/tests/org/jetbrains/jet/FqNameTest.java b/compiler/tests/org/jetbrains/jet/FqNameTest.java index cc3544ced46..638a73fdb5c 100644 --- a/compiler/tests/org/jetbrains/jet/FqNameTest.java +++ b/compiler/tests/org/jetbrains/jet/FqNameTest.java @@ -17,10 +17,10 @@ package org.jetbrains.jet; import com.google.common.collect.Lists; -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.resolve.name.NamePackage; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.NamePackage; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 1ed5899104f..b46a276915a 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -52,7 +52,7 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.jet.lang.diagnostics.Severity; @@ -64,7 +64,7 @@ import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.test.InnerTestClasses; diff --git a/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java b/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java index 520b29ba4cf..4545f256529 100644 --- a/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java +++ b/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java @@ -18,8 +18,8 @@ package org.jetbrains.jet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.junit.Test; import static org.jetbrains.jet.lang.resolve.java.PackageClassUtils.getPackageClassName; diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java index 25ec564cf41..0474f19b2d9 100644 --- a/compiler/tests/org/jetbrains/jet/ScriptTest.java +++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.config.CompilerConfiguration; 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.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.utils.PathUtil; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index 589e70a3ccd..cf79d1932de 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -30,9 +30,9 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.jet.context.SimpleGlobalContext; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetElement; @@ -46,8 +46,8 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java index ecfed00883f..8946d2d63bd 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java @@ -22,8 +22,8 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java index e5ea494ee8e..69567ca1c19 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java @@ -32,13 +32,13 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.lang.types.Flexibility; +import org.jetbrains.kotlin.types.Flexibility; import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.junit.Assert; diff --git a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt index 3d7e1f3039b..07a792f8e73 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.checkers -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.descriptors.Named +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.descriptors.Named import java.util.IdentityHashMap import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaTypeImpl @@ -29,10 +29,10 @@ import org.jetbrains.jet.lang.resolve.java.structure.JavaNamedElement import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.DescriptorUtils import java.util.HashMap -import org.jetbrains.jet.lang.types.JetTypeImpl +import org.jetbrains.kotlin.types.JetTypeImpl import java.util.regex.Pattern import org.jetbrains.jet.lang.resolve.calls.tasks.ResolutionTaskHolder import org.jetbrains.kotlin.renderer.DescriptorRenderer diff --git a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt index 291c1f72b85..074edfb92b7 100644 --- a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt @@ -25,13 +25,13 @@ import kotlin.test.assertNotNull import java.util.regex.Pattern import org.jetbrains.jet.JetTestUtils import org.jetbrains.jet.lang.resolve.constants.StringValue -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.constants.IntegerValueConstant import java.util.HashMap import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.evaluate.ConstantExpressionEvaluator import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescriptorResolveTest() { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index ea9e13efdcb..aa37008b807 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index e13c0bd664d..4882cb49b93 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -30,10 +30,10 @@ import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index db6779a8e9d..8f2cce6e123 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -21,8 +21,8 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.ResolvePackage; import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; import org.jetbrains.jet.lang.resolve.java.kotlinSignature.TypeTransformingVisitor; import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java index bb12849f2f7..bc50c9a2920 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java index 3a42292daf2..bdc5badfd7c 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java @@ -22,7 +22,7 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.common.ExitCode; import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.junit.Assert; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index b7866ae1467..7c9f7044f37 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -26,9 +26,9 @@ import org.jetbrains.jet.MockLibraryUtil; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.test.TestCaseWithTmpdir; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt index 28cd526582b..45948d0175d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt @@ -18,16 +18,16 @@ package org.jetbrains.jet.jvm.compiler import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberScope -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.Collections import org.jetbrains.kotlin.serialization.DescriptorSerializer import com.intellij.testFramework.UsefulTestCase import java.util.ArrayList -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.jet.test.util.DescriptorValidator import org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.MemberComparator class DeserializedScopeValidationVisitor : DescriptorValidator.ValidationVisitor() { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java index a66d84fe350..831be4da4c5 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -19,13 +19,13 @@ package org.jetbrains.jet.jvm.compiler; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java index 323b24f9f78..74cbc37ff3b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.compiler.CoreExternalAnnotationsManager; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java index a5676f15e14..9213ccf51c0 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index 17e5f33bf07..fccbd3b044d 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -32,14 +32,14 @@ import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; 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.lazy.JvmResolveUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 49662130d62..3aaa3469647 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -24,9 +24,9 @@ import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters import org.jetbrains.kotlin.psi.JetFile import java.io.File import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.* import org.junit.Assert import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.config.CompilerConfiguration @@ -39,7 +39,7 @@ import org.jetbrains.jet.analyzer.ResolverForProject import org.jetbrains.jet.analyzer.ModuleInfo import java.util.HashMap import org.jetbrains.jet.analyzer.ModuleContent -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.jet.lang.resolve.descriptorUtil.module import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index fcf03f601bc..4d4d6aa2519 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -31,11 +31,11 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.TimeUtils; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.ResolvePackage; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java index 9855930b5e9..b69dcd5f344 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java @@ -21,8 +21,8 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.junit.Assert; 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 9db9a18f561..2e43616c2c1 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/JvmResolveUtil.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.context.ContextPackage; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java index 24fba28522a..b210b68aa7a 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveTestUtil.java @@ -22,14 +22,14 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.name.SpecialNames; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt index 394faea25ae..01bfa0db38a 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/lazyResolveTestUtil.kt @@ -22,7 +22,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.lang.resolve.java.JvmAnalyzerFacade import org.jetbrains.jet.analyzer.ModuleInfo -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.java.JvmPlatformParameters import org.jetbrains.jet.analyzer.ModuleContent diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index a564c8b3534..d39fa037a5a 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -27,7 +27,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.jet.lang.diagnostics.Errors; @@ -35,11 +35,11 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java index 06413ec764e..1bc0ae5d3a6 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java @@ -20,21 +20,21 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index 744f12af9a4..baae2a7b435 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -24,17 +24,17 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.psi.JetAnnotationEntry; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.TypeProjection; +import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index 857d0afb675..16c5d8a1bff 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -35,9 +35,9 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.jet.lang.resolve.calls.callUtil.getParentResolvedCall -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt index 9142d3d0ef3..bf2a25c5a67 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -21,11 +21,11 @@ import org.jetbrains.jet.JetLiteFixture import org.jetbrains.jet.JetTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.di.InjectorForTests -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.diagnostics.rendering.Renderers import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import java.io.File import java.util.regex.Pattern import org.jetbrains.jet.resolve.constraintSystem.AbstractConstraintSystemTest.MyConstraintKind diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt index 1940ae58ee5..46c206cbba3 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -17,17 +17,17 @@ package org.jetbrains.jet.resolve.constraintSystem import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import com.intellij.openapi.project.Project import java.util.regex.Pattern import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstructor -import org.jetbrains.jet.lang.types.JetTypeImpl -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.types.JetTypeImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations public class ConstraintSystemTestData( context: BindingContext, diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt index 73dc1650479..a766cd823f5 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -22,19 +22,19 @@ import org.jetbrains.jet.ConfigurationKind import java.io.File 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.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.types.Variance.* -import org.jetbrains.jet.lang.types.typesApproximation.approximateCapturedTypes +import org.jetbrains.kotlin.types.Variance.* +import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypes import org.jetbrains.jet.JetTestUtils import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.resolve.calls.inference.createCapturedType import org.jetbrains.jet.lang.diagnostics.Severity -import org.jetbrains.jet.lang.types.typesApproximation.approximateCapturedTypesIfNecessary +import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypesIfNecessary import java.util.ArrayList -import org.jetbrains.jet.lang.types.TypeProjection -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.TypeProjection +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor public class CapturedTypeApproximationTest() : JetLiteFixture() { diff --git a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java index 1ec22eb07fb..eaedf6e832b 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java @@ -21,9 +21,9 @@ import com.google.common.base.Predicates; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.junit.Assert; diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java index 82e653e82f8..94bbfcfc00b 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java @@ -25,10 +25,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.jvm.compiler.ExpectedLoadErrorsUtil; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; 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.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java index 4538c024e75..8927f659efd 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.test.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java index fccffee7b15..2734ba3f57e 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java @@ -20,12 +20,12 @@ import com.google.common.collect.Lists; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.LazyEntity; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.utils.Printer; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt b/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt index a47c8a27a45..d59084313ca 100644 --- a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt +++ b/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt @@ -23,9 +23,9 @@ import java.io.File import org.junit.Assert.* import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.jet.lang.resolve.typeBinding.* -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.utils.Printer diff --git a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java index 724498f4e5e..e3e77f0d683 100644 --- a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java @@ -18,14 +18,14 @@ package org.jetbrains.jet.types; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; 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.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.BoundsSubstitutor; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.BoundsSubstitutor; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 9c8d2c717c8..a93cb3dbd9d 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -22,9 +22,9 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index db646d6983a..31de74c3a6d 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -20,8 +20,8 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.OverloadUtil; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index b14e74580e5..7d16ac4d3b5 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -20,8 +20,8 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.DescriptorResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index 8d0bcbf24b8..180305ceec9 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -24,24 +24,24 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.ReceiverParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.*; import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; -import org.jetbrains.jet.lang.types.CommonSupertypes; -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.kotlin.types.CommonSupertypes; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index d0054f051a8..d20f464a926 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -25,10 +25,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; @@ -38,10 +38,10 @@ import org.jetbrains.jet.lang.resolve.BindingTrace; import org.jetbrains.jet.lang.resolve.BindingTraceContext; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; 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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.*; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java index ad13c08609e..ec3950a0dfa 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java @@ -24,18 +24,18 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.psi.JetTypeProjection; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.TypeResolver; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; 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.*; +import org.jetbrains.kotlin.types.*; 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/cfg/AbstractDataFlowTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java index c927c7ce9c3..d9fc081a8f2 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java index 731c756fbaf..1a89a67884a 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliCommonTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cli; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java index ebd74ee1561..fdff92d811a 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/jvm/K2JvmCliTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.cli.jvm; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.CliBaseTest; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index 12a7a3a2b5e..452183cf362 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java index 93f9438165c..f7bf4583a2b 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.UtilsPackage; import java.lang.reflect.Constructor; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java index aadf19f9d99..e6a1c4624e9 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 1401115c9ee..0752d0f98ef 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 62a3a751b1e..fc103803c48 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -29,9 +29,9 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; 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.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index e17f88ead25..78abdf1069c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java index 409d5c080fd..194cac2270a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/InlineTestUtil.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.tree.MethodNode; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java index 1b4e744497a..ffe2f829bf3 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java @@ -20,8 +20,8 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.serialization.ClassData; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; import java.lang.annotation.Annotation; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java index 26c8978b969..19528714003 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.serialization.PackageData; import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.lang.annotation.Annotation; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java index a7e3df6750d..e645c6b5b77 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil; import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.backend.common.output.OutputFile; import java.lang.annotation.Annotation; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java index 69b3cdfcab4..56a52d23faf 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java @@ -20,7 +20,7 @@ import org.jetbrains.jet.ConfigurationKind; 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.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java index 54576b2c223..2eceee5de92 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.lang.resolve.java.JvmAbi; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.backend.common.output.OutputFile; import java.lang.annotation.Annotation; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java index 8e0adb24a50..bea19d7d3ca 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java @@ -30,13 +30,13 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; @@ -49,7 +49,7 @@ import java.lang.reflect.Modifier; import java.net.URL; import java.net.URLClassLoader; -import static org.jetbrains.jet.lang.types.TypeUtils.getAllSupertypes; +import static org.jetbrains.kotlin.types.TypeUtils.getAllSupertypes; @SuppressWarnings("JUnitTestCaseWithNoTests") public class TestlibTest extends UsefulTestCase { diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index b2a6f91609b..7f0a448c573 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -17,12 +17,12 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.jet.lang.resolve.TypeResolver; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; @@ -34,10 +34,10 @@ import org.jetbrains.jet.lang.resolve.calls.CallCompleter; import org.jetbrains.jet.lang.resolve.calls.CandidateResolver; import org.jetbrains.jet.lang.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.calls.extensions.CallResolverExtensionProvider; diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index 98b0076269a..9d8e18b2019 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.renderer -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import com.intellij.openapi.editor.impl.DocumentImpl import org.jetbrains.jet.JetTestUtils import java.util.ArrayList @@ -33,11 +33,11 @@ import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jet.lang.types.DynamicTypesSettings +import org.jetbrains.kotlin.types.DynamicTypesSettings public abstract class AbstractDescriptorRendererTest : KotlinTestWithEnvironment() { protected open fun getDescriptor(declaration: JetDeclaration, resolveSession: ResolveSession): DeclarationDescriptor { diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index 119bc67e4a3..b50acb5fb5c 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java index 01c4f81e10a..07f3ee83a25 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassFinder.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; public interface JavaClassFinder { @Nullable diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt index 0633e5ed274..59b3eb3f891 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.java -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.java.structure.* import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider import org.jetbrains.jet.lang.resolve.scopes.JetScope diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java index d12197ae6f0..8479ec7d15f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JavaVisibilities.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java index 3ae00e68287..04f1d7d0376 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAbi.java @@ -17,8 +17,8 @@ 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.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; public final class JvmAbi { /** diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java index 59ce7e14dc6..18fd217a674 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmAnnotationNames.java @@ -18,10 +18,10 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.ClassId; -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.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; import java.util.Arrays; import java.util.HashSet; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java index fd9bb0d754c..6861f53e594 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/JvmClassName.java @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; public class JvmClassName { @NotNull 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 943ba97347f..d34b212a449 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 @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.PrimitiveType; import java.util.HashSet; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java index 95e13c7dcda..f18694c16db 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/PackageClassUtils.java @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.java; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; public final class PackageClassUtils { public static final String PACKAGE_CLASS_NAME_SUFFIX = "Package"; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java index c2c3229d70a..9e67d93a964 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaCallableMemberDescriptor.java @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.java.descriptor; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; public interface JavaCallableMemberDescriptor extends CallableMemberDescriptor { } diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaClassDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaClassDescriptor.java index 4b3392965ff..2e35bf21039 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaClassDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaClassDescriptor.java @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve.java.descriptor; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.types.JetType; public interface JavaClassDescriptor extends ClassDescriptor { @Nullable diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaConstructorDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaConstructorDescriptor.java index 8ffab92e3d2..172ee2b824c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaConstructorDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaConstructorDescriptor.java @@ -18,12 +18,12 @@ package org.jetbrains.jet.lang.resolve.java.descriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl; public class JavaConstructorDescriptor extends ConstructorDescriptorImpl implements JavaCallableMemberDescriptor { private Boolean hasStableParameterNames = null; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java index a0b0e5ba54b..b7df91fd394 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaMethodDescriptor.java @@ -18,14 +18,14 @@ package org.jetbrains.jet.lang.resolve.java.descriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.FunctionDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.name.Name; public class JavaMethodDescriptor extends SimpleFunctionDescriptorImpl implements JavaCallableMemberDescriptor { private Boolean hasStableParameterNames = null; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java index e44e52c6523..2d75e3897a4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/JavaPropertyDescriptor.java @@ -17,13 +17,13 @@ package org.jetbrains.jet.lang.resolve.java.descriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.Modality; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.Visibility; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.Modality; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl; +import org.jetbrains.kotlin.name.Name; public class JavaPropertyDescriptor extends PropertyDescriptorImpl implements JavaCallableMemberDescriptor { public JavaPropertyDescriptor( diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java index 6036db0d6e9..7576a8bd38b 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamAdapterDescriptor.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.descriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; public interface SamAdapterDescriptor extends FunctionDescriptor, JavaCallableMemberDescriptor { @NotNull diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.kt index 3f77f7aa964..39bb69d5dcb 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/descriptor/SamConstructorDescriptor.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve.java.descriptor -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude public class SamConstructorDescriptor( diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt index 1832452971e..6102ccef28e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/LazyJavaPackageFragmentProvider.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.lang.resolve.java.lazy -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.storage.MemoizedFunctionToNullable -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.* -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.emptyOrSingletonList public class LazyJavaPackageFragmentProvider( diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/ModuleClassResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/ModuleClassResolver.kt index 632bfe8f2b8..25b17f432c0 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/ModuleClassResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/ModuleClassResolver.kt @@ -16,10 +16,10 @@ package org.jetbrains.jet.lang.resolve.java.lazy -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import kotlin.properties.Delegates import javax.inject.Inject diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt index dcdb3597083..ba72f5f4beb 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/annotationUtils.kt @@ -18,9 +18,9 @@ package org.jetbrains.jet.lang.resolve.java.lazy import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.resolveAnnotation diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt index 9fe689f7d9e..b2091dd8e6e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/context.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.lazy import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter import org.jetbrains.jet.lang.resolve.java.JavaClassFinder import org.jetbrains.jet.lang.resolve.java.resolver.* diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt index 871e62f54b3..9eb34d0999c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt @@ -16,15 +16,15 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.types.* -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.types.* +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext import org.jetbrains.jet.lang.resolve.java.structure.* import org.jetbrains.jet.lang.resolve.constants.* -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames.* import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils 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 e67ed75f11f..3cd6df0bf20 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 @@ -16,13 +16,13 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorBase +import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorBase import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.TypeConstructor +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.TypeConstructor import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext import org.jetbrains.jet.lang.resolve.java.lazy.child import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage @@ -32,8 +32,8 @@ import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.utils.* import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.types.AbstractClassTypeConstructor +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.types.AbstractClassTypeConstructor class LazyJavaClassDescriptor( private val outerC: LazyJavaResolverContext, diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt index ae520f6a849..0fd77669748 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -16,25 +16,25 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.java.structure.* import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage -import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl import java.util.Collections import org.jetbrains.kotlin.utils.* import java.util.ArrayList import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.impl.EnumEntrySyntheticClassDescriptor -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.java.JavaVisibilities import org.jetbrains.jet.lang.resolve.java.descriptor.JavaConstructorDescriptor import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter public class LazyJavaClassMemberScope( 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 d23b58247e1..9687e13d1ad 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 @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.storage.NotNullLazyValue -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod import org.jetbrains.jet.lang.resolve.java.structure.JavaField @@ -26,24 +26,24 @@ import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext import org.jetbrains.jet.lang.resolve.java.descriptor.JavaMethodDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.java.lazy.child -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.jet.lang.resolve.java.lazy.resolveAnnotations import org.jetbrains.jet.lang.resolve.java.structure.JavaArrayType import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.java.lazy.hasNotNullAnnotation import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeAttributes import org.jetbrains.jet.lang.resolve.java.structure.JavaValueParameter import java.util.ArrayList import java.util.LinkedHashSet -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.java.descriptor.JavaPropertyDescriptor -import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl import org.jetbrains.jet.lang.resolve.java.resolver.ExternalSignatureResolver import org.jetbrains.kotlin.utils.* import org.jetbrains.jet.lang.resolve.java.PLATFORM_TYPES -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude.NonExtensions diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt index bc1f5a093a8..1df5942f8a4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaPackageFragment.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage -import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl import kotlin.properties.Delegates class LazyJavaPackageFragment( diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticClassScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticClassScope.kt index b46bd0b95c2..3213aa968b0 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticClassScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticClassScope.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.resolve.name.* +import org.jetbrains.kotlin.name.* import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext import org.jetbrains.jet.lang.resolve.java.structure.JavaClass import org.jetbrains.jet.lang.resolve.DescriptorFactory.* diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt index 98daa30ce2d..2c63cd36561 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaStaticScope.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.* +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.* import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType public abstract class LazyJavaStaticScope( c: LazyJavaResolverContext, 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 7861583ef4e..3e3799deec7 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 @@ -16,16 +16,16 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.impl.AbstractLazyTypeParameterDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext import org.jetbrains.jet.lang.resolve.java.lazy.types.toAttributes -import org.jetbrains.jet.lang.descriptors.SourceElement +import org.jetbrains.kotlin.descriptors.SourceElement class LazyJavaTypeParameterDescriptor( private val c: LazyJavaResolverContext, diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt index 582aaaa4657..c617c4b80a7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.* +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.* import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaResolverContext import org.jetbrains.jet.lang.resolve.java.structure.JavaPackage import org.jetbrains.jet.lang.resolve.java.structure.JavaClass diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt index 359d50a396d..909cf3fdcc9 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/MemberIndex.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.java.lazy.descriptors -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.java.structure.* import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils import org.jetbrains.kotlin.utils.valuesToMap diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt index e29a8e9fdec..19d142de725 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/resolvers.kt @@ -17,14 +17,14 @@ package org.jetbrains.jet.lang.resolve.java.lazy import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameter import org.jetbrains.jet.lang.resolve.java.lazy.descriptors.LazyJavaTypeParameterDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.jet.lang.resolve.java.structure.JavaTypeParameterListOwner //TODO: (module refactoring) usages of this interface should be replaced by ModuleClassResolver 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 9cf327de1a0..8a914614c26 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 @@ -17,12 +17,12 @@ package org.jetbrains.jet.lang.resolve.java.lazy.types import org.jetbrains.jet.lang.resolve.java.structure.* -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage.* import org.jetbrains.jet.lang.resolve.java.resolver.* -import org.jetbrains.jet.lang.types.Variance.* -import org.jetbrains.jet.lang.types.* +import org.jetbrains.kotlin.types.Variance.* +import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.utils.sure @@ -30,10 +30,10 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.java.lazy.* import org.jetbrains.kotlin.storage.* import java.util.HashSet -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.jet.lang.resolve.java.PLATFORM_TYPES import org.jetbrains.jet.lang.resolve.java.lazy.types.JavaTypeFlexibility.* -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames import kotlin.platform.platformStatic diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java index 64553f8d1d6..fcfb1bc7df0 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/DescriptorResolverUtils.java @@ -20,14 +20,14 @@ import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.java.structure.*; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import java.util.*; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java index ccf4684830f..c1150581858 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ErrorReporter.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.resolver; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; public interface ErrorReporter { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java index 77006e5cdb2..562afa16f8e 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalAnnotationResolver.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotation; import org.jetbrains.jet.lang.resolve.java.structure.JavaAnnotationOwner; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java index 4b94f2ec6b5..384d071cfcc 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/ExternalSignatureResolver.java @@ -18,11 +18,11 @@ package org.jetbrains.jet.lang.resolve.java.resolver; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.java.structure.JavaField; import org.jetbrains.jet.lang.resolve.java.structure.JavaMember; import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; import java.util.List; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java index ab4c243997f..bedf6d6e161 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaResolverCache.java @@ -18,15 +18,15 @@ package org.jetbrains.jet.lang.resolve.java.resolver; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.java.structure.JavaClass; import org.jetbrains.jet.lang.resolve.java.structure.JavaElement; import org.jetbrains.jet.lang.resolve.java.structure.JavaField; import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; public interface JavaResolverCache { @Nullable diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java index d860b8fe24a..a9f9ebcd872 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/MethodSignatureChecker.java @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve.java.resolver; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod; import java.util.List; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/SamConversionResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/SamConversionResolver.kt index 6981a96de4d..0d7f0407928 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/SamConversionResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/resolver/SamConversionResolver.kt @@ -16,10 +16,10 @@ package org.jetbrains.jet.lang.resolve.java.resolver -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sources/JavaSourceElementFactory.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sources/JavaSourceElementFactory.kt index 6d975b2f9eb..1a419c7c29a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sources/JavaSourceElementFactory.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/sources/JavaSourceElementFactory.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.sources import org.jetbrains.jet.lang.resolve.java.structure.JavaElement -import org.jetbrains.jet.lang.descriptors.SourceElement +import org.jetbrains.kotlin.descriptors.SourceElement public trait JavaSourceElementFactory { public fun source(javaElement: JavaElement): JavaSourceElement @@ -25,4 +25,4 @@ public trait JavaSourceElementFactory { public trait JavaSourceElement: SourceElement { public val javaElement: JavaElement -} \ No newline at end of file +} diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java index ed2aa66c2f4..a8cd8689568 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotation.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.Name; import java.util.Collection; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java index 8bd27d2fcc1..37ece63402f 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaAnnotationOwner.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java index b5ec1a9e71d..fdf128d4aef 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaClass.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java index c02a71f41a9..4581af0553c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaModifierListOwner.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.Visibility; public interface JavaModifierListOwner extends JavaElement { boolean isAbstract(); diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java index 249c0233829..227e74e8c3c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaNamedElement.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; public interface JavaNamedElement extends JavaElement { @NotNull diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.kt index 19d846760e5..79343b54c88 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPackage.kt @@ -16,8 +16,8 @@ package 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.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name public trait JavaPackage : JavaElement { public fun getClasses(nameFilter: (Name) -> Boolean): Collection diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPropertyInitializerEvaluator.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPropertyInitializerEvaluator.java index 8208633657f..1cdf1905306 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPropertyInitializerEvaluator.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaPropertyInitializerEvaluator.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; public interface JavaPropertyInitializerEvaluator { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java index 7d0a3b35107..0632c9d40cf 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/JavaValueParameter.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; public interface JavaValueParameter extends JavaAnnotationOwner { @Nullable diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/annotationArguments.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/annotationArguments.kt index 085a120aa20..8fa70ceb9a5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/annotationArguments.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/structure/annotationArguments.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.java.structure -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name public trait JavaAnnotationArgument { public val name: Name? diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt index 4169b0c4252..99fa0c315a5 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/AbstractBinaryClassAnnotationAndConstantLoader.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.kotlin -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import java.util.ArrayList import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind import org.jetbrains.kotlin.serialization.deserialization.NameResolver @@ -25,9 +25,9 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf.* import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import java.util.HashMap -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.deserialization.AnnotationAndConstantLoader import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt index b483fdc6aeb..6a82502868a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt @@ -19,17 +19,17 @@ package org.jetbrains.jet.lang.resolve.kotlin import org.jetbrains.jet.lang.resolve.java.resolver.DescriptorResolverUtils import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass.AnnotationArrayArgumentVisitor -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils.javaClassIdToKotlinClassId import org.jetbrains.kotlin.storage.StorageManager import java.util.* -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.ClassId -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.constants.ArrayValue import org.jetbrains.jet.lang.resolve.constants.EnumValue -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl import org.jetbrains.jet.lang.resolve.constants.ErrorValue import org.jetbrains.jet.lang.resolve.constants.createCompileTimeConstant import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt index 301e21190a3..5e8b081e08a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializationComponentsForJava.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.lang.resolve.kotlin import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.java.lazy.LazyJavaPackageFragmentProvider -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents // This class is needed only for easier injection: exact types of needed components are specified in the constructor here. diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java index f676d63218c..7ca536dfc42 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedDescriptorResolver.java @@ -23,11 +23,11 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; import org.jetbrains.kotlin.serialization.PackageData; import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter; import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import javax.inject.Inject; diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java index a8e2169f5ce..5e7b5315326 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/DeserializedResolverUtils.java @@ -17,16 +17,16 @@ package org.jetbrains.jet.lang.resolve.kotlin; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.name.*; +import org.jetbrains.kotlin.name.*; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.jet.lang.resolve.name.SpecialNames.isClassObjectName; +import static org.jetbrains.kotlin.name.SpecialNames.isClassObjectName; public class DeserializedResolverUtils { private DeserializedResolverUtils() { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt index 965a5a78583..0c2dd5d322b 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaClassDataFinder.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.lang.resolve.kotlin -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder import org.jetbrains.kotlin.serialization.ClassData import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt index 8427f5e25e4..c3eb761ce28 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/JavaFlexibleTypeCapabilitiesDeserializer.kt @@ -17,10 +17,10 @@ package org.jetbrains.jet.lang.resolve.kotlin import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.lang.resolve.java.lazy.types.LazyJavaTypeResolver -import org.jetbrains.jet.lang.types.FlexibleTypeCapabilities -import org.jetbrains.jet.lang.types +import org.jetbrains.kotlin.types.FlexibleTypeCapabilities +import org.jetbrains.kotlin.types object JavaFlexibleTypeCapabilitiesDeserializer : FlexibleTypeCapabilitiesDeserializer { override fun capabilitiesById(id: String): FlexibleTypeCapabilities? { diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt index ed30b59b20c..7978d219a18 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinClassFinder.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.kotlin import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId public trait KotlinClassFinder { public fun findKotlinClass(classId: ClassId): KotlinJvmBinaryClass? diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java index f5e496294c2..da680dc12ed 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/KotlinJvmBinaryClass.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.kotlin; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.Name; public interface KotlinJvmBinaryClass { @NotNull diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/MemberSignature.kt b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/MemberSignature.kt index d95efa4ad75..8aad4e0056a 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/MemberSignature.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/MemberSignature.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.kotlin import kotlin.platform.platformStatic -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name // The purpose of this class is to hold a unique signature of either a method or a field, so that annotations on a member can be put // into a map indexed by these signatures @@ -35,4 +35,4 @@ data class MemberSignature private(private val signature: String) { return MemberSignature(signature.signature + "@" + index) } } -} \ No newline at end of file +} diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java index 4e5b7ff1da1..7281c45677c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/SignatureDeserializer.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.lang.resolve.kotlin; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.kotlin.serialization.deserialization.NameResolver; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; public class SignatureDeserializer { // These types are ordered according to their sorts, this is significant for deserialization diff --git a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java index 6420b212ddd..148c3a7d8f1 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/kotlin/header/ReadKotlinClassHeaderAnnotationVisitor.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.java.AbiVersionUtil; import org.jetbrains.jet.lang.resolve.java.JvmClassName; -import org.jetbrains.jet.lang.resolve.name.ClassId; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.Name; import java.util.*; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java index ab4c6dbde18..72ea794aa90 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java @@ -18,14 +18,14 @@ package org.jetbrains.kotlin.platform; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType; import org.jetbrains.jet.lang.resolve.java.resolver.TypeUsage; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java index 7456e67341d..c6ad2c791fa 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMapBuilder.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.platform; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.lang.annotation.Annotation; 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 b3448f2f9ab..9f0d55cd085 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java @@ -18,18 +18,18 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.*; +import org.jetbrains.kotlin.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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; -import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; +import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getDefaultConstructorVisibility; public class DescriptorFactory { 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 f08171c7c03..b9f9f5c4f55 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java @@ -19,25 +19,25 @@ package org.jetbrains.jet.lang.resolve; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; -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.resolve.name.SpecialNames; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.FilteringScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.ErrorUtils; -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.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.LazyType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.*; -import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*; +import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; public class DescriptorUtils { public static final Name ENUM_VALUES = Name.identifier("values"); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt index 7926970d135..f1f6c3aaf5c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve.descriptorUtil -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.ClassKind.* +import org.jetbrains.kotlin.descriptors.ClassKind.* public fun ClassDescriptor.getClassObjectReferenceTarget(): ClassDescriptor { val classObjectDescriptor = getClassObjectDescriptor() @@ -34,4 +34,4 @@ public val DeclarationDescriptor.isExtension: Boolean get() = this is CallableDescriptor && getExtensionReceiverParameter() != null public val DeclarationDescriptor.module: ModuleDescriptor - get() = DescriptorUtils.getContainingModule(this) \ No newline at end of file + get() = DescriptorUtils.getContainingModule(this) diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java index cf41befb951..a7127b066a0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; public interface ExternalOverridabilityCondition { boolean isOverridable(@NotNull CallableDescriptor superDescriptor, @NotNull CallableDescriptor subDescriptor); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java index cdf6687937c..b64e6285f90 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.renderer.DescriptorRenderer; public final class ImportPath { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java index 4c0e80472c3..cd560f10fd0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java index 7365870e4e5..161722fdb05 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java @@ -22,15 +22,15 @@ import kotlin.Unit; import kotlin.jvm.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.FunctionDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.PropertyAccessorDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.PropertyAccessorDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.utils.DFS; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java index 06da68f996d..ec99bf852a2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.Visibilities; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.Visibilities; import java.util.Queue; 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 a1811481196..ad73de36244 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 @@ -16,20 +16,11 @@ package org.jetbrains.jet.lang.resolve.calls.inference -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.TypeProjection -import org.jetbrains.jet.lang.types.TypeConstructor -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.kotlin.types.* +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.types.Variance.* 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 -import org.jetbrains.jet.lang.types.DelegatingType -import org.jetbrains.jet.lang.types.JetTypeImpl -import org.jetbrains.jet.lang.types.TypeUtils public class CapturedTypeConstructor( public val typeProjection: TypeProjection diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.kt index bef4df56ee5..9de0e4c985b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/ConstraintSystem.kt @@ -16,10 +16,10 @@ package org.jetbrains.jet.lang.resolve.calls.inference -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.TypeSubstitutor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition public trait ConstraintSystem { @@ -76,4 +76,4 @@ public trait ConstraintSystem { * If there is no information for type parameter, returns type projection for DONT_CARE type. */ public fun getCurrentSubstitutor(): TypeSubstitutor -} \ No newline at end of file +} 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 bab8b6d43cb..7964b11d0cf 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 @@ -16,20 +16,20 @@ package org.jetbrains.jet.lang.resolve.calls.inference -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.TypeProjection -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.TypeUtils.DONT_CARE -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.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.TypeProjection +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils.DONT_CARE +import org.jetbrains.kotlin.types.TypeProjectionImpl +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.types.ErrorUtils +import org.jetbrains.kotlin.types.Variance 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 -import org.jetbrains.jet.lang.types.TypeConstructor +import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure +import org.jetbrains.kotlin.types.checker.TypeCheckingProcedureCallbacks +import org.jetbrains.kotlin.types.TypeConstructor import java.util.LinkedHashMap import java.util.HashSet import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind.* @@ -39,8 +39,8 @@ import java.util.ArrayList import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.CompoundConstraintPosition -import org.jetbrains.jet.lang.types.getCustomTypeVariable -import org.jetbrains.jet.lang.types.isFlexible +import org.jetbrains.kotlin.types.getCustomTypeVariable +import org.jetbrains.kotlin.types.isFlexible import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.Bound public class ConstraintSystemImpl : ConstraintSystem { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBounds.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBounds.kt index 80f3beebf0f..2e9a2978362 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBounds.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBounds.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve.calls.inference -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition public trait TypeBounds { @@ -41,4 +41,4 @@ public trait TypeBounds { } public class Bound(public val constrainingType: JetType, public val kind: BoundKind, public val position: ConstraintPosition) -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBoundsImpl.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBoundsImpl.kt index fb2f6f6dc0b..d8b85e2138e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBoundsImpl.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/calls/inference/TypeBoundsImpl.kt @@ -16,22 +16,22 @@ package org.jetbrains.jet.lang.resolve.calls.inference -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.Bound -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind -import org.jetbrains.jet.lang.types.ErrorUtils -import org.jetbrains.jet.lang.types.CommonSupertypes -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.ErrorUtils +import org.jetbrains.kotlin.types.CommonSupertypes +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstructor import java.util.LinkedHashSet import org.jetbrains.jet.lang.resolve.calls.inference.TypeBounds.BoundKind.* import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition import org.jetbrains.kotlin.utils.addIfNotNull -import org.jetbrains.jet.lang.types.singleBestRepresentative -import org.jetbrains.jet.lang.types.typeUtil.cannotBeReified +import org.jetbrains.kotlin.types.singleBestRepresentative +import org.jetbrains.kotlin.types.typeUtil.cannotBeReified public class TypeBoundsImpl( override val typeVariable: TypeParameterDescriptor, 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 72dada72993..378425a25fd 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 @@ -17,10 +17,10 @@ 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.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.types.JetType; 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 57ef7dd7625..833f655b59c 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 @@ -17,9 +17,9 @@ 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; 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 ceaf6072d57..7a5b0009f87 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 @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.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 56ca94ca171..3199a06d55c 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 @@ -17,9 +17,9 @@ 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; 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 46434a03041..c857264b0f7 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 @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.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 ab76593d61f..e8f9451d736 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 @@ -18,9 +18,9 @@ package org.jetbrains.jet.lang.resolve.constants; 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; 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 c8ecf17129a..d0869bf75a4 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 @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve.constants -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils public fun createCompileTimeConstant( value: Any?, 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 7f0f2ab39ac..05f23795b71 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 @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.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 9af8b0cabd2..0c6612e9f6a 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 @@ -17,10 +17,10 @@ package org.jetbrains.jet.lang.resolve.constants; 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; 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 df8f37ee55e..56e206a37ab 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 @@ -17,10 +17,10 @@ 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.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; 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 3159d841aa0..1d059dd4583 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 @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.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 3c1e4aa3ad7..dada04f9a43 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 @@ -17,9 +17,9 @@ 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; 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 c585bdc541d..21d25593e09 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 @@ -18,10 +18,10 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.types.*; 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 8da35f102c4..172e1c9dda4 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 @@ -18,12 +18,12 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; 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 7a6a3da2ee3..26c69a813fb 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 @@ -17,9 +17,9 @@ 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; 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 7261e6201a0..71a15c769f7 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 @@ -17,9 +17,9 @@ 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; 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 7e7b0df4f5a..9ee0d0c2b60 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 @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.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 f3240fb100f..8a70b02319e 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 @@ -17,9 +17,9 @@ 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; 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 48fe25965c9..1c92d481183 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 @@ -17,9 +17,9 @@ package org.jetbrains.jet.lang.resolve.constants; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor; +import org.jetbrains.kotlin.types.JetType; public class StringValue extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/resolveByModule.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/resolveByModule.kt index e6cbfe6c5ee..021eb965dbc 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/resolveByModule.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/resolveByModule.kt @@ -16,12 +16,12 @@ package org.jetbrains.jet.lang.resolve -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.ClassDescriptor public fun ModuleDescriptor.resolveTopLevelClass(topLevelClassFqName: FqName): ClassDescriptor? { assert(!topLevelClassFqName.isRoot()) return getPackage(topLevelClassFqName.parent())?.getMemberScope() ?.getClassifier(topLevelClassFqName.shortName()) as? ClassDescriptor -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt index 9ac0d0fd6da..149e0c5fa42 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer /** diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt index abacb9d44a4..79c6e81be2e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt @@ -16,12 +16,10 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer - import java.util.* - import org.jetbrains.jet.lang.resolve.scopes.JetScopeSelectorUtil.* public open class ChainedScope( diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.kt index b54744da557..5bf1144cf25 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer public class FilteringScope(private val workerScope: JetScope, private val predicate: (DeclarationDescriptor) -> Boolean) : JetScope { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt index dba67ccf3b6..c86d17531a7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.name.Name public class InnerClassesScopeWrapper(override val workerScope: JetScope) : AbstractScopeAdapter() { override fun getClassifier(name: Name) = workerScope.getClassifier(name) as? ClassDescriptor diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt index 1bbeef0acb0..35a0d706edd 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.toReadOnlyList import java.lang.reflect.Modifier diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.kt index 3bd16dd6338..705b0d59cb7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.kt @@ -16,10 +16,9 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer -import java.util.Collections public abstract class JetScopeImpl : JetScope { override fun getClassifier(name: Name): ClassifierDescriptor? = null diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java index 103e0f1ffd1..f7430f213b5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java @@ -18,8 +18,8 @@ package org.jetbrains.jet.lang.resolve.scopes; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.name.Name; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/StaticScopeForKotlinClass.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/StaticScopeForKotlinClass.kt index 49ac5efb618..fc67b3fcf1a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/StaticScopeForKotlinClass.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/StaticScopeForKotlinClass.kt @@ -16,8 +16,8 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.utils.Printer import java.util.ArrayList import kotlin.properties.Delegates diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.kt b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.kt index 28bdfa378eb..37abbad3617 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.kt +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.kt @@ -16,11 +16,10 @@ package org.jetbrains.jet.lang.resolve.scopes -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.types.TypeSubstitutor +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.utils.* - import java.util.* import kotlin.properties.Delegates diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java index 8b301683fc8..8f1d32f871a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public abstract class AbstractReceiverValue implements ReceiverValue { protected final JetType receiverType; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java index e4f891157d5..a831dbbb74c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java @@ -17,8 +17,8 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.types.JetType; public class ClassReceiver implements ThisReceiver { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java index 15983c34127..47e7aa23f41 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java @@ -17,9 +17,8 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.types.JetType; public class ExtensionReceiver extends AbstractReceiverValue implements ThisReceiver { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java index 40b94b1bcd0..acbe3cca0eb 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public interface ReceiverValue { ReceiverValue NO_RECEIVER = new ReceiverValue() { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java index af6d4e29347..14ffbeba8b6 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; /** * Describes a "this" receiver diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java index bd58b3d0949..6a5a069c5a0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.lang.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; /** * This represents the receiver of hasNext and next() in for-loops diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt index 4c2e49cd8f6..2d9e7960066 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.builtins import org.jetbrains.kotlin.serialization.* import org.jetbrains.kotlin.serialization.deserialization.* import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf class BuiltInsAnnotationAndConstantLoader( diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializationUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializationUtil.kt index 67073c3039f..321d0d622da 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializationUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsSerializationUtil.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.builtins -import org.jetbrains.jet.lang.resolve.name.* +import org.jetbrains.kotlin.name.* import kotlin.platform.platformStatic public object BuiltInsSerializationUtil { diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt index aae1bba3882..bffe5304a05 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltinsPackageFragment.kt @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.builtins import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider -import org.jetbrains.jet.lang.descriptors.PackageFragmentProviderImpl -import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl -import org.jetbrains.jet.lang.resolve.name.* +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider +import org.jetbrains.kotlin.descriptors.PackageFragmentProviderImpl +import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl +import org.jetbrains.kotlin.name.* import org.jetbrains.kotlin.storage.StorageManager import java.io.InputStream import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java index 42c0c96fcfd..f31573f851a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.builtins; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.constants.ArrayValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 1a49a2c7283..f27e34df41e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -21,19 +21,19 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.ValueParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.ImportPath; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.io.InputStream; diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.java index 59551b0c3a4..8ad2c4283f2 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/PrimitiveType.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.builtins; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import java.util.Collections; import java.util.EnumSet; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java index 78971999e78..0544e3f9d4e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.List; import java.util.Set; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableMemberDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableMemberDescriptor.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableMemberDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableMemberDescriptor.java index 5a5e73cb1a2..c47187977d1 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/CallableMemberDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/CallableMemberDescriptor.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.descriptors; +package org.jetbrains.kotlin.descriptors; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java index 9a69053e8d6..d71c9323c2a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeProjection; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.Collection; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassKind.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassKind.java index 25cdb7a9363..1f898ae78b3 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassKind.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassKind.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.descriptors; +package org.jetbrains.kotlin.descriptors; public enum ClassKind { CLASS, diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrPackageFragmentDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassOrPackageFragmentDescriptor.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrPackageFragmentDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassOrPackageFragmentDescriptor.java index 3200a637c3a..135c88fdc1a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassOrPackageFragmentDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassOrPackageFragmentDescriptor.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.descriptors; +package org.jetbrains.kotlin.descriptors; public interface ClassOrPackageFragmentDescriptor extends DeclarationDescriptorNonRoot { } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptor.java similarity index 82% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptor.java index e17dd7a8514..5248623fce2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ClassifierDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassifierDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; public interface ClassifierDescriptor extends DeclarationDescriptorNonRoot { @NotNull diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstructorDescriptor.java similarity index 86% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstructorDescriptor.java index d4030785a71..7f32cbae552 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ConstructorDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ConstructorDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java index fa9951ce885..33b905c74da 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.types.TypeSubstitutor; public interface DeclarationDescriptor extends Annotated, Named { /** diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorNonRoot.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorNonRoot.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorNonRoot.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorNonRoot.java index b05ace8bfc2..cb8b4a2ac31 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorNonRoot.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorNonRoot.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.java index ae095c52b5a..c14922815b7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorVisitor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorVisitor.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.descriptors; +package org.jetbrains.kotlin.descriptors; import kotlin.jvm.KotlinSignature; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithSource.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithSource.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithSource.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithSource.java index ea086baaf75..3fb6c5c672b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithSource.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithSource.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithVisibility.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithVisibility.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithVisibility.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithVisibility.java index e617a39df21..1e733a3d805 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorWithVisibility.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/DeclarationDescriptorWithVisibility.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java index 4a7d44d653c..7c148711735 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/FunctionDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/FunctionDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.Set; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/MemberDescriptor.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/MemberDescriptor.java index bfe7e352fc3..215bda6f15b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/MemberDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/MemberDescriptor.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Modality.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Modality.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/Modality.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/Modality.java index 54de8248864..dc61a08cbe1 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Modality.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Modality.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt similarity index 86% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt index 80fb5a66375..5e2eed82a7e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ModuleDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors +package org.jetbrains.kotlin.descriptors import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap 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.kotlin.name.FqName +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.descriptors.impl.PackageViewDescriptorImpl import org.jetbrains.kotlin.builtins.KotlinBuiltIns public trait ModuleDescriptor : DeclarationDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Named.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Named.java similarity index 83% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/Named.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/Named.java index 46c8356a3f3..20d5d7d75ea 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Named.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Named.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; public interface Named { @NotNull diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt similarity index 86% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt index 5f769e853ab..9105283348d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors +package org.jetbrains.kotlin.descriptors -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.lang.resolve.scopes.JetScope public trait PackageFragmentDescriptor : ClassOrPackageFragmentDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProvider.kt similarity index 82% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProvider.kt index 99e362b154b..7967acadbb2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProvider.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors +package org.jetbrains.kotlin.descriptors -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name public trait PackageFragmentProvider { public fun getPackageFragments(fqName: FqName): List diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProviderImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProviderImpl.kt similarity index 86% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProviderImpl.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProviderImpl.kt index 2dd955ae9a1..211bf847804 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageFragmentProviderImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentProviderImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors +package org.jetbrains.kotlin.descriptors -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name public class PackageFragmentProviderImpl( private val packageFragments: Collection diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageViewDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageViewDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java index f8034065d95..0045ad302fe 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PackageViewDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.JetScope; public interface PackageViewDescriptor extends DeclarationDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyAccessorDescriptor.java similarity index 92% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyAccessorDescriptor.java index ec7d4674ac5..02e4a7ba736 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyAccessorDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyAccessorDescriptor.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyDescriptor.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyDescriptor.java index 46aa56d9785..945fa080a79 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.List; import java.util.Set; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyGetterDescriptor.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyGetterDescriptor.java index a70519dd1b6..1905a0e7bfa 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertyGetterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertyGetterDescriptor.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertySetterDescriptor.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertySetterDescriptor.java index 2295bd2a35e..62920354434 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/PropertySetterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PropertySetterDescriptor.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ReceiverParameterDescriptor.java similarity index 86% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ReceiverParameterDescriptor.java index 3b396a6e730..8a1bd0e8994 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ReceiverParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ReceiverParameterDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; public interface ReceiverParameterDescriptor extends CallableDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java similarity index 85% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java index 7d074739a5b..253c2057f6b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ScriptDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.impl.ScriptCodeDescriptor; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.impl.ScriptCodeDescriptor; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; public interface ScriptDescriptor extends DeclarationDescriptorNonRoot { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/SimpleFunctionDescriptor.java similarity index 92% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/SimpleFunctionDescriptor.java index cdeed16bcc8..484cb78c39b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SimpleFunctionDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/SimpleFunctionDescriptor.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.InlineStrategy; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SourceElement.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/SourceElement.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/SourceElement.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/SourceElement.java index a345e059b01..6fe7ba61f1c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/SourceElement.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/SourceElement.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.descriptors; +package org.jetbrains.kotlin.descriptors; public interface SourceElement { SourceElement NO_SOURCE = new SourceElement() { @@ -23,4 +23,4 @@ public interface SourceElement { return "NO_SOURCE"; } }; -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/TypeParameterDescriptor.java similarity index 81% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/TypeParameterDescriptor.java index 652b4997d10..67a10f4798e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/TypeParameterDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeSubstitutor; -import org.jetbrains.jet.lang.types.Variance; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.Variance; import java.util.Set; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ValueParameterDescriptor.java similarity index 92% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/ValueParameterDescriptor.java index e919cfd8fd1..fc85287c66d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/ValueParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ValueParameterDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import java.util.Set; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java similarity index 85% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java index c3d2dd0f316..b411a25a56a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/VariableDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; public interface VariableDescriptor extends CallableDescriptor { @NotNull diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java similarity index 99% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java index 66bcaae1e70..bf7ce2a04d1 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibilities.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.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.descriptors; +package org.jetbrains.kotlin.descriptors; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibility.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibility.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.java index cb49e3c17f6..3d852abd5fd 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/Visibility.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.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.descriptors; +package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotated.java similarity index 87% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotated.java index 69110545fec..a4658dd1bf7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotated.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotated.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.descriptors.annotations; +package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotatedImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotatedImpl.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotatedImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotatedImpl.java index 95f01c60d88..25366c36be5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotatedImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotatedImpl.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.descriptors.annotations; +package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationArgumentVisitor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationArgumentVisitor.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationArgumentVisitor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationArgumentVisitor.java index fb652d72b23..c2e877686e6 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationArgumentVisitor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationArgumentVisitor.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.descriptors.annotations; +package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.constants.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptor.java similarity index 81% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptor.java index ac0cf24c2d5..5fb8e7c61fa 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.annotations; +package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.Map; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptorImpl.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptorImpl.java index b124350c3d3..342a2651bac 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.annotations; +package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotations.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotations.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt index 69dfd1ea3e1..66e92a84753 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/Annotations.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/Annotations.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.annotations +package org.jetbrains.kotlin.descriptors.annotations import org.jetbrains.annotations.Nullable -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import java.util.Collections public trait Annotations : Iterable { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationsImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.java similarity index 87% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationsImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.java index dd8c6d68fc5..8326c0e8f7a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/AnnotationsImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.annotations; +package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Iterator; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/DefaultAnnotationArgumentVisitor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/DefaultAnnotationArgumentVisitor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java index 51941f8a909..d7fc3380bc2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/annotations/DefaultAnnotationArgumentVisitor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.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.descriptors.annotations; +package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.constants.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java index 7ddc2870d6a..3140f579630 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.SubstitutingScope; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractLazyTypeParameterDescriptor.java similarity index 82% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractLazyTypeParameterDescriptor.java index 930afa607df..936791b347e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractLazyTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractLazyTypeParameterDescriptor.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -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.TypeConstructor; -import org.jetbrains.jet.lang.types.Variance; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.storage.StorageManager; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.Variance; import java.util.Collection; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractReceiverParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java index cdb8113224b..d37663c786c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractReceiverParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeSubstitutor; -import org.jetbrains.jet.lang.types.Variance; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.Variance; import java.util.Collections; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java index 0f256ec8288..97b6dae1ba5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AbstractTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.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,21 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorVisitor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; 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.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; 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/AnonymousFunctionDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AnonymousFunctionDescriptor.java similarity index 75% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AnonymousFunctionDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AnonymousFunctionDescriptor.java index 7ff4540eb3d..690f3a351db 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/AnonymousFunctionDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AnonymousFunctionDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; public class AnonymousFunctionDescriptor extends SimpleFunctionDescriptorImpl { public AnonymousFunctionDescriptor( diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorBase.java similarity index 84% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorBase.java index c6736c1b095..a1b4764b974 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorBase.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.storage.StorageManager; public abstract class ClassDescriptorBase extends AbstractClassDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java index c4c9499afa0..7ff8c52cbfb 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ClassDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeConstructorImpl; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeConstructorImpl; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/CompositePackageFragmentProvider.kt similarity index 81% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/CompositePackageFragmentProvider.kt index df68072480d..045a41c8cfb 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/CompositePackageFragmentProvider.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/CompositePackageFragmentProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl - -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider -import org.jetbrains.jet.lang.resolve.name.FqName +package org.jetbrains.kotlin.descriptors.impl +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider +import org.jetbrains.kotlin.name.FqName import java.util.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.toReadOnlyList public class CompositePackageFragmentProvider(// can be modified from outside diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ConstructorDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ConstructorDescriptorImpl.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ConstructorDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ConstructorDescriptorImpl.java index 914e3c4f97d..d2ede361068 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ConstructorDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ConstructorDescriptorImpl.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; +import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; public class ConstructorDescriptorImpl extends FunctionDescriptorImpl implements ConstructorDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorImpl.java similarity index 82% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorImpl.java index 03fcb859360..d88f16c6380 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorVisitor; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorVisitor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotatedImpl; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.renderer.DescriptorRenderer; public abstract class DeclarationDescriptorImpl extends AnnotatedImpl implements DeclarationDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorNonRootImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorNonRootImpl.java similarity index 78% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorNonRootImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorNonRootImpl.java index 50d758d551f..018cf921e16 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorNonRootImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorNonRootImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorNonRoot; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorNonRoot; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; public abstract class DeclarationDescriptorNonRootImpl extends DeclarationDescriptorImpl diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java index 4fac770d5fc..66ce29cc95e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/DeclarationDescriptorVisitorEmptyBodies.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; public class DeclarationDescriptorVisitorEmptyBodies implements DeclarationDescriptorVisitor { public R visitDeclarationDescriptor(DeclarationDescriptor descriptor, D data) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java index 2aa603bb7bf..224e8f79ee2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/EnumEntrySyntheticClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.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,25 +14,25 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.jet.lang.resolve.OverridingUtil; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.resolve.name.SpecialNames; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl; import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeConstructorImpl; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeConstructorImpl; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java index 8f5cbbe0e5d..1b2e8ef98ce 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/FunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.jet.lang.resolve.OverridingUtil; -import org.jetbrains.jet.lang.resolve.name.Name; -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.kotlin.name.Name; +import org.jetbrains.kotlin.types.DescriptorSubstitutor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.Variance; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazyClassReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyClassReceiverParameterDescriptor.java similarity index 85% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazyClassReceiverParameterDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyClassReceiverParameterDescriptor.java index 2919f9b9c03..ea299fcada2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazyClassReceiverParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyClassReceiverParameterDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public class LazyClassReceiverParameterDescriptor extends AbstractReceiverParameterDescriptor { private final ClassDescriptor descriptor; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java index c8b1ea6584a..e77c3567d83 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/LazySubstitutingClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.SubstitutingScope; -import org.jetbrains.jet.lang.types.*; +import org.jetbrains.kotlin.types.*; import java.util.ArrayList; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ModuleDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt similarity index 92% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ModuleDescriptorImpl.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt index de0817edc1e..2b74c876db9 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ModuleDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl +package org.jetbrains.kotlin.descriptors.impl -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider import java.util.ArrayList import org.jetbrains.jet.lang.resolve.ImportPath -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import kotlin.properties.Delegates import java.util.LinkedHashSet import org.jetbrains.kotlin.builtins.KotlinBuiltIns diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageFragmentDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt similarity index 81% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageFragmentDescriptorImpl.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt index 3db8f5fb77c..c9bec82d783 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageFragmentDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageFragmentDescriptorImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl +package org.jetbrains.kotlin.descriptors.impl -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.types.TypeSubstitutor +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.types.TypeSubstitutor public abstract class PackageFragmentDescriptorImpl( module: ModuleDescriptor, diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.java index f743376c0f2..43961790619 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PackageViewDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.ArrayList; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyAccessorDescriptorImpl.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyAccessorDescriptorImpl.java index 1335ef28b96..f4c186a620f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyAccessorDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyAccessorDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.TypeSubstitutor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java index 653d2ee8356..0f8c44a84b1 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.DescriptorFactory; import org.jetbrains.jet.lang.resolve.OverridingUtil; -import org.jetbrains.jet.lang.resolve.name.Name; -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.kotlin.name.Name; +import org.jetbrains.kotlin.types.DescriptorSubstitutor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; +import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyGetterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyGetterDescriptorImpl.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyGetterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyGetterDescriptorImpl.java index 2969f27ff53..f160b44f902 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertyGetterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyGetterDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java index 4bc74c51a05..970f6a6b71c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/PropertySetterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ReceiverParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ReceiverParameterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java index e0dda6b44e4..aaec62d1dc7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ReceiverParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; public class ReceiverParameterDescriptorImpl extends AbstractReceiverParameterDescriptor { private final DeclarationDescriptor containingDeclaration; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ScriptCodeDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ScriptCodeDescriptor.java similarity index 87% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ScriptCodeDescriptor.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ScriptCodeDescriptor.java index 3701cdd9cc1..954146d655e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ScriptCodeDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ScriptCodeDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; 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/kotlin/descriptors/impl/SimpleFunctionDescriptorImpl.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SimpleFunctionDescriptorImpl.java index 1aaaa1e48c9..ba91412ea76 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SimpleFunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SimpleFunctionDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.TypeSubstitutor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.builtins.InlineStrategy; import org.jetbrains.kotlin.builtins.InlineUtil; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SubpackagesScope.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SubpackagesScope.kt rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt index 5e398e4b5af..f8077d4fbd0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/SubpackagesScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl +package org.jetbrains.kotlin.descriptors.impl -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl import org.jetbrains.kotlin.utils.* diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.java index 68796012716..caa9a85731f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.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,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.Name; -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.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeConstructorImpl; +import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.LockBasedStorageManager; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.java index 51e41cbcda2..9d2b2909f1f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/ValueParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.TypeSubstitutor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorImpl.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorImpl.java index 9325c52e0e0..7d698ec0529 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/descriptors/impl/VariableDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.descriptors.impl; +package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.storage.NullableLazyValue; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/ClassId.java b/core/descriptors/src/org/jetbrains/kotlin/name/ClassId.java similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/name/ClassId.java rename to core/descriptors/src/org/jetbrains/kotlin/name/ClassId.java index 49dbe8d31db..f0adea53235 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/ClassId.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/ClassId.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.name; +package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java b/core/descriptors/src/org/jetbrains/kotlin/name/FqName.java similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java rename to core/descriptors/src/org/jetbrains/kotlin/name/FqName.java index ea3fbff0bac..cece2cd1c1f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqName.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/FqName.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.name; +package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java b/core/descriptors/src/org/jetbrains/kotlin/name/FqNameBase.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java rename to core/descriptors/src/org/jetbrains/kotlin/name/FqNameBase.java index edd85fab065..e4f815ad94b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameBase.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/FqNameBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.name; +package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java b/core/descriptors/src/org/jetbrains/kotlin/name/FqNameUnsafe.java similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java rename to core/descriptors/src/org/jetbrains/kotlin/name/FqNameUnsafe.java index dd50a53c104..db7d456e51d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNameUnsafe.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/FqNameUnsafe.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.name; +package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNamesUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/name/FqNamesUtil.kt similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNamesUtil.kt rename to core/descriptors/src/org/jetbrains/kotlin/name/FqNamesUtil.kt index d109911addb..74b17714705 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/FqNamesUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/name/FqNamesUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.name +package org.jetbrains.kotlin.name -import org.jetbrains.jet.lang.resolve.name.FqName import org.jetbrains.jet.lang.resolve.ImportPath public fun FqName.isSubpackageOf(packageName: FqName): Boolean { @@ -117,4 +116,4 @@ private fun isSubpackageOf(subpackageNameStr: String, packageNameStr: String): B private fun getFirstSegment(fqn: String): String { val dotIndex = fqn.indexOf('.') return if ((dotIndex != -1)) fqn.substring(0, dotIndex) else fqn -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java b/core/descriptors/src/org/jetbrains/kotlin/name/Name.java similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java rename to core/descriptors/src/org/jetbrains/kotlin/name/Name.java index ea8acace7a2..c5a6efb933c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/Name.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/Name.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.name; +package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java b/core/descriptors/src/org/jetbrains/kotlin/name/SpecialNames.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java rename to core/descriptors/src/org/jetbrains/kotlin/name/SpecialNames.java index a638ac94cfb..1698ee36c60 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/name/SpecialNames.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/SpecialNames.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.name; +package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/kotlin/platform/PlatformToKotlinClassMap.java b/core/descriptors/src/org/jetbrains/kotlin/platform/PlatformToKotlinClassMap.java index 3e302ed6678..53aa813b82c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/platform/PlatformToKotlinClassMap.java +++ b/core/descriptors/src/org/jetbrains/kotlin/platform/PlatformToKotlinClassMap.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.platform; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import java.util.Collection; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java index fa3ca8697fa..e89aefbafcb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRenderer.java @@ -17,14 +17,14 @@ package org.jetbrains.kotlin.renderer; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqNameBase; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeProjection; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.name.FqNameBase; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java index 30679925b23..9b6ea8bda0e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererBuilder.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.renderer; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.types.JetType; import java.util.Collection; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java index b2b7b10af48..d3a0b8bc932 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java @@ -20,29 +20,29 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.DefaultAnnotationArgumentVisitor; -import org.jetbrains.jet.lang.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.DefaultAnnotationArgumentVisitor; +import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.constants.AnnotationValue; import org.jetbrains.jet.lang.resolve.constants.ArrayValue; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.JavaClassValue; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameBase; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameBase; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.ErrorUtils.UninferredParameterTypeConstructor; +import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.*; -import static org.jetbrains.jet.lang.types.TypeUtils.CANT_INFER_LAMBDA_PARAM_TYPE; +import static org.jetbrains.kotlin.types.TypeUtils.CANT_INFER_LAMBDA_PARAM_TYPE; public class DescriptorRendererImpl implements DescriptorRenderer { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractClassTypeConstructor.java b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/types/AbstractClassTypeConstructor.java rename to core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java index 11e68c24a6a..87fbd66381d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractClassTypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.FqNameUnsafe; public abstract class AbstractClassTypeConstructor implements TypeConstructor { @Override diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractJetType.java b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractJetType.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/types/AbstractJetType.java rename to core/descriptors/src/org/jetbrains/kotlin/types/AbstractJetType.java index 54336357274..ff87120636a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractJetType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractJetType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.Iterator; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt rename to core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt index 4f3ac45d935..cd014dfadfc 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/AbstractLazyType.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types +package org.jetbrains.kotlin.types import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.annotations.Annotations public abstract class AbstractLazyType(storageManager: StorageManager) : AbstractJetType(), LazyType { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/CapturedTypeApproximation.kt b/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/types/CapturedTypeApproximation.kt rename to core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.kt index 4e1f11eb4a5..d78d3b86039 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/CapturedTypeApproximation.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/CapturedTypeApproximation.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,23 +14,23 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.typesApproximation +package org.jetbrains.kotlin.types.typesApproximation -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.kotlin.types.JetType +import org.jetbrains.kotlin.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.TypeProjection +import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import java.util.ArrayList -import org.jetbrains.jet.lang.types.JetTypeImpl -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.JetTypeImpl +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.jet.lang.resolve.calls.inference.CapturedTypeConstructor -import org.jetbrains.jet.lang.types.TypeSubstitutor -import org.jetbrains.jet.lang.types.TypeSubstitution -import org.jetbrains.jet.lang.types.TypeConstructor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.LazyType +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.types.TypeSubstitution +import org.jetbrains.kotlin.types.TypeConstructor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.LazyType import org.jetbrains.jet.lang.resolve.calls.inference.isCaptured public data class ApproximationBounds( diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java b/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java rename to core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java index a78e806ea90..0854b63bd97 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/CommonSupertypes.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.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,25 +14,25 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; -import static org.jetbrains.jet.lang.types.TypeUtils.topologicallySortSuperclassesAndRecordAllInstances; -import static org.jetbrains.jet.lang.types.Variance.IN_VARIANCE; -import static org.jetbrains.jet.lang.types.Variance.OUT_VARIANCE; +import static org.jetbrains.kotlin.types.TypeUtils.topologicallySortSuperclassesAndRecordAllInstances; +import static org.jetbrains.kotlin.types.Variance.IN_VARIANCE; +import static org.jetbrains.kotlin.types.Variance.OUT_VARIANCE; public class CommonSupertypes { @Nullable diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/CompositeTypeSubstitution.java b/core/descriptors/src/org/jetbrains/kotlin/types/CompositeTypeSubstitution.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/types/CompositeTypeSubstitution.java rename to core/descriptors/src/org/jetbrains/kotlin/types/CompositeTypeSubstitution.java index 756d0a10916..4067ac3e43e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/CompositeTypeSubstitution.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/CompositeTypeSubstitution.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; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/DelegatingType.java b/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/types/DelegatingType.java rename to core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java index 449fcdfb0cc..944cd249a0b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/DelegatingType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java b/core/descriptors/src/org/jetbrains/kotlin/types/DescriptorSubstitutor.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java rename to core/descriptors/src/org/jetbrains/kotlin/types/DescriptorSubstitutor.java index c6163371c21..7878ba8a247 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/DescriptorSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/DescriptorSubstitutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.Mutable; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import java.util.HashMap; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java rename to core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java index 113024e0076..c5dab68343e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.*; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.*; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.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.kotlin.types.error.ErrorSimpleFunctionDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.Printer; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java b/core/descriptors/src/org/jetbrains/kotlin/types/IntersectionTypeConstructor.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java rename to core/descriptors/src/org/jetbrains/kotlin/types/IntersectionTypeConstructor.java index dd98be4095b..823ecc6f741 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/IntersectionTypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/IntersectionTypeConstructor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotatedImpl; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/JetType.java b/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java similarity index 87% rename from core/descriptors/src/org/jetbrains/jet/lang/types/JetType.java rename to core/descriptors/src/org/jetbrains/kotlin/types/JetType.java index d2c3d313849..f38c083bb11 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/JetType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import kotlin.jvm.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/JetTypeImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/types/JetTypeImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.java index 269c2985e2a..149bd1444c0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/JetTypeImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/LazyType.java b/core/descriptors/src/org/jetbrains/kotlin/types/LazyType.java similarity index 88% rename from core/descriptors/src/org/jetbrains/jet/lang/types/LazyType.java rename to core/descriptors/src/org/jetbrains/kotlin/types/LazyType.java index ac0b27b2de6..75b3a0f4f45 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/LazyType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/LazyType.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; +package org.jetbrains.kotlin.types; public interface LazyType extends JetType { } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeCapabilities.kt b/core/descriptors/src/org/jetbrains/kotlin/types/TypeCapabilities.kt similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeCapabilities.kt rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeCapabilities.kt index 2fd069483ff..bad6b66718b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeCapabilities.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeCapabilities.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types +package org.jetbrains.kotlin.types -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor public trait TypeCapability diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructor.java similarity index 82% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructor.java index 9abb487aaf7..9e200f2a314 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; import java.util.Collection; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructorImpl.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructorImpl.java index 3c9842980d6..c3671c5d702 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeConstructorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeConstructorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotatedImpl; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import java.util.ArrayList; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjection.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeProjection.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjection.java rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeProjection.java index 4a542753b5a..5662e0e3bfa 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjection.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeProjection.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; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjectionBase.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeProjectionBase.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjectionBase.java rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeProjectionBase.java index e9d80363f96..0d2a5a9c824 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjectionBase.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeProjectionBase.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; +package org.jetbrains.kotlin.types; public abstract class TypeProjectionBase implements TypeProjection { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjectionImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeProjectionImpl.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjectionImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeProjectionImpl.java index 1bbbe42f25b..054f99c029c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeProjectionImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeProjectionImpl.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; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitution.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitution.java rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.java index 54aad6a5eb0..e619330d8d3 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitution.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitution.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; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java index 4187c63742e..aaeb54e770a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.jet.lang.resolve.calls.inference.InferencePackage; import org.jetbrains.jet.lang.resolve.scopes.SubstitutingScope; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.lang.types.typeUtil.TypeUtilPackage; -import org.jetbrains.jet.lang.types.typesApproximation.TypesApproximationPackage; +import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; +import org.jetbrains.kotlin.types.typesApproximation.TypesApproximationPackage; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java index 0538c6e94f4..5351ce9d5e7 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types; +package org.jetbrains.kotlin.types; import kotlin.Function1; import kotlin.KotlinPackage; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl; 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.kotlin.types.checker.JetTypeChecker; 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/kotlin/types/TypeUtils.kt similarity index 81% rename from core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.kt rename to core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.kt index 2f43d5ca4a1..3b8a2cff2c4 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/TypeUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.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,20 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.typeUtil +package org.jetbrains.kotlin.types.typeUtil import java.util.LinkedHashSet -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.Flexibility -import org.jetbrains.jet.lang.types.TypeConstructor +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.Flexibility +import org.jetbrains.kotlin.types.TypeConstructor import org.jetbrains.kotlin.utils.toReadOnlyList -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.types.isDynamic +import org.jetbrains.kotlin.types.isDynamic fun JetType.getContainedTypeParameters(): Collection { val declarationDescriptor = getConstructor().getDeclarationDescriptor() diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/Variance.kt b/core/descriptors/src/org/jetbrains/kotlin/types/Variance.kt similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/types/Variance.kt rename to core/descriptors/src/org/jetbrains/kotlin/types/Variance.kt index c7738831097..b23b783e160 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/Variance.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/Variance.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 +package org.jetbrains.kotlin.types public enum class Variance( public val label: String, diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java b/core/descriptors/src/org/jetbrains/kotlin/types/checker/JetTypeChecker.java similarity index 92% rename from core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java rename to core/descriptors/src/org/jetbrains/kotlin/types/checker/JetTypeChecker.java index 96235e4f8e4..8df2183d5e8 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/JetTypeChecker.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/JetTypeChecker.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.checker; +package org.jetbrains.kotlin.types.checker; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; public class JetTypeChecker { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerProcedureCallbacksImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckerProcedureCallbacksImpl.java similarity index 87% rename from core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerProcedureCallbacksImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckerProcedureCallbacksImpl.java index 7e09a459a33..576f4c32cbd 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckerProcedureCallbacksImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckerProcedureCallbacksImpl.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,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.checker; +package org.jetbrains.kotlin.types.checker; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeProjection; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeProjection; class TypeCheckerProcedureCallbacksImpl implements TypeCheckingProcedureCallbacks { @Override diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java rename to core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java index cb8e912241e..af5d701676d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedure.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.checker; +package org.jetbrains.kotlin.types.checker; 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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.types.*; import java.util.List; -import static org.jetbrains.jet.lang.types.Variance.*; +import static org.jetbrains.kotlin.types.Variance.*; public class TypeCheckingProcedure { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedureCallbacks.java b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedureCallbacks.java similarity index 84% rename from core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedureCallbacks.java rename to core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedureCallbacks.java index 1ecf017acea..2c3fce0902c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/checker/TypeCheckingProcedureCallbacks.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedureCallbacks.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.checker; +package org.jetbrains.kotlin.types.checker; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeProjection; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeProjection; /** * Methods of this class return true to continue type checking and false to fail diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/dynamicTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/dynamicTypes.kt similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/types/dynamicTypes.kt rename to core/descriptors/src/org/jetbrains/kotlin/types/dynamicTypes.kt index 0d1937d3f0b..ef4f373b070 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/dynamicTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/dynamicTypes.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 +package org.jetbrains.kotlin.types import org.jetbrains.kotlin.builtins.KotlinBuiltIns import kotlin.platform.platformStatic diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorSimpleFunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java similarity index 80% rename from core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorSimpleFunctionDescriptorImpl.java rename to core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java index 9c6a44961db..784898b2c2f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/error/ErrorSimpleFunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/error/ErrorSimpleFunctionDescriptorImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.error; +package org.jetbrains.kotlin.types.error; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.FunctionDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.ErrorUtils; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.ErrorUtils; public class ErrorSimpleFunctionDescriptorImpl extends SimpleFunctionDescriptorImpl { // used for diagnostic only diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/error/MissingDependencyErrorClass.kt b/core/descriptors/src/org/jetbrains/kotlin/types/error/MissingDependencyErrorClass.kt similarity index 84% rename from core/descriptors/src/org/jetbrains/jet/lang/types/error/MissingDependencyErrorClass.kt rename to core/descriptors/src/org/jetbrains/kotlin/types/error/MissingDependencyErrorClass.kt index 5566863d5c4..a25eacf8931 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/error/MissingDependencyErrorClass.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/error/MissingDependencyErrorClass.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types.error +package org.jetbrains.kotlin.types.error -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName // marker for DescriptorRenderer to treat specially in decompiler mode public trait MissingDependencyErrorClass { public val fullFqName: FqName -} \ No newline at end of file +} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/flexibleTypes.kt b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/types/flexibleTypes.kt rename to core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt index 653b0455b7f..6e05077a5fb 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/flexibleTypes.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/flexibleTypes.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.types +package org.jetbrains.kotlin.types -import org.jetbrains.jet.lang.types.checker.JetTypeChecker -import org.jetbrains.jet.lang.types.Approximation.DataFlowExtras -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.Approximation.DataFlowExtras +import org.jetbrains.kotlin.name.FqName import kotlin.platform.platformStatic -import org.jetbrains.jet.lang.resolve.name.ClassId -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.FqNameUnsafe +import org.jetbrains.kotlin.name.Name public trait FlexibleTypeCapabilities { fun getCapability(capabilityClass: Class, jetType: JetType, flexibility: Flexibility): T? diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt index 845408b6b97..8f4b878bb1d 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt @@ -16,13 +16,13 @@ package org.jetbrains.kotlin.serialization -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationArgumentVisitor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationArgumentVisitor 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.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns public object AnnotationSerializer { diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index 0c117f677c3..be401f9c915 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.serialization; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.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.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java b/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java index 26e13592ee5..017ec6ea15c 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/Flags.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.serialization; import com.google.protobuf.Internal; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; public class Flags { private Flags() {} diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java b/core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java index 32ca727e304..eda2def896a 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/SerializerExtension.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.serialization; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import java.util.Collection; diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java b/core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java index 04df1f05ff3..d02183f6fb3 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/StringTable.java @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.serialization; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassOrPackageFragmentDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassOrPackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import java.util.List; 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 c92212a2c19..4d0b4b26cdd 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt @@ -16,24 +16,23 @@ package org.jetbrains.kotlin.serialization.deserialization -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptorImpl -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptorImpl +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor 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.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.constants.* -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.name.ClassId -import org.jetbrains.jet.lang.types.ErrorUtils -import org.jetbrains.jet.lang.descriptors.ClassKind -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.kotlin.serialization.deserialization.NameResolver +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.types.ErrorUtils +import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.types.Variance public class AnnotationDeserializer(private val module: ModuleDescriptor) { private val builtIns: KotlinBuiltIns diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java index 674b9330a24..a6067d65ec0 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDataFinder.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.serialization.deserialization; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.ClassId; +import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.serialization.ClassData; public interface ClassDataFinder { diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt index 2bdfce7f65a..6092be3cb46 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ClassDeserializer.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.serialization.deserialization import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.serialization.ClassData public class ClassDeserializer(private val components: DeserializationComponents) { diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt index 7b6f487531a..0dbae6ebb0c 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.serialization.deserialization import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.types.* +import org.jetbrains.kotlin.types.* class DeserializedType( c: DeserializationContext, diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt index 0244bf60a96..90d33c1f0bf 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/FlexibleTypeCapabilitiesDeserializer.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.serialization.deserialization -import org.jetbrains.jet.lang.types.FlexibleTypeCapabilities +import org.jetbrains.kotlin.types.FlexibleTypeCapabilities trait FlexibleTypeCapabilitiesDeserializer { object ThrowException : FlexibleTypeCapabilitiesDeserializer { diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt index 84a74bed5d2..358dcdb011a 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.serialization.deserialization import org.jetbrains.kotlin.serialization.* import org.jetbrains.kotlin.serialization.deserialization.descriptors.* -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.descriptors.impl.* +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.impl.* import org.jetbrains.jet.lang.resolve.DescriptorFactory import org.jetbrains.kotlin.serialization.ProtoBuf.Callable import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind.* diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java index 79f8e47fd26..ad0fe2f5577 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolver.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.serialization.deserialization; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.ClassId; -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.kotlin.name.ClassId; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.serialization.ProtoBuf; import static org.jetbrains.kotlin.serialization.ProtoBuf.QualifiedNameTable.QualifiedName; diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt index c4bf50e7edb..6d20b161ee9 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/ProtoContainer.kt @@ -17,9 +17,9 @@ package org.jetbrains.kotlin.serialization.deserialization import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe +import org.jetbrains.kotlin.name.FqNameUnsafe public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqName: FqName?) { { @@ -32,4 +32,4 @@ public data class ProtoContainer(val classProto: ProtoBuf.Class?, val packageFqN return nameResolver.getClassId(classProto!!.getFqName()).asSingleFqName() } -} \ No newline at end of file +} diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt index cd5bad05d41..eb5dcfdcbcb 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/TypeDeserializer.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.serialization.deserialization import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedTypeParameterDescriptor import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.types.* +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.utils.* import java.util.LinkedHashMap diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt index 443b1fd3ba4..6d9d2182bb1 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.serialization.deserialization import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor public class DeserializationComponents( public val storageManager: StorageManager, diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt index aa08e608bae..6cdab1b2bce 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedAnnotations.kt @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors import org.jetbrains.kotlin.utils.toReadOnlyList import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils class DeserializedAnnotations( diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt index 45dc892cc8d..2d5b1b6dee1 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedCallableMemberDescriptor.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor public trait DeserializedCallableMemberDescriptor: CallableMemberDescriptor { public val proto: ProtoBuf.Callable diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt index b6126eb1d40..860ee2b3b9e 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt @@ -19,18 +19,18 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.* -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.descriptors.impl.AbstractClassDescriptor -import org.jetbrains.jet.lang.descriptors.impl.EnumEntrySyntheticClassDescriptor +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.impl.AbstractClassDescriptor +import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor import org.jetbrains.jet.lang.resolve.DescriptorFactory import org.jetbrains.jet.lang.resolve.OverridingUtil -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass -import org.jetbrains.jet.lang.types.AbstractClassTypeConstructor -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.AbstractClassTypeConstructor +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.serialization.deserialization -import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName +import org.jetbrains.kotlin.name.SpecialNames.getClassObjectName import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt index b10556ec137..44573787cfd 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedMemberScope.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.toReadOnlyList diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt index 5e0a1c83cdb..f57314bd4dd 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPackageMemberScope.kt @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor -import org.jetbrains.jet.lang.resolve.name.ClassId -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.serialization.deserialization.NameResolver diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt index 2cb591cdaa4..d6eaf7ea0b8 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedPropertyDescriptor.kt @@ -16,17 +16,17 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.Modality -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.jet.lang.descriptors.impl.PropertyDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.PropertyDescriptorImpl import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind -import org.jetbrains.jet.lang.descriptors.SourceElement +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind +import org.jetbrains.kotlin.descriptors.SourceElement public class DeserializedPropertyDescriptor( containingDeclaration: DeclarationDescriptor, diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java index adb979fa3d4..d14fabd82e6 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedSimpleFunctionDescriptor.java @@ -18,18 +18,18 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.serialization.Flags; -import org.jetbrains.kotlin.serialization.deserialization.NameResolver; import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SourceElement; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.descriptors.impl.FunctionDescriptorImpl; -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.serialization.deserialization.NameResolver; public class DeserializedSimpleFunctionDescriptor extends SimpleFunctionDescriptorImpl implements DeserializedCallableMemberDescriptor { 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 945f1b0a4be..6e6474f4bfe 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 @@ -17,14 +17,14 @@ package org.jetbrains.kotlin.serialization.deserialization.descriptors; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.SourceElement; +import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor; import org.jetbrains.kotlin.serialization.ProtoBuf; +import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext; import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage; import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer; -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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt index 366c132adee..f6f8c3d8a6f 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/findClassInModule.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.serialization.deserialization -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.resolve.name.SpecialNames -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.SpecialNames +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.name.ClassId private fun findInnerClass(classDescriptor: ClassDescriptor, name: Name): ClassDescriptor? { return if (SpecialNames.isClassObjectName(name)) { diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt index ab54e076873..13c1624ea7b 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/protoEnumMapping.kt @@ -17,12 +17,12 @@ package org.jetbrains.kotlin.serialization.deserialization import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.Modality -import org.jetbrains.jet.lang.descriptors.Visibilities -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance fun memberKind(memberKind: ProtoBuf.Callable.MemberKind) = when (memberKind) { ProtoBuf.Callable.MemberKind.DECLARATION -> CallableMemberDescriptor.Kind.DECLARATION diff --git a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt index ecd851e7bed..9567b58cf1d 100644 --- a/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt +++ b/generators/src/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMap.kt @@ -21,10 +21,10 @@ import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil import org.jetbrains.kotlin.utils.Printer 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 -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.JetType val DEST_FILE: File = File("compiler/frontend/src/org/jetbrains/jet/lang/evaluate/OperationsMapGenerated.kt") private val EXCLUDED_FUNCTIONS = listOf("rangeTo", "hashCode", "inc", "dec", "subSequence") diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index d8c6328e6b3..662897e3a75 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.generators.injectors import com.intellij.openapi.project.Project import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.context.GlobalContextImpl -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.java.JavaClassFinderImpl import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver @@ -29,10 +29,10 @@ import org.jetbrains.jet.lang.resolve.java.sam.SamConversionResolverImpl import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder import org.jetbrains.jet.lang.resolve.lazy.ResolveSession import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices import org.jetbrains.kotlin.generators.di.* -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils import org.jetbrains.jet.lang.resolve.calls.CallResolver import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaPropertyInitializerEvaluatorImpl import com.intellij.psi.search.GlobalSearchScope @@ -49,8 +49,8 @@ import org.jetbrains.jet.lang.resolve.java.JavaLazyAnalyzerPostConstruct import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolverPostConstruct import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider -import org.jetbrains.jet.lang.types.DynamicTypesAllowed -import org.jetbrains.jet.lang.types.DynamicTypesSettings +import org.jetbrains.kotlin.types.DynamicTypesAllowed +import org.jetbrains.kotlin.types.DynamicTypesSettings // NOTE: After making changes, you need to re-generate the injectors. // To do that, you can run main in this file. diff --git a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java index 8d812a14aad..b3b8fbd504b 100644 --- a/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java +++ b/idea/ide-common/src/org/jetbrains/jet/lang/resolve/lazy/ElementResolver.java @@ -26,20 +26,20 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.analyzer.AnalyzerPackage; import org.jetbrains.kotlin.cfg.JetFlowInformationProvider; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.Annotated; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.Annotated; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyClassDescriptor; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.TypeConstructor; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.di.InjectorForBodyResolve; diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt index 8d9139f2e74..5e1e9854156 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/codeInsight/ReferenceVariantsHelper.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.codeInsight -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.jet.lang.resolve.BindingContext @@ -27,14 +27,14 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver import java.util.* import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.scopes.getDescriptorsFiltered import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude -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.kotlin.types.JetType +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.util.CallType import org.jetbrains.jet.plugin.util.substituteExtensionIfCallable diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt index a28813d62e9..a37e33617bd 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/FuzzyType.kt @@ -16,18 +16,18 @@ package org.jetbrains.jet.plugin.util -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.utils.addIfNotNull import java.util.HashSet import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintSystemImpl import java.util.LinkedHashMap -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintsUtil -import org.jetbrains.jet.lang.types.TypeSubstitutor -import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPositionKind fun CallableDescriptor.fuzzyReturnType(): FuzzyType? { diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/IdeDescriptorRenderers.java b/idea/ide-common/src/org/jetbrains/jet/plugin/util/IdeDescriptorRenderers.java index 7ced6b46ce6..b094c746ca4 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/IdeDescriptorRenderers.java +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/IdeDescriptorRenderers.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.util; import kotlin.Function1; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; 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 2bfb27aa822..beff813fd43 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 @@ -16,20 +16,20 @@ package org.jetbrains.jet.plugin.util -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.TypeUtils 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 +import org.jetbrains.kotlin.types.JetTypeImpl +import org.jetbrains.kotlin.types.TypeProjectionImpl +import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.jet.lang.resolve.java.kotlinSignature.CollectionClassMapping -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames -import org.jetbrains.jet.lang.types.isFlexible -import org.jetbrains.jet.lang.types.flexibility +import org.jetbrains.kotlin.types.isFlexible +import org.jetbrains.kotlin.types.flexibility import java.util.LinkedHashSet -import org.jetbrains.jet.lang.types.isDynamic -import org.jetbrains.jet.lang.types.isNullabilityFlexible +import org.jetbrains.kotlin.types.isDynamic +import org.jetbrains.kotlin.types.isNullabilityFlexible fun JetType.makeNullable() = TypeUtils.makeNullable(this) fun JetType.makeNotNullable() = TypeUtils.makeNotNullable(this) diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt index efeda7ad9d0..28e6c027045 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/extensionsUtils.kt @@ -16,14 +16,14 @@ package org.jetbrains.jet.plugin.util -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.jet.lang.resolve.calls.smartcasts.SmartCastUtils -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor public enum class CallType { NORMAL diff --git a/idea/ide-common/src/org/jetbrains/jet/plugin/util/implicitReceiversUtils.kt b/idea/ide-common/src/org/jetbrains/jet/plugin/util/implicitReceiversUtils.kt index 15588117570..62f9efd6155 100644 --- a/idea/ide-common/src/org/jetbrains/jet/plugin/util/implicitReceiversUtils.kt +++ b/idea/ide-common/src/org/jetbrains/jet/plugin/util/implicitReceiversUtils.kt @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.util import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.LinkedHashSet -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import java.util.HashSet public fun JetScope.getImplicitReceiversWithInstance(): List { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java index 47a5380c1ae..d0caafbafe8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/JetDescriptorIconProvider.java @@ -23,8 +23,8 @@ import com.intellij.ui.RowIcon; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.psi.JetElement; import javax.swing.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java index a66734b4cce..3288cffe4f8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IDELightClassGenerationSupport.java @@ -38,10 +38,10 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JvmAbi; @@ -49,8 +49,8 @@ import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode; import org.jetbrains.jet.lang.resolve.lazy.ForceResolveUtil; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.plugin.decompiler.navigation.JetSourceNavigationHelper; import org.jetbrains.jet.plugin.project.ResolveSessionForBodies; import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt index ef3ac39b13c..c54e5ac10ce 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/IdeaModuleInfos.kt @@ -25,7 +25,7 @@ import com.intellij.openapi.roots.ModuleOrderEntry import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.JdkOrderEntry import com.intellij.openapi.module.Module -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import java.util.LinkedHashSet import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.libraries.Library diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt index 5dacac96b5f..ab08b5c1e70 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JavaResolveExtension.kt @@ -23,7 +23,7 @@ import com.intellij.openapi.project.Project import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.psi.PsiMethod -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.jet.lang.resolve.java.resolveMethod import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaMethodImpl diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt index 401b3bdddfc..23cfadd6870 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/JsAnalyzerFacade.kt @@ -28,11 +28,11 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactoryService import org.jetbrains.jet.lang.resolve.BindingTraceContext import org.jetbrains.kotlin.di.InjectorForLazyResolve -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.jet.analyzer.ModuleInfo import org.jetbrains.jet.analyzer.ModuleContent import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider -import org.jetbrains.jet.lang.types.DynamicTypesAllowed +import org.jetbrains.kotlin.types.DynamicTypesAllowed public class JsResolverForModule( override val lazyResolveSession: ResolveSession diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt index 11a342da9f9..7c4ed507201 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt @@ -35,9 +35,9 @@ import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.utils.keysToMap import com.intellij.openapi.roots.ProjectRootModificationTracker import org.jetbrains.jet.plugin.util.ProjectRootsUtil -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode private val LOG = Logger.getInstance(javaClass()) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt index 73052b68e5d..5307e9250ea 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt @@ -57,7 +57,7 @@ import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.analyzer.analyzeInContext import org.jetbrains.jet.lang.resolve.BindingTraceContext -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.jet.lang.resolve.scopes.ChainedScope import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.di.InjectorForLazyBodyResolve diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt index 7db041ca368..b243a45c9e3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/ResolutionFacade.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.analyzer.AnalysisResult import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt index 050ca8c59e5..4bed8e8f1c6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/resolutionApi.kt @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.analyzer.AnalysisResult import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor public fun JetElement.getResolutionFacade(): ResolutionFacade { return KotlinCacheService.getInstance(getProject()).getResolutionFacade(listOf(this)) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt index 4e2b9846853..8ed9e015465 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/DescriptorToDeclarationUtil.kt @@ -18,13 +18,13 @@ package org.jetbrains.jet.plugin.codeInsight import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.decompiler.navigation.DecompiledNavigationUtils import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver import java.util.HashSet -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import com.intellij.psi.JavaPsiFacade import org.jetbrains.jet.plugin.search.allScope import org.jetbrains.kotlin.utils.addIfNotNull diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt index 9130df8e0f9..89b5574830a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/ShortenReferences.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.codeInsight import com.intellij.psi.PsiElement; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt index b317197e2e8..708427b5a58 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/JetClsFile.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.impl.compiled.ClsFileImpl import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.annotations.TestOnly -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.decompiler.textBuilder.buildDecompiledText diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java index 1e1ee2c95ab..5895a98f5c8 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/navigation/DecompiledNavigationUtils.java @@ -23,15 +23,15 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.jet.plugin.decompiler.DecompilerPackage; import org.jetbrains.jet.plugin.decompiler.JetClsFile; import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; 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 72f4f2c4526..10fc092d8c5 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 @@ -40,9 +40,9 @@ import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.BindingTraceContext; @@ -53,10 +53,10 @@ import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap; import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex; 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 5af4c40f8fd..7bff4ef5fcc 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 @@ -23,13 +23,13 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.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.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; 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 cd89a3dde79..17bcc8cb2b9 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 @@ -27,11 +27,11 @@ import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes import org.jetbrains.kotlin.psi.JetParameterList -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.psi.JetDelegationSpecifierList import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName +import org.jetbrains.kotlin.name.SpecialNames.getClassObjectName import org.jetbrains.kotlin.psi.JetClassObject import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt index 6d09101d9e1..c5a40204f89 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt @@ -17,17 +17,17 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter import org.jetbrains.jet.lang.resolve.kotlin.AbstractBinaryClassAnnotationAndConstantLoader -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass -import org.jetbrains.jet.lang.resolve.name.SpecialNames +import org.jetbrains.kotlin.name.SpecialNames class ClsStubBuilderComponents( diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt index 332535c420f..bdbd70e05a4 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/KotlinClsStubBuilder.kt @@ -31,7 +31,7 @@ import org.jetbrains.jet.plugin.decompiler.textBuilder.LocalClassDataFinder import com.intellij.openapi.diagnostic.Logger import org.jetbrains.jet.plugin.decompiler.textBuilder.LoggingErrorReporter import org.jetbrains.jet.plugin.decompiler.isKotlinInternalCompiledFile -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName public class KotlinClsStubBuilder : ClsStubBuilder() { override fun getStubVersion() = ClassFileStubBuilder.STUB_VERSION + 1 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 e59bdff7947..fb821ad5c3a 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 @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder import com.intellij.psi.stubs.StubElement import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.lexer.JetTokens 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.name.Name import org.jetbrains.kotlin.psi.JetNullableType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetTypeArgumentList @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeParameterStubImpl import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance import org.jetbrains.kotlin.psi.JetTypeConstraintList import org.jetbrains.kotlin.psi.stubs.impl.KotlinTypeConstraintStubImpl -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import java.util.ArrayList import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt index 234df1d4faa..364f30e53f7 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl import org.jetbrains.kotlin.psi.JetPackageDirective @@ -25,9 +25,9 @@ import com.intellij.psi.stubs.StubElement import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl import org.jetbrains.kotlin.psi.JetDotQualifiedExpression -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub -import org.jetbrains.jet.lang.resolve.name.SpecialNames +import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.psi.stubs.impl.KotlinUserTypeStubImpl import org.jetbrains.kotlin.lexer.JetModifierKeywordToken import org.jetbrains.kotlin.serialization.Flags @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.psi.stubs.impl.KotlinAnnotationEntryStubImpl import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression import org.jetbrains.kotlin.psi.JetTypeReference -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind import java.util.ArrayList diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt index a8d72ef27f3..9caccb4ada6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextFactory.kt @@ -18,21 +18,21 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder import com.intellij.openapi.util.TextRange import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder import java.util.* import org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry import org.jetbrains.jet.lang.resolve.DescriptorUtils.isSyntheticClassObject -import org.jetbrains.jet.lang.types.error.MissingDependencyErrorClass +import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike -import org.jetbrains.jet.lang.types.isFlexible +import org.jetbrains.kotlin.types.isFlexible import org.jetbrains.jet.lang.resolve.java.JvmAbi import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind -import org.jetbrains.jet.lang.types.flexibility +import org.jetbrains.kotlin.types.flexibility private val FILE_ABI_VERSION_MARKER: String = "FILE_ABI" private val CURRENT_ABI_VERSION_MARKER: String = "CURRENT_ABI" diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt index 9bf17173a36..5ca5b70584b 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 @@ -16,13 +16,13 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor import org.jetbrains.jet.lang.resolve.kotlin.* -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.storage.LockBasedStorageManager import java.util.Collections import com.intellij.openapi.vfs.VirtualFile @@ -32,7 +32,7 @@ import com.intellij.openapi.diagnostic.Logger import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl public fun DeserializerForDecompiler(classFile: VirtualFile): DeserializerForDecompiler { val kotlinClass = KotlinBinaryClassCache.getKotlinBinaryClass(classFile) diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt index 4b66749ccb4..ce31158dfb7 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt @@ -18,13 +18,13 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder import org.jetbrains.jet.lang.resolve.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass import org.jetbrains.jet.lang.resolve.kotlin.DeserializedResolverUtils import org.jetbrains.jet.plugin.decompiler.isKotlinWithCompatibleAbiVersion import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache import com.intellij.openapi.vfs.VirtualFile -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder import org.jetbrains.kotlin.serialization.ClassData import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt index f01ae50065b..1596c8f7ce1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LoggingErrorReporter.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass import com.intellij.openapi.diagnostic.Logger @@ -33,4 +33,4 @@ class LoggingErrorReporter(private val log: Logger) : ErrorReporter { override fun reportIncompatibleAbiVersion(kotlinClass: KotlinJvmBinaryClass, actualVersion: Int) { log.error("Incompatible ABI version for class ${kotlinClass.getClassId()}, actual version: $actualVersion") } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt index 1fe47ba2520..fb4a8361a7f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/ResolverForDecompiler.kt @@ -16,10 +16,10 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.name.ClassId public trait ResolverForDecompiler { public fun resolveTopLevelClass(classId: ClassId): ClassDescriptor? diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt index 6de629f7873..328152bbea9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/missingDependencies.kt @@ -16,20 +16,20 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.impl.PackageFragmentDescriptorImpl +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.types.error.MissingDependencyErrorClass -import org.jetbrains.jet.lang.descriptors.impl.ClassDescriptorImpl -import org.jetbrains.jet.lang.types.TypeSubstitutor -import org.jetbrains.jet.lang.types.TypeProjection -import org.jetbrains.jet.lang.descriptors.impl.ConstructorDescriptorImpl -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.types.ErrorUtils.createErrorType +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass +import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.types.TypeProjection +import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.types.ErrorUtils.createErrorType private class PackageFragmentWithMissingDependencies(override val fqName: FqName, moduleDescriptor: ModuleDescriptor) : PackageFragmentDescriptorImpl(moduleDescriptor, fqName) { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/KotlinWordsScanner.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/KotlinWordsScanner.kt index 88791304119..eb0bb6c1610 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/KotlinWordsScanner.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/KotlinWordsScanner.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.lexer.JetLexer import com.intellij.lang.cacheBuilder.WordOccurrence import org.jetbrains.kotlin.lexer.JetTokens import com.intellij.lang.cacheBuilder.SimpleWordsScanner -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions class KotlinWordsScanner() : WordsScanner { private val lexer = JetLexer() diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt index b82f690a5ac..84bd8c082df 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/findUsages/UsageTypeUtils.kt @@ -42,23 +42,23 @@ import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypesAndPredicate import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.references.JetArrayAccessReference import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.references.JetInvokeFunctionReference -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.psi.JetAnnotationEntry import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.kotlin.psi.JetWhenConditionInRange import org.jetbrains.kotlin.psi.JetPackageDirective import org.jetbrains.kotlin.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.ClassKind -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import com.intellij.psi.PsiPackage -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum.* import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch 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 ddbc3899114..b2030ffd7a4 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 @@ -25,8 +25,8 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -35,8 +35,8 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall; 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.kotlin.name.FqName; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.renderer.DescriptorRenderer; 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 a86ce1e90d7..0bcced89100 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 @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; @@ -27,8 +27,8 @@ 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.resolve.calls.tasks.TasksPackage; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisitor { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java index a289e323de6..7ddaa45ca82 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java @@ -19,14 +19,14 @@ package org.jetbrains.jet.plugin.highlighter; import com.google.common.base.Predicate; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; import org.jetbrains.jet.lang.resolve.calls.inference.constraintPosition.ConstraintPosition; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.kotlin.renderer.Renderer; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java index f6050bc72c5..c60ecadd4b2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java @@ -17,13 +17,13 @@ package org.jetbrains.jet.plugin.highlighter; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.calls.inference.InferenceErrorData; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.java.diagnostics.ConflictingJvmDeclarationsData; import org.jetbrains.jet.lang.resolve.java.diagnostics.JvmDeclarationOrigin; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.Renderer; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java index 45bf6a718b1..717b6aad8fc 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/PropertiesHighlightingVisitor.java @@ -19,9 +19,9 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java index 3e8785931e8..351c83a858c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/TypeKindHighlightingVisitor.java @@ -21,7 +21,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java index 5251577eed2..f71e56a3365 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java @@ -19,15 +19,15 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.expressions.CaptureKind; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.expressions.CaptureKind; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import static org.jetbrains.jet.lang.resolve.BindingContext.*; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt index 68de833f864..6163bb603b7 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/renderersUtil.kt @@ -17,15 +17,15 @@ package org.jetbrains.jet.plugin.highlighter.renderersUtil import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.calls.callUtil.* import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.plugin.highlighter.IdeRenderers -import org.jetbrains.jet.lang.types.ErrorUtils -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.ErrorUtils +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor fun renderResolvedCall(resolvedCall: ResolvedCall): String { val htmlRenderer = DescriptorRenderer.HTML_FOR_UNINFERRED_TYPE_PARAMS diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt index 7b344344351..86d17501422 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/OperatorToFunctionIntention.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt index 6aff322929d..04c28bd5a1d 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.util.DelegatingCall -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.jet.lang.resolve.scopes.JetScope import org.jetbrains.kotlin.psi.JetTypeProjection import org.jetbrains.kotlin.psi.Call diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java index 78a1c54688a..b4b51ab0fb5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveSessionForBodies.java @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; @@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ScopeProvider; import org.jetbrains.jet.lang.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java index 629338c0939..473e6248fd1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatform.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; import org.jetbrains.jet.lang.resolve.kotlin.JavaDeclarationCheckerProvider; -import org.jetbrains.jet.lang.types.DynamicTypesAllowed; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.DynamicTypesAllowed; +import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider; public interface TargetPlatform { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformImpl.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformImpl.java index 617a8405809..e7a53575cc2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformImpl.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/TargetPlatformImpl.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.project; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; -import org.jetbrains.jet.lang.types.DynamicTypesSettings; +import org.jetbrains.kotlin.types.DynamicTypesSettings; public class TargetPlatformImpl implements TargetPlatform { @NotNull private final String platformName; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java index 520c57facdd..4deabc9fd61 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelper.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetImportDirective; import org.jetbrains.jet.lang.resolve.ImportPath; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt index 35453844062..ac9ed3d218e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/refactoring/fqName/fqNameUtil.kt @@ -18,12 +18,12 @@ package org.jetbrains.jet.plugin.refactoring.fqName import org.jetbrains.kotlin.asJava.namedUnwrappedElement import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.psi.PsiPackage import com.intellij.psi.PsiClass import com.intellij.psi.PsiMember import org.jetbrains.kotlin.psi.JetNamedDeclaration -import org.jetbrains.jet.lang.resolve.name.isOneSegmentFQN +import org.jetbrains.kotlin.name.isOneSegmentFQN import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetElement 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 492290db390..03598c59350 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 @@ -39,12 +39,12 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; 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.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java index ed41209e415..2dbb87f2674 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetArrayAccessReference.java @@ -23,8 +23,8 @@ import com.intellij.psi.MultiRangeReference; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetArrayAccessExpression; import org.jetbrains.kotlin.psi.JetContainerNode; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt index e84d63e86eb..5ae55eb002e 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetForLoopInReference.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.references import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.jet.lang.resolve.BindingContext import java.util.Collections diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java index 5e7108a37ba..6aa7fd217dd 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetInvokeFunctionReference.java @@ -22,7 +22,7 @@ import com.intellij.psi.MultiRangeReference; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt index f066b84e90a..2c7198d80ff 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetMultiDeclarationReference.kt @@ -18,17 +18,17 @@ package org.jetbrains.jet.plugin.references import org.jetbrains.kotlin.psi.JetMultiDeclaration import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.openapi.util.TextRange import java.util.Collections -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.source.PsiSourceElement import org.jetbrains.jet.lang.resolve.source.getPsi import com.intellij.psi.PsiElement import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.psi.JetNamedFunction -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor class JetMultiDeclarationReference(element: JetMultiDeclaration) : JetMultiReference(element) { override fun getTargetDescriptors(context: BindingContext): Collection { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt index a8ef356e990..46164b1a705 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetPropertyDelegationMethodsReference.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.plugin.references import com.intellij.openapi.util.TextRange -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetPropertyDelegate import org.jetbrains.jet.lang.resolve.BindingContext diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt index 9cade0cff33..67134245f6a 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetReference.kt @@ -23,7 +23,7 @@ import com.intellij.psi.ResolveResult import com.intellij.psi.PsiElementResolveResult import com.intellij.util.IncorrectOperationException import com.intellij.psi.PsiReference -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.BindingContext import java.util.Collections import org.jetbrains.kotlin.psi.JetReferenceExpression diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt index 2930a55a196..7443426b6dc 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiElement import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.refactoring.fqName.changeQualifiedName @@ -28,12 +28,12 @@ import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector import org.jetbrains.kotlin.psi.psiUtil.getOutermostNonInterleavingQualifiedElement import org.jetbrains.jet.plugin.codeInsight.shorten.addToShorteningWaitSet import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.util.IncorrectOperationException -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/conventions.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/conventions.kt index f6090443036..6375c946636 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/conventions.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/conventions.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.plugin.search.usagesSearch -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.lexer.JetToken -import org.jetbrains.jet.lang.types.expressions.OperatorConventions.* +import org.jetbrains.kotlin.types.expressions.OperatorConventions.* import com.google.common.collect.ImmutableSet import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.lexer.JetSingleValueToken diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt index ce0f5b06b6d..cedef51ee05 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/searchHelpers.kt @@ -31,10 +31,10 @@ import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.asJava.LightClassUtil.PropertyAccessorsPsiMethods import org.jetbrains.kotlin.psi.psiUtil.* -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.lexer.JetSingleValueToken import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.references.* import org.jetbrains.kotlin.psi.JetDeclaration diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt index 2f635def330..7e49657bc83 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/search/usagesSearch/utils.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.search.usagesSearch import com.intellij.psi.PsiConstructorCall -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.jet.lang.resolve.BindingContext diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java index a7838679751..d2d57585f7c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java @@ -30,7 +30,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt index c42f817557d..618ed3a93f1 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinInheritedMembersNodeProvider.kt @@ -18,11 +18,11 @@ package org.jetbrains.jet.plugin.structureView import com.intellij.ide.util.InheritedMembersNodeProvider import com.intellij.ide.util.treeView.smartTree.TreeElement -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.lang.resolve.BindingContext import java.util.ArrayList -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import com.intellij.psi.NavigatablePsiElement import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java index c8c410e3b23..3a5922332b7 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/structureView/KotlinStructureElementPresentation.java @@ -28,8 +28,8 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetClassInitializer; import org.jetbrains.kotlin.psi.JetModifierListOwner; import org.jetbrains.kotlin.psi.JetPsiUtil; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt index 85b320fe9fe..a1e4d3c27c5 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/PackageIndexUtil.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.stubs.StubIndex import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import kotlin.platform.platformStatic import com.intellij.util.containers.MultiMap import org.jetbrains.jet.lang.resolve.java.PackageClassUtils diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java index d55bd7cb6c7..cd85c60e9d3 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/StubIndexServiceImpl.java @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.stubs.*; import org.jetbrains.kotlin.psi.stubs.elements.StubIndexService; import org.jetbrains.jet.lang.resolve.java.JvmAbi; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; public class StubIndexServiceImpl implements StubIndexService { diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt index 24a09156e52..8b575cb967b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/SubpackagesIndexService.kt @@ -17,14 +17,14 @@ package org.jetbrains.jet.plugin.stubindex import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.psi.search.GlobalSearchScope import java.util.HashSet import com.intellij.psi.util.CachedValuesManager import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.util.PsiModificationTracker import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import com.intellij.openapi.components.ServiceManager public class SubpackagesIndexService(private val project: Project) { @@ -83,4 +83,4 @@ public class SubpackagesIndexService(private val project: Project) { return ServiceManager.getService(project, javaClass())!!.cachedValue.getValue()!! } } -} \ No newline at end of file +} diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt index e67416c9673..b482cf36e5c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/PluginDeclarationProviderFactory.kt @@ -21,7 +21,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.jet.lang.resolve.lazy.declarations.* -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt index 708ec7c73b5..6bc7c0472be 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/stubindex/resolve/StubBasedPackageMemberDeclarationProvider.kt @@ -20,8 +20,8 @@ import com.intellij.openapi.project.Project import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.lazy.declarations.PackageMemberDeclarationProvider -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.plugin.stubindex.JetFullClassNameIndex import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil import org.jetbrains.jet.lang.resolve.lazy.data.JetClassLikeInfo diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java index f1a48db3253..4778caba4e0 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/IDEVirtualFileFinder.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinder; import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClassFinder; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java index a62c444dcd0..89c7ac8629b 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/vfilefinder/KotlinClassFileIndex.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache; import org.jetbrains.jet.lang.resolve.kotlin.KotlinJvmBinaryClass; import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.io.DataInput; import java.io.DataOutput; diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index 78d18ab8fc4..fbf7e9e0148 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -27,7 +27,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.kdoc.lexer.KDocTokens; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetPackageDirective; import org.jetbrains.kotlin.psi.JetReferenceExpression; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java index a357c801631..612568502d2 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddFunctionToClassifierAction.java @@ -29,15 +29,15 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.Modality; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.Modality; import org.jetbrains.kotlin.psi.JetClass; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java index b7ca1d3dbc8..ead761f3969 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/JetAddImportAction.java @@ -33,7 +33,7 @@ import com.intellij.psi.PsiFile; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index ea6e87acb3f..25fcb75626d 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java @@ -28,7 +28,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt index 828f96393f8..0355b5c280a 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.openapi.fileEditor.FileDocumentManager -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.diff.DiffManager import com.intellij.openapi.diff.SimpleDiffRequest @@ -44,7 +44,7 @@ import com.intellij.openapi.ui.Messages import javax.swing.SwingUtilities import org.jetbrains.kotlin.psi.JetNameReferenceExpression import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.JetBlockExpression 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 fb8bcb23d1c..7a8c020bd69 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt @@ -32,8 +32,8 @@ import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.calls.callUtil.getCalleeExpressionIfAny import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import com.intellij.usages.UsageViewManager diff --git a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java b/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java index 71814a4fb07..c357a154ffb 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java +++ b/idea/src/org/jetbrains/jet/plugin/caches/JetGotoClassContributor.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetEnumEntry; import org.jetbrains.kotlin.psi.JetNamedDeclaration; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.stubindex.JetClassShortNameIndex; import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt index 19e3960677d..e4a4c3cf265 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.caches import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.plugin.stubindex.* import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.jet.lang.resolve.scopes.JetScope diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java index cded3849545..8ecc906970b 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/CodeInsightUtils.java @@ -28,7 +28,7 @@ import com.intellij.util.text.CharArrayUtil; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java index b165f75ff35..03a755ffce7 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java @@ -25,7 +25,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMember; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetNamedDeclaration; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java index 8917a8826c0..2dd383aadae 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java @@ -32,11 +32,11 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; 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.kotlin.types.JetType; 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/ImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java index f3bf067589b..dd65c80b8a4 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java @@ -21,8 +21,8 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java index b1127197971..710b3faf6a7 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.ide.util.DefaultPsiElementCellRenderer; import com.intellij.psi.PsiElement; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java index dd6a30f3a46..ca6b698f28a 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java @@ -18,14 +18,14 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.codeInsight.navigation.actions.TypeDeclarationProvider; import com.intellij.psi.PsiElement; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; public class JetTypeDeclarationProvider implements TypeDeclarationProvider { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 7d085bd4335..8dd69ea7e5a 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -26,7 +26,7 @@ import com.intellij.codeInsight.editorActions.ReferenceTransferableData import com.intellij.codeInsight.daemon.impl.CollectHighlightsUtil import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.openapi.project.Project import com.intellij.openapi.util.Ref import com.intellij.openapi.project.DumbService @@ -36,14 +36,14 @@ import java.awt.datatransfer.Transferable import com.intellij.codeInsight.CodeInsightSettings import com.intellij.codeInsight.editorActions.CopyPastePostProcessor import org.jetbrains.jet.plugin.references.JetReference -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.openapi.util.TextRange import java.util.Collections import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetCallExpression -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.psi.JetImportDirective import org.jetbrains.kotlin.psi.JetPackageDirective import org.jetbrains.jet.plugin.references.JetMultiReference diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java index 4ded2723c75..7b9dfc6b11f 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java @@ -31,9 +31,9 @@ import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.quickfix.QuickfixPackage; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java index ce7aaa0a879..702b36f9ccb 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java @@ -19,13 +19,13 @@ package org.jetbrains.jet.plugin.codeInsight; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.OverrideResolver; import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.jet.lang.resolve.calls.CallResolverUtil; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.HashSet; import java.util.LinkedHashSet; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java index e8246a43609..b03e69e2c9c 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetBlockExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java index 687e67cb769..be3ee105b83 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java @@ -25,10 +25,10 @@ import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiUtilCore; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; 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 0e8aa96099b..894b22e4428 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 @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; 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 be9659eaba6..d2b9627bab9 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 @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt index 0a055dc9d66..db0810e4de6 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt @@ -36,12 +36,12 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.kotlin.psi.JetParenthesizedExpression -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.jet.plugin.JetBundle public class KotlinRuntimeTypeCastSurrounder: KotlinExpressionSurrounder() { diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java index bd680f2f3dc..403e4bfd28a 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java @@ -22,14 +22,14 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetWhenCondition; import org.jetbrains.kotlin.psi.JetWhenEntry; import org.jetbrains.kotlin.psi.JetWhenExpression; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.surroundWith.KotlinSurrounderUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt index fd94bdb19a6..ea9f61a9626 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt @@ -18,16 +18,16 @@ package org.jetbrains.jet.plugin.completion import com.intellij.codeInsight.completion.* import org.jetbrains.kotlin.asJava.KotlinLightClass -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.psi.JetFile 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 +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor class AllClassesCompletion(val parameters: CompletionParameters, val lookupElementFactory: LookupElementFactory, diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt index f44bb3e7f07..64f0a13c0da 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt @@ -20,7 +20,7 @@ import com.intellij.codeInsight.completion.* import com.intellij.psi.PsiElement import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.* diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt index a70691c3a7d..1a4a9f9d41c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt @@ -24,12 +24,12 @@ import com.intellij.codeInsight.lookup.LookupElementWeigher import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.WeighingContext 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.kotlin.descriptors.impl.LocalVariableDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.resolve.name.isValidJavaFqName +import org.jetbrains.kotlin.name.isValidJavaFqName import org.jetbrains.jet.lang.resolve.ImportPath import com.intellij.codeInsight.completion.CompletionType import org.jetbrains.jet.plugin.completion.smart.NameSimilarityWeigher @@ -37,11 +37,11 @@ import org.jetbrains.jet.plugin.completion.smart.SMART_COMPLETION_ITEM_PRIORITY_ import org.jetbrains.jet.plugin.completion.smart.SmartCompletionItemPriority import com.intellij.psi.PsiClass import java.util.HashSet -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor public fun CompletionResultSet.addKotlinSorting(parameters: CompletionParameters): CompletionResultSet { var sorter = CompletionSorter.defaultSorter(parameters, getPrefixMatcher())!! diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt index d851ed046d9..280a3fd6420 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt @@ -22,29 +22,29 @@ import com.intellij.codeInsight.lookup.AutoCompletionPolicy import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.codeInsight.completion.CompletionService import com.intellij.codeInsight.completion.CompletionProgressIndicator -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor -import org.jetbrains.jet.lang.descriptors.ClassKind -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import com.intellij.codeInsight.completion.PrefixMatcher -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import com.intellij.codeInsight.lookup.LookupElementPresentation import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.completion.InsertionContext import org.jetbrains.jet.plugin.completion.handlers.CastReceiverInsertHandler -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression @@ -61,7 +61,7 @@ import org.jetbrains.kotlin.psi.JetLabeledExpression import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.psiUtil.parents import org.jetbrains.kotlin.psi.JetReferenceExpression -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt index f882054814c..39698bad7f8 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.completion import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor fun renderDataFlowValue(value: DataFlowValue): String? { // If it is not a stable identifier, there's no point in rendering it diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DeclarationDescriptorLookupObject.kt b/idea/src/org/jetbrains/jet/plugin/completion/DeclarationDescriptorLookupObject.kt index 62e23dfc501..d18d0cc1956 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DeclarationDescriptorLookupObject.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/DeclarationDescriptorLookupObject.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.completion import com.intellij.openapi.diagnostic.Logger import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade /** diff --git a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt index 30f7f0e793e..6e5f535ae94 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt @@ -31,24 +31,24 @@ import org.jetbrains.jet.lang.resolve.calls.context.CheckValueArgumentsMode import org.jetbrains.jet.lang.resolve.calls.extensions.CompositeExtension import org.jetbrains.kotlin.di.InjectorForMacros import org.jetbrains.jet.lang.resolve.calls.results.OverloadResolutionResults -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import java.util.HashSet import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetIfExpression 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 +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.jet.plugin.util.makeNotNullable import org.jetbrains.kotlin.psi.JetWhenConditionWithExpression import org.jetbrains.kotlin.psi.JetWhenEntry import org.jetbrains.kotlin.psi.JetWhenExpression import org.jetbrains.kotlin.psi.JetCallElement -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.jet.lang.resolve.calls.context.BasicCallResolutionContext import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace import org.jetbrains.kotlin.psi.JetPrefixExpression @@ -62,13 +62,13 @@ import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.psi.JetReturnExpression import org.jetbrains.jet.lang.resolve.bindingContextUtil.getTargetFunctionDescriptor import org.jetbrains.jet.plugin.completion.smart.toList -import org.jetbrains.jet.lang.descriptors.PropertyGetterDescriptor -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.calls.results.ResolutionStatus import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade -import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils +import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils enum class Tail { COMMA diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt index cb6c50f89a0..01f70ffbc19 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionCharFilter.kt @@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.Lookup import com.intellij.codeInsight.lookup.CharFilter.Result import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.util.Key -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor public class KotlinCompletionCharFilter() : CharFilter() { class object { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt index 64fc082eed9..ab4bed9d032 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt @@ -54,9 +54,9 @@ import org.jetbrains.kotlin.psi.psiUtil.prevLeaf import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.JetTypeArgumentList import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt index d0d56f867be..01e6f86fa94 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt @@ -21,7 +21,7 @@ import com.intellij.codeInsight.lookup.LookupElement import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.openapi.util.Iconable import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns @@ -32,10 +32,10 @@ import com.intellij.psi.PsiClass import org.jetbrains.kotlin.asJava.KotlinLightClass import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import com.intellij.codeInsight.lookup.DefaultLookupItemRenderer -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import com.intellij.codeInsight.lookup.impl.LookupCellRenderer import org.jetbrains.jet.plugin.util.nullability import org.jetbrains.jet.plugin.util.TypeNullability diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt index d7543fddc73..351585f5a8b 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementsCollector.kt @@ -20,13 +20,13 @@ import com.intellij.codeInsight.completion.InsertionContext 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.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.completion.handlers.* import com.intellij.codeInsight.completion.PrefixMatcher import java.util.ArrayList import com.intellij.codeInsight.completion.CompletionResultSet -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import com.intellij.openapi.util.TextRange import com.intellij.codeInsight.completion.CompletionParameters import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade diff --git a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt index 588d3c1e26a..5a7403daf8b 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/NamedParametersCompletion.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.JetValueArgument import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetCallElement import org.jetbrains.jet.plugin.references.JetReference -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.jet.plugin.JetIcons import org.jetbrains.jet.plugin.quickfix.QuickFixUtil @@ -36,7 +36,7 @@ import org.jetbrains.jet.plugin.util.FirstChildInParentFilter import org.jetbrains.kotlin.psi.psiUtil.getCallNameExpression import com.intellij.psi.PsiElement import com.intellij.codeInsight.completion.InsertHandler -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType 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 737b55a9dc7..50c07231a3e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/GenerateLambda.kt @@ -28,7 +28,7 @@ import com.intellij.codeInsight.template.TextResult 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.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.openapi.project.Project import com.intellij.psi.PsiDocumentManager diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt index 39b75bd02d2..e8ac7b098fc 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt @@ -31,10 +31,10 @@ import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper import com.intellij.openapi.editor.Document -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import com.intellij.openapi.util.TextRange import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetPsiFactory diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt index 1c5fb22f8e0..8dcd5be49f6 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.completion.DeclarationDescriptorLookupObject -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode import com.intellij.psi.PsiClass import org.jetbrains.kotlin.psi.JetNameReferenceExpression 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 2335c8c874b..abae45988c0 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/KeywordValues.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.* import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.completion.InsertionContext import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler -import org.jetbrains.jet.lang.types.TypeSubstitutor +import org.jetbrains.kotlin.types.TypeSubstitutor object KeywordValues { public fun addToCollection(collection: MutableCollection, expectedInfos: Collection, expressionWithType: JetExpression) { diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt index 8ad692f635a..98378a12a7e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt @@ -26,16 +26,16 @@ import org.jetbrains.jet.plugin.completion.ItemPriority import org.jetbrains.jet.lang.resolve.BindingContext import java.util.HashSet import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.plugin.JetDescriptorIconProvider -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.plugin.completion.PositionalArgumentExpectedInfo import java.util.ArrayList import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.completion.assignPriority import com.intellij.codeInsight.lookup.Lookup -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.types.checker.JetTypeChecker class MultipleArgumentsItemProvider(val bindingContext: BindingContext, val smartCastTypes: (VariableDescriptor) -> Collection) { 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 a2bd9367dc2..f6ac7b89c14 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt @@ -16,11 +16,11 @@ package org.jetbrains.jet.plugin.completion.smart -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.types.* +import org.jetbrains.kotlin.types.* import com.intellij.codeInsight.lookup.* import com.intellij.codeInsight.completion.* import java.util.* @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf +import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf import org.jetbrains.jet.plugin.util.FuzzyType import org.jetbrains.jet.plugin.util.fuzzyReturnType import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt index 24dc7b7f5f3..f20657af4ea 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.plugin.completion.smart import com.intellij.codeInsight.lookup.LookupElement -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation @@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.jet.plugin.completion.LookupElementFactory -import org.jetbrains.jet.lang.types.TypeSubstitutor +import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.jet.plugin.util.fuzzyReturnType import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.plugin.completion.isVisible 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 71e74638859..7aa8b185493 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -17,13 +17,13 @@ package org.jetbrains.jet.plugin.completion.smart import com.intellij.codeInsight.lookup.LookupElement -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.completion.InsertHandler -import org.jetbrains.jet.lang.descriptors.Modality -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.Modality +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation @@ -31,12 +31,12 @@ import com.intellij.codeInsight.completion.InsertionContext import org.jetbrains.jet.plugin.completion.handlers.KotlinFunctionInsertHandler import org.jetbrains.jet.plugin.completion.* import org.jetbrains.jet.plugin.completion.handlers.CaretPosition -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.jet.plugin.util.makeNotNullable import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.jet.lang.resolve.java.descriptor.SamConstructorDescriptor import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils @@ -44,23 +44,23 @@ import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.ClassInheritorsSearch import org.jetbrains.kotlin.asJava.KotlinLightClass -import org.jetbrains.jet.lang.types.TypeProjection +import org.jetbrains.kotlin.types.TypeProjection import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.lang.resolve.PossiblyBareType -import org.jetbrains.jet.lang.types.JetTypeImpl -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.types.JetTypeImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.java.mapping.KotlinToJavaTypesMap -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.resolveTopLevelClass -import org.jetbrains.jet.lang.types.TypeProjectionImpl -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.TypeProjectionImpl +import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf +import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf import org.jetbrains.jet.plugin.caches.resolve.KotlinLightClassForDecompiledDeclaration class TypeInstantiationItems( diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt index c352d489ee0..dd3071178f6 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt @@ -17,8 +17,8 @@ package org.jetbrains.jet.plugin.completion.smart import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.descriptors.VariableDescriptor import java.util.Collections import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValue 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 d0708fe38f2..d1575ffe18d 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt @@ -24,20 +24,20 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.codeInsight.ShortenReferences 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.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.types.JetType 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 +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.plugin.completion.handlers.WithTailInsertHandler -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import com.intellij.openapi.util.Key -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade -import org.jetbrains.jet.lang.types.TypeSubstitutor +import org.jetbrains.kotlin.types.TypeSubstitutor import java.util.ArrayList import java.util.HashMap import org.jetbrains.jet.plugin.util.FuzzyType diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt index 1ca8ad8734c..f543a1eb2d5 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt @@ -41,10 +41,10 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.ClassBuilderFactories import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.codegen.state.JetTypeMapper -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.callUtil.* @@ -53,7 +53,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument 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.kotlin.name.FqName import org.jetbrains.kotlin.builtins.InlineStrategy import org.jetbrains.kotlin.builtins.InlineUtil import org.jetbrains.jet.plugin.caches.resolve.IdeaModuleInfo @@ -67,7 +67,7 @@ import java.util.* import org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass import org.jetbrains.jet.plugin.stubindex.PackageIndexUtil -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.psi.stubs.StubElement import org.jetbrains.jet.plugin.util.application.runReadAction diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt index 11c7f884e4b..dd874aa12ae 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt @@ -25,10 +25,10 @@ import com.intellij.util.containers.OrderedSet import com.intellij.util.Range import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import com.intellij.debugger.engine.MethodFilter import com.intellij.debugger.engine.BasicStepMethodFilter import com.intellij.debugger.engine.DebugProcessImpl diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt index 70eb2379c25..c6f61c11d57 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -22,15 +22,15 @@ import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.diagnostic.Logger -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.openapi.roots.libraries.LibraryUtil import com.intellij.openapi.module.impl.scopes.LibraryScope import com.intellij.openapi.roots.LibraryOrderEntry import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.module.impl.scopes.JdkScope import com.intellij.openapi.roots.JdkOrderEntry diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt index 589137fbaff..3816f1765c8 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetBlockCodeFragment import org.jetbrains.kotlin.asJava.KotlinLightClass import com.intellij.debugger.DebuggerManagerEx import org.jetbrains.kotlin.psi.JetCodeFragment -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import com.intellij.util.concurrency.Semaphore import java.util.concurrent.atomic.AtomicReference import com.intellij.openapi.progress.ProgressManager diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt index c0e85de7e64..4050f489c10 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt @@ -26,9 +26,9 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl import java.util.ArrayList import com.intellij.openapi.components.ServiceManager import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.apache.log4j.Logger import org.jetbrains.jet.plugin.util.application.runReadAction diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt index ef958cd8896..ff130dc6673 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -39,7 +39,7 @@ import org.jetbrains.eval4j.jdi.JDIEval import org.jetbrains.eval4j.jdi.asJdiValue import org.jetbrains.eval4j.jdi.makeInitialFrame import org.jetbrains.jet.lang.resolve.java.PackageClassUtils -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.eval4j.jdi.asValue import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.codegen.ClassFileFactory @@ -61,7 +61,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import com.sun.jdi.InvalidStackFrameException import org.jetbrains.jet.plugin.util.application.runReadAction import org.jetbrains.kotlin.psi.analysisContext -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import com.intellij.psi.JavaPsiFacade @@ -71,7 +71,7 @@ import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaClassImpl import com.intellij.openapi.project.Project import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.codegen.StackValue -import org.jetbrains.jet.lang.types.Flexibility +import org.jetbrains.kotlin.types.Flexibility import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.util.attachment.attachmentByPsiFile import com.intellij.openapi.diagnostic.Attachment diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt index 43b99ff0c36..c225fe8233b 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt @@ -36,7 +36,7 @@ import com.sun.jdi.ClassType import com.sun.jdi.Value import org.jetbrains.eval4j.jdi.* import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.org.objectweb.asm.Type as AsmType import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.java.JvmAbi diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt b/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt index 7c6f8b6a93a..c9f212b962b 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/render/KotlinClassWithDelegatedPropertyRenderer.kt @@ -35,7 +35,7 @@ import com.sun.jdi.ReferenceType import com.sun.jdi.Type import com.sun.jdi.Method import org.jetbrains.kotlin.codegen.PropertyCodegen -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import com.intellij.debugger.engine.evaluation.EvaluateException public class KotlinClassWithDelegatedPropertyRenderer : ClassRenderer() { diff --git a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java b/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java index 2924464092e..44c3c3b14c6 100644 --- a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java +++ b/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java @@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.JvmClassName; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.util.DebuggerUtils; import java.util.regex.Matcher; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 03fefa084d0..5f2977651c3 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -30,11 +30,11 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.decompiler.navigation.JetSourceNavigationHelper; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java index 4b3d0568b1a..4d0c9dfc377 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java @@ -20,9 +20,9 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java index 7a1ecb9b8f5..dd0829717d4 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java @@ -36,10 +36,10 @@ import com.intellij.ui.LayeredIcon; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java index d39e3d8baaf..d6d11adaf68 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java @@ -35,8 +35,8 @@ import com.intellij.util.NullableFunction; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.Modality; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.Modality; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt index d0948cb16cd..1ebb47f69c6 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt @@ -16,13 +16,13 @@ package org.jetbrains.jet.plugin.highlighter.markers -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.jet.lang.resolve.OverrideResolver -import org.jetbrains.jet.lang.descriptors.Modality +import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder -import org.jetbrains.jet.lang.descriptors.PropertyAccessorDescriptor -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import com.intellij.psi.NavigatablePsiElement import java.awt.event.MouseEvent import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil diff --git a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt index 5385208c908..52d7c3b3eeb 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt @@ -16,17 +16,17 @@ package org.jetbrains.jet.plugin.imports -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension diff --git a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt index 1d8efd05b21..bcdfd804c66 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.ImportPath -import org.jetbrains.jet.lang.resolve.name.* +import org.jetbrains.kotlin.name.* import org.jetbrains.jet.plugin.references.JetReference import java.util.HashSet import java.util.ArrayList diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt index 8b26efbc09c..18b4faac9f8 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToExpressionBodyAction.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.* 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 +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt index 9b2bde5a057..b0fca22521a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/InsertExplicitTypeArguments.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.JetTypeArgumentList diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt index 6b35771af2a..15490bfbdbe 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import com.intellij.openapi.editor.Editor import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiWhiteSpace import org.jetbrains.jet.plugin.codeInsight.ShortenReferences diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java index ee95b5367f2..d013025445e 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java @@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt index d1419285d21..2abf65f4fa4 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt @@ -26,9 +26,9 @@ import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.JetBundle import com.intellij.psi.codeStyle.CodeStyleManager -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.jet.plugin.references.JetReference -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils public class ReplaceExplicitFunctionLiteralParamWithItIntention() : PsiElementBaseIntentionAction() { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt index 26952e489f5..84952353c04 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.jet.plugin.references.JetReference import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt index 82bd5cac2ec..d050cf98cf5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.lexer.JetTokens 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.kotlin.descriptors.ClassDescriptor 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/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java index 9becc8aa1e5..d92eb9b1532 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java @@ -30,16 +30,16 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt b/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt index 31d1426c608..2ba04d3c0db 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SwapBinaryExpression.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.util.JetPsiPrecedences import org.jetbrains.kotlin.lexer.JetTokens.* -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions public class SwapBinaryExpression : JetSelfTargetingIntention( "swap.binary.expression", javaClass() diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt index 259a94fce15..44ef743bb0b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt @@ -17,9 +17,9 @@ package org.jetbrains.jet.plugin.intentions import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.JetNodeTypes import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt index 239733b29b9..5b891a434f2 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/AttributeCallReplacementIntention.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.plugin.intentions.JetSelfTargetingIntention import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.lang.resolve.calls.model.DefaultValueArgument 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 9206365b17c..b54b1453794 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/attributeCallReplacements/ReplaceContainsIntention.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.intentions.attributeCallReplacements 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.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPsiUtil diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt index 82943d4fab1..7614d687946 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt @@ -32,7 +32,7 @@ import org.jetbrains.jet.plugin.refactoring.inline.KotlinInlineValHandler import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowValueFactory import org.jetbrains.jet.lang.resolve.BindingContextUtils -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.search.LocalSearchScope import org.jetbrains.kotlin.psi.JetDeclaration diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java index cce557e7c33..92dba1b014d 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java @@ -31,8 +31,8 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java index 78ed2cc847d..76bd41acdd1 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java index 73fc5a24e73..8f330177fd4 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureAnnotationIntention.java @@ -33,9 +33,9 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; import org.jetbrains.jet.lang.resolve.java.JavaPackage; import org.jetbrains.jet.lang.resolve.java.structure.impl.JavaConstructorImpl; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java index e832ffbca4c..f52860eca43 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -38,7 +38,7 @@ import com.intellij.util.Function; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.java.JavaBindingContext; import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java index 0d7ce0f447d..59d2545ae1f 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java @@ -26,10 +26,10 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java index 5cc1b790ad6..3d3d84cba8a 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java @@ -30,15 +30,15 @@ import com.intellij.psi.PsiNamedElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.UtilPackage; import org.jetbrains.kotlin.di.InjectorForMacros; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java index e373f2de2f6..70e98767fc9 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java @@ -30,9 +30,9 @@ import com.intellij.psi.PsiNamedElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassKind; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassKind; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java index 6b436618abd..e1bd43266a4 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java @@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.plugin.JetBundle; public class JetAnyVariableMacro extends BaseJetVariableMacro { diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java index cb3a607c9ee..24f12ed6a39 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java @@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.plugin.JetBundle; public class JetIterableVariableMacro extends BaseJetVariableMacro { diff --git a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java index a14bb7aa26b..ba1808173c4 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java @@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.plugin.JetBundle; public class JetSuggestVariableNameMacro extends BaseJetVariableMacro { diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java index 0f2e514fc70..b05d57c99cd 100644 --- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java @@ -33,19 +33,19 @@ import com.intellij.util.ArrayUtil; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.JetVisibilityChecker; import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java index 776e718660e..d2e5007141d 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetDefaultNamedDeclarationPresentation.java @@ -21,7 +21,7 @@ import com.intellij.openapi.editor.colors.CodeInsightColors; import com.intellij.openapi.editor.colors.TextAttributesKey; import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.psi.JetPsiUtil; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetIconProvider; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java b/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java index 17111dabb9f..80b316668cc 100644 --- a/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java +++ b/idea/src/org/jetbrains/jet/plugin/presentation/JetFunctionPresenter.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetTypeReference; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java index d50800cbde8..2299e35cccd 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java @@ -24,16 +24,16 @@ import com.intellij.psi.PsiReference; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetCallElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.JetNameValidator; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java index 8ab70b4f920..6dffcbe57ef 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java @@ -24,14 +24,14 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedFunction; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.actions.JetAddFunctionToClassifierAction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java index f20f46b8ad9..02557ef7766 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java @@ -30,8 +30,8 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetCallElement; import org.jetbrains.kotlin.psi.JetExpression; @@ -40,8 +40,8 @@ import org.jetbrains.kotlin.psi.JetValueArgument; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.JetIcons; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java index e9342742e76..10ec8d46c0a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddStarProjectionsFix.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.expressions.TypeReconstructionUtil; +import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil; import org.jetbrains.jet.plugin.JetBundle; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt index 093c14a0a86..6eea3fe8f53 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.ImportPath -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.plugin.actions.JetAddImportAction import org.jetbrains.jet.plugin.caches.JetShortNamesCache @@ -43,14 +43,14 @@ import org.jetbrains.jet.plugin.caches.resolve.* import org.jetbrains.jet.plugin.project.ProjectStructureUtil import org.jetbrains.jet.plugin.util.JetPsiHeuristicsUtil import java.util.ArrayList -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import com.intellij.openapi.module.ModuleUtilCore import org.jetbrains.jet.plugin.util.ProjectRootsUtil import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility +import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.jet.lang.diagnostics.Errors import com.intellij.psi.util.PsiModificationTracker import org.jetbrains.jet.plugin.completion.isVisible diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java index 0f7590520bf..11506394a0f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java @@ -28,8 +28,8 @@ import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; 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/ChangeAccessorTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java index 0c27455c65c..1f1a627aa5e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeAccessorTypeFix.java @@ -25,7 +25,7 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java index 1b2b7a941b1..4ad7ae9a7a9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -24,17 +24,17 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; 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/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java index 90b3b8cc7bd..bb3c3c90929 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java @@ -20,11 +20,11 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFunctionLiteral; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.SimpleCollectingValidator; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java index f28335f9bab..6228a73f173 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java @@ -25,8 +25,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -34,11 +34,11 @@ import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; -import org.jetbrains.jet.lang.resolve.name.FqName; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; 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/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java index c037050af0b..439cf061a57 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java @@ -23,10 +23,10 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; @@ -34,8 +34,8 @@ import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; @@ -46,7 +46,7 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; import java.util.List; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; import static org.jetbrains.jet.lang.diagnostics.Errors.EXPECTED_PARAMETERS_NUMBER_MISMATCH; import static org.jetbrains.jet.lang.diagnostics.Errors.UNUSED_PARAMETER; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java index 4f681b6aca5..efc4d5051c9 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java @@ -36,17 +36,17 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.PlatformIcons; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.FunctionDescriptorUtil; import org.jetbrains.jet.lang.resolve.VisibilityUtil; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java index 538ad7de86a..a13cf8a3ece 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeParameterTypeFix.java @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.psi.JetParameter; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java index a242df90ab1..6ac0c60ed36 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java @@ -21,14 +21,14 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java index a981e73ac58..9db58eaf057 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToStarProjectionFix.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetTypeElement; import org.jetbrains.kotlin.psi.JetTypeReference; -import org.jetbrains.jet.lang.types.expressions.TypeReconstructionUtil; +import org.jetbrains.kotlin.types.expressions.TypeReconstructionUtil; import org.jetbrains.jet.plugin.JetBundle; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java index 64c7c159496..947502b895d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java index fd57f44fc6a..c47645491ad 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java @@ -24,7 +24,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java index dc4983ee424..e03e7c70d4f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java @@ -25,18 +25,18 @@ import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.name.FqName; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; 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/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java index 1dbc2332000..abdbc042e36 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java @@ -23,10 +23,10 @@ import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.Visibilities; -import org.jetbrains.jet.lang.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.Visibilities; +import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetModifierListOwner; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java index 151404b5ccc..9e3fbbc3f3e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.NamePackage; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.NamePackage; import org.jetbrains.jet.plugin.project.ProjectStructureUtil; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java index 51a55c2614c..14fd42251a8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java @@ -27,8 +27,8 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetCallableDeclaration; import org.jetbrains.kotlin.psi.JetDeclaration; @@ -38,7 +38,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import java.util.*; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.*; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*; import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; import static org.jetbrains.kotlin.lexer.JetTokens.OPEN_KEYWORD; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java index 33282a4f7bf..0fe893ab812 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java @@ -29,8 +29,8 @@ import com.intellij.refactoring.rename.inplace.MyLookupExpression; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import org.jetbrains.jet.lang.diagnostics.Errors; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java index 533ec588c73..4657f08ef47 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1; import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters2; @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.UtilPackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java index e4d1e8e0515..afc200f5831 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java @@ -27,9 +27,9 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; @@ -37,10 +37,10 @@ import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.types.DeferredType; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.types.DeferredType; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java index a181c99a765..4ae5f4d738d 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java @@ -20,8 +20,8 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java index 410c5bd20f4..f57f825bed6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveModifierFix.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.Variance; +import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java index 680408e59ee..562f2bc8c93 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemovePartsFromPropertyFix.java @@ -25,7 +25,7 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java index b7b5a0787dc..c2ed1ed794c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java @@ -24,8 +24,8 @@ import com.intellij.refactoring.rename.RenameProcessor; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java index ddddeec810d..29fc796ad5f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/SpecifyTypeExplicitlyFix.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import static org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction.addTypeAnnotation; 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 bb351973a11..22700b96896 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 @@ -28,13 +28,13 @@ import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.psi.PsiDocumentManager import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.IncorrectOperationException -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.types.* +import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.plugin.refactoring.JetNameSuggester @@ -54,13 +54,13 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.util.application.runWriteAction import org.jetbrains.jet.plugin.refactoring.isMultiLine -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.checker.JetTypeChecker import com.intellij.psi.SmartPointerManager -import org.jetbrains.jet.lang.descriptors.impl.SimpleFunctionDescriptorImpl -import org.jetbrains.jet.lang.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.impl.MutablePackageFragmentDescriptor -import org.jetbrains.jet.lang.descriptors.impl.TypeParameterDescriptorImpl +import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl import java.util.LinkedHashMap import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassKind 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 8b789d86560..192d58719be 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 @@ -2,24 +2,24 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder import java.util.Collections import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.types.JetType import kotlin.properties.Delegates import com.intellij.util.ArrayUtil import org.jetbrains.jet.plugin.refactoring.JetNameSuggester 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.kotlin.types.ErrorUtils 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 import org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass.ClassInfo import org.jetbrains.jet.plugin.util.makeNotNullable -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.checker.JetTypeChecker -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.checker.JetTypeChecker +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor /** * Represents a concrete type or a set of types yet to be inferred from an expression. diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt index 6c6fe04b047..5d828140b29 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt @@ -14,13 +14,13 @@ import org.jetbrains.kotlin.psi.JetParameter import java.util.HashSet import org.jetbrains.jet.plugin.refactoring.CollectingValidator import com.intellij.codeInsight.lookup.LookupElementBuilder -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.psi.JetCallableDeclaration import java.util.Collections -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.psi.JetParameterList import org.jetbrains.kotlin.psi.JetNamedDeclaration 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 e6f322d4c0b..a49ed140520 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 @@ -1,8 +1,8 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.lang.resolve.scopes.JetScope import java.util.LinkedHashSet @@ -16,23 +16,23 @@ import org.jetbrains.kotlin.psi.JetNamedDeclaration import com.intellij.refactoring.psi.SearchUtils import org.jetbrains.jet.plugin.references.JetSimpleNameReference import java.util.HashSet -import org.jetbrains.jet.lang.types.ErrorUtils -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.checker.JetTypeChecker -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.types.TypeProjectionImpl -import org.jetbrains.jet.lang.types.JetTypeImpl +import org.jetbrains.kotlin.types.ErrorUtils +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.types.TypeProjectionImpl +import org.jetbrains.kotlin.types.JetTypeImpl import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.jet.lang.resolve.bindingContextUtil.isUsedAsStatement import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetPropertyDelegate import org.jetbrains.kotlin.psi.JetProperty -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import kotlin.properties.Delegates -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.jet.plugin.util.makeNotNullable import org.jetbrains.kotlin.psi.JetAnnotationEntry import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType 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 4b41f9fafc3..93daff9668f 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 @@ -4,7 +4,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic 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.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory 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 41f8f8e5d6f..0b3f53b7afe 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 @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression 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.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt index e1f28d1fd08..a33ca67ba1b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromReferenceExpressionActionFactory.kt @@ -24,8 +24,8 @@ import java.util.Arrays import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.psiUtil.isDotReceiver import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.name.FqName import java.util.ArrayList import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt index f40d8f7e46c..5e4c25b5325 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/CreateClassFromTypeReferenceActionFactory.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.psi.JetUserType import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt index 6871dd3be23..f64f4b7d4a0 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createClass/createClassUtils.kt @@ -1,21 +1,21 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import com.intellij.psi.JavaPsiFacade import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.types.TypeUtils -import org.jetbrains.jet.lang.types.checker.JetTypeChecker -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.types.TypeUtils +import org.jetbrains.kotlin.types.checker.JetTypeChecker +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.Call import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.jet.lang.resolve.scopes.receivers.Qualifier 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 62d9af3d46a..9a289d295b6 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 @@ -4,9 +4,9 @@ import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import java.util.Collections import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt index 3e0584ce81a..13b43a30227 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateComponentFunctionActionFactory.kt @@ -8,7 +8,7 @@ import org.jetbrains.jet.lang.diagnostics.Errors import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetMultiDeclaration import org.jetbrains.kotlin.psi.JetForExpression -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateComponentFunctionActionFactory : JetSingleIntentionActionFactory() { 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 87e61717800..3c7c2f8c653 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 @@ -4,7 +4,7 @@ import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory 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.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt index 73a0e763b80..b68a9b2bde5 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateGetFunctionActionFactory.kt @@ -5,7 +5,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import java.util.Collections 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 e201934d59a..d80b36013bc 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 @@ -5,7 +5,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns 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 56f97254043..0a242e91008 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 @@ -5,7 +5,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.lang.diagnostics.Errors 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 15ed011378b..923f9393a9a 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 @@ -7,12 +7,12 @@ import org.jetbrains.kotlin.psi.JetFile 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.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.caches.resolve.analyzeFully -import org.jetbrains.jet.lang.types.TypeProjectionImpl +import org.jetbrains.kotlin.types.TypeProjectionImpl import java.util.Collections -import org.jetbrains.jet.lang.types.JetTypeImpl +import org.jetbrains.kotlin.types.JetTypeImpl import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* object CreateIteratorFunctionActionFactory : JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt index b222f26e16b..90a47e55e35 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateNextFunctionActionFactory.kt @@ -6,7 +6,7 @@ import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory import org.jetbrains.jet.lang.diagnostics.Errors -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetForExpression import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* 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 49164b4ce12..1d345b51047 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 @@ -4,18 +4,18 @@ import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.FunctionInfo import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetExpression 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 +import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor import org.jetbrains.jet.plugin.caches.resolve.analyze object CreatePropertyDelegateAccessorsActionFactory : JetSingleIntentionActionFactory() { 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 64b8437a69b..f9eeec5f72b 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 @@ -5,7 +5,7 @@ import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetArrayAccessExpression -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import java.util.ArrayList import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.builtins.KotlinBuiltIns @@ -13,9 +13,9 @@ import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import java.util.Collections import org.jetbrains.kotlin.psi.JetOperationExpression import org.jetbrains.kotlin.psi.JetUnaryExpression -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.jet.plugin.caches.resolve.analyze object CreateSetFunctionActionFactory : JetSingleIntentionActionFactory() { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt index dcf6f21b403..6cdbcf907bc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateUnaryOperationActionFactory.kt @@ -4,10 +4,10 @@ import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.jet.lang.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import java.util.Collections import org.jetbrains.kotlin.psi.JetUnaryExpression import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt index 91115b0f131..3d46042a482 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateLocalVariableActionFactory.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement import org.jetbrains.kotlin.psi.JetBlockExpression import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallableBuilderConfiguration import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.createBuilder import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.CallablePlacement 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 81cdf3f1111..e0f599933d4 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 @@ -10,8 +10,8 @@ import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.guessTypes import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetPropertyAccessor @@ -21,10 +21,10 @@ import org.jetbrains.kotlin.psi.JetClassBody 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 +import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes import java.util.LinkedHashSet -import org.jetbrains.jet.lang.types.JetType -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor +import org.jetbrains.kotlin.types.JetType +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.jet.plugin.refactoring.changeSignature.JetValVar import org.jetbrains.kotlin.psi.JetEnumEntry import org.jetbrains.kotlin.psi.JetClassOrObject 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 75f55f20a44..1e21417a675 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 @@ -33,7 +33,7 @@ import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.plugin.refactoring.canRefactor import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.kotlin.psi.JetClass -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor public object CreateParameterByNamedArgumentActionFactory: JetSingleIntentionActionFactory() { override fun createAction(diagnostic: Diagnostic): IntentionAction? { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt index 7d44c46408c..41b71598314 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createVariable/CreateParameterFromUsageFix.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.refactoring.changeSignature.runChangeSignature import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor public class CreateParameterFromUsageFix( val functionDescriptor: FunctionDescriptor, diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java index 04b19937e8f..386ecda3311 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java @@ -21,15 +21,15 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -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.TypeUtils; -import org.jetbrains.jet.lang.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetLexer; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java index b4fef74f39b..a54b617039d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetVisitorVoid; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; 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 52ee0af200e..c6441deb9e5 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java @@ -37,14 +37,14 @@ import com.intellij.util.containers.ContainerUtil; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; 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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; 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 076b69d3b31..ddf824746df 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt @@ -25,13 +25,13 @@ import com.intellij.refactoring.changeSignature.* import com.intellij.usageView.UsageInfo import com.intellij.util.VisibilityUtil import org.jetbrains.kotlin.asJava.* -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.Visibilities -import org.jetbrains.jet.lang.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibility 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.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.JetLanguage diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt index 1527e88c481..2836f6809ef 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt @@ -23,12 +23,12 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.ui.Messages import com.intellij.openapi.util.Disposer import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.renderer.DescriptorRenderer import java.util.* -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.* +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.* import org.jetbrains.annotations.TestOnly import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.plugin.quickfix.QuickFixUtil diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt index e2c02a18a5d..9059a33287c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureData.kt @@ -23,8 +23,8 @@ import com.intellij.refactoring.changeSignature.OverriderUsageInfo import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.asJava.KotlinLightMethod import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.jet.lang.descriptors.* -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor +import org.jetbrains.kotlin.descriptors.* +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.caches.resolve.* import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java index 27122065c83..eb3d6b3693c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureDialog.java @@ -50,10 +50,10 @@ import com.intellij.util.ui.table.JBTableRow; import com.intellij.util.ui.table.JBTableRowEditor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.Visibilities; -import org.jetbrains.jet.lang.descriptors.Visibility; +import org.jetbrains.kotlin.descriptors.Visibilities; +import org.jetbrains.kotlin.descriptors.Visibility; import org.jetbrains.kotlin.psi.JetTypeCodeFragment; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetFileType; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java index 6a43519ed05..7a64d1ecc6d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java @@ -33,10 +33,10 @@ import com.intellij.refactoring.util.CommonRefactoringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.asJava.AsJavaPackage; import java.util.Collection; -import static org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; +import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; import static org.jetbrains.jet.plugin.refactoring.changeSignature.ChangeSignaturePackage.runChangeSignature; public class JetChangeSignatureHandler implements ChangeSignatureHandler { diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index 6866095f14b..cc316300f68 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -34,15 +34,15 @@ import com.intellij.util.containers.HashSet; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.FunctionDescriptorImpl; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.FunctionDescriptorImpl; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.RefactoringPackage; import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.*; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetMethodDescriptor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetMethodDescriptor.kt index 57196b9f847..dc6c4ec5364 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetMethodDescriptor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetMethodDescriptor.kt @@ -19,10 +19,10 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature import com.intellij.psi.PsiElement import com.intellij.refactoring.changeSignature.MethodDescriptor import com.intellij.usageView.UsageInfo -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.Visibility +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers public trait JetMethodDescriptor : MethodDescriptor { @@ -38,4 +38,4 @@ val JetMethodDescriptor.isConstructor: Boolean get() = baseDescriptor is ConstructorDescriptor fun JetMethodDescriptor.renderOriginalReturnType(): String = - baseDescriptor.getReturnType()?.let { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) } ?: "" \ No newline at end of file + baseDescriptor.getReturnType()?.let { IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES.renderType(it) } ?: "" diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt index 875ad8de158..3b48e71b32f 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt @@ -19,11 +19,11 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature import com.intellij.lang.ASTNode import com.intellij.refactoring.changeSignature.ParameterInfo import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetModifierList diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/typeUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/typeUtils.kt index ffd880c8945..71fe317397c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/typeUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/typeUtils.kt @@ -16,18 +16,18 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.types.TypeSubstitutor -import org.jetbrains.jet.lang.types.TypeConstructor -import org.jetbrains.jet.lang.types.TypeProjection +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.types.TypeConstructor +import org.jetbrains.kotlin.types.TypeProjection import java.util.LinkedHashMap -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.types.checker.TypeCheckingProcedure -import org.jetbrains.jet.lang.types.TypeProjectionImpl +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.types.checker.TypeCheckingProcedure +import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers -import org.jetbrains.jet.lang.types.Variance +import org.jetbrains.kotlin.types.Variance private fun getTypeSubstitution(baseType: JetType, derivedType: JetType): LinkedHashMap? { val substitutedType = TypeCheckingProcedure.findCorrespondingSupertype(derivedType, baseType) ?: return null @@ -74,4 +74,4 @@ fun JetType.renderTypeWithSubstitution(substitutor: TypeSubstitutor?, defaultTex val newType = substitutor?.substitute(this, Variance.INVARIANT) ?: return defaultText val renderer = if (inArgumentPosition) IdeDescriptorRenderers.SOURCE_CODE_FOR_TYPE_ARGUMENTS else IdeDescriptorRenderers.SOURCE_CODE return renderer.renderType(newType) -} \ No newline at end of file +} diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt index 04f60d6b75f..ce32fab55b4 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JavaMethodKotlinUsageWithDelegate.kt @@ -22,7 +22,7 @@ import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeInfo import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFunction -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor public abstract class JavaMethodKotlinUsageWithDelegate( val psiElement: T, 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 3e401c9fee6..a77810b9b8e 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 @@ -26,15 +26,15 @@ import kotlin.KotlinPackage; import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.psi.*; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/KotlinSAMUsage.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/KotlinSAMUsage.kt index 4b26b086a06..bb525b137fe 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/KotlinSAMUsage.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/KotlinSAMUsage.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.refactoring.changeSignature.usages import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.psi.JetFunctionLiteral -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.types.JetType public class KotlinSAMUsage( val functionLiteral: JetFunctionLiteral, 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 879f567d664..c5a5ae5d156 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetElement @@ -25,7 +25,7 @@ import com.intellij.util.containers.MultiMap import com.intellij.psi.PsiElement import org.jetbrains.kotlin.psi.JetThisExpression import org.jetbrains.jet.plugin.references.JetSimpleNameReference -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.plugin.references.JetSimpleNameReference.ShorteningMode import org.jetbrains.kotlin.psi.psiUtil.replaced import org.jetbrains.kotlin.psi.JetQualifiedExpression @@ -34,32 +34,32 @@ import org.jetbrains.kotlin.psi.JetTypeConstraint import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.Status import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle import org.jetbrains.jet.plugin.refactoring.extractFunction.AnalysisResult.ErrorMessage -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetDeclaration import com.intellij.openapi.util.text.StringUtil import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetNamedDeclaration -import org.jetbrains.jet.lang.resolve.name.Name -import org.jetbrains.jet.lang.types.CommonSupertypes -import org.jetbrains.jet.lang.types.TypeSubstitutor -import org.jetbrains.jet.lang.types.JetTypeImpl -import org.jetbrains.jet.lang.descriptors.annotations.Annotations +import org.jetbrains.kotlin.name.Name +import org.jetbrains.kotlin.types.CommonSupertypes +import org.jetbrains.kotlin.types.TypeSubstitutor +import org.jetbrains.kotlin.types.JetTypeImpl +import org.jetbrains.kotlin.descriptors.annotations.Annotations import java.util.Collections -import org.jetbrains.jet.lang.types.TypeProjectionImpl -import org.jetbrains.jet.lang.types.Variance -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.types.TypeProjection -import org.jetbrains.jet.lang.types.TypeConstructor +import org.jetbrains.kotlin.types.TypeProjectionImpl +import org.jetbrains.kotlin.types.Variance +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.types.TypeProjection +import org.jetbrains.kotlin.types.TypeConstructor import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ExpressionValue import org.jetbrains.kotlin.psi.JetReturnExpression import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Jump -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import kotlin.properties.Delegates import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.psi.JetCallElement diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt index af444f5ee9b..c69bc85aa73 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.project.Project @@ -37,15 +37,15 @@ import org.jetbrains.kotlin.psi.psiUtil.isInsideOf import java.util.ArrayList import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.psi.JetSuperExpression -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver -import org.jetbrains.jet.lang.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.psi.JetUserType import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetClassInitializer 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 98379d82c64..08c99e8beae 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt @@ -17,9 +17,9 @@ package org.jetbrains.jet.plugin.refactoring.extractFunction import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.types.* +import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle import org.jetbrains.kotlin.psi.psiUtil.isInsideOf import java.util.* @@ -37,7 +37,7 @@ import org.jetbrains.jet.plugin.refactoring.JetNameValidatorImpl import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.plugin.imports.canBeReferencedViaImport import com.intellij.psi.PsiNamedElement -import org.jetbrains.jet.lang.descriptors.impl.LocalVariableDescriptor +import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor import org.jetbrains.kotlin.utils.DFS import org.jetbrains.kotlin.utils.DFS.* import com.intellij.refactoring.util.RefactoringUIUtil diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinParameterTablePanel.java b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinParameterTablePanel.java index 9a283ae3a24..ab2c3e8a6e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinParameterTablePanel.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ui/KotlinParameterTablePanel.java @@ -30,7 +30,7 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.refactoring.JetNameSuggester; import org.jetbrains.jet.plugin.refactoring.extractFunction.Parameter; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java index e68bd1e9e36..3554fc24c40 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java @@ -45,9 +45,9 @@ import com.intellij.util.Function; import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory; import org.jetbrains.jet.lang.diagnostics.Errors; @@ -56,8 +56,8 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.lazy.BodyResolveMode; -import org.jetbrains.jet.lang.types.ErrorUtils; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java index 3a189bff845..71e93e14b91 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java @@ -38,7 +38,7 @@ import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.kotlin.psi.JetTypeReference; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.intentions.SpecifyTypeExplicitlyAction; import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers; 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 be79ce90c24..1db9f047412 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 @@ -44,9 +44,9 @@ import org.jetbrains.jet.lang.resolve.ObservableBindingTrace; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.jet.lang.resolve.calls.smartcasts.DataFlowInfo; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index 04eeae82f72..4e45640ffbe 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -58,7 +58,7 @@ import com.intellij.psi.PsiDocumentManager import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.psi.psiUtil.isAncestor import com.intellij.psi.PsiNamedElement -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.openapi.util.text.StringUtil import javax.swing.Icon @@ -66,8 +66,8 @@ import org.jetbrains.jet.plugin.util.string.collapseSpaces import org.jetbrains.kotlin.asJava.KotlinLightMethod import com.intellij.psi.PsiMethod import org.jetbrains.jet.plugin.caches.resolve.analyze -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.jet.lang.resolve.OverridingUtil import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt index 95a3b6479c2..7b2070ceb2c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt @@ -25,7 +25,7 @@ import com.intellij.openapi.roots.JavaProjectRootsUtil import com.intellij.psi.PsiCompiledElement import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetNamedDeclaration -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.plugin.references.JetSimpleNameReference import org.jetbrains.kotlin.psi.psiUtil.getPackage import org.jetbrains.jet.plugin.refactoring.move.PackageNameInfo diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt index 6b6c8cc8584..b5a9052ac59 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/KotlinMoveTarget.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.JetFile import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.openapi.project.Project import kotlin.properties.Delegates diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java index 343f0b4be9e..985c73a0dce 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/ui/MoveKotlinTopLevelDeclarationsDialog.java @@ -82,7 +82,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedDeclaration; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.refactoring.JetRefactoringBundle; import org.jetbrains.jet.plugin.refactoring.RefactoringPackage; import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.*; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt index b59b3c2fbbd..100a5f4e358 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt @@ -20,9 +20,9 @@ import org.jetbrains.jet.plugin.codeInsight.JetFileReferencesResolver import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.jet.plugin.references.JetSimpleNameReference -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.plugin.JetFileType @@ -30,10 +30,10 @@ import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.kotlin.psi.psiUtil.isAncestor import java.util.Collections -import org.jetbrains.jet.lang.resolve.name.isImported -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor +import org.jetbrains.kotlin.name.isImported +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.psi.psiUtil.isExtensionDeclaration import com.intellij.psi.PsiElement @@ -56,9 +56,9 @@ import com.intellij.util.IncorrectOperationException import com.intellij.psi.PsiFile import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor.Kind +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector public class PackageNameInfo(val oldPackageName: FqName, val newPackageName: FqName) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt index f0e8022c037..58f08e7550e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -28,7 +28,7 @@ import com.intellij.psi.SyntheticElement import com.intellij.refactoring.util.RefactoringUtil import com.intellij.refactoring.rename.RenameProcessor import org.jetbrains.kotlin.codegen.PropertyCodegen -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import com.intellij.usageView.UsageInfo import com.intellij.refactoring.listeners.RefactoringElementListener import com.intellij.openapi.editor.Editor @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.openapi.ui.Messages -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.jet.lang.resolve.OverrideResolver import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java index d642896ee76..d0b0833df4d 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java @@ -33,9 +33,9 @@ import com.intellij.usages.UsageViewPresentation; import com.intellij.usages.impl.UsagePreviewPanel; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetProperty; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt index f4164e9b26d..3425ed8d881 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -33,8 +33,8 @@ import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceJavaDele import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.asJava.* -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.descriptors.Modality +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.kotlin.lexer.JetTokens diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index 79eaf910454..2f86ee27e49 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java @@ -44,8 +44,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionFqnNameIndex; diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java index 0b150084c9c..7fc397635e1 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfigurationProducer.java @@ -31,10 +31,10 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; 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/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java index 24e7974240c..a34653487cb 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java @@ -33,8 +33,8 @@ import com.intellij.psi.util.PsiUtilCore; import com.intellij.util.Processor; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.psi.JetAnnotationEntry; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; diff --git a/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java b/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java index 087d05471e7..31b1cde7334 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/util/JetPsiHeuristicsUtil.java @@ -21,8 +21,8 @@ import com.intellij.psi.PsiModifier; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.lang.resolve.name.NamePackage; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.NamePackage; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; diff --git a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt index 24a6d787ac5..8829ce0ea48 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt +++ b/idea/src/org/jetbrains/jet/plugin/util/psi/patternMatching/JetPsiUnifier.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.util.psi.patternMatching -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.* import org.jetbrains.jet.plugin.util.psi.patternMatching.UnificationResult.Status.* import java.util.HashMap @@ -25,9 +25,9 @@ import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.psi.PsiElement import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import com.intellij.util.containers.ContainerUtil -import org.jetbrains.jet.lang.types.checker.JetTypeChecker +import org.jetbrains.kotlin.types.checker.JetTypeChecker import java.util.Collections import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.kotlin.psi.Call @@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver import com.intellij.psi.impl.source.tree.LeafPsiElement import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetTypeReference -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.psi.ValueArgument import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind import org.jetbrains.kotlin.psi.JetIfExpression @@ -48,12 +48,12 @@ import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.kotlin.lexer.JetToken -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.psi.JetLabelReferenceExpression import org.jetbrains.jet.lang.resolve.calls.callUtil.getCall import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.types.ErrorUtils +import org.jetbrains.kotlin.types.ErrorUtils import com.intellij.lang.ASTNode import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.psi.JetCallableReferenceExpression @@ -64,21 +64,21 @@ import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Empty import org.jetbrains.kotlin.psi.JetMultiDeclaration import org.jetbrains.kotlin.psi.JetFunction import org.jetbrains.kotlin.psi.JetClassBody -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.psi.JetDeclarationWithBody -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import org.jetbrains.kotlin.psi.JetWithExpressionInitializer import org.jetbrains.kotlin.psi.JetParameter -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.psi.JetClassObject import org.jetbrains.kotlin.psi.JetTypeParameter -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetClass -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetClassInitializer import org.jetbrains.kotlin.psi.JetTypeParameterListOwner diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java index da8b9611b86..9860551afb5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java @@ -32,8 +32,8 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.OverrideResolver; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java index e6df4e9ba83..ff5c2c8ccf0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.MockLibraryUtil; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; import org.jetbrains.jet.testing.ConfigLibraryUtil; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index 152620a3f11..849337b8ca0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.application.ApplicationManager -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.InTextDirectivesUtils import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.jet.plugin.caches.resolve.analyzeFully diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt index 722c183216a..5a470f0d956 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubConsistencyTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.lang.resolve.java.PackageClassUtils import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileFinderFactory import com.intellij.psi.search.GlobalSearchScope 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 b0538e8a1a1..05cf175d84b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -18,20 +18,20 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.junit.Assert import org.jetbrains.jet.plugin.PluginTestCaseBase 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.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor 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 +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.java.TopDownAnalyzerFacadeForJVM import org.jetbrains.jet.lang.resolve.BindingTraceContext -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.jet.lang.resolve.MemberComparator import org.jetbrains.jet.lang.resolve.descriptorUtil.module import org.jetbrains.jet.context.GlobalContext diff --git a/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java b/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java index a30a7ac6e66..da9861449bf 100644 --- a/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java @@ -30,7 +30,7 @@ import com.intellij.refactoring.MultiFileTestCase; import com.intellij.testFramework.PsiTestUtil; import kotlin.Function1; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java index d0c92794aa6..355f603bf02 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsOnFlyTest.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; public class OptimizeImportsOnFlyTest extends LightDaemonAnalyzerTestCase { diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java index 7b1a39f3d01..b337ecc9853 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/AbstractFunctionParameterInfoTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.parameterInfo; import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetValueArgumentList; import org.jetbrains.kotlin.lexer.JetTokens; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java index 44c726522ea..f2ca402dc5e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/ImportClassHelperTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.codeInsight.daemon.LightDaemonAnalyzerTestCase; import com.intellij.openapi.application.ApplicationManager; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; import java.io.IOException; 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 32796c6d387..6ee07f0899d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java @@ -33,8 +33,8 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.VisibilityUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.Visibilities; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt index 9a3bd7d59f9..004da42bccd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt @@ -37,12 +37,12 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.module.Module import org.jetbrains.jet.lang.resolve.BindingContext import java.util.Collections -import org.jetbrains.jet.lang.resolve.name.Name +import org.jetbrains.kotlin.name.Name import org.jetbrains.jet.lang.resolve.BindingContextUtils -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe -import org.jetbrains.jet.lang.resolve.name.isSubpackageOf +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.name.FqNameUnsafe +import org.jetbrains.kotlin.name.isSubpackageOf import org.jetbrains.jet.getString import org.jetbrains.jet.getNullableString import org.jetbrains.jet.plugin.search.allScope diff --git a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java index 82a8304c942..9a74ae08739 100644 --- a/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolverTest.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.references; import com.intellij.psi.*; 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.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java index 391f6b8f541..136cf05b809 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java @@ -25,10 +25,10 @@ import com.intellij.util.Consumer; import kotlin.Function0; import kotlin.Unit; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java index d9c841829a7..099d1bd4b8d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder; -import org.jetbrains.jet.lang.resolve.name.SpecialNames; +import org.jetbrains.kotlin.name.SpecialNames; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java index e66d0bd127f..7344747b67d 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetClassInitializer; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetPsiUtil; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt index a75168b4bb7..108ac56580b 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt @@ -23,15 +23,15 @@ import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.JetTestCaseBuilder import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.HashSet import org.jetbrains.jet.JetTestUtils import java.io.File import org.jetbrains.kotlin.psi.JetBlockExpression import org.junit.Assert -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.psiUtil.parents diff --git a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java index c06d4ddd96a..36b1e9dedaa 100644 --- a/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java +++ b/idea/tests/org/jetbrains/kotlin/asJava/FakeLightClassForPackageTest.java @@ -23,7 +23,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt index 17fc76620c5..18571ed7b22 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Converter.kt @@ -20,7 +20,7 @@ import com.intellij.psi.* import org.jetbrains.kotlin.j2k.ast.* import java.util.* import com.intellij.psi.CommonClassNames.* -import org.jetbrains.jet.lang.types.expressions.OperatorConventions.* +import org.jetbrains.kotlin.types.expressions.OperatorConventions.* import com.intellij.openapi.project.Project import com.intellij.psi.util.PsiMethodUtil import com.intellij.psi.util.PsiTreeUtil @@ -28,14 +28,16 @@ import org.jetbrains.kotlin.j2k.usageProcessing.UsageProcessing import org.jetbrains.kotlin.j2k.usageProcessing.FieldToPropertyProcessing import org.jetbrains.kotlin.j2k.usageProcessing.UsageProcessingExpressionConverter -class Converter private(private val elementToConvert: PsiElement, - val settings: ConverterSettings, - val conversionScope: ConversionScope, - val referenceSearcher: ReferenceSearcher, - val resolverForConverter: ResolverForConverter, - private val postProcessor: PostProcessor?, - private val commonState: Converter.CommonState, - private val personalState: Converter.PersonalState) { +class Converter private( + private val elementToConvert: PsiElement, + val settings: ConverterSettings, + val conversionScope: ConversionScope, + val referenceSearcher: ReferenceSearcher, + val resolverForConverter: ResolverForConverter, + private val postProcessor: PostProcessor?, + private val commonState: Converter.CommonState, + private val personalState: Converter.PersonalState +) { // state which is shared between all converter's based on this one private class CommonState(val usageProcessingsCollector: (UsageProcessing) -> Unit) { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt index a2779e14aaf..ebc9fa3f523 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ExpressionConverter.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.j2k import com.intellij.psi.* import com.intellij.psi.tree.IElementType import org.jetbrains.kotlin.j2k.ast.* -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import com.intellij.psi.CommonClassNames.* import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.builtins.PrimitiveType @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.lang.resolve.java.JvmPrimitiveType -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.asJava.KotlinLightField import org.jetbrains.kotlin.psi.JetObjectDeclaration import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ResolverForConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/ResolverForConverter.kt index ee696e9b4bb..4e2795df619 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ResolverForConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ResolverForConverter.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.j2k import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor public trait ResolverForConverter { public fun resolveToDescriptor(declaration: JetDeclaration): DeclarationDescriptor? diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt index 7e0a0f20976..a4ecb6ae005 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt @@ -33,9 +33,9 @@ import org.jetbrains.kotlin.j2k.ast.Mutability import java.util.HashSet import org.jetbrains.kotlin.asJava.KotlinLightElement import org.jetbrains.kotlin.psi.JetCallableDeclaration -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor class TypeConverter(val converter: Converter) { public fun convertType(type: PsiType?, nullability: Nullability = Nullability.Default, mutability: Mutability = Mutability.Default): Type { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt index db8e7da0c1a..d8c80b8338b 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/Utils.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.j2k -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import com.intellij.psi.* import com.intellij.psi.util.PsiUtil import org.jetbrains.kotlin.j2k.ast.* diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt index 008662e8891..0badddb3ece 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Expressions.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.j2k.ast -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.j2k.* class ArrayAccessExpression(val expression: Expression, val index: Expression, val lvalue: Boolean) : Expression() { diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt index 6c8d3dabee7..230753ce264 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Imports.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.j2k.ast import com.intellij.psi.PsiImportStatementBase import org.jetbrains.kotlin.j2k.* import com.intellij.psi.PsiImportList -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import com.intellij.psi.PsiJavaCodeReferenceElement import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 50440dc36e5..dd7578f9f1c 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -22,7 +22,7 @@ import com.intellij.util.io.PersistentHashMap import java.io.DataOutput import com.intellij.util.io.IOUtil import java.io.DataInput -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.util.io.DataExternalizer import org.jetbrains.kotlin.serialization.jvm.BitEncoding import java.util.Arrays diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index cca30f8be06..0a7dee9ad5b 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import java.io.File class LocalFileKotlinClass private( diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 10c17122b72..1dc8b222646 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.builders.impl.BuildDataPathsImpl; 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 8ac15883b94..dc3cfa695d8 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.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.resolve.BindingTrace; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.resolve.lazy.declarations.DeclarationProviderFactory; @@ -28,15 +28,15 @@ import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider; -import org.jetbrains.jet.lang.types.DynamicTypesAllowed; +import org.jetbrains.kotlin.types.DynamicTypesAllowed; import org.jetbrains.jet.lang.resolve.AnnotationResolver; import org.jetbrains.jet.lang.resolve.calls.CallResolver; import org.jetbrains.jet.lang.resolve.calls.ArgumentTypeResolver; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingComponents; -import org.jetbrains.jet.lang.types.expressions.ControlStructureTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.types.expressions.ForLoopConventionsChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; +import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; +import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.calls.CallExpressionResolver; import org.jetbrains.jet.lang.resolve.DescriptorResolver; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt index b9b96271d5f..0294226b61c 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/PredefinedAnnotation.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js import kotlin.properties.Delegates -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName public enum class PredefinedAnnotation(fqName: String) { LIBRARY : PredefinedAnnotation("kotlin.js.library") 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 4cdb8d96d28..64bff050c9c 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 @@ -27,13 +27,13 @@ import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageFragmentProvider; -import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentProvider; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; 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.kotlin.name.Name; 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/analyze/suppressWarnings.kt b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt index d349455425d..f2b094955da 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/analyze/suppressWarnings.kt @@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.diagnostics.Severity import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.js.config.LibrarySourcesConfig import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticWithParameters1 import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java index 28ee1319d14..5833d574946 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/Config.java @@ -22,7 +22,7 @@ import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingTrace; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java index c1e10c3afb7..0e7a66900d1 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/config/LibrarySourcesConfigWithCaching.java @@ -27,7 +27,7 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.jet.lang.resolve.BindingContext; 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 5c85c2febd3..aa863eb0425 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 @@ -19,18 +19,18 @@ package org.jetbrains.kotlin.js.resolve import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider import org.jetbrains.jet.lang.resolve.AnnotationChecker import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.jet.lang.diagnostics.DiagnosticSink -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.types.TypeUtils +import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.js.PredefinedAnnotation import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils -import org.jetbrains.jet.lang.descriptors.Visibilities -import org.jetbrains.jet.lang.types.typeUtil.isSubtypeOf +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf public object KotlinJsDeclarationCheckerProvider : AdditionalCheckerProvider { override val annotationCheckers: List = listOf(NativeInvokeChecker(), NativeGetterChecker(), NativeSetterChecker()) diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java index be615020a77..f8aa407c746 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/ErrorsJs.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.diagnostics.Errors; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import java.util.List; diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java index ec2804ec1b2..ae59680dd3b 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/translate/utils/AnnotationsUtils.java @@ -20,13 +20,13 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.js.PredefinedAnnotation; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java index 4b2ba339c7d..cf9e0dd8e5b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.java @@ -32,7 +32,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt index 40af737cd09..e2cfd424d94 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfo.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.js.translate.callTranslator import com.google.dart.compiler.backend.js.ast.JsExpression import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForReceiver diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt index b53c52bb81e..e23380e2595 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallInfoExtensions.kt @@ -16,17 +16,17 @@ package org.jetbrains.kotlin.js.translate.callTranslator -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.kotlin.psi.JetSuperExpression import com.google.dart.compiler.backend.js.ast.JsExpression -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import com.google.dart.compiler.backend.js.ast.JsName import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.translate.context.TranslationContext -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt index 10e8327d0f5..5446fd63505 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/CallTranslator.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.js.translate.callTranslator import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import com.google.dart.compiler.backend.js.ast.JsExpression -import org.jetbrains.jet.lang.descriptors.VariableDescriptor +import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.jet.lang.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.jet.lang.resolve.calls.tasks.ExplicitReceiverKind.* 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 422da443adc..392c2b8c370 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 @@ -21,15 +21,15 @@ import com.google.dart.compiler.backend.js.ast.JsNameRef import com.google.dart.compiler.backend.js.ast.JsInvocation import java.util.ArrayList import org.jetbrains.kotlin.js.translate.context.Namer -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import com.google.dart.compiler.backend.js.ast.JsNew -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor 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 import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibilities import com.intellij.util.SmartList import com.google.dart.compiler.backend.js.ast.JsArrayAccess import org.jetbrains.kotlin.js.translate.utils.JsAstUtils diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt index 1a982aac0df..1e76ca6a77a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/callTranslator/VarialbeCallCases.kt @@ -20,9 +20,9 @@ import com.google.dart.compiler.backend.js.ast.JsExpression import com.google.dart.compiler.backend.js.ast.JsNameRef import com.google.dart.compiler.backend.js.ast.JsLiteral import com.google.dart.compiler.backend.js.ast.JsInvocation -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import java.util.Collections -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure import org.jetbrains.kotlin.js.translate.context.Namer.getCapturedVarAccessor diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java index f7ffc2e7e61..bd1fd4a8d01 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/AliasingContext.java @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import java.util.Collections; 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 5558914800d..2c6c922c5b5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; 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 a9a7c5ebef0..3a6e84c8117 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 @@ -21,10 +21,10 @@ import com.google.dart.compiler.backend.js.ast.JsName; import com.google.dart.compiler.backend.js.ast.JsObjectScope; import org.jetbrains.annotations.NotNull; 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.kotlin.builtins.PrimitiveType; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index 2ad89fa56f1..cafe7ff1ede 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -23,12 +23,12 @@ import com.intellij.psi.PsiElement; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.config.EcmaVersion; import org.jetbrains.kotlin.js.config.LibrarySourcesConfig; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java index 85c0fa9bdb8..cedc2a51823 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/TranslationContext.java @@ -20,15 +20,15 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.MemberDescriptor; -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.MemberDescriptor; +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticSink; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt index 88cbe1c51f1..21ec717d8e1 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.context -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorUtils.isAncestor import com.google.dart.compiler.backend.js.ast.JsName import org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.java index 7db6af958cc..d5cd80ffda9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Generator.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import java.util.List; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Rule.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Rule.java index 587777fb111..27ca4f852c8 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Rule.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/generator/Rule.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.context.generator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; public interface Rule { @Nullable 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 72cf3663a43..efa19fb29e2 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 @@ -19,16 +19,11 @@ package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.kotlin.psi.JetClassOrObject; -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.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; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.translate.context.DefinitionPlace; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; @@ -38,11 +33,15 @@ import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.initializer.ClassInitializerTranslator; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.UtilsPackage; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetParameter; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; import java.util.*; import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.jet.lang.types.TypeUtils.topologicallySortSuperclassesAndRecordAllInstances; import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsFQReference; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getClassDescriptor; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getPropertyDescriptorForConstructorParameter; @@ -51,6 +50,7 @@ import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getSuper import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getPrimaryConstructorParameters; import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction; import static org.jetbrains.kotlin.js.translate.utils.UtilsPackage.generateDelegateCall; +import static org.jetbrains.kotlin.types.TypeUtils.topologicallySortSuperclassesAndRecordAllInstances; /** * Generates a definition of a single class. diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java index f510af568a8..f4dfd6a04e6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DeclarationBodyVisitor.java @@ -22,12 +22,10 @@ import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer; import com.intellij.util.SmartList; import jet.runtime.typeinfo.KotlinSignature; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.Modality; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.Modality; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.PropertyTranslatorPackage; import org.jetbrains.kotlin.js.translate.general.Translation; @@ -35,6 +33,8 @@ import org.jetbrains.kotlin.js.translate.general.TranslatorVisitor; import org.jetbrains.kotlin.js.translate.initializer.ClassInitializerTranslator; import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.types.JetType; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DefineInvocation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DefineInvocation.java index 529edd102ab..af97cde2746 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DefineInvocation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DefineInvocation.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.name.FqName; import java.util.AbstractList; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt index cf93b94ee08..bfc5a583c7f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/DelegationTranslator.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.declaration import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext @@ -27,7 +27,6 @@ import org.jetbrains.kotlin.js.translate.general.Translation import org.jetbrains.kotlin.js.translate.utils.BindingUtils import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.* - import org.jetbrains.jet.lang.resolve.DescriptorUtils import org.jetbrains.kotlin.backend.common.CodegenUtil import java.util.HashMap diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt index 6eca2f471f5..67b4fe6d0c0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/FileDeclaration.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.JetClass import com.google.dart.compiler.backend.js.ast.JsFunction import org.jetbrains.kotlin.js.translate.utils.BindingUtils.* import org.jetbrains.kotlin.js.translate.initializer.InitializerUtils.* -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor import com.intellij.util.SmartList class FileDeclarationVisitor( diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java index 103624d70c1..49c240fa525 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java @@ -18,14 +18,14 @@ package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.backend.common.CodegenUtil; import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.psi.JetParameter; import java.util.ArrayList; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java index 40735fbea8f..da3e800dc41 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.js.translate.declaration; import com.google.dart.compiler.backend.js.ast.*; import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java index 56a79d9289f..66811752736 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageTranslator.java @@ -20,15 +20,15 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor; -import org.jetbrains.kotlin.psi.JetDeclaration; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.js.translate.context.DefinitionPlace; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; import org.jetbrains.kotlin.js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetDeclaration; +import org.jetbrains.kotlin.psi.JetFile; import java.util.List; import java.util.Map; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt index db419cfa8ae..662754b04ca 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.declaration.propertyTranslator import com.google.dart.compiler.backend.js.ast.* import com.intellij.util.SmartList -import org.jetbrains.jet.lang.descriptors.* +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.jet.lang.resolve.BindingContext 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 227e7cc121a..4f30061564f 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 @@ -20,17 +20,17 @@ 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.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java index 6a7d8dcf0a9..0c99372e5b0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/FunctionTranslator.java @@ -25,10 +25,10 @@ import com.google.dart.compiler.backend.js.ast.metadata.MetadataPackage; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.Modality; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.Modality; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetDeclarationWithBody; import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; import org.jetbrains.jet.lang.resolve.DescriptorUtils; 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 ae39cf94af3..f23488f45b5 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 @@ -19,20 +19,20 @@ package org.jetbrains.kotlin.js.translate.expression import com.google.dart.compiler.backend.js.ast.* import com.google.dart.compiler.backend.js.ast.metadata.staticRef import com.google.dart.compiler.backend.js.ast.metadata.isLocal -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.js.translate.context.* import org.jetbrains.kotlin.js.translate.general.AbstractTranslator import org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDescriptor import org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.translateFunctionBody import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction -import org.jetbrains.jet.lang.descriptors.MemberDescriptor -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.MemberDescriptor +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.js.inline.util.getInnerFunction import org.jetbrains.kotlin.builtins.InlineUtil -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor class LiteralFunctionTranslator(context: TranslationContext) : AbstractTranslator(context) { fun translate(declaration: JetDeclarationWithBody): JsExpression { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt index 88586c0efd7..b65535071c3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/LoopTranslator.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js.translate.expression.loopTranslator import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall import org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java index 556e470b02e..2e90a557e3b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/MultiDeclarationTranslator.java @@ -22,8 +22,8 @@ import com.google.dart.compiler.backend.js.ast.JsNameRef; import com.google.dart.compiler.backend.js.ast.JsVars; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.JetMultiDeclaration; import org.jetbrains.kotlin.psi.JetMultiDeclarationEntry; import org.jetbrains.jet.lang.resolve.BindingContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java index e0bb964c178..9cb91709a2d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java @@ -21,11 +21,7 @@ import com.google.dart.compiler.backend.js.ast.JsInvocation; import com.google.dart.compiler.backend.js.ast.JsNameRef; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.JetIsExpression; -import org.jetbrains.kotlin.psi.JetTypeReference; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.general.Translation; @@ -33,6 +29,10 @@ import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredic import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetIsExpression; +import org.jetbrains.kotlin.psi.JetTypeReference; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getTypeByReference; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java index c3c3c3810a5..87ca59b8fa5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/StringTemplateTranslator.java @@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.JetType; 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/general/JetTestFunctionDetector.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java index 60f656ec77c..a585ee30a86 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/JetTestFunctionDetector.java @@ -20,18 +20,18 @@ import com.google.common.collect.Lists; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.Modality; -import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor; -import org.jetbrains.jet.lang.descriptors.annotations.Annotations; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.Modality; +import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import java.util.Collection; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java index 0148dc5135e..784fbd77bb1 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.js.translate.general; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.psi.JetDeclarationWithBody; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java index bffba7d2336..eda11a2b54d 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java @@ -20,16 +20,16 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetDelegationSpecifier; import org.jetbrains.kotlin.psi.JetDelegatorToSuperCall; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java index ac277dbb1a7..be2e0469cf5 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/InitializerUtils.java @@ -19,16 +19,16 @@ package org.jetbrains.kotlin.js.translate.initializer; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.JetObjectDeclaration; -import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator; import org.jetbrains.kotlin.js.translate.general.Translation; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetObjectDeclaration; +import org.jetbrains.kotlin.psi.JetProperty; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java index 4945c966089..ded30f23523 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/FunctionIntrinsics.java @@ -20,7 +20,7 @@ import com.google.common.collect.Lists; import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.*; 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 9edd2deed55..901e46b7b48 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 @@ -21,13 +21,13 @@ import com.google.dart.compiler.backend.js.ast.JsArrayAccess; 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.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; import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate; import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate; +import org.jetbrains.kotlin.name.Name; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java index dfdda30defe..11e390e1ca7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/CompositeFIF.java @@ -23,7 +23,7 @@ import com.google.dart.compiler.backend.js.ast.JsNameRef; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.BuiltInPropertyIntrinsic; 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/FunctionIntrinsicFactory.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java index fa6c76e3bdd..21070f556ac 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/FunctionIntrinsicFactory.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; public interface FunctionIntrinsicFactory { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt index 71de197f814..6b632791a64 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/LongOperationFIF.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor 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/PrimitiveBinaryOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java index 75056f36b93..e412109461c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveBinaryOperationFIF.java @@ -24,10 +24,7 @@ import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate; @@ -35,6 +32,9 @@ import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredic import org.jetbrains.kotlin.js.translate.operation.OperatorTable; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; +import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java index 6ccfdd49d0d..c905b56010a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/PrimitiveUnaryOperationFIF.java @@ -21,10 +21,7 @@ import com.google.common.base.Predicates; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -import org.jetbrains.jet.lang.resolve.name.Name; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic; import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.DescriptorPredicate; @@ -32,6 +29,9 @@ import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredic import org.jetbrains.kotlin.js.translate.operation.OperatorTable; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; +import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.List; 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 09e6ff43519..cd15e322fed 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 @@ -19,16 +19,16 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetQualifiedExpression; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/DescriptorPredicate.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/DescriptorPredicate.java index 765f06d1c28..258cf9ce8e1 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/DescriptorPredicate.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/DescriptorPredicate.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns; import com.google.common.base.Predicate; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; public interface DescriptorPredicate extends Predicate { @Override 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 b3ca1c222d6..b3c786c1c6b 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 @@ -23,8 +23,8 @@ import com.intellij.util.Function; 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.kotlin.builtins.PrimitiveType; +import org.jetbrains.kotlin.name.Name; import java.util.Arrays; import java.util.Collection; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/PatternBuilder.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/PatternBuilder.java index 5fcf41c9799..dbc7b0739e0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/PatternBuilder.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/patterns/PatternBuilder.java @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt index 32413a5585b..78fffaabd79 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/CompareToBOIF.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.common.collect.ImmutableSet import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt index a0444aafdab..3f0b853bc97 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/EqualsBOIF.kt @@ -17,9 +17,9 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.TopLevelFIF import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.lexer.JetTokens import com.google.common.collect.ImmutableSet import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.PatternBuilder.pattern import org.jetbrains.jet.lang.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.types.isDynamic +import org.jetbrains.kotlin.types.isDynamic object EqualsBOIF : BinaryOperationIntrinsicFactory { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt index c7aa85d288c..2ff8a5c6e2e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/LongCompareToBOIF.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation import com.google.common.collect.ImmutableSet import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.lang.types.expressions.OperatorConventions +import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt index 9d82ff3b9de..3818012e6cb 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/operation/binaryOperationIntrinsics.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.js.translate.intrinsic.operation -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.lexer.JetToken import org.jetbrains.kotlin.js.translate.context.TranslationContext diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java index 051ed4f2d6c..5959a142d5a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/AssignmentTranslator.java @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsBlock; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java index 12723e95fa5..b21c7b2de21 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/BinaryOperationTranslator.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java index 62fbcd876b2..5b423f7d12e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/CompareToTranslator.java @@ -21,12 +21,12 @@ import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; -import org.jetbrains.kotlin.psi.JetBinaryExpression; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java index db0b6c85dd0..245e114a1b3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java @@ -23,11 +23,11 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.util.AstUtil; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetUnaryExpression; import org.jetbrains.jet.lang.resolve.calls.tasks.TasksPackage; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java index 7983d23bfa3..a5a0bc6b37e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IntrinsicAssignmentTranslator.java @@ -20,11 +20,11 @@ import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; import com.google.dart.compiler.backend.js.ast.JsBinaryOperator; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; -import org.jetbrains.kotlin.lexer.JetToken; -import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.isAssignment; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java index 0b90e43f73e..cd8fcc9ee52 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetBinaryExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java index 45c340e0d47..53e52270669 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.operation; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetUnaryExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java index b59b59e5d1b..aec5cecd6eb 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/UnaryOperationTranslator.java @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.JsBinaryOperation; import com.google.dart.compiler.backend.js.ast.JsExpression; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetConstantExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetUnaryExpression; @@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.types.JetType; +import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetTokens; 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/reference/AbstractCallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java index 55a21a3346c..8f1d81dbe06 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetCallExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java index 46705df6783..ea8b674cd83 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ArrayAccessTranslator.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetArrayAccessExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.ValueArgument; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java index ff318bb6a5f..4d619e0b84b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/BackingFieldAccessTranslator.java @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor; -import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import java.util.Collections; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java index 076ae898b91..6fd88483c42 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallArgumentTranslator.java @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.jet.lang.resolve.calls.model.*; 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 80e8dd67889..dd25158e430 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 @@ -27,7 +27,7 @@ import com.google.gwt.dev.js.rhino.EvaluatorException; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.jet.lang.diagnostics.DiagnosticFactory2; import org.jetbrains.jet.lang.diagnostics.ParametrizedDiagnostic; import org.jetbrains.kotlin.psi.JetCallExpression; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt index ec120766096..2534fff7a4c 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallableReferenceTranslator.kt @@ -17,21 +17,21 @@ package org.jetbrains.kotlin.js.translate.reference import com.google.dart.compiler.backend.js.ast.JsExpression -import org.jetbrains.jet.lang.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils -import org.jetbrains.jet.lang.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor import com.google.dart.compiler.backend.js.ast.JsInvocation -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.kotlin.psi.JetCallableReferenceExpression import org.jetbrains.kotlin.js.translate.utils.BindingUtils -import org.jetbrains.jet.lang.descriptors.ConstructorDescriptor -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.ConstructorDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import com.google.dart.compiler.backend.js.ast.JsLiteral import java.util.ArrayList -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.lang.resolve.DescriptorUtils object CallableReferenceTranslator { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java index dcea3a4b3b2..f60d5ef7ea7 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ClassObjectAccessTranslator.java @@ -18,15 +18,15 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.kotlin.psi.JetReferenceExpression; -import org.jetbrains.kotlin.psi.JetSimpleNameExpression; -import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; +import org.jetbrains.kotlin.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import java.util.Collections; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java index 128c8faec54..f85de5cde12 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/QualifiedExpressionTranslator.java @@ -20,8 +20,8 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java index 949612d2b0d..d22c536b8ef 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceAccessTranslator.java @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; -import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import java.util.Collections; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java index 114540a6b1c..df5f3054f03 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/ReferenceTranslator.java @@ -19,18 +19,18 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.JetQualifiedExpression; -import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.BindingUtils; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetQualifiedExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; -import static org.jetbrains.kotlin.psi.JetPsiUtil.isBackingFieldReference; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.setQualifier; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getSelectorAsSimpleName; +import static org.jetbrains.kotlin.psi.JetPsiUtil.isBackingFieldReference; public final class ReferenceTranslator { diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java index 7b556b18971..8579062e78e 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.reference; import com.google.dart.compiler.backend.js.ast.JsExpression; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.VariableDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.JetReferenceExpression; import org.jetbrains.jet.lang.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java index 3f6c5816080..0ee985d41b9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/test/JSTestGenerator.java @@ -20,8 +20,8 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import com.google.dart.compiler.backend.js.ast.JsNew; import com.google.dart.compiler.backend.js.ast.JsStringLiteral; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java index decbdc0afd5..e6c08aee5c3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/BindingUtils.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.utils; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContextUtils; @@ -28,8 +28,8 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.jet.lang.resolve.calls.model.ResolvedCall; import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; -import org.jetbrains.jet.lang.types.JetType; -import org.jetbrains.jet.lang.types.TypeUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java index 516d905b96c..d8f2e1710bc 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ErrorReportingUtils.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.utils; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.JetExpression; 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 f11b2a75a93..1d05bcc82d0 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 @@ -18,16 +18,16 @@ package org.jetbrains.kotlin.js.translate.utils; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor; -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.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.general.Translation; import org.jetbrains.kotlin.js.translate.utils.mutator.Mutator; +import org.jetbrains.kotlin.psi.JetDeclarationWithBody; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.types.JetType; import java.util.ArrayList; import java.util.List; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java index c3293d82e22..aa9ed46d8f6 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/JsAstUtils.java @@ -20,9 +20,9 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.types.expressions.OperatorConventions; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.Arrays; import java.util.Collections; 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 7831a98e138..d5c6b61c0e6 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 @@ -20,15 +20,15 @@ import com.intellij.openapi.util.Condition; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.name.Name; +import org.jetbrains.kotlin.name.Name; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java index 5c38a6b4144..7c9269a5a9b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/ManglingUtils.java @@ -20,10 +20,10 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.descriptors.*; +import org.jetbrains.kotlin.descriptors.*; 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.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.kotlin.backend.common.CodegenUtil; 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 7ea98ad1250..2a7b7cc5a11 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 @@ -21,12 +21,12 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.descriptors.*; -import org.jetbrains.jet.lang.descriptors.impl.AnonymousFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; 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.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.js.translate.context.TemporaryConstVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt index cb4deb630ca..adddd6aa9ba 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/utils.kt @@ -22,7 +22,7 @@ import com.google.dart.compiler.backend.js.ast.JsNameRef import com.google.dart.compiler.backend.js.ast.JsParameter import com.google.dart.compiler.backend.js.ast.JsPropertyInitializer import com.intellij.util.SmartList -import org.jetbrains.jet.lang.descriptors.FunctionDescriptor +import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.js.translate.context.Namer import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.simpleReturnFunction diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index 411440bd9b0..31e2022ff25 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -19,20 +19,15 @@ import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import com.intellij.openapi.util.Disposer import org.jetbrains.jet.config.CompilerConfiguration -import org.jetbrains.jet.lang.resolve.name.FqName -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptorWithVisibility -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.descriptors.* import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.PackageViewDescriptor import java.util.ArrayList import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.renderer.DescriptorRenderer import kotlin.test.fail import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import java.util.HashSet import org.jetbrains.jet.config.CommonConfigurationKeys import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys diff --git a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt index 20e53255f14..f3e05dc8fcc 100644 --- a/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt +++ b/libraries/tools/kdoc/src/main/kotlin/org/jetbrains/kotlin/doc/model/KotlinModel.kt @@ -7,22 +7,22 @@ import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiElement import com.intellij.psi.PsiFile import com.intellij.psi.PsiFileSystemItem -import org.jetbrains.jet.lang.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.descriptors.ClassKind -import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor -import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.descriptors.Visibilities +import org.jetbrains.kotlin.descriptors.CallableDescriptor +import org.jetbrains.kotlin.descriptors.ClassDescriptor +import org.jetbrains.kotlin.descriptors.ClassKind +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor +import org.jetbrains.kotlin.descriptors.ModuleDescriptor +import org.jetbrains.kotlin.descriptors.PropertyDescriptor +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor +import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils import org.jetbrains.jet.lang.diagnostics.DiagnosticUtils.LineAndColumn import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.lang.resolve.BindingContext import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.types.JetType +import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.doc.* import org.jetbrains.kotlin.doc.highlighter.SyntaxHighlighter @@ -32,7 +32,7 @@ import org.pegdown.LinkRenderer import org.pegdown.LinkRenderer.Rendering import org.pegdown.PegDownProcessor import org.pegdown.ast.WikiLinkNode -import org.jetbrains.jet.lang.descriptors.PackageFragmentDescriptor +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor /** * Returns the collection of functions with duplicate function names filtered out