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 bbd46c48c67..d8bee3d0e1c 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 @@ -24,8 +24,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; 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 92e29776007..7e6648d7b63 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 @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.types.JetType import kotlin.platform.platformStatic 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 org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.MemberComparator import java.util.Comparator import org.jetbrains.kotlin.types.isDynamic 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 83330a59dea..2e643bd9fb5 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 @@ -22,9 +22,9 @@ 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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 a56791cbbe0..88aba59025d 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 @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.backend.common.bridges import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.resolve.OverrideResolver +import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.OverrideResolver import org.jetbrains.kotlin.resolve.calls.CallResolverUtil import org.jetbrains.kotlin.types.TypeUtils diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java index 42b3bd9345c..141b3c12cde 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java @@ -21,9 +21,9 @@ 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.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.types.JetType; import java.util.ArrayList; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java index 636ae49efcd..9d0f31093cd 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForPropertyDescriptor.java @@ -24,8 +24,8 @@ 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.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.DescriptorUtils; 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 a6d6e5a7432..61d74caaf44 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -18,20 +18,20 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; 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.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.constants.*; +import org.jetbrains.kotlin.resolve.constants.StringValue; 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.*; import java.lang.annotation.Retention; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index fca95ccc032..9d0031157f1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -24,6 +24,8 @@ import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.context.CodegenContext; @@ -31,26 +33,24 @@ import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.load.java.JavaVisibilities; import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.resolve.jvm.JvmClassName; -import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.resolve.jvm.*; import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; -import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; 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; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.Method; @@ -61,10 +61,10 @@ import java.util.Map; import java.util.Set; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.ABI_VERSION_FIELD_NAME; import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.resolve.jvm.types.PrimitiveTypesUtil.asmTypeForPrimitive; import static org.jetbrains.kotlin.types.TypeUtils.isNullableType; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java index 0c2130d67ce..9933c26c351 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; import org.jetbrains.kotlin.codegen.context.ClassContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.descriptors.ClassDescriptor; @@ -25,9 +26,8 @@ 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; -import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import java.util.Collections; import java.util.List; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 5ed92c5b6de..9da3fe94ab0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -22,6 +22,7 @@ import kotlin.Function1; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; import org.jetbrains.kotlin.codegen.context.ClassContext; import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; @@ -29,14 +30,13 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; 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.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.JetElement; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; 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; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt index 3c258e3b63c..215fffa84f3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/CollectionStubMethodGenerator.kt @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.types.* -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.resolve.OverrideResolver -import org.jetbrains.jet.lang.resolve.OverridingUtil +import org.jetbrains.kotlin.resolve.OverrideResolver +import org.jetbrains.kotlin.resolve.OverridingUtil import java.util.LinkedHashSet import org.jetbrains.kotlin.name.Name import java.util.ArrayList diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java index 0aeac959461..1d398ecb68e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueLoader.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetParameter; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; public interface DefaultParameterValueLoader { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index 5b2431f82b6..5cdf454a519 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -30,6 +30,8 @@ import kotlin.KotlinPackage; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.backend.common.CodegenUtil; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.context.*; @@ -43,34 +45,32 @@ import org.jetbrains.kotlin.codegen.when.SwitchCodegen; import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; -import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; +import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.name.Name; 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.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; -import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; -import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant; +import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.receivers.*; +import org.jetbrains.kotlin.resolve.scopes.receivers.*; 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; -import org.jetbrains.kotlin.backend.common.CodegenUtil; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; @@ -83,17 +83,17 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*; +import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; -import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull; -import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure; +import static org.jetbrains.kotlin.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContextUtils.getNotNull; +import static org.jetbrains.kotlin.resolve.BindingContextUtils.isVarCapturedInClosure; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCallWithAssert; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; -import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.TraitImpl; -import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; +import static org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; import static org.jetbrains.org.objectweb.asm.Opcodes.ACC_PRIVATE; public class ExpressionCodegen extends JetVisitor implements LocalLookup { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java index 2491688e355..b35d29758db 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FieldInfo.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassKind; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.org.objectweb.asm.Type; public class FieldInfo { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index cffaa017749..3489bcefc1f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -24,6 +24,9 @@ import com.intellij.util.containers.ContainerUtil; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +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.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.context.CodegenContext; import org.jetbrains.kotlin.codegen.context.MethodContext; @@ -34,26 +37,23 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeDeclarationsPackage; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetClassOrObject; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; -import org.jetbrains.jet.lang.resolve.constants.ArrayValue; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.JavaClassValue; +import org.jetbrains.kotlin.resolve.constants.ArrayValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.JavaClassValue; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; -import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeDeclarationsPackage; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.Approximation; import org.jetbrains.kotlin.types.TypesPackage; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.backend.common.bridges.Bridge; -import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; @@ -70,11 +70,11 @@ 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.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; -import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.OLD_JET_VALUE_PARAMETER_ANNOTATION; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.callableDescriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isFunctionLiteral; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isTrait; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.Synthetic; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 1dc436625e7..3f66252c43a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -23,44 +23,44 @@ import com.intellij.util.ArrayUtil; import kotlin.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.backend.common.CodegenUtil; +import org.jetbrains.kotlin.backend.common.CodegenUtilKt; +import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -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.kotlin.descriptors.*; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DeclarationResolver; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DeclarationResolver; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VarargValueArgument; -import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.load.java.JvmAnnotationNames; -import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmClassSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; -import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.serialization.ClassData; +import org.jetbrains.kotlin.serialization.DescriptorSerializer; +import org.jetbrains.kotlin.serialization.ProtoBuf; +import org.jetbrains.kotlin.serialization.jvm.BitEncoding; 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; -import org.jetbrains.kotlin.backend.common.CodegenUtilKt; -import org.jetbrains.kotlin.backend.common.DataClassMethodGenerator; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.Method; @@ -70,14 +70,14 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*; -import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.classDescriptorToDeclaration; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.classDescriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; +import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver; import static org.jetbrains.kotlin.types.Variance.INVARIANT; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 453ad7c389f..b0c5e694b09 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -28,16 +28,16 @@ import org.jetbrains.kotlin.codegen.context.CodegenContext; 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.kotlin.descriptors.*; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilPackage; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaPackageFragment; import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass; import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilPackage; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.kotlin.types.JetType; import java.io.File; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java index a6687fe46da..fd373447f46 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java @@ -17,20 +17,20 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.reflect.ReflectionTypes; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; 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.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; +import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java index 6977c5e2e65..90a09bf38db 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/KotlinCodegenFacade.java @@ -20,10 +20,10 @@ import com.google.common.collect.Sets; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.state.GenerationState; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetScript; -import org.jetbrains.jet.lang.resolve.ScriptNameUtil; -import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.ScriptNameUtil; 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 1957a6a90da..beea4393474 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -30,18 +30,18 @@ import org.jetbrains.kotlin.codegen.state.GenerationState; 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.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.SpecialNames; -import org.jetbrains.kotlin.types.ErrorUtils; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.types.ErrorUtils; +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; @@ -54,7 +54,7 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.SYNTHESIZED; import static org.jetbrains.kotlin.descriptors.SourceElement.NO_SOURCE; -import static org.jetbrains.jet.lang.resolve.BindingContext.VARIABLE; +import static org.jetbrains.kotlin.resolve.BindingContext.VARIABLE; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.TraitImpl; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java index 79e08d538bc..5d839c845d8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegen.java @@ -34,28 +34,28 @@ import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.context.PackageContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.config.IncrementalCompilation; -import org.jetbrains.kotlin.serialization.jvm.BitEncoding; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; +import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.MemberComparator; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.serialization.DescriptorSerializer; import org.jetbrains.kotlin.serialization.PackageData; 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.kotlin.descriptors.CallableMemberDescriptor; -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; -import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.MemberComparator; -import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.load.java.JvmAnnotationNames; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; -import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.serialization.jvm.BitEncoding; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; @@ -66,12 +66,12 @@ import java.util.*; import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses; import static org.jetbrains.kotlin.codegen.AsmUtil.method; -import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver; +import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.K_PACKAGE_IMPL_TYPE; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType; -import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; +import static org.jetbrains.kotlin.serialization.NameSerializationUtil.createNameResolver; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class PackageCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ParentCodegenAware.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ParentCodegenAware.java index c9493e1fd32..c760510fe02 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ParentCodegenAware.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ParentCodegenAware.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; public class ParentCodegenAware { protected final GenerationState state; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index bdd8bff66e0..7cc38149cbe 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -24,16 +24,16 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.descriptors.*; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorFactory; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorFactory; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.FieldVisitor; @@ -49,8 +49,8 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.getParentBodyCodegen; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface; import static org.jetbrains.kotlin.codegen.JvmSerializationBindings.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isClassObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isTrait; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.PROPERTY_METADATA_TYPE; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java index de01a2fea8c..50c8fceca4f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/RangeCodegenUtil.java @@ -19,20 +19,20 @@ package org.jetbrains.kotlin.codegen; import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.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; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.types.JetType; import java.util.List; -import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitiveNumberClassDescriptor; import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; +import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitiveNumberClassDescriptor; public class RangeCodegenUtil { private static final ImmutableMap RANGE_TO_ELEMENT_TYPE; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java index 097e51f5a14..44b38e43537 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java @@ -23,13 +23,13 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; 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.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; @@ -38,8 +38,8 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.Collections; import static org.jetbrains.kotlin.codegen.AsmUtil.*; -import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; +import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.org.objectweb.asm.Opcodes.*; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index 79413eb3145..c939574288f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -27,9 +27,9 @@ 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.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index 68e98ab712d..bdf9a455b5c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -22,21 +22,21 @@ import kotlin.Unit; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethod; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.psi.JetArrayAccessExpression; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; -import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.kotlin.builtins.PrimitiveType; -import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; 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/TailRecursionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java index e87fde3c0bd..29684c79d5d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.codegen; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cfg.TailRecursionKind; import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.descriptors.CallableDescriptor; @@ -26,14 +27,13 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.ValueArgument; -import org.jetbrains.kotlin.cfg.TailRecursionKind; import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.List; -import static org.jetbrains.jet.lang.resolve.BindingContext.TAIL_RECURSION_CALL; +import static org.jetbrains.kotlin.resolve.BindingContext.TAIL_RECURSION_CALL; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; public class TailRecursionCodegen { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java index e37468df61c..fc118cccb65 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TraitImplBodyCodegen.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.context.ClassContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import static org.jetbrains.kotlin.codegen.AsmUtil.writeKotlinSyntheticClassAnnotation; import static org.jetbrains.kotlin.load.java.JvmAnnotationNames.KotlinSyntheticClass; 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 255d6224fd9..8181c3f2ecc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -23,6 +23,7 @@ import com.intellij.util.containers.Stack; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.cfg.WhenChecker; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.codegen.JvmRuntimeTypes; import org.jetbrains.kotlin.codegen.SamCodegenUtil; @@ -30,35 +31,34 @@ import org.jetbrains.kotlin.codegen.SamType; 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.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.name.Name; 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.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.EnumValue; -import org.jetbrains.jet.lang.resolve.constants.NullValue; -import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.resolve.source.SourcePackage; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.EnumValue; +import org.jetbrains.kotlin.resolve.constants.NullValue; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.source.SourcePackage; 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.kotlin.name.SpecialNames.safeIdentifier; import static org.jetbrains.kotlin.lexer.JetTokens.*; +import static org.jetbrains.kotlin.name.SpecialNames.safeIdentifier; +import static org.jetbrains.kotlin.resolve.BindingContext.*; class CodegenAnnotatingVisitor extends JetVisitorVoid { private static final TokenSet BINARY_OPERATIONS = TokenSet.orSet( 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 0acf8d2c32c..754e73a15e2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -19,31 +19,31 @@ package org.jetbrains.kotlin.codegen.binding; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.slicedmap.BasicWritableSlice; +import org.jetbrains.jet.util.slicedmap.Slices; +import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.SamType; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping; 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.kotlin.resolve.calls.model.ResolvedCall; 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; -import org.jetbrains.jet.util.slicedmap.Slices; -import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.org.objectweb.asm.Type; import java.util.*; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isInterface; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; -import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; +import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; public class CodegenBinding { public static final WritableSlice CLOSURE = Slices.createSimpleSlice(); 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 471be1d8176..8023dcbce2a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java @@ -22,13 +22,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.org.objectweb.asm.Type; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; public final class PsiCodegenPredictor { private PsiCodegenPredictor() { 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 2b98a0b2796..6f40b771e7a 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java @@ -24,11 +24,11 @@ import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.NullableLazyValue; +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/context/LocalLookup.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java index 5bd75225209..41965600b0f 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/LocalLookup.java @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.codegen.binding.MutableClosure; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; 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 83c761fb193..683c6cb6090 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -20,6 +20,8 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.InlineStrategy; +import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.context.CodegenContext; @@ -27,19 +29,17 @@ import org.jetbrains.kotlin.codegen.context.MethodContext; 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.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; -import org.jetbrains.kotlin.builtins.InlineStrategy; -import org.jetbrains.kotlin.builtins.InlineUtil; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java index fcd29c7ca29..e31858f1050 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -23,27 +23,27 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; +import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.context.CodegenContext; 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.jvm.JvmProtoBuf; -import org.jetbrains.kotlin.serialization.ProtoBuf; -import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; +import org.jetbrains.kotlin.serialization.ProtoBuf; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor; +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.tree.*; @@ -56,8 +56,8 @@ import java.io.StringWriter; import java.util.Arrays; import java.util.ListIterator; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isTrait; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isTrait; public class InlineCodegenUtil { public static final int API = Opcodes.ASM5; 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 e6d040df004..30eb936ed65 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/LambdaInfo.java @@ -28,7 +28,7 @@ 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; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.tree.FieldInsnNode; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt index 5e1514721c8..1f3fd198b38 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/ReifiedTypeInliner.kt @@ -30,7 +30,7 @@ import org.jetbrains.org.objectweb.asm.signature.SignatureWriter import org.jetbrains.org.objectweb.asm.MethodVisitor import com.google.common.collect.ImmutableSet import org.jetbrains.kotlin.codegen.context.MethodContext -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils public class ReifiedTypeInliner(private val parametersMapping: ReifiedTypeParameterMappings?) { 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 e6d81bd0db9..0c62e3578f7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/ArrayIterator.java @@ -18,28 +18,28 @@ package org.jetbrains.kotlin.codegen.intrinsics; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.StackValue; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.name.FqName; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.Iterator; import java.util.List; +import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; import static org.jetbrains.kotlin.codegen.AsmUtil.asmDescByFqNameWithoutInnerClasses; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.getType; import static org.jetbrains.kotlin.resolve.jvm.types.PrimitiveTypesUtil.asmTypeForPrimitive; -import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME; public class ArrayIterator extends IntrinsicMethod { @NotNull diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java index aa51075c535..19afcb4d3b3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/Clone.java @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetSuperExpression; import org.jetbrains.kotlin.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.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; 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 1fd704aab24..1352680dbfc 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicMethods.java @@ -19,15 +19,15 @@ 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.kotlin.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; -import org.jetbrains.kotlin.name.FqNameUnsafe; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.HashMap; import java.util.Map; 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 066b1cbc968..b05111f4804 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/intrinsics/IntrinsicsMap.java @@ -23,9 +23,9 @@ 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.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import java.util.Map; 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 6588cd23073..255df3835ce 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/signature/KotlinToJvmSignatureMapperImpl.kt @@ -19,9 +19,8 @@ package org.jetbrains.kotlin.codegen.signature import org.jetbrains.kotlin.codegen.ClassBuilderMode import org.jetbrains.kotlin.codegen.state.JetTypeMapper import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature public class KotlinToJvmSignatureMapperImpl : KotlinToJvmSignatureMapper { // We use empty BindingContext, because it is only used by JetTypeMapper for purposes irrelevant to the needs of this class diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt index e296598992c..ff61d17a8b7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/BuilderFactoryForDuplicateSignatureDiagnostics.kt @@ -21,7 +21,7 @@ import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.codegen.ClassBuilderFactory import org.jetbrains.kotlin.codegen.SignatureCollectingClassBuilderFactory import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.jvm.diagnostics.* import java.util.* import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.FAKE_OVERR import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.codegen.ClassBuilderMode import org.jetbrains.kotlin.load.java.descriptors.SamAdapterDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.diagnostics.DiagnosticSink class BuilderFactoryForDuplicateSignatureDiagnostics( 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 c61ce23807d..bc8f8b6d743 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/GenerationState.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.codegen.state; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; @@ -27,14 +28,13 @@ import org.jetbrains.kotlin.codegen.when.MappingsClassesForWhenByEnum; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.kotlin.diagnostics.DiagnosticSink; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetScript; -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.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; 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 2477415dbc7..c9623b9b2a1 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -20,41 +20,41 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.binding.CalculatedClosure; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; 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.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; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.annotations.AnnotationsPackage; -import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.StringValue; -import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; -import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeDeclarationsPackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.SpecialNames; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.StringValue; +import org.jetbrains.kotlin.resolve.jvm.AsmTypes; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; 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; @@ -67,8 +67,8 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.boxType; import static org.jetbrains.kotlin.codegen.AsmUtil.isStaticMethod; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*; -import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; +import static org.jetbrains.kotlin.resolve.BindingContextUtils.isVarCapturedInClosure; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class JetTypeMapper { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapperWithOutDirectory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapperWithOutDirectory.java index 086664d133a..48f0cf4d108 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapperWithOutDirectory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapperWithOutDirectory.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.state; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ClassBuilderMode; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import java.io.File; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java index a33dfa834f0..3b092f7e141 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/EnumSwitchCodegen.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.codegen.when; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.psi.JetWhenExpression; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.EnumValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.EnumValue; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java index 692a5c70b90..3463d689343 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/IntegralConstantsSwitchCodegen.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen.when; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.psi.JetWhenExpression; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.org.objectweb.asm.Label; public class IntegralConstantsSwitchCodegen extends SwitchCodegen { @@ -32,9 +32,7 @@ public class IntegralConstantsSwitchCodegen extends SwitchCodegen { } @Override - protected void processConstant( - @NotNull CompileTimeConstant constant, @NotNull Label entryLabel - ) { + protected void processConstant(@NotNull CompileTimeConstant constant, @NotNull Label entryLabel) { assert constant.getValue() != null : "constant value should not be null"; int value = (constant.getValue() instanceof Number) ? ((Number) constant.getValue()).intValue() diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java index 90d3ea6beb9..c9e8a0f6359 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/MappingClassesForWhenByEnumCodegen.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ClassBuilder; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.constants.EnumValue; +import org.jetbrains.kotlin.resolve.constants.EnumValue; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java index c57a4d5d40c..f3a1058bab3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/StringSwitchCodegen.java @@ -21,8 +21,8 @@ import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.psi.JetWhenExpression; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.StringValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.StringValue; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.Type; 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 83d6d7f83f5..dbfd999331b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegen.java @@ -21,9 +21,9 @@ import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.FrameMap; import org.jetbrains.kotlin.psi.JetWhenEntry; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.NullValue; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.org.objectweb.asm.Label; @@ -32,7 +32,7 @@ import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import java.util.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.EXPRESSION_TYPE; +import static org.jetbrains.kotlin.resolve.BindingContext.EXPRESSION_TYPE; abstract public class SwitchCodegen { protected final JetWhenExpression expression; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java index 33ec2d08086..eba9caf3e4b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/SwitchCodegenUtil.java @@ -22,11 +22,11 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.ExpressionCodegen; import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.IntegerValueConstant; -import org.jetbrains.jet.lang.resolve.constants.NullValue; -import org.jetbrains.jet.lang.resolve.constants.StringValue; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.IntegerValueConstant; +import org.jetbrains.kotlin.resolve.constants.NullValue; +import org.jetbrains.kotlin.resolve.constants.StringValue; import org.jetbrains.org.objectweb.asm.Type; import java.util.ArrayList; 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 400ed1aa858..20d16542a85 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/when/WhenByEnumsMapping.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/when/WhenByEnumsMapping.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen.when; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.resolve.constants.EnumValue; +import org.jetbrains.kotlin.resolve.constants.EnumValue; import java.util.HashMap; import java.util.Map; diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index 313d9f092a3..343de93bd01 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -38,7 +38,7 @@ import org.jetbrains.jet.analyzer.ModuleInfo import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.jet.analyzer.ModuleContent import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java index 8665486ea72..4a417f6e1c2 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CompilerPluginContext.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cli.common; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/messages/AnalyzerWithCompilerReport.java index 4a6adfbc9a9..9893c0a01f2 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 @@ -30,17 +30,17 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.diagnostics.*; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.load.java.JavaBindingContext; import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.load.java.components.TraceBasedErrorReporter; import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import java.util.Collection; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index c5bbccdff88..cbd3aeb9864 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -34,10 +34,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.kotlin.config.Services; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.CLICompiler; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; @@ -52,12 +48,16 @@ import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.CompileEnvironmentUtil; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.config.Services; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.config.EcmaVersion; import org.jetbrains.kotlin.js.config.LibrarySourcesConfig; import org.jetbrains.kotlin.js.facade.MainCallParameters; import org.jetbrains.kotlin.js.facade.Status; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java index 5fecf03dff4..906b4a8b81a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/JVMConfigurationKeys.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.cli.jvm; import org.jetbrains.jet.config.CompilerConfigurationKey; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import java.io.File; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java index e437ae29d84..036f40315f0 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java @@ -20,15 +20,8 @@ import com.google.common.base.Splitter; import com.google.common.collect.Lists; import com.intellij.openapi.Disposable; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.codegen.CompilationException; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.kotlin.config.Services; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; -import org.jetbrains.kotlin.utils.KotlinPaths; -import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir; -import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.cli.common.CLICompiler; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.ExitCode; @@ -37,6 +30,13 @@ import org.jetbrains.kotlin.cli.common.messages.*; import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData; import org.jetbrains.kotlin.cli.jvm.compiler.*; import org.jetbrains.kotlin.cli.jvm.repl.ReplFromTerminal; +import org.jetbrains.kotlin.codegen.CompilationException; +import org.jetbrains.kotlin.config.Services; +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.utils.KotlinPaths; +import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; import java.util.Collections; 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 caf17cd1ad9..a4bd4b62013 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,25 +30,25 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -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.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; -import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; -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; import org.jetbrains.jet.util.slicedmap.WritableSlice; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.asJava.KotlinLightClassForExplicitDeclaration; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.LightClassConstructionContext; import org.jetbrains.kotlin.asJava.LightClassGenerationSupport; +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.load.java.JvmAbi; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.*; +import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.Collection; import java.util.Collections; 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 f11d5beb1ba..a8de1a4421b 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 @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.cli.jvm.compiler; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; import java.util.List; diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java index b75766ca746..a182b2941a1 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/JetCoreEnvironment.java @@ -44,16 +44,7 @@ import org.jetbrains.jet.CompilerModeProvider; import org.jetbrains.jet.OperationModeProvider; import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.kotlin.parsing.JetParserDefinition; -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.CodeAnalyzerInitializer; -import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache; -import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; -import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService; -import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService; import org.jetbrains.jet.plugin.JetFileType; -import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.asJava.JavaElementFinder; import org.jetbrains.kotlin.asJava.KotlinLightClassForPackage; import org.jetbrains.kotlin.asJava.LightClassGenerationSupport; @@ -62,6 +53,15 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.load.kotlin.KotlinBinaryClassCache; +import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; +import org.jetbrains.kotlin.parsing.JetParserDefinition; +import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer; +import org.jetbrains.kotlin.resolve.lazy.declarations.CliDeclarationProviderFactoryService; +import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; import java.util.ArrayList; 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 b07b4c23918..0d0beada565 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 @@ -31,27 +31,9 @@ import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.kotlin.codegen.*; -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.kotlin.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.kotlin.parsing.JetScriptDefinition; -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; -import org.jetbrains.jet.lang.resolve.ScriptNameUtil; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackage; -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache; -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.MainFunctionDetector; -import org.jetbrains.kotlin.utils.KotlinPaths; import org.jetbrains.kotlin.asJava.FilteredJvmDiagnostics; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.CompilerPlugin; @@ -59,6 +41,24 @@ import org.jetbrains.kotlin.cli.common.CompilerPluginContext; import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.codegen.*; +import org.jetbrains.kotlin.codegen.state.GenerationState; +import org.jetbrains.kotlin.codegen.state.Progress; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackage; +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache; +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.parsing.JetScriptDefinition; +import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.ScriptNameUtil; +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.utils.KotlinPaths; import java.io.File; import java.net.URL; 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 5ac43372e8c..0253d888110 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 @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli.jvm.repl import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter open class DelegatePackageMemberDeclarationProvider(var delegate: PackageMemberDeclarationProvider) : PackageMemberDeclarationProvider { // Can't use Kotlin delegate feature because of inability to change delegate object in runtime (KT-5870) 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 95ec16f95eb..53c229182f9 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplInterpreter.java @@ -32,32 +32,12 @@ import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.SmartList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.codegen.ClassBuilderFactories; -import org.jetbrains.kotlin.codegen.CompilationErrorHandler; -import org.jetbrains.kotlin.codegen.KotlinCodegenFacade; -import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; -import org.jetbrains.kotlin.descriptors.ScriptDescriptor; -import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider; -import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.kotlin.parsing.JetParserDefinition; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.psi.JetScript; -import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.kotlin.resolve.jvm.JvmClassName; -import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; -import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; -import org.jetbrains.kotlin.resolve.lazy.declarations.*; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorToString; @@ -65,7 +45,27 @@ import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.codegen.ClassBuilderFactories; +import org.jetbrains.kotlin.codegen.CompilationErrorHandler; +import org.jetbrains.kotlin.codegen.KotlinCodegenFacade; +import org.jetbrains.kotlin.codegen.state.GenerationState; +import org.jetbrains.kotlin.descriptors.ScriptDescriptor; +import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider; +import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.di.InjectorForReplWithJava; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.parsing.JetParserDefinition; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetScript; +import org.jetbrains.kotlin.resolve.*; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; +import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; +import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; +import org.jetbrains.kotlin.resolve.lazy.declarations.*; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.org.objectweb.asm.Type; import java.io.File; @@ -82,7 +82,7 @@ import java.util.List; import static org.jetbrains.kotlin.codegen.AsmUtil.asmTypeByFqNameWithoutInnerClasses; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.registerClassNameForScript; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; public class ReplInterpreter { private int lineNumber = 0; diff --git a/compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.ExternalOverridabilityCondition b/compiler/frontend.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition similarity index 100% rename from compiler/frontend.java/src/META-INF/services/org.jetbrains.jet.lang.resolve.ExternalOverridabilityCondition rename to compiler/frontend.java/src/META-INF/services/org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition 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 2c0b9691b36..9a55fa1ce60 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolver.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.jet.context.GlobalContextImpl; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; 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 fcd75803375..f073d2570f7 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForJavaDescriptorResolverUtil.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.di; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; public class InjectorForJavaDescriptorResolverUtil { 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 004eae4d722..48be8df52b7 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForLazyResolveWithJava.java @@ -19,7 +19,7 @@ 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.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazyResolveToken; import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -53,19 +53,19 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -import org.jetbrains.jet.lang.resolve.TypeResolver; -import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider; import org.jetbrains.kotlin.load.java.lazy.GlobalJavaResolverContext; import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver; 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 27f80b8efe3..1a56f948285 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForReplWithJava.java @@ -19,14 +19,14 @@ 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.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; +import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer; import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; @@ -39,13 +39,13 @@ import org.jetbrains.kotlin.load.java.components.PsiBasedExternalAnnotationResol import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl; import org.jetbrains.kotlin.load.java.components.JavaSourceElementFactoryImpl; -import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; +import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver; import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -56,32 +56,32 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -import org.jetbrains.jet.lang.resolve.TypeResolver; -import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import org.jetbrains.jet.lang.resolve.BodyResolver; -import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; -import org.jetbrains.jet.lang.resolve.DeclarationsChecker; -import org.jetbrains.jet.lang.resolve.ModifiersChecker; -import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; -import org.jetbrains.jet.lang.resolve.DeclarationResolver; -import org.jetbrains.jet.lang.resolve.ImportsResolver; -import org.jetbrains.jet.lang.resolve.OverloadResolver; -import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.BodyResolver; +import org.jetbrains.kotlin.resolve.ControlFlowAnalyzer; +import org.jetbrains.kotlin.resolve.DeclarationsChecker; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; +import org.jetbrains.kotlin.resolve.DeclarationResolver; +import org.jetbrains.kotlin.resolve.ImportsResolver; +import org.jetbrains.kotlin.resolve.OverloadResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.TopDownAnalyzer; +import org.jetbrains.kotlin.resolve.TypeHierarchyResolver; +import org.jetbrains.kotlin.resolve.ScriptHeaderResolver; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker; import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider; import org.jetbrains.kotlin.load.java.lazy.GlobalJavaResolverContext; import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver; 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 acf0ab88d3f..8669eaeebfd 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJvm.java @@ -19,14 +19,14 @@ 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.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import com.intellij.psi.search.GlobalSearchScope; -import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; +import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer; import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; import org.jetbrains.kotlin.load.kotlin.DeserializationComponentsForJava; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; @@ -39,12 +39,12 @@ import org.jetbrains.kotlin.load.java.components.PsiBasedExternalAnnotationResol import org.jetbrains.kotlin.load.java.structure.impl.JavaPropertyInitializerEvaluatorImpl; import org.jetbrains.kotlin.load.java.sam.SamConversionResolverImpl; import org.jetbrains.kotlin.load.java.components.JavaSourceElementFactoryImpl; -import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; +import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; import org.jetbrains.kotlin.load.java.lazy.SingleModuleClassResolver; import org.jetbrains.kotlin.resolve.jvm.JavaLazyAnalyzerPostConstruct; import org.jetbrains.kotlin.load.java.JavaFlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -55,33 +55,33 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -import org.jetbrains.jet.lang.resolve.TypeResolver; -import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import org.jetbrains.jet.lang.resolve.BodyResolver; -import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; -import org.jetbrains.jet.lang.resolve.DeclarationsChecker; -import org.jetbrains.jet.lang.resolve.ModifiersChecker; -import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; -import org.jetbrains.jet.lang.resolve.DeclarationResolver; -import org.jetbrains.jet.lang.resolve.ImportsResolver; -import org.jetbrains.jet.lang.resolve.OverloadResolver; -import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.BodyResolver; +import org.jetbrains.kotlin.resolve.ControlFlowAnalyzer; +import org.jetbrains.kotlin.resolve.DeclarationsChecker; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; +import org.jetbrains.kotlin.resolve.DeclarationResolver; +import org.jetbrains.kotlin.resolve.ImportsResolver; +import org.jetbrains.kotlin.resolve.OverloadResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.TopDownAnalyzer; +import org.jetbrains.kotlin.resolve.TypeHierarchyResolver; +import org.jetbrains.kotlin.resolve.ScriptHeaderResolver; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker; import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider; import org.jetbrains.kotlin.load.java.lazy.GlobalJavaResolverContext; import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java index 7a3fc5501cb..b494fb3e1b9 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaBindingContext.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.load.java; -import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.List; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt index f40b3513767..aac662b3a1e 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaClassFinderPostConstruct.kt @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer import org.jetbrains.kotlin.descriptors.ModuleDescriptor import javax.inject.Inject import javax.annotation.PostConstruct -import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.CodeAnalyzerInitializer +import org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer public open class JavaClassFinderPostConstruct { PostConstruct public open fun postCreate() {} diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaFlexibleTypeCapabilitiesProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaFlexibleTypeCapabilitiesProvider.kt index 4469c5deda6..5e633f19396 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaFlexibleTypeCapabilitiesProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/JavaFlexibleTypeCapabilitiesProvider.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.load.java -import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider import org.jetbrains.kotlin.types.FlexibleTypeCapabilities import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver public class JavaFlexibleTypeCapabilitiesProvider : FlexibleTypeCapabilitiesProvider() { override fun getCapabilities(): FlexibleTypeCapabilities = LazyJavaTypeResolver.FlexibleJavaClassifierTypeCapabilities -} \ No newline at end of file +} diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/JavaSourceElementFactoryImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/JavaSourceElementFactoryImpl.kt index dc85c96b806..c3b69a0a994 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/JavaSourceElementFactoryImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/JavaSourceElementFactoryImpl.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.load.java.components -import org.jetbrains.jet.lang.resolve.source.PsiSourceElement +import org.jetbrains.kotlin.resolve.source.PsiSourceElement import com.intellij.psi.PsiElement import org.jetbrains.kotlin.load.java.structure.JavaElement import org.jetbrains.kotlin.load.java.structure.impl.JavaElementImpl diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedMethodSignatureChecker.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedMethodSignatureChecker.java index 8bf3e270817..5edf6f0b8a4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedMethodSignatureChecker.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/PsiBasedMethodSignatureChecker.java @@ -26,11 +26,11 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.jvm.kotlinSignature.SignaturesUtil; import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl; +import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.OverridingUtil; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.SignaturesUtil; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.SubstitutionUtils; import org.jetbrains.kotlin.types.TypeSubstitution; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java index c3485f5f2bc..e1906ea22b4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedErrorReporter.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.load.java.components; import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; -import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass; +import org.jetbrains.kotlin.load.kotlin.VirtualFileKotlinClass; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.OverrideResolver; import javax.inject.Inject; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java index d08d93c49c0..af409f32f2c 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedExternalSignatureResolver.java @@ -23,16 +23,16 @@ 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.kotlin.load.java.JavaBindingContext; -import org.jetbrains.kotlin.resolve.jvm.JvmPackage; -import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.AlternativeFieldSignatureData; -import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.AlternativeMethodSignatureData; -import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.SignaturesPropagationData; import org.jetbrains.kotlin.load.java.structure.JavaConstructor; import org.jetbrains.kotlin.load.java.structure.JavaField; import org.jetbrains.kotlin.load.java.structure.JavaMember; import org.jetbrains.kotlin.load.java.structure.JavaMethod; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.AlternativeFieldSignatureData; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.AlternativeMethodSignatureData; +import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.SignaturesPropagationData; import org.jetbrains.kotlin.types.JetType; import javax.inject.Inject; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedJavaResolverCache.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedJavaResolverCache.java index 0a07b7b8307..26e039a324b 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedJavaResolverCache.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/components/TraceBasedJavaResolverCache.java @@ -23,8 +23,6 @@ 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.kotlin.load.java.structure.JavaClass; import org.jetbrains.kotlin.load.java.structure.JavaElement; import org.jetbrains.kotlin.load.java.structure.JavaField; @@ -34,10 +32,12 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaElementImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaFieldImpl; import org.jetbrains.kotlin.load.java.structure.impl.JavaMethodImpl; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.BindingTrace; import javax.inject.Inject; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; public class TraceBasedJavaResolverCache implements JavaResolverCache { private BindingTrace trace; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java index 7e82ef8243d..4ee46b2ce47 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamAdapterOverridabilityCondition.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.jet.lang.resolve.ExternalOverridabilityCondition; +import org.jetbrains.kotlin.resolve.ExternalOverridabilityCondition; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt index 0f9b4076fbe..d9d40bf5648 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SamConversionResolverImpl.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.java.sam import org.jetbrains.kotlin.load.java.components.SamConversionResolver import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.load.java.descriptors.* import org.jetbrains.kotlin.load.java.lazy.descriptors.LazyJavaClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java index e335696b90c..47c16744f6b 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/structure/impl/JavaPropertyInitializerEvaluatorImpl.java @@ -22,11 +22,11 @@ import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; -import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.ConstantsPackage; import org.jetbrains.kotlin.load.java.structure.JavaField; import org.jetbrains.kotlin.load.java.structure.JavaPropertyInitializerEvaluator; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.ConstantsPackage; +import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; public class JavaPropertyInitializerEvaluatorImpl implements JavaPropertyInitializerEvaluator { @Nullable diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt index 309baef2377..f3e605c2771 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/JavaDeclarationCheckerProvider.kt @@ -16,28 +16,28 @@ package org.jetbrains.kotlin.load.kotlin -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider -import org.jetbrains.jet.lang.resolve.AnnotationChecker +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider +import org.jetbrains.kotlin.resolve.AnnotationChecker import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.resolve.annotations.hasPlatformStaticAnnotation +import org.jetbrains.kotlin.resolve.annotations.hasPlatformStaticAnnotation import org.jetbrains.kotlin.psi.JetNamedFunction -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.jet.lang.resolve.annotations.hasInlineAnnotation +import org.jetbrains.kotlin.resolve.annotations.hasInlineAnnotation import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.diagnostics.Errors 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.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetTypeParameter -import org.jetbrains.jet.lang.resolve.annotations.hasIntrinsicAnnotation +import org.jetbrains.kotlin.resolve.annotations.hasIntrinsicAnnotation import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeFunChecker import org.jetbrains.kotlin.psi.JetPropertyAccessor import org.jetbrains.kotlin.descriptors.MemberDescriptor diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt index df77fada476..0568873f4f4 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/incremental/IncrementalPackageFragmentProvider.kt @@ -24,7 +24,7 @@ import java.util.HashMap 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.resolve.scopes.JetScope import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope import org.jetbrains.kotlin.serialization.* diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt index 92a6325b377..378f5516717 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/native.kt @@ -16,10 +16,8 @@ package org.jetbrains.kotlin.load.kotlin.nativeDeclarations -import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression -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.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.AnnotationChecker import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.diagnostics.DiagnosticSink @@ -28,9 +26,9 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm import org.jetbrains.kotlin.psi.JetDeclarationWithBody -import org.jetbrains.jet.lang.resolve.annotations.hasInlineAnnotation -import org.jetbrains.jet.lang.resolve.diagnostics.SuppressDiagnosticsByAnnotations -import org.jetbrains.jet.lang.resolve.diagnostics.FUNCTION_NO_BODY_ERRORS +import org.jetbrains.kotlin.resolve.annotations.hasInlineAnnotation +import org.jetbrains.kotlin.resolve.diagnostics.SuppressDiagnosticsByAnnotations +import org.jetbrains.kotlin.resolve.diagnostics.FUNCTION_NO_BODY_ERRORS private val NATIVE_ANNOTATION_CLASS_NAME = FqName("kotlin.jvm.native") diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt index 933f54ab8cd..de8651c859a 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/JvmAnalyzerFacade.kt @@ -32,7 +32,7 @@ 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 -import org.jetbrains.jet.lang.resolve.CodeAnalyzerInitializer +import org.jetbrains.kotlin.resolve.CodeAnalyzerInitializer import com.intellij.psi.search.GlobalSearchScope public class JvmResolverForModule( diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java index 0d67c6f7957..55e5d03c9c8 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/TopDownAnalyzerFacadeForJVM.java @@ -25,20 +25,20 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.context.GlobalContext; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; -import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; +import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerForJvm; import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache; import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider; -import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerForJvm; +import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters; +import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import java.util.ArrayList; import java.util.Collection; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/ElementAlternativeSignatureData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/ElementAlternativeSignatureData.java index 0e4e14a3228..a511ae71bdc 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/ElementAlternativeSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/ElementAlternativeSignatureData.java @@ -20,14 +20,14 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiErrorElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.types.JetType; import java.util.List; import java.util.Map; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java index 091c9f4dd38..e7ce5690621 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/PropagationHeuristics.java @@ -21,16 +21,16 @@ 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.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.scopes.JetScope; 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; import java.util.Arrays; import java.util.List; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java index 486fabf1a1d..7e02bee4f33 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java @@ -25,30 +25,30 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.jvm.JvmPackage; -import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; -import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmSignaturePackage; -import org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper; import org.jetbrains.kotlin.load.java.components.TypeUsage; +import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor; import org.jetbrains.kotlin.load.java.structure.JavaMethod; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.kotlin.types.*; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmSignaturePackage; +import org.jetbrains.kotlin.resolve.jvm.jvmSignature.KotlinToJvmSignatureMapper; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.types.*; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; import static org.jetbrains.kotlin.load.java.components.TypeUsage.*; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; import static org.jetbrains.kotlin.types.Variance.INVARIANT; public class SignaturesPropagationData { diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java index 0f270143197..72236983581 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/TypeTransformingVisitor.java @@ -19,22 +19,22 @@ package org.jetbrains.kotlin.resolve.jvm.kotlinSignature; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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; -import org.jetbrains.kotlin.resolve.jvm.JvmPackage; -import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; -import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; import org.jetbrains.kotlin.load.java.components.TypeUsage; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.kotlin.types.*; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.jvm.JvmPackage; +import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.types.*; import java.util.*; diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java index 50ba9491965..f4e7ba2088d 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/types/KotlinToJavaTypesMap.java @@ -18,15 +18,15 @@ package org.jetbrains.kotlin.resolve.jvm.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.platform.JavaToKotlinClassMapBuilder; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.builtins.PrimitiveType; -import org.jetbrains.kotlin.platform.JavaToKotlinClassMapBuilder; import org.jetbrains.org.objectweb.asm.Type; import java.util.HashMap; diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt index f073172e6cb..ca012e0a779 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalysisResult.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.analyzer import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.types.ErrorUtils import kotlin.platform.platformStatic diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt index 65bb160edff..e183a009fa9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerFacade.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.resolve.lazy.ResolveSession 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.resolve.ImportPath import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import com.intellij.openapi.project.Project import org.jetbrains.jet.context.GlobalContext diff --git a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt index 9a845849ddb..2404e4d9e3a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/analyzer/AnalyzerUtil.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.analyzer import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.di.InjectorForMacros import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.kotlin.types.JetType @@ -25,10 +25,10 @@ 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 -import org.jetbrains.jet.lang.resolve.descriptorUtil.module +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingTraceContext +import org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.descriptorUtil.module public fun JetExpression.computeTypeInfoInContext( scope: JetScope, diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java index 21fbf0b3fde..5967b5c2994 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/CheckerTestUtil.java @@ -42,8 +42,8 @@ import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticRenderer; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetReferenceExpression; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.*; import java.util.regex.Matcher; diff --git a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java index b0e00504fc9..2e7c63c958e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/jet/checkers/DebugInfoUtil.java @@ -31,8 +31,8 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; @@ -44,7 +44,7 @@ import org.jetbrains.jet.util.slicedmap.WritableSlice; import java.util.Collection; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.lexer.JetTokens.*; public class DebugInfoUtil { 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 4b79b62074e..1c841ab85f1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/reflect/ReflectionTypes.kt @@ -20,7 +20,7 @@ import kotlin.properties.Delegates 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.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.annotations.Annotations diff --git a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java b/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java index 76b7de25508..c535783e92e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java +++ b/compiler/frontend/src/org/jetbrains/jet/plugin/MainFunctionDetector.java @@ -23,9 +23,9 @@ 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.checker.JetTypeChecker; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java index a319da5cd8f..0e807c1902d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilder.java @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.List; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java index ff638afe17b..f96c4076325 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowBuilderAdapter.java @@ -25,8 +25,8 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.*; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.List; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index f6466e980a7..e705f6356e8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -27,37 +27,37 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.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; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils; -import org.jetbrains.kotlin.resolve.calls.model.*; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -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.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; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils; +import org.jetbrains.kotlin.resolve.calls.model.*; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.*; import static org.jetbrains.kotlin.cfg.JetControlFlowBuilder.PredefinedOperation.*; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.kotlin.lexer.JetTokens.*; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; public class JetControlFlowProcessor { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 1b12355bda4..bc95c801cb2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -27,6 +27,8 @@ import kotlin.Function3; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.plugin.MainFunctionDetector; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableInitState; import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState; import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue; @@ -49,28 +51,26 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; +import org.jetbrains.kotlin.resolve.*; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.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.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver; 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; import java.util.*; import static org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState.*; +import static org.jetbrains.kotlin.cfg.TailRecursionKind.*; import static org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder.FORWARD; import static org.jetbrains.kotlin.diagnostics.Errors.*; -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.kotlin.resolve.BindingContext.CAPTURED_IN_CLOSURE; +import static org.jetbrains.kotlin.resolve.BindingContext.TAIL_RECURSION_CALL; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt index e03bd4fbd89..59630ac9d69 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariableDataCollector.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.cfg import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.cfg.pseudocodeTraverser.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java index 79e477ca122..4a2dab9485b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.java @@ -36,7 +36,7 @@ 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; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java index 522f544c2a1..1978fd02069 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java @@ -18,19 +18,19 @@ package org.jetbrains.kotlin.cfg; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; 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; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry; +import static org.jetbrains.kotlin.resolve.BindingContext.EXPRESSION_TYPE; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; public final class WhenChecker { private WhenChecker() { 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 453e2ee5ca3..65747f65387 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/JetControlFlowInstructionsGenerator.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.cfg.pseudocode; import com.intellij.util.containers.Stack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cfg.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope; @@ -28,10 +29,9 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.*; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; 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 8d12f58fdc9..234167b3090 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -18,6 +18,8 @@ package org.jetbrains.kotlin.cfg.pseudocode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; +import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.cfg.JetControlFlowProcessor; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.ReadValueInstruction; @@ -27,11 +29,9 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetElement; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; -import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.BindingTrace; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt index 2af7bb3fc03..0636a38bc2f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/instructions/eval/InstructionWithReceivers.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cfg.pseudocode.instructions.eval import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue public trait InstructionWithReceivers: Instruction { public val receiverValues: Map 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 6346ce1e90e..240d2bf4d19 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 @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionWithNext import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.cfg.pseudocode.PseudoValueFactory import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitorWithResult 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 26b45572583..e0de21a872a 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 @@ -24,10 +24,9 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.LexicalScope 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.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate -import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.MagicKind public abstract class OperationInstruction protected( element: JetElement, 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 e9a5525d2e1..b0e42dba6d9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/pseudocodeUtil.kt @@ -21,13 +21,13 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.eval.* import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.bindingContextUtil.* +import org.jetbrains.kotlin.resolve.bindingContextUtil.* import org.jetbrains.kotlin.resolve.calls.model.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import java.util.* -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue -import org.jetbrains.jet.lang.resolve.OverridingUtil +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java index 6c27e11eb05..7757e27cfe4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/ClassDescriptorWithResolutionScopes.java @@ -19,7 +19,7 @@ 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.kotlin.resolve.scopes.JetScope; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java index ba43cce665d..7dc09c9b57b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java @@ -24,9 +24,9 @@ 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.kotlin.types.*; +import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.types.*; import java.util.ArrayList; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java index 6533401671b..65addd30226 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/MutablePackageFragmentDescriptor.java @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; 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; -import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; public class MutablePackageFragmentDescriptor extends PackageFragmentDescriptorImpl { private final WritableScope scope; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScopeBasedPackageLikeBuilder.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScopeBasedPackageLikeBuilder.java index f60a60c3f04..4ff8f28bac9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScopeBasedPackageLikeBuilder.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScopeBasedPackageLikeBuilder.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; 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; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; public class ScopeBasedPackageLikeBuilder implements PackageLikeBuilder { private final DeclarationDescriptor containingDeclaration; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScriptDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScriptDescriptorImpl.java index abbff983bc3..319e3f0de2c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScriptDescriptorImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/descriptors/impl/ScriptDescriptorImpl.java @@ -17,17 +17,17 @@ package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; +import org.jetbrains.kotlin.resolve.scopes.receivers.ScriptReceiver; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java index b097f9e70a1..6c39d4a5ad5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForBodyResolve.java @@ -19,14 +19,14 @@ 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.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; 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; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; -import org.jetbrains.jet.lang.resolve.BodyResolver; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.BodyResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -37,21 +37,21 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -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.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; -import org.jetbrains.jet.lang.resolve.DeclarationsChecker; -import org.jetbrains.jet.lang.resolve.ModifiersChecker; -import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.ControlFlowAnalyzer; +import org.jetbrains.kotlin.resolve.DeclarationsChecker; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java index 651a0d2fa41..9a024624072 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyBodyResolve.java @@ -20,15 +20,15 @@ import com.intellij.openapi.project.Project; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; 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; -import org.jetbrains.jet.lang.resolve.BodyResolver; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer; +import org.jetbrains.kotlin.resolve.BodyResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -38,32 +38,32 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -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.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; -import org.jetbrains.jet.lang.resolve.DeclarationsChecker; -import org.jetbrains.jet.lang.resolve.ModifiersChecker; -import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import org.jetbrains.jet.lang.resolve.DeclarationResolver; -import org.jetbrains.jet.lang.resolve.ImportsResolver; +import org.jetbrains.kotlin.resolve.ControlFlowAnalyzer; +import org.jetbrains.kotlin.resolve.DeclarationsChecker; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.DeclarationResolver; +import org.jetbrains.kotlin.resolve.ImportsResolver; import org.jetbrains.kotlin.psi.JetImportsFactory; -import org.jetbrains.jet.lang.resolve.OverloadResolver; -import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; +import org.jetbrains.kotlin.resolve.OverloadResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.TopDownAnalyzer; +import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; +import org.jetbrains.kotlin.resolve.TypeHierarchyResolver; +import org.jetbrains.kotlin.resolve.ScriptHeaderResolver; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java index dd68f1d3d4e..869b54d7ead 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyResolve.java @@ -23,12 +23,12 @@ import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.jet.context.LazyResolveToken; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -38,20 +38,20 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -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.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java index 50833a34ee8..32c79f02900 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForLazyTopDownAnalyzerBasic.java @@ -19,15 +19,15 @@ 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.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; -import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider.Empty; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider.Empty; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -38,35 +38,35 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -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.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import org.jetbrains.jet.lang.resolve.BodyResolver; -import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; -import org.jetbrains.jet.lang.resolve.DeclarationsChecker; -import org.jetbrains.jet.lang.resolve.ModifiersChecker; -import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; -import org.jetbrains.jet.lang.resolve.DeclarationResolver; -import org.jetbrains.jet.lang.resolve.ImportsResolver; -import org.jetbrains.jet.lang.resolve.OverloadResolver; -import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; -import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.BodyResolver; +import org.jetbrains.kotlin.resolve.ControlFlowAnalyzer; +import org.jetbrains.kotlin.resolve.DeclarationsChecker; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; +import org.jetbrains.kotlin.resolve.DeclarationResolver; +import org.jetbrains.kotlin.resolve.ImportsResolver; +import org.jetbrains.kotlin.resolve.OverloadResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.TopDownAnalyzer; +import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; +import org.jetbrains.kotlin.resolve.TypeHierarchyResolver; +import org.jetbrains.kotlin.resolve.ScriptHeaderResolver; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java index e60daaa565d..3edb353989d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForMacros.java @@ -25,18 +25,18 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider.Empty; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; -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.kotlin.resolve.AdditionalCheckerProvider.Empty; +import org.jetbrains.kotlin.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java index 7367420eb30..1623202684e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerBasic.java @@ -19,16 +19,16 @@ 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.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; 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.kotlin.resolve.TopDownAnalyzer; +import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesSettings; -import org.jetbrains.jet.lang.resolve.BodyResolver; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.BodyResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -38,30 +38,30 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -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.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; -import org.jetbrains.jet.lang.resolve.DeclarationsChecker; -import org.jetbrains.jet.lang.resolve.ModifiersChecker; -import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import org.jetbrains.jet.lang.resolve.DeclarationResolver; -import org.jetbrains.jet.lang.resolve.ImportsResolver; +import org.jetbrains.kotlin.resolve.ControlFlowAnalyzer; +import org.jetbrains.kotlin.resolve.DeclarationsChecker; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.DeclarationResolver; +import org.jetbrains.kotlin.resolve.ImportsResolver; import org.jetbrains.kotlin.psi.JetImportsFactory; -import org.jetbrains.jet.lang.resolve.OverloadResolver; -import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; +import org.jetbrains.kotlin.resolve.OverloadResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.TypeHierarchyResolver; +import org.jetbrains.kotlin.resolve.ScriptHeaderResolver; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.java index 499036769ef..2b38e5787e4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/DiagnosticUtils.java @@ -28,8 +28,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index 1daf0b34327..9e5ef59880e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -20,18 +20,17 @@ import com.google.common.collect.ImmutableSet; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import com.intellij.psi.impl.source.tree.LeafPsiElement; -import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData; -import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData; +import org.jetbrains.kotlin.types.JetType; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index 889755c8e99..c01c87dd753 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -29,15 +29,15 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.lexer.JetKeywordToken; +import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; 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.kotlin.types.JetType; -import org.jetbrains.kotlin.lexer.JetKeywordToken; -import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.renderer.MultiRenderer; import org.jetbrains.kotlin.renderer.Renderer; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker.VarianceConflictDiagnosticData; +import org.jetbrains.kotlin.types.JetType; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt index 9d1d7c01935..6accc472406 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticRendererUtil.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.diagnostics.rendering import org.jetbrains.kotlin.renderer.Renderer import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils.isClassObject +import org.jetbrains.kotlin.resolve.DescriptorUtils.isClassObject import org.jetbrains.kotlin.renderer.DescriptorRendererImpl public fun

renderParameter(parameter: P, renderer: Renderer

?): Any = renderer?.render(parameter) ?: parameter diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java index e504cf986f8..48fc3c95fd3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.java @@ -25,20 +25,20 @@ import com.intellij.psi.PsiElement; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetNamedDeclaration; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.Renderer; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.inference.*; import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -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; import java.util.Collection; import java.util.Iterator; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java index 93e046ed841..e4032dde452 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinition.java @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.parsing; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; -import org.jetbrains.jet.lang.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.resolve.ImportPath; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java index 23b9218995f..518309f2524 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/JetScriptDefinitionProvider.java @@ -21,7 +21,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/Call.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/Call.java index 0fcbbc12fb1..82fbba7dec2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/Call.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/Call.java @@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java index f4c07297917..a32c6073ee1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportDirective.java @@ -21,12 +21,12 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub; -import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.jet.lang.resolve.ImportPath; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.stubs.KotlinImportDirectiveStub; +import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; +import org.jetbrains.kotlin.resolve.ImportPath; public class JetImportDirective extends JetElementImplStub { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java index 4bf6d5377cf..0155486c900 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java @@ -22,7 +22,7 @@ import com.google.common.collect.Maps; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.ImportPath; import javax.inject.Inject; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt index db0de2a20f9..fa467ca11d2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement import com.intellij.psi.PsiFileFactory import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.LocalTimeCounter -import org.jetbrains.jet.lang.resolve.ImportPath +import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.lexer.JetKeywordToken import org.jetbrains.jet.plugin.JetFileType import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder.Target diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AdditionalCheckerProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AdditionalCheckerProvider.kt similarity index 84% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/AdditionalCheckerProvider.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/AdditionalCheckerProvider.kt index 179fc752c00..a8aad77eff9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AdditionalCheckerProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AdditionalCheckerProvider.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,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve - -import org.jetbrains.annotations.ReadOnly - -import java.util.Collections +package org.jetbrains.kotlin.resolve public trait AdditionalCheckerProvider { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzerScriptParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzerScriptParameter.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzerScriptParameter.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzerScriptParameter.java index 832bc9f636f..4bbb55ce049 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzerScriptParameter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzerScriptParameter.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java index d4ce651bf8b..1ab50c5d558 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnalyzingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.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; +package org.jetbrains.kotlin.resolve; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiErrorElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.kt index 5cfa40bb0e4..cf8a160ea05 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationChecker.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,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.kotlin.descriptors.MemberDescriptor import org.jetbrains.kotlin.diagnostics.DiagnosticSink import org.jetbrains.kotlin.descriptors.DeclarationDescriptor diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java index b9e8a64bffb..cd46f45e6be 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import com.intellij.openapi.util.Pair; @@ -27,7 +27,6 @@ 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.diagnostics.Errors; -import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; @@ -37,17 +36,18 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.util.CallMaker; -import org.jetbrains.jet.lang.resolve.constants.ArrayValue; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; +import org.jetbrains.kotlin.resolve.constants.ArrayValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant; +import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyAnnotationDescriptor; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyAnnotationsContextImpl; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.storage.StorageManager; import javax.inject.Inject; import java.util.HashMap; @@ -55,7 +55,7 @@ import java.util.List; import java.util.Map; import static org.jetbrains.kotlin.diagnostics.Errors.NOT_AN_ANNOTATION_CLASS; -import static org.jetbrains.jet.lang.resolve.BindingContext.ANNOTATION_DESCRIPTOR_TO_PSI_ELEMENT; +import static org.jetbrains.kotlin.resolve.BindingContext.ANNOTATION_DESCRIPTOR_TO_PSI_ELEMENT; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; public class AnnotationResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtil.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt index 4a32f0d803c..2c563191be5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/AnnotationUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.annotations +package org.jetbrains.kotlin.resolve.annotations 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.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.PropertyAccessorDescriptor import org.jetbrains.kotlin.descriptors.ClassKind diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java index 4d1591d35d7..d48033c82fc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.ImmutableMap; import com.intellij.psi.PsiElement; @@ -23,25 +23,25 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.annotations.TestOnly; +import org.jetbrains.jet.util.Box; +import org.jetbrains.jet.util.slicedmap.*; +import org.jetbrains.kotlin.cfg.TailRecursionKind; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.cfg.TailRecursionKind; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemCompleter; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -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.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.receivers.Qualifier; 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.*; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java index b21ad0d367f..16cdc5d6403 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import com.intellij.openapi.util.Pair; @@ -22,9 +22,10 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; @@ -32,13 +33,12 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetTypeInfo; import org.jetbrains.kotlin.types.TypeUtils; -import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import java.util.Collection; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DECLARATION; import static org.jetbrains.kotlin.diagnostics.Errors.AMBIGUOUS_LABEL; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; public class BindingContextUtils { private BindingContextUtils() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.kt similarity index 86% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.kt index 7f17dc81679..fbc1175fdff 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingContextUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.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,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.bindingContextUtil +package org.jetbrains.kotlin.resolve.bindingContextUtil -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetReturnExpression 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.resolve.BindingContext.LABEL_TARGET +import org.jetbrains.kotlin.resolve.BindingContext.FUNCTION +import org.jetbrains.kotlin.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.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTrace.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTrace.java index a0ff88374c6..c3e68783845 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTrace.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.diagnostics.DiagnosticSink; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.diagnostics.DiagnosticSink; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java index ee68888b93c..2f1e7b0bd2e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.ImmutableMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.kotlin.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression; import org.jetbrains.jet.util.slicedmap.*; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.java index c216b7f0efd..98abcb013ae 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodiesResolveContext.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; +package org.jetbrains.kotlin.resolve; import com.google.common.base.Function; import com.intellij.psi.PsiElement; @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 381385a7a90..ead39e161d7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -22,27 +22,27 @@ import com.intellij.psi.PsiElement; import com.intellij.util.containers.Queue; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.Box; +import org.jetbrains.jet.util.ReenteringLazyValueComputationException; +import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.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.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.scopes.*; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.util.Box; -import org.jetbrains.jet.util.ReenteringLazyValueComputationException; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import javax.inject.Inject; import java.util.*; import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.DEFERRED_TYPE; +import static org.jetbrains.kotlin.resolve.BindingContext.DEFERRED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; public class BodyResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ChainedTemporaryBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ChainedTemporaryBindingTrace.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ChainedTemporaryBindingTrace.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ChainedTemporaryBindingTrace.java index df8ebb92c55..8d2fa8a1c9d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ChainedTemporaryBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ChainedTemporaryBindingTrace.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CodeAnalyzerInitializer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/CodeAnalyzerInitializer.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt index fa2616b18e0..cde3f0392eb 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CodeAnalyzerInitializer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CodeAnalyzerInitializer.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer import com.intellij.openapi.project.Project diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.java index 407af89f39c..89e9c223775 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompileTimeConstantUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompileTimeConstantUtils.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,34 +14,35 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.BooleanValue; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.constants.BooleanValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; 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; import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.INVALID_TYPE_OF_ANNOTATION_MEMBER; import static org.jetbrains.kotlin.diagnostics.Errors.NULLABLE_TYPE_OF_ANNOTATION_MEMBER; -import static org.jetbrains.jet.lang.resolve.BindingContext.VALUE_PARAMETER; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; +import static org.jetbrains.kotlin.resolve.BindingContext.VALUE_PARAMETER; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isAnnotationClass; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumClass; public class CompileTimeConstantUtils { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt index 73b4b5c8865..da214e04ffe 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/CompositeBindingContext.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/CompositeBindingContext.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve import org.jetbrains.jet.util.slicedmap.ReadOnlySlice import org.jetbrains.jet.util.slicedmap.WritableSlice @@ -22,7 +22,7 @@ import com.google.common.collect.ImmutableMap import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.psi.PsiElement import com.intellij.openapi.util.ModificationTracker -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics public class CompositeBindingContext private ( private val delegates: List diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.java index 353782e0c21..bb38e0e8cb2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ControlFlowAnalyzer.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DataClassUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassUtils.kt similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DataClassUtils.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassUtils.kt index fd14fee3aa6..f530c1520df 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DataClassUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DataClassUtils.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,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.dataClassUtils +package org.jetbrains.kotlin.resolve.dataClassUtils import org.jetbrains.kotlin.name.Name -import java.util.regex.Pattern private val COMPONENT_FUNCTION_NAME_PREFIX = "component" diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.java index 81b12ae64f9..7732e8cd700 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.base.Function; import com.google.common.base.Predicate; @@ -26,29 +26,29 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.kotlin.descriptors.impl.PackageLikeBuilder; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; -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; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.resolveUtil.ResolveUtilPackage; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.utils.UtilsPackage; import javax.inject.Inject; import java.util.*; import static org.jetbrains.kotlin.diagnostics.Errors.REDECLARATION; -import static org.jetbrains.jet.lang.resolve.ScriptHeaderResolver.resolveScriptDeclarations; +import static org.jetbrains.kotlin.resolve.ScriptHeaderResolver.resolveScriptDeclarations; public class DeclarationResolver { private AnnotationResolver annotationResolver; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java index 31deaa31611..723bc3fe4fd 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Multimap; import com.google.common.collect.Sets; @@ -23,23 +23,23 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; 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; import javax.inject.Inject; import java.util.*; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE; -import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE_PARAMETER; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveAbstractMembers; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveOpenMembers; +import static org.jetbrains.kotlin.resolve.BindingContext.TYPE; +import static org.jetbrains.kotlin.resolve.BindingContext.TYPE_PARAMETER; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.classCanHaveAbstractMembers; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.classCanHaveOpenMembers; public class DeclarationsChecker { private BindingTrace trace; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java index 2511aff168a..de8c84aeb9b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.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,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.rendering.Renderers; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; @@ -29,24 +32,21 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.util.CallMaker; -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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; 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; import javax.inject.Inject; import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getCalleeExpressionIfAny; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.FROM_COMPLETER; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java index 2bf1c42c790..8d492e777f7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatingBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; @@ -22,10 +22,10 @@ import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.kotlin.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression; import org.jetbrains.jet.util.slicedmap.*; +import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression; import java.util.Collection; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.java index 4b074d7df94..9f61824d8b9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegationResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -34,7 +34,7 @@ import java.util.*; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.DELEGATION; import static org.jetbrains.kotlin.diagnostics.Errors.MANY_IMPL_MEMBER_NOT_IMPLEMENTED; -import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; +import static org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; public final class DelegationResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorEquivalenceForOverrides.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorEquivalenceForOverrides.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorEquivalenceForOverrides.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorEquivalenceForOverrides.kt index 4cfa3d2ba06..294f299a957 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorEquivalenceForOverrides.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorEquivalenceForOverrides.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,16 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve 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 +import org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo object DescriptorEquivalenceForOverrides { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 5430ed779fa..b04e366830e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -24,43 +24,43 @@ import com.intellij.psi.PsiElement; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.*; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1; -import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.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.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.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; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant; +import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; +import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; import org.jetbrains.kotlin.storage.StorageManager; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; +import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import javax.inject.Inject; import java.util.*; import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; -import static org.jetbrains.jet.lang.resolve.ModifiersChecker.*; -import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; import static org.jetbrains.kotlin.lexer.JetTokens.OVERRIDE_KEYWORD; import static org.jetbrains.kotlin.lexer.JetTokens.VARARG_KEYWORD; +import static org.jetbrains.kotlin.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; +import static org.jetbrains.kotlin.resolve.ModifiersChecker.*; +import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; public class DescriptorResolver { public static final Name COPY_METHOD_NAME = Name.identifier("copy"); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.java index 7300339d174..aaee4c70529 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorToSourceUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorToSourceUtils.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import com.intellij.psi.PsiElement; @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.source.SourcePackage; +import org.jetbrains.kotlin.resolve.source.SourcePackage; import java.util.ArrayList; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionAnalyzerExtension.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionAnalyzerExtension.java index 2b33d529df8..d605b213923 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionAnalyzerExtension.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; 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; +import org.jetbrains.kotlin.resolve.extension.InlineAnalyzerExtension; import javax.inject.Inject; import java.util.ArrayList; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java index f195bc4ad17..81bc3620ac3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/FunctionDescriptorUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.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.resolve; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; 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/kotlin/resolve/Importer.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/Importer.java index 6ecf1358f05..817db083318 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/Importer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/Importer.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,19 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import com.intellij.openapi.util.Pair; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.*; +import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; +import org.jetbrains.kotlin.resolve.scopes.FilteringScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; import java.util.ArrayList; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportsResolver.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportsResolver.java index 2f05314d15d..1a486c24768 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ImportsResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ImportsResolver.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.resolve; +package org.jetbrains.kotlin.resolve; 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.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ScriptDescriptorImpl; -import org.jetbrains.kotlin.psi.*; 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.kotlin.platform.PlatformToKotlinClassMap; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; import javax.inject.Inject; import java.util.Collection; @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode; +import static org.jetbrains.kotlin.resolve.QualifiedExpressionResolver.LookupMode; public class ImportsResolver { private ModuleDescriptor moduleDescriptor; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineDescriptorUtils.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineDescriptorUtils.java index d75b48da396..2537fb412a2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/InlineDescriptorUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/InlineDescriptorUtils.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.resolve; +package org.jetbrains.kotlin.resolve; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.InlineUtil; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ArgumentMapping; import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.builtins.InlineUtil; public class InlineDescriptorUtils { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/JetModuleUtil.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/JetModuleUtil.java index eed7eae9544..df4fb94dc99 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetModuleUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/JetModuleUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; 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; +import org.jetbrains.kotlin.resolve.scopes.JetScope; public class JetModuleUtil { public static JetScope getSubpackagesOfRootScope(@NotNull ModuleDescriptor module) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetVisibilityChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/JetVisibilityChecker.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetVisibilityChecker.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/JetVisibilityChecker.java index d0a5c1803d1..aa3d597f9a7 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/JetVisibilityChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/JetVisibilityChecker.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.java index 47261f6abac..9efe5fdfa07 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LazyTopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; @@ -26,13 +26,13 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.resolve.lazy.LazyImportScope; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.resolveUtil.ResolveUtilPackage; -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; +import org.jetbrains.kotlin.resolve.resolveUtil.ResolveUtilPackage; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker; import javax.inject.Inject; import java.util.ArrayList; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LibrarySourceHacks.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LibrarySourceHacks.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/LibrarySourceHacks.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/LibrarySourceHacks.java index abb20a8ac02..66d754de653 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/LibrarySourceHacks.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LibrarySourceHacks.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import com.intellij.openapi.util.Key; @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.callableDescriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.callableDescriptorToDeclaration; public class LibrarySourceHacks { private LibrarySourceHacks() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java index dfa83275343..c696b2d3779 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -27,13 +27,13 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.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.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.StringValue; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt index cb28de46aff..48aebb2891f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/MutablePackageFragmentProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/MutablePackageFragmentProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.MultiMap diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NoSubpackagesInPackageScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/NoSubpackagesInPackageScope.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt index b1c93e1c242..06a12197bec 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/NoSubpackagesInPackageScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/NoSubpackagesInPackageScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve 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 +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.AbstractScopeAdapter +import org.jetbrains.kotlin.resolve.scopes.JetScope class NoSubpackagesInPackageScope(packageDescriptor: PackageViewDescriptor) : AbstractScopeAdapter() { override val workerScope: JetScope = packageDescriptor.getMemberScope() diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java index aac99562c10..3c93c636b76 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ObservableBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ObservableBindingTrace.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Maps; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.diagnostics.Diagnostic; import java.util.Collection; import java.util.Map; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.java index 7fa5ddca5a2..5c975ef392a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Sets; import com.intellij.openapi.util.Pair; @@ -22,19 +22,18 @@ import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.name.Name; 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.kotlin.name.FqNameUnsafe; -import org.jetbrains.kotlin.name.Name; import javax.inject.Inject; import java.util.Collection; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; public class OverloadResolver { private BindingTrace trace; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.java index aeefadb7355..a48fca18f6a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.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.resolve; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; 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.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypesPackage; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.List; -import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.INCOMPATIBLE; +import static org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.INCOMPATIBLE; public class OverloadUtil { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java index 5ae3b0e6cb0..d572e0a8b4a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -30,18 +30,18 @@ import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; -import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; 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; import javax.inject.Inject; @@ -49,8 +49,8 @@ import java.util.*; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.classCanHaveAbstractMembers; -import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.classCanHaveAbstractMembers; +import static org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; public class OverrideResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PartialBodyResolveProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PartialBodyResolveProvider.kt similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/PartialBodyResolveProvider.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/PartialBodyResolveProvider.kt index fe3fe233e67..e3161fb8dd5 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PartialBodyResolveProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PartialBodyResolveProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve import org.jetbrains.kotlin.psi.JetElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PossiblyBareType.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PossiblyBareType.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/PossiblyBareType.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/PossiblyBareType.java index 2ade73ca3c4..0493186e1c6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/PossiblyBareType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/PossiblyBareType.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.java index e1d92a68351..92727724971 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/QualifiedExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/QualifiedExpressionResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; @@ -25,11 +25,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; -import org.jetbrains.kotlin.psi.*; 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; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.scopes.AbstractScopeAdapter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.java index 2c62cc407cb..e7b83db0cd8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptBodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptBodyResolver.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.psi.JetScript; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.data.DataPackage; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.CoercionStrategy; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptHeaderResolver.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptHeaderResolver.java index e0917c335e1..c7278c1e72d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptHeaderResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptHeaderResolver.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; +package org.jetbrains.kotlin.resolve; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; @@ -22,19 +22,19 @@ 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.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; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetScript; +import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; import javax.inject.Inject; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; +import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; // SCRIPT: Resolve declarations in scripts public class ScriptHeaderResolver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.java index 39ffa67daf6..732867e785f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptNameUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptNameUtil.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptParameterResolver.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptParameterResolver.java index a13a056a081..f666db45388 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/ScriptParameterResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ScriptParameterResolver.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TemporaryBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TemporaryBindingTrace.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.java index 913036c45d0..380022a9e8d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TemporaryBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TemporaryBindingTrace.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.java index 26aad298479..1bdb43a79ad 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisContext.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; +package org.jetbrains.kotlin.resolve; import com.google.common.base.Function; import com.google.common.base.Functions; @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.java index 3098ed6221c..b587079f4d2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisParameters.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalysisParameters.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; +package org.jetbrains.kotlin.resolve; import com.google.common.base.Predicate; import com.intellij.psi.PsiFile; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalyzer.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalyzer.java index 72e4ff8b06f..d98821eac84 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TopDownAnalyzer.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; +package org.jetbrains.kotlin.resolve; import com.google.common.collect.Sets; import com.intellij.psi.PsiElement; @@ -24,11 +24,11 @@ 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.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; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker; import javax.inject.Inject; import java.util.Arrays; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceBasedRedeclarationHandler.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceBasedRedeclarationHandler.java index 7136aca31d6..ddb0aadc248 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceBasedRedeclarationHandler.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceBasedRedeclarationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.resolve.scopes.RedeclarationHandler; +import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; import static org.jetbrains.kotlin.diagnostics.Errors.REDECLARATION; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceEntryFilter.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceEntryFilter.java similarity index 90% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceEntryFilter.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceEntryFilter.java index f24f20a7e9f..1b3962c4362 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TraceEntryFilter.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TraceEntryFilter.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.kt index 5b574be44e8..51047d3f363 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeBinding.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeBinding.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,17 +14,15 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.typeBinding +package org.jetbrains.kotlin.resolve.typeBinding 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 -import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetTypeReference -import java.util.AbstractList import org.jetbrains.kotlin.types.TypeProjection import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.types.TypeProjectionImpl diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeHierarchyResolver.java similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeHierarchyResolver.java index 11fdadc2e39..c737e03f601 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeHierarchyResolver.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; +package org.jetbrains.kotlin.resolve; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiNameIdentifierOwner; @@ -25,13 +25,13 @@ 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.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.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.scopes.ChainedScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WriteThroughScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.utils.DFS; @@ -39,14 +39,14 @@ import javax.inject.Inject; import java.util.*; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.FQNAME_TO_CLASS_DESCRIPTOR; -import static org.jetbrains.jet.lang.resolve.BindingContext.TYPE; -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.kotlin.name.SpecialNames.getClassObjectName; -import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; +import static org.jetbrains.kotlin.resolve.BindingContext.FQNAME_TO_CLASS_DESCRIPTOR; +import static org.jetbrains.kotlin.resolve.BindingContext.TYPE; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isObject; +import static org.jetbrains.kotlin.resolve.ModifiersChecker.getDefaultClassVisibility; +import static org.jetbrains.kotlin.resolve.ModifiersChecker.resolveVisibilityFromModifiers; +import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; public class TypeHierarchyResolver { private static final DFS.Neighbors CLASS_INHERITANCE_EDGES = new DFS.Neighbors() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolutionContext.java similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolutionContext.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolutionContext.java index 00020e9556a..5df4c1820d4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolutionContext.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,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; public class TypeResolutionContext { public final JetScope scope; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.kt index 58fd059331f..c41dab9aab4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/TypeResolver.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,28 +14,27 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve 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.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.LazyScopeAdapter import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.storage.LockBasedStorageManager import org.jetbrains.kotlin.diagnostics.Errors.* -import org.jetbrains.jet.lang.resolve.PossiblyBareType.type +import org.jetbrains.kotlin.resolve.PossiblyBareType.type import org.jetbrains.kotlin.types.Variance.* -import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider import kotlin.platform.platformStatic import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.jet.context.LazinessToken import org.jetbrains.kotlin.resolve.lazy.LazyEntity import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull -import org.jetbrains.kotlin.lexer.JetTokens public class TypeResolver( private val annotationResolver: AnnotationResolver, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt index aad41423c15..6bedfcfdad2 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/VarianceChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/VarianceChecker.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.varianceChecker +package org.jetbrains.kotlin.resolve.varianceChecker import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.diagnostics.Errors @@ -23,14 +23,14 @@ 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 org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.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.resolve.typeBinding.createTypeBinding +import org.jetbrains.kotlin.resolve.typeBinding.createTypeBindingForReturnType import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.resolve.TopDownAnalysisContext +import org.jetbrains.kotlin.resolve.TopDownAnalysisContext import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.psi.JetTypeReference @@ -40,10 +40,10 @@ 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.kotlin.resolve.source.getPsi import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.JetTypeParameterListOwner -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import kotlin.platform.platformStatic diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java index 1a7e20146d0..09318f9176f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java @@ -19,30 +19,30 @@ package org.jetbrains.kotlin.resolve.calls; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.diagnostics.Errors; -import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext; import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode; import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; -import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstructor; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor; +import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.resolve.scopes.JetScope; 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; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getRecordedTypeInfo; +import static org.jetbrains.kotlin.resolve.BindingContextUtils.getRecordedTypeInfo; import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode; import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt index df97ea52325..ae9a2d7573e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallCompleter.kt @@ -23,11 +23,11 @@ import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem 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.kotlin.resolve.BindingContext.CONSTRAINT_SYSTEM_COMPLETER import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl import org.jetbrains.kotlin.resolve.calls.context.CallCandidateResolutionContext import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus @@ -37,10 +37,10 @@ import org.jetbrains.kotlin.resolve.calls.model.ArgumentMapping import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.kotlin.resolve.calls.model.ArgumentUnmapped import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext import org.jetbrains.kotlin.resolve.calls.callUtil.* -import org.jetbrains.jet.lang.resolve.BindingContextUtils +import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext import org.jetbrains.kotlin.types.expressions.DataFlowUtils import org.jetbrains.kotlin.psi.JetExpression @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression import org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS -import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace +import org.jetbrains.kotlin.resolve.TemporaryBindingTrace import org.jetbrains.kotlin.psi.JetQualifiedExpression import java.util.ArrayList import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.* diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java index 30c5ffbe0dc..4b2e6757d6b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java @@ -21,12 +21,12 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.lexer.JetTokens; 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.DescriptorUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode; @@ -37,9 +37,10 @@ import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsUtil; import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.IntegerValueConstant; -import org.jetbrains.jet.lang.resolve.scopes.receivers.*; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.IntegerValueConstant; +import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.resolve.scopes.receivers.*; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.JetTypeInfo; @@ -48,16 +49,14 @@ 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; import javax.inject.Inject; import java.util.Collections; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.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.kotlin.resolve.scopes.receivers.ReceiversPackage.createQualifier; +import static org.jetbrains.kotlin.resolve.scopes.receivers.ReceiversPackage.resolveAsStandaloneExpression; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; public class CallExpressionResolver { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java index 4d8fcdb102f..7836ee24c82 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java @@ -22,8 +22,10 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.context.*; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; @@ -37,13 +39,11 @@ import org.jetbrains.kotlin.resolve.calls.tasks.*; import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollectors; import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall; -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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; 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; import java.util.Collection; @@ -52,7 +52,7 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.NOT_A_CLASS; import static org.jetbrains.kotlin.diagnostics.Errors.NO_CONSTRUCTOR; -import static org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage.recordScopeAndDataFlowInfo; +import static org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.recordScopeAndDataFlowInfo; import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.RESOLVE_FUNCTION_ARGUMENTS; import static org.jetbrains.kotlin.resolve.calls.CallResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; import static org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults.Code.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java index 809b38e09e3..bbb510a9d25 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolverUtil.java @@ -18,13 +18,18 @@ package org.jetbrains.kotlin.resolve.calls; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.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.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; +import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; +import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.psi.Call; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.types.*; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java index 7c9938a8aa0..88effae1222 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java @@ -26,9 +26,9 @@ 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; -import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace; +import org.jetbrains.kotlin.resolve.ChainedTemporaryBindingTrace; +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; +import org.jetbrains.kotlin.resolve.TemporaryBindingTrace; import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.kotlin.resolve.calls.context.CallCandidateResolutionContext; import org.jetbrains.kotlin.resolve.calls.context.ContextDependency; @@ -42,8 +42,8 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate; import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionTask; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategyForInvoke; import org.jetbrains.kotlin.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.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java index 5d663df0b10..f61d0f72606 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.java @@ -23,10 +23,11 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.context.*; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl; @@ -39,12 +40,11 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils; import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionTask; import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; 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; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java index 26eb2e013ee..790ac7a86de 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java @@ -25,19 +25,19 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.List; import java.util.Map; import java.util.Set; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; +import static org.jetbrains.kotlin.resolve.BindingContext.REFERENCE_TARGET; import static org.jetbrains.kotlin.resolve.calls.ValueArgumentsToParametersMapper.Status.*; /*package*/ class ValueArgumentsToParametersMapper { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/BasicCallResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/BasicCallResolutionContext.java index 07f83c65350..5fa8e68bb95 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/BasicCallResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/BasicCallResolutionContext.java @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.Call; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; public class BasicCallResolutionContext extends CallResolutionContext { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallCandidateResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallCandidateResolutionContext.java index 6575d71c253..0f5d35b614c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallCandidateResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallCandidateResolutionContext.java @@ -20,14 +20,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.Call; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; public final class CallCandidateResolutionContext extends CallResolutionContext> { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.java index 034750634ea..230392c1089 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/CallResolutionContext.java @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.Call; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.kotlin.resolve.calls.model.DataFlowInfoForArgumentsImpl; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; public abstract class CallResolutionContext> extends ResolutionContext { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionContext.java index d6dc6f9eae3..528a3974568 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionContext.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionResultsCache.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionResultsCache.kt index 396a4729b59..66e343ad68b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionResultsCache.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/ResolutionResultsCache.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.calls.context import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsImpl -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import java.util.HashMap import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/SimpleResolutionContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/SimpleResolutionContext.java index 3f15f1c4943..d16624ef102 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/SimpleResolutionContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/SimpleResolutionContext.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; public class SimpleResolutionContext extends ResolutionContext { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/TemporaryTraceAndCache.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/TemporaryTraceAndCache.java index bfd895567a5..83ea8c04b87 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/TemporaryTraceAndCache.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/context/TemporaryTraceAndCache.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve.calls.context; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.TemporaryBindingTrace; +import org.jetbrains.kotlin.resolve.TemporaryBindingTrace; public class TemporaryTraceAndCache { public final TemporaryBindingTrace trace; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CapturingInClosureExtension.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CapturingInClosureExtension.kt index 6bf3a97cd1d..4d8faf6a2cf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CapturingInClosureExtension.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/CapturingInClosureExtension.kt @@ -19,14 +19,14 @@ package org.jetbrains.kotlin.resolve.calls.extensions import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext -import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.scopes.JetScope 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.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext.CAPTURED_IN_CLOSURE import org.jetbrains.kotlin.types.expressions.CaptureKind -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.kotlin.resolve.calls.callUtil.* diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/InlineCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/InlineCallResolverExtension.java index d1e662b1f72..680c97a29e7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/InlineCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/InlineCallResolverExtension.java @@ -20,31 +20,31 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.InlineUtil; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.kotlin.resolve.calls.model.DefaultValueArgument; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.kotlin.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.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.InlineUtil; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.lexer.JetToken; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.HashSet; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.InlineDescriptorUtils.allowsNonLocalReturns; -import static org.jetbrains.jet.lang.resolve.InlineDescriptorUtils.checkNonLocalReturnUsage; +import static org.jetbrains.kotlin.resolve.InlineDescriptorUtils.allowsNonLocalReturns; +import static org.jetbrains.kotlin.resolve.InlineDescriptorUtils.checkNonLocalReturnUsage; public class InlineCallResolverExtension implements CallResolverExtension { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java index 5e362992c40..463fa9a5c8e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/extensions/NeedSyntheticCallResolverExtension.java @@ -22,9 +22,9 @@ import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.Visibilities; import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; -import static org.jetbrains.jet.lang.resolve.BindingContext.NEED_SYNTHETIC_ACCESSOR; +import static org.jetbrains.kotlin.resolve.BindingContext.NEED_SYNTHETIC_ACCESSOR; public class NeedSyntheticCallResolverExtension implements CallResolverExtension { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DelegatingResolvedCall.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DelegatingResolvedCall.java index 1c36908b342..5fec5890d10 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DelegatingResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/DelegatingResolvedCall.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus; import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableResolvedCall.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableResolvedCall.java index ce8898599b8..2e19257e70f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/MutableResolvedCall.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.DelegatingBindingTrace; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus; import org.jetbrains.kotlin.types.TypeSubstitutor; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCall.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCall.java index 90afc5b9946..36b40bf9d1e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCall.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus; import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java index 28a62b2b512..e968f31783d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/ResolvedCallImpl.java @@ -26,14 +26,14 @@ 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; -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus; import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.TypeSubstitutor; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VariableAsFunctionResolvedCall.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VariableAsFunctionResolvedCall.kt index 4d748612ac4..119000225e6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VariableAsFunctionResolvedCall.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/model/VariableAsFunctionResolvedCall.kt @@ -16,17 +16,10 @@ package org.jetbrains.kotlin.resolve.calls.model -import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue 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.kotlin.descriptors.TypeParameterDescriptor -import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace public trait VariableAsFunctionResolvedCall { public val functionCall: ResolvedCall diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java index 5db3f08d20c..83c5f02fc5d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadResolutionResultsImpl.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.calls.results; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.java index fce0b573c14..a15aeb37bf2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/OverloadingConflictResolver.java @@ -20,14 +20,14 @@ import gnu.trove.THashSet; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java index 052a9179393..9816ea56800 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/results/ResolutionResultsHandler.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.calls.results; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; -import org.jetbrains.jet.lang.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java index 374b2cbedf1..1105607a830 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/DataFlowValueFactory.java @@ -20,17 +20,17 @@ import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.scopes.receivers.*; +import org.jetbrains.kotlin.resolve.scopes.receivers.*; 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; +import static org.jetbrains.kotlin.resolve.BindingContext.REFERENCE_TARGET; public class DataFlowValueFactory { private DataFlowValueFactory() {} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java index f2f6e033e98..f076eb4c000 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/smartcasts/SmartCastUtils.java @@ -24,13 +24,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.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.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; @@ -41,8 +41,8 @@ import java.util.List; import java.util.Set; import static org.jetbrains.kotlin.diagnostics.Errors.SMARTCAST_IMPOSSIBLE; -import static org.jetbrains.jet.lang.resolve.BindingContext.EXPRESSION_TYPE; -import static org.jetbrains.jet.lang.resolve.BindingContext.SMARTCAST; +import static org.jetbrains.kotlin.resolve.BindingContext.EXPRESSION_TYPE; +import static org.jetbrains.kotlin.resolve.BindingContext.SMARTCAST; public class SmartCastUtils { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java index 3c255b47dd0..195d26699da 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/AbstractTracingStrategy.java @@ -21,30 +21,33 @@ import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; -import org.jetbrains.kotlin.resolve.calls.inference.*; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemStatus; +import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; 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; import java.util.Collection; import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; +import static org.jetbrains.kotlin.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqNameFromTopLevelClass; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqNameFromTopLevelClass; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; public abstract class AbstractTracingStrategy implements TracingStrategy { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt index 9e00cc61554..703b05ecb42 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/CallableDescriptorCollectors.kt @@ -17,15 +17,15 @@ package org.jetbrains.kotlin.resolve.calls.tasks.collectors import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope 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 +import org.jetbrains.kotlin.resolve.LibrarySourceHacks.filterOutMembersFromLibrarySource +import org.jetbrains.kotlin.resolve.DescriptorUtils.isStaticNestedClass public trait CallableDescriptorCollector { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionCandidate.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionCandidate.java index 920f134deb7..95526653236 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionCandidate.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionCandidate.java @@ -20,12 +20,12 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.Call; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; +import static org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; public class ResolutionCandidate { private final Call call; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java index 5a3cb988ef1..f774b868ed4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/ResolutionTask.java @@ -23,13 +23,13 @@ import org.jetbrains.annotations.Nullable; 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; -import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.context.*; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt index d308f2113a5..832ea66dc7a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TaskPrioritizer.kt @@ -26,21 +26,19 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollector import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollectors 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.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils +import org.jetbrains.kotlin.resolve.scopes.receivers.QualifierReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue 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.kotlin.resolve.calls.context.ResolutionContext -import java.util.ArrayList - import org.jetbrains.kotlin.resolve.calls.CallResolverUtil.isOrOverridesSynthesized import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.* -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER public class TaskPrioritizer(private val storageManager: StorageManager) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java index 3547017fa34..063e131c05e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategy.java @@ -20,10 +20,10 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForInvoke.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForInvoke.java index 1fe0418228b..af94086c7e5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForInvoke.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyForInvoke.java @@ -19,24 +19,24 @@ package org.jetbrains.kotlin.resolve.calls.tasks; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.JetReferenceExpression; +import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collection; import static org.jetbrains.kotlin.diagnostics.Errors.FUNCTION_EXPECTED; import static org.jetbrains.kotlin.diagnostics.Errors.NO_RECEIVER_ALLOWED; -import static org.jetbrains.jet.lang.resolve.BindingContext.CALL; -import static org.jetbrains.jet.lang.resolve.BindingContext.RESOLVED_CALL; +import static org.jetbrains.kotlin.resolve.BindingContext.CALL; +import static org.jetbrains.kotlin.resolve.BindingContext.RESOLVED_CALL; public class TracingStrategyForInvoke extends AbstractTracingStrategy { private static final Logger LOG = Logger.getInstance(TracingStrategyForInvoke.class); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java index e5d68ac38da..7a1cfce657b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/TracingStrategyImpl.java @@ -21,7 +21,7 @@ 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.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.kotlin.resolve.calls.util.FakeCallableDescriptorForObject; @@ -31,7 +31,7 @@ import java.util.Collection; import static org.jetbrains.kotlin.diagnostics.Errors.UNRESOLVED_REFERENCE; import static org.jetbrains.kotlin.diagnostics.Errors.UNRESOLVED_REFERENCE_WRONG_RECEIVER; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; public class TracingStrategyImpl extends AbstractTracingStrategy { private final JetReferenceExpression reference; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt index 33faf7ee14a..37d3dbd6ac4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt @@ -35,20 +35,20 @@ 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.kotlin.resolve.scopes.receivers.TransientReceiver import org.jetbrains.kotlin.types.isDynamic import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollector -import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.calls.tasks.collectors.CallableDescriptorCollectors -import org.jetbrains.jet.lang.resolve.scopes.JetScopeImpl +import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.psi.JetOperationReferenceExpression -import org.jetbrains.jet.lang.resolve.DescriptorFactory +import org.jetbrains.kotlin.resolve.DescriptorFactory import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.ValueArgument diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java index 1a4e3d9358b..2714dcece44 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/CallMaker.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.Call.CallType; import org.jetbrains.kotlin.psi.debugText.DebugTextPackage; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java index 98ca2b5fb9e..dcd78d696ad 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/DelegatingCall.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt index 6c5e68c8bc7..4bb4de410ea 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/FakeCallableDescriptorForObject.kt @@ -25,10 +25,9 @@ import java.util.Collections 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.kotlin.resolve.constants.CompileTimeConstant import org.jetbrains.kotlin.descriptors.SourceElement -import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.jet.lang.resolve.descriptorUtil.getClassObjectReferenceTarget +import org.jetbrains.kotlin.resolve.descriptorUtil.getClassObjectReferenceTarget public class FakeCallableDescriptorForObject( private val classDescriptor: ClassDescriptor diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt index f5a7c41c94a..abce4350f98 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/util/callUtil.kt @@ -23,11 +23,11 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatchStatus import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver -import org.jetbrains.jet.lang.resolve.BindingContext.CALL +import org.jetbrains.kotlin.resolve.BindingContext.CALL import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.resolve.BindingContext.RESOLVED_CALL +import org.jetbrains.kotlin.resolve.BindingContext.RESOLVED_CALL import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation import org.jetbrains.kotlin.descriptors.FunctionDescriptor diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkTraitRequirements.kt similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/checkTraitRequirements.kt index 0e496fef9e3..2786ac6734e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/checkTraitRequirements.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkTraitRequirements.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,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.resolveUtil +package org.jetbrains.kotlin.resolve.resolveUtil import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.kotlin.descriptors.ClassDescriptorWithResolutionScopes -import org.jetbrains.jet.lang.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.BindingTrace fun checkTraitRequirements(c: Map, trace: BindingTrace) { for ((classOrObject, descriptor) in c.entrySet()) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.java index 5d510ccbe5b..3ec48e5b508 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstantChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstantChecker.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,22 +14,22 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.constants; +package org.jetbrains.kotlin.resolve.constants; import com.google.common.collect.Sets; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.psi.JetConstantExpression; import org.jetbrains.kotlin.psi.JetElement; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; 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/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt index 92e01adc208..dd787e718e7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.resolve.constants.evaluate 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.kotlin.resolve.* import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.resolve.constants.* +import org.jetbrains.kotlin.resolve.constants.* import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.builtins.KotlinBuiltIns diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt index 93df16297c0..036c7e25500 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/Diagnostics.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/Diagnostics.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.diagnostics +package org.jetbrains.kotlin.resolve.diagnostics import com.intellij.psi.PsiElement import org.jetbrains.kotlin.diagnostics.Diagnostic diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsElementsCache.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsElementsCache.java index 6c48484a286..ab9f6f21e18 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsElementsCache.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsElementsCache.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.diagnostics; +package org.jetbrains.kotlin.resolve.diagnostics; import com.intellij.openapi.util.AtomicNotNullLazyValue; import com.intellij.psi.PsiElement; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java similarity index 97% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java index 6cc9478162e..d883492e715 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/DiagnosticsWithSuppression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.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.diagnostics; +package org.jetbrains.kotlin.resolve.diagnostics; import com.google.common.collect.ImmutableSet; import com.intellij.openapi.application.Application; @@ -30,17 +30,17 @@ 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.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Severity; import org.jetbrains.kotlin.psi.JetAnnotated; import org.jetbrains.kotlin.psi.JetAnnotationEntry; import org.jetbrains.kotlin.psi.JetStubbedPsiUtil; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.constants.ArrayValue; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.StringValue; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.constants.ArrayValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.StringValue; import java.util.*; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt index 0dde16d77ea..7382e9803d4 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/MutableDiagnosticsWithSuppression.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.diagnostics +package org.jetbrains.kotlin.resolve.diagnostics import org.jetbrains.kotlin.diagnostics.Diagnostic import java.util.ArrayList @@ -23,7 +23,7 @@ import com.intellij.util.CachedValueImpl import com.intellij.psi.util.CachedValueProvider import com.intellij.psi.PsiElement import org.jetbrains.annotations.TestOnly -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext public class MutableDiagnosticsWithSuppression( private val bindingContext: BindingContext, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SimpleDiagnostics.kt similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SimpleDiagnostics.kt index 996b86178d4..c208b7b518d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SimpleDiagnostics.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SimpleDiagnostics.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.diagnostics +package org.jetbrains.kotlin.resolve.diagnostics import com.intellij.psi.PsiElement import org.jetbrains.kotlin.diagnostics.Diagnostic diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt similarity index 94% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt index 9e7528f3810..51d2a3bbc60 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/SuppressDiagnosticsByAnnotations.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.diagnostics +package org.jetbrains.kotlin.resolve.diagnostics import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.diagnostics.Errors -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.name.FqName diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/extension/InlineAnalyzerExtension.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/extension/InlineAnalyzerExtension.java index 1171f84d0e3..a874082a8f9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/extension/InlineAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/extension/InlineAnalyzerExtension.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.resolve.extension; +package org.jetbrains.kotlin.resolve.extension; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.InlineUtil; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.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.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.InlineUtil; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java index 11e4b5ed3b1..f67d72694e8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeConstructor; import org.jetbrains.kotlin.types.TypeProjection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ImportsProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ImportsProvider.java index de8f0202f83..bc3c71d5e45 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ImportsProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ImportsProvider.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.resolve.lazy; import com.google.common.collect.*; import kotlin.Function0; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.JetImportDirective; -import org.jetbrains.jet.lang.resolve.ImportPath; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.JetImportDirective; +import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/KotlinCodeAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/KotlinCodeAnalyzer.java index 4248538306f..2fc8d7f2cb1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/KotlinCodeAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/KotlinCodeAnalyzer.java @@ -20,12 +20,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.name.FqName; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.kotlin.name.FqName; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt index da6fedf5d68..afd6e969ce6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyImportScope.kt @@ -22,15 +22,15 @@ import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetImportDirective import org.jetbrains.kotlin.psi.debugText.* -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.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.Importer +import org.jetbrains.kotlin.resolve.ImportsResolver +import org.jetbrains.kotlin.resolve.JetModuleUtil import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.* +import org.jetbrains.kotlin.resolve.scopes.* import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver.LookupMode import java.util.LinkedHashSet public class LazyImportScope(private val resolveSession: ResolveSession, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java index c8515e5b28b..b3f9be04c71 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSession.java @@ -30,17 +30,17 @@ import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo; import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider; import org.jetbrains.kotlin.resolve.lazy.descriptors.*; -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.resolve.scopes.JetScope; import org.jetbrains.kotlin.storage.*; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java index 9a509b88aca..3044404a742 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java @@ -25,13 +25,13 @@ 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.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 org.jetbrains.kotlin.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.psi.JetNamedDeclarationUtil; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import java.util.Collection; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java index e120ce27f4a..db1b1e63cc3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ScopeProvider.java @@ -22,15 +22,15 @@ import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.lazy.descriptors.LazyClassDescriptor; 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.psi.*; +import org.jetbrains.kotlin.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.JetModuleUtil; +import org.jetbrains.kotlin.resolve.NoSubpackagesInPackageScope; +import org.jetbrains.kotlin.resolve.TemporaryBindingTrace; +import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor; +import org.jetbrains.kotlin.resolve.scopes.ChainedScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt index 6add1c83703..96fa7ecad50 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/data/JetScriptInfo.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.lazy.data import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.descriptors.ClassKind -import org.jetbrains.jet.lang.resolve.ScriptNameUtil +import org.jetbrains.kotlin.resolve.ScriptNameUtil import org.jetbrains.kotlin.name.FqName public class JetScriptInfo( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt index 96088e551b2..537d91b4065 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/AbstractPsiBasedDeclarationProvider.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils.safeNameForLazyResolve import java.util.ArrayList -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public abstract class AbstractPsiBasedDeclarationProvider(storageManager: StorageManager) : DeclarationProvider { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt index 92f73e0278f..8b56cd67db2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/CombinedPackageMemberDeclarationProvider.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.resolve.lazy.declarations import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public class CombinedPackageMemberDeclarationProvider(val providers: Collection) : PackageMemberDeclarationProvider { override fun getAllDeclaredSubPackages() = providers.flatMap { it.getAllDeclaredSubPackages() } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProvider.kt index 7fd2c3f33b8..97789132168 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProvider.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/DeclarationProvider.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public trait DeclarationProvider { public fun getDeclarations(kindFilter: DescriptorKindFilter, nameFilter: (Name) -> Boolean): List diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt index 269d0eeb0cb..b1fee945b7f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/AbstractLazyMemberScope.kt @@ -19,22 +19,22 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors import com.google.common.collect.Sets import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.AnnotationResolver -import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.ScriptNameUtil +import org.jetbrains.kotlin.resolve.AnnotationResolver +import org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.ScriptNameUtil import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProvider import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull import org.jetbrains.kotlin.utils.Printer import java.util.* import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.utils.toReadOnlyList -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public abstract class AbstractLazyMemberScope protected( protected val resolveSession: ResolveSession, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt index aae75d6a5c2..abb486df1d4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyAnnotations.kt @@ -21,15 +21,15 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.resolve.lazy.LazyEntity import org.jetbrains.kotlin.psi.JetAnnotationEntry -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.lang.resolve.AnnotationResolver -import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.AnnotationResolver +import org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.BindingContext abstract class LazyAnnotationsContext( val annotationResolver: AnnotationResolver, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index 8e16bd4bfcd..6922ce0d740 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -28,14 +28,16 @@ import org.jetbrains.annotations.Mutable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorBase; +import org.jetbrains.kotlin.name.Name; 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.ModifiersChecker; -import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.TypeHierarchyResolver; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyEntity; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; @@ -44,26 +46,24 @@ import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil; import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo; import org.jetbrains.kotlin.resolve.lazy.data.SyntheticClassObjectInfo; import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.*; -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.resolve.scopes.*; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.NullableLazyValue; import org.jetbrains.kotlin.storage.StorageManager; +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 java.util.*; import static org.jetbrains.kotlin.diagnostics.Errors.CLASS_OBJECT_NOT_ALLOWED; import static org.jetbrains.kotlin.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.kotlin.name.SpecialNames.getClassObjectName; -import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isSyntheticClassObject; +import static org.jetbrains.kotlin.resolve.ModifiersChecker.*; +import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDescriptorWithResolutionScopes, LazyEntity { private static final Predicate VALID_SUPERTYPE = new Predicate() { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt index 268964dd171..db56490a8f3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt @@ -21,12 +21,12 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.* -import org.jetbrains.jet.lang.resolve.dataClassUtils.* +import org.jetbrains.kotlin.resolve.* +import org.jetbrains.kotlin.resolve.dataClassUtils.* import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.DeferredType import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns @@ -36,10 +36,10 @@ import java.util.* 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.resolve.DelegationResolver.generateDelegatedMembers import org.jetbrains.kotlin.storage.NotNullLazyValue -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker public open class LazyClassMemberScope(resolveSession: ResolveSession, declarationProvider: ClassMemberDeclarationProvider, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java index c1b7c19e215..2b7de45d7b5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageDescriptor.java @@ -19,14 +19,14 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.impl.PackageFragmentDescriptorImpl; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyEntity; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; public class LazyPackageDescriptor extends PackageFragmentDescriptorImpl implements LazyEntity { private final JetScope memberScope; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt index ae066092bf1..9b8bf40a936 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyPackageMemberScope.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.declarations.PackageMemberDeclarationProvider import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public class LazyPackageMemberScope( resolveSession: ResolveSession, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassDescriptor.java index f3958d02df0..b9789fd2051 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassDescriptor.java @@ -20,11 +20,11 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.TemporaryBindingTrace; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo; import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider; -import org.jetbrains.kotlin.name.Name; public class LazyScriptClassDescriptor extends LazyClassDescriptor { public LazyScriptClassDescriptor( diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt index dd4b0b8781b..5f827cc9431 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptClassMemberScope.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.descriptors.impl.ScriptDescriptorImpl -import org.jetbrains.jet.lang.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.lazy.ResolveSession import org.jetbrains.kotlin.resolve.lazy.data.JetScriptInfo import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProvider diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt index 6f1bf0957af..09f5d6cdc82 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyScriptDescriptor.kt @@ -22,25 +22,25 @@ import org.jetbrains.kotlin.resolve.lazy.LazyEntity 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.resolve.scopes.receivers.ScriptReceiver import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.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.kotlin.resolve.ScriptParameterResolver +import org.jetbrains.kotlin.resolve.ScriptBodyResolver 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.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl +import org.jetbrains.kotlin.resolve.scopes.ChainedScope import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil 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.kotlin.resolve.scopes.RedeclarationHandler +import org.jetbrains.kotlin.resolve.scopes.WritableScope import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.resolve.source.toSourceElement +import org.jetbrains.kotlin.resolve.source.toSourceElement public class LazyScriptDescriptor( private val resolveSession: ResolveSession, diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java index 3db761ccf58..b5c57872ec5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeParameterDescriptor.java @@ -19,18 +19,18 @@ package org.jetbrains.kotlin.resolve.lazy.descriptors; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyEntity; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; +import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescriptor implements LazyEntity { private final ResolveSession resolveSession; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ClassObjectMixinScope.kt similarity index 85% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ClassObjectMixinScope.kt index 6ec8978b7de..33a15f4940f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/ClassObjectMixinScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/ClassObjectMixinScope.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,9 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor - -import java.util.Collections /** * Members of the class object are accessible from the class. diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java similarity index 95% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.java index b6c602ee203..01d27af523e 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/JetScopeUtils.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.scopes; +package org.jetbrains.kotlin.resolve.scopes; import com.google.common.base.Function; import com.google.common.collect.Collections2; @@ -25,9 +25,9 @@ import org.jetbrains.annotations.TestOnly; 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; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.TraceBasedRedeclarationHandler; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.utils.Printer; import java.util.Collection; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/RedeclarationHandler.java similarity index 91% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/RedeclarationHandler.java index 5978c8c5aeb..7e96bc6c28c 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/RedeclarationHandler.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/RedeclarationHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes; +package org.jetbrains.kotlin.resolve.scopes; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; public interface RedeclarationHandler { RedeclarationHandler DO_NOTHING = new RedeclarationHandler() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt similarity index 96% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt index 683c9afda1e..9fb246767d9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import com.google.common.collect.Multimap import org.jetbrains.kotlin.descriptors.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt similarity index 99% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt index 082139b089b..6898202500b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import com.google.common.collect.* import org.jetbrains.kotlin.descriptors.* diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeWithImports.kt similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeWithImports.kt index daa714e302d..f7cb1006e72 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WritableScopeWithImports.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import com.google.common.collect.Lists import com.google.common.collect.Sets @@ -23,9 +23,6 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.utils.Printer import java.util.* -import kotlin.List -import kotlin.Set -import kotlin.Collection public abstract class WritableScopeWithImports(override val workerScope: JetScope, protected val redeclarationHandler: RedeclarationHandler, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WriteThroughScope.kt similarity index 98% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WriteThroughScope.kt index 69c0d2a4ce0..4a3525adc5d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/WriteThroughScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import com.google.common.collect.Lists import com.google.common.collect.Multimap diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExpressionReceiver.java similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExpressionReceiver.java index 06721849075..f7b682dadf6 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExpressionReceiver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExpressionReceiver.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.scopes.receivers; +package org.jetbrains.kotlin.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetExpression; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.kt index 293d8167af2..617bdda9003 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/Qualifier.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/Qualifier.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,25 +14,25 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes.receivers +package org.jetbrains.kotlin.resolve.scopes.receivers import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.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.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.ChainedScope +import org.jetbrains.kotlin.resolve.scopes.ChainedScope import java.util.ArrayList import org.jetbrains.kotlin.utils.addIfNotNull -import org.jetbrains.jet.lang.resolve.BindingContext.* +import org.jetbrains.kotlin.resolve.BindingContext.* import org.jetbrains.kotlin.diagnostics.Errors.* 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.resolve.descriptorUtil.getClassObjectReferenceTarget import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.resolve.bindingContextUtil.recordScopeAndDataFlowInfo +import org.jetbrains.kotlin.resolve.bindingContextUtil.recordScopeAndDataFlowInfo import kotlin.properties.Delegates public trait Qualifier: ReceiverValue { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ScriptReceiver.java similarity index 93% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ScriptReceiver.java index 2865629f217..738ce9a8cc8 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ScriptReceiver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/scopes/receivers/ScriptReceiver.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes.receivers; +package org.jetbrains.kotlin.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; // SCRIPT: script receiver public class ScriptReceiver implements ThisReceiver { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/source/KotlinSourceElement.kt similarity index 92% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/source/KotlinSourceElement.kt index 257bf11052c..da37734c6cc 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/KotlinSourceElement.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/source/KotlinSourceElement.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.source +package org.jetbrains.kotlin.resolve.source import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.descriptors.SourceElement diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/PsiSourceElement.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/source/PsiSourceElement.kt similarity index 89% rename from compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/PsiSourceElement.kt rename to compiler/frontend/src/org/jetbrains/kotlin/resolve/source/PsiSourceElement.kt index 107bf807bc1..982200e972f 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/source/PsiSourceElement.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/source/PsiSourceElement.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.source +package org.jetbrains.kotlin.resolve.source import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.SourceElement diff --git a/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java b/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java index e16e8e174a0..6f251d5cc05 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LazyResolveStorageManager.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.storage; import kotlin.Function1; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; public interface LazyResolveStorageManager extends StorageManager { @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt index 168bd790239..554c399f61e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/storage/LockBasedLazyResolveStorageManager.kt @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.storage import com.intellij.util.containers.ConcurrentWeakValueHashMap import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.diagnostics.Diagnostic -import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.jet.util.slicedmap.ReadOnlySlice import org.jetbrains.jet.util.slicedmap.WritableSlice -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics public class LockBasedLazyResolveStorageManager(private val storageManager: StorageManager): StorageManager by storageManager, LazyResolveStorageManager { override fun createWeaklyRetainedMemoizedFunction(compute: Function1) = diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java index 22a84853c17..1c29f55242f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/DeferredType.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.types; import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.kotlin.storage.NotNullLazyValue; -import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.jet.util.Box; import org.jetbrains.jet.util.ReenteringLazyValueComputationException; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.storage.NotNullLazyValue; +import org.jetbrains.kotlin.storage.StorageManager; -import static org.jetbrains.jet.lang.resolve.BindingContext.DEFERRED_TYPE; +import static org.jetbrains.kotlin.resolve.BindingContext.DEFERRED_TYPE; public class DeferredType extends DelegatingType implements LazyType { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java index 9f3ea1a03c1..fad45f29f29 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -22,14 +22,17 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; -import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; @@ -38,7 +41,6 @@ import org.jetbrains.kotlin.resolve.calls.context.TemporaryTraceAndCache; import org.jetbrains.kotlin.resolve.calls.model.DataFlowInfoForArgumentsImpl; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCallImpl; -import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsImpl; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsUtil; @@ -49,20 +51,17 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; import org.jetbrains.kotlin.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.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.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstantChecker; +import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant; +import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import org.jetbrains.kotlin.utils.ThrowingList; import java.util.Collection; @@ -71,19 +70,19 @@ import java.util.List; import static org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getStaticNestedClassesScope; +import static org.jetbrains.kotlin.lexer.JetTokens.AS_KEYWORD; +import static org.jetbrains.kotlin.lexer.JetTokens.AS_SAFE; +import static org.jetbrains.kotlin.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getStaticNestedClassesScope; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.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.kotlin.resolve.scopes.receivers.ReceiverValue.NO_RECEIVER; +import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; 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; @SuppressWarnings("SuspiciousMethodCalls") public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java index d22be11c942..b80b3205077 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ClosureExpressionsTypingVisitor.java @@ -24,26 +24,26 @@ import kotlin.Function0; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.*; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.*; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import java.util.Collection; import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.jet.lang.resolve.source.SourcePackage.toSourceElement; +import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; import static org.jetbrains.kotlin.types.TypeUtils.*; import static org.jetbrains.kotlin.types.expressions.CoercionStrategy.COERCION_TO_UNIT; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java index 17bbf238065..4311134c7e8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingUtils.java @@ -29,28 +29,31 @@ 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.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.CallResolver; -import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.kotlin.resolve.calls.inference.*; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemStatus; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintsUtil; +import org.jetbrains.kotlin.resolve.calls.inference.InferenceErrorData; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionCandidate; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; import org.jetbrains.kotlin.resolve.calls.util.CallMaker; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.*; -import org.jetbrains.kotlin.lexer.JetTokens; import java.util.*; -import static org.jetbrains.jet.lang.resolve.BindingContext.CALL; -import static org.jetbrains.jet.lang.resolve.BindingContext.RESOLVED_CALL; +import static org.jetbrains.kotlin.resolve.BindingContext.CALL; +import static org.jetbrains.kotlin.resolve.BindingContext.RESOLVED_CALL; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.EXPECTED_TYPE_POSITION; public class ControlStructureTypingUtils { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java index 9bf82862357..cd5e1b4af0b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.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.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.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.resolve.scopes.receivers.ExpressionReceiver; -import org.jetbrains.jet.lang.resolve.scopes.receivers.TransientReceiver; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; import java.util.Collections; @@ -44,7 +44,7 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java index ec426405579..89eb531b454 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowUtils.java @@ -22,23 +22,23 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory; import org.jetbrains.kotlin.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.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstantChecker; +import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant; +import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.resolve.constants.evaluate.EvaluatePackage; 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 java.util.Collection; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java index 8db9a5397be..5a825d5f14c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingComponents.java @@ -18,12 +18,12 @@ package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.context.GlobalContext; -import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.jet.lang.reflect.ReflectionTypes; -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.types.DynamicTypesSettings; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import javax.inject.Inject; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java index 781feb00042..535ec728311 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingContext.java @@ -17,15 +17,15 @@ package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.context.ContextDependency; import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.kotlin.resolve.calls.context.ResolutionResultsCache; import org.jetbrains.kotlin.resolve.calls.context.ResolutionResultsCacheImpl; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstantChecker; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstantChecker; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; public class ExpressionTypingContext extends ResolutionContext { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java index 028bca60479..0235880edad 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java @@ -24,28 +24,28 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalyzerPackage; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; -import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; -import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.resolve.calls.context.ContextDependency; import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtension; +import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; import org.jetbrains.kotlin.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.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; 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; import javax.inject.Inject; import java.util.Iterator; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java index 7adabe77c8a..42ff92703e4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java @@ -25,30 +25,30 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetNodeTypes; +import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.util.CallMaker; -import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; -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.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; +import org.jetbrains.kotlin.resolve.scopes.receivers.ClassReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; 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; import java.util.ArrayList; import java.util.Collections; @@ -56,7 +56,7 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; public class ExpressionTypingUtils { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java index e7b8177b333..2e380c33378 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -19,19 +19,19 @@ package org.jetbrains.kotlin.types.expressions; import com.intellij.openapi.progress.ProcessCanceledException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.ReenteringLazyValueComputationException; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.types.DeferredType; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetTypeInfo; -import org.jetbrains.jet.util.ReenteringLazyValueComputationException; import org.jetbrains.kotlin.utils.KotlinFrontEndException; import static org.jetbrains.kotlin.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM; -import static org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage.recordScopeAndDataFlowInfo; +import static org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.recordScopeAndDataFlowInfo; public class ExpressionTypingVisitorDispatcher extends JetVisitor implements ExpressionTypingInternals { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java index 7c95835812b..bd357c41b45 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorForStatements.java @@ -20,31 +20,37 @@ 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.kotlin.descriptors.*; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.FunctionDescriptor; +import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; +import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; +import org.jetbrains.kotlin.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.FunctionDescriptorUtil; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.TemporaryBindingTrace; import org.jetbrains.kotlin.resolve.calls.context.TemporaryTraceAndCache; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResultsUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; 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 java.util.Collection; import static org.jetbrains.kotlin.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.kotlin.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; +import static org.jetbrains.kotlin.resolve.BindingContext.VARIABLE_REASSIGNMENT; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java index 464ec8fcc2e..dcee59d848d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ForLoopConventionsChecker.java @@ -20,30 +20,30 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.util.slicedmap.WritableSlice; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory1; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.jet.util.slicedmap.WritableSlice; import javax.inject.Inject; import java.util.Collections; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.jet.lang.resolve.BindingContext.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; public class ForLoopConventionsChecker { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java index 418e4ca2fc1..5b50c84e6f8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LabelResolver.java @@ -21,18 +21,18 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.*; -import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.*; +import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import java.util.Collection; import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.LABEL_NAME_CLASH; import static org.jetbrains.kotlin.diagnostics.Errors.UNRESOLVED_REFERENCE; -import static org.jetbrains.jet.lang.resolve.BindingContext.LABEL_TARGET; -import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; +import static org.jetbrains.kotlin.resolve.BindingContext.LABEL_TARGET; +import static org.jetbrains.kotlin.resolve.BindingContext.REFERENCE_TARGET; public class LabelResolver { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java index 93b5c9a5cf0..5db1fe9d8ac 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/LocalClassifierAnalyzer.java @@ -26,14 +26,14 @@ 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.kotlin.types.DynamicTypesSettings; import org.jetbrains.kotlin.di.InjectorForTopDownAnalyzerBasic; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.TopDownAnalysisContext; +import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.types.DynamicTypesSettings; import java.util.Collections; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java index 69f83b06308..a6de3ed2a91 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java @@ -20,19 +20,19 @@ import com.google.common.collect.Sets; import com.intellij.openapi.util.Ref; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.PossiblyBareType; -import org.jetbrains.jet.lang.resolve.TypeResolutionContext; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.PossiblyBareType; +import org.jetbrains.kotlin.resolve.TypeResolutionContext; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory; import org.jetbrains.kotlin.resolve.calls.util.CallMaker; -import org.jetbrains.jet.lang.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.Collections; import java.util.Set; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java index 559cfd2c8ba..6ec0e79f3c8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/TypeReconstructionUtil.java @@ -18,13 +18,16 @@ package org.jetbrains.kotlin.types.expressions; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.types.*; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.PossiblyBareType; +import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeReconstructionResult; import static org.jetbrains.kotlin.diagnostics.Errors.NO_TYPE_ARGUMENTS_ON_RHS; 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 cf8561d5085..e7246c4844c 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinJavaFileStubProvider.java @@ -48,22 +48,22 @@ import org.jetbrains.kotlin.codegen.binding.CodegenBinding; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.Progress; import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPsiUtil; import org.jetbrains.kotlin.psi.JetScript; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.org.objectweb.asm.Type; import java.util.Collection; import java.util.Collections; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; public class KotlinJavaFileStubProvider implements CachedValueProvider { 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 23685dd6d03..bd7d66cbb3b 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForAnonymousDeclaration.java @@ -25,9 +25,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetClassOrObject; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.types.JetType; import java.util.Collection; 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 9d0e59bde10..2e410b5c811 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightClassForExplicitDeclaration.java @@ -42,18 +42,18 @@ import kotlin.KotlinPackage; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; -import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.jvm.JvmClassName; +import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; -import org.jetbrains.jet.plugin.JetLanguage; import javax.swing.*; import java.util.Collection; 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 a25aa732530..b3e6db1968a 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassConstructionContext.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.asJava; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; public class LightClassConstructionContext { private final BindingContext bindingContext; 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 ca8229db4c1..7f4b18c85d7 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassStubWithData.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.impl.java.stubs.PsiJavaFileStub import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.psi.JetClassOrObject -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.name.FqName trait LightClassData diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt index 0150c20c9ae..0e5c8e2f37f 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.asJava import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.kotlin.psi.JetClassOrObject diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java index 582530e42a2..03878973a6b 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/jet/JetTestUtils.java @@ -58,10 +58,10 @@ import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.Severity; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; 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.ImportPath; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/jet/ScriptTest.java index 4955ed27d41..80f0aad7032 100644 --- a/compiler/tests/org/jetbrains/jet/ScriptTest.java +++ b/compiler/tests/org/jetbrains/jet/ScriptTest.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.KotlinPaths; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java index 183b1d1f0fd..c632fa0947d 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTest.java @@ -38,12 +38,12 @@ import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.name.FqName; diff --git a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java index 8946d2d63bd..9d80bf4ee8f 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java +++ b/compiler/tests/org/jetbrains/jet/checkers/AbstractJetDiagnosticsTestWithJsStdLib.java @@ -25,9 +25,9 @@ import org.jetbrains.jet.context.GlobalContext; 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; -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java index f6b9a5f5aa3..65c7f402fe2 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java @@ -36,8 +36,8 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.types.Flexibility; import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.junit.Assert; diff --git a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java index 43f62006699..71702bf8901 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/CheckerTestUtilTest.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.checkers.CheckerTestUtil.DiagnosedRange; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt index d7d516d83e7..1fc8f94f1ae 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt +++ b/compiler/tests/org/jetbrains/jet/checkers/LazyOperationsLog.kt @@ -20,7 +20,7 @@ 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.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.load.java.structure.impl.JavaTypeImpl import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import java.util.ArrayList @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import java.util.HashMap import org.jetbrains.kotlin.types.JetTypeImpl import java.util.regex.Pattern diff --git a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt index 9ce32edd8ec..87b07607dec 100644 --- a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.evaluate -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.resolve.annotation.AbstractAnnotationDescriptorResolveTest import java.io.File import com.intellij.openapi.util.io.FileUtil @@ -24,13 +24,13 @@ import org.jetbrains.jet.InTextDirectivesUtils 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.kotlin.resolve.constants.StringValue import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.resolve.constants.IntegerValueConstant +import org.jetbrains.kotlin.resolve.constants.IntegerValueConstant import java.util.HashMap import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import org.jetbrains.kotlin.types.TypeUtils public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescriptorResolveTest() { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java index 30b677d6fed..1ad5544ccf5 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java @@ -35,10 +35,10 @@ 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; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.storage.ExceptionTracker; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index 7dd8d01cf4c..c44e8df198f 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -23,15 +23,15 @@ import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; 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; -import org.jetbrains.jet.lang.resolve.ResolvePackage; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.ResolvePackage; import org.jetbrains.kotlin.load.java.JavaBindingContext; import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.TypeTransformingVisitor; import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 8d9addd1738..0c198c9ff7e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -29,7 +29,7 @@ import org.jetbrains.jet.config.CompilerConfiguration; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.test.util.DescriptorValidator; @@ -49,7 +49,7 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.zip.ZipOutputStream; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isObject; import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile; public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt index 45948d0175d..d22404f0c5e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.jvm.compiler -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberScope import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.Collections @@ -28,7 +28,7 @@ import org.jetbrains.jet.test.util.DescriptorValidator import org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.MemberComparator +import org.jetbrains.kotlin.resolve.MemberComparator class DeserializedScopeValidationVisitor : DescriptorValidator.ValidationVisitor() { override fun validateScope(scope: JetScope, collector: DescriptorValidator.DiagnosticCollector) { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java index bd1acd8092e..e1d5956d0e2 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -22,11 +22,11 @@ import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.load.java.JavaBindingContext; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.*; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java index bfbc59bee00..80e2c5e4730 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java @@ -35,8 +35,8 @@ import org.jetbrains.jet.config.CompilerConfiguration; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 2ec75efc5ae..68037feadeb 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -40,7 +40,7 @@ import org.jetbrains.jet.analyzer.ModuleInfo import java.util.HashMap import org.jetbrains.jet.analyzer.ModuleContent import org.jetbrains.kotlin.types.ErrorUtils -import org.jetbrains.jet.lang.resolve.descriptorUtil.module +import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles public class MultiModuleJavaAnalysisCustomTest : UsefulTestCase() { 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 4d4d6aa2519..829b41e8694 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -33,8 +33,8 @@ import org.jetbrains.jet.TimeUtils; import org.jetbrains.jet.config.CompilerConfiguration; 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.kotlin.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.ResolvePackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java index b69dcd5f344..e23ab07967b 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java index 33932ef2cff..0829806bc72 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; @@ -49,8 +49,8 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.jetbrains.jet.lang.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; -import static org.jetbrains.jet.lang.resolve.BindingContext.REFERENCE_TARGET; +import static org.jetbrains.kotlin.resolve.BindingContext.AMBIGUOUS_REFERENCE_TARGET; +import static org.jetbrains.kotlin.resolve.BindingContext.REFERENCE_TARGET; import static org.junit.Assert.*; public abstract class ExpectedResolveData { diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java index 9871b6c1d45..6dc6abf91e1 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java @@ -21,7 +21,7 @@ import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; diff --git a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt index 5ab0137947e..39706e5b849 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/MutableDiagnosticsTest.kt @@ -16,17 +16,17 @@ package org.jetbrains.jet.resolve -import org.jetbrains.jet.lang.resolve.BindingTraceContext -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace +import org.jetbrains.kotlin.resolve.BindingTraceContext +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import org.junit.Assert import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment import org.jetbrains.jet.config.CompilerConfiguration -import org.jetbrains.jet.lang.resolve.BindingTrace -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics -import org.jetbrains.jet.lang.resolve.diagnostics.MutableDiagnosticsWithSuppression +import org.jetbrains.kotlin.resolve.BindingTrace +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics +import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles class MutableDiagnosticsTest : KotlinTestWithEnvironment() { diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index baae2a7b435..789b38b7e29 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -30,10 +30,10 @@ 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index a07fbe216c2..68d1965b1fc 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -21,8 +21,8 @@ import org.jetbrains.jet.JetLiteFixture import org.jetbrains.jet.JetTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.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.kotlin.resolve.scopes.receivers.ExpressionReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import java.io.File import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil @@ -36,9 +36,9 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall import org.jetbrains.kotlin.resolve.calls.callUtil.getParentResolvedCall import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ClassReceiver import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType public abstract class AbstractResolvedCallsTest() : JetLiteFixture() { diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt index 03cc3fded8a..10ff77c41c6 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.di.InjectorForTests import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.diagnostics.rendering.Renderers -import org.jetbrains.jet.lang.resolve.* +import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImpl import org.jetbrains.kotlin.types.Variance import java.io.File diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt index 46c206cbba3..4529e71f19c 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -20,12 +20,12 @@ import org.jetbrains.jet.JetTestUtils 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.kotlin.resolve.* +import org.jetbrains.kotlin.resolve.scopes.JetScope 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.kotlin.resolve.constants.IntegerValueTypeConstructor import org.jetbrains.kotlin.types.JetTypeImpl import org.jetbrains.kotlin.descriptors.annotations.Annotations diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt index 3b7f742283e..242d3bf36a4 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.jet.ConfigurationKind import java.io.File import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.builtins.KotlinBuiltIns diff --git a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java index eaedf6e832b..1aa02230712 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java @@ -22,7 +22,7 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; 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 94bbfcfc00b..b5990d26b9e 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java @@ -26,10 +26,10 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.jvm.compiler.ExpectedLoadErrorsUtil; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.MemberComparator; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.MemberComparator; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; @@ -42,7 +42,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; import static org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden; public class RecursiveDescriptorComparator { diff --git a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt b/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt index 684836af87a..021aa7d822d 100644 --- a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt +++ b/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt @@ -21,8 +21,8 @@ import org.jetbrains.jet.ConfigurationKind import org.jetbrains.jet.JetTestUtils 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.kotlin.resolve.BindingTraceContext +import org.jetbrains.kotlin.resolve.typeBinding.* import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java index 78bde78320b..78ffd73e752 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java @@ -26,15 +26,15 @@ 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; -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; -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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; 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/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java index 9dc50a4ac57..20538362ccc 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java @@ -23,8 +23,8 @@ import org.jetbrains.jet.JetTestUtils; 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; +import org.jetbrains.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.OverloadUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java index ad11dba71a7..dd13ae519b6 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java @@ -23,8 +23,8 @@ import org.jetbrains.jet.JetTestUtils; 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; +import org.jetbrains.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.OverridingUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java index d87dd2933ef..ae999727b57 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java @@ -29,14 +29,14 @@ 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.kotlin.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; 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.kotlin.resolve.scopes.*; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.kotlin.types.CommonSupertypes; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java index a928dde931a..71d7a7eb909 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java @@ -33,14 +33,14 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetTypeReference; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingTrace; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.*; +import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java index ec3950a0dfa..a452fc471b9 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java @@ -29,12 +29,12 @@ 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.kotlin.resolve.TypeResolver; 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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; +import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/jet/util/slicemap/TrackingSliceMapTest.java b/compiler/tests/org/jetbrains/jet/util/slicemap/TrackingSliceMapTest.java index d15032447d5..1fd98c62b01 100644 --- a/compiler/tests/org/jetbrains/jet/util/slicemap/TrackingSliceMapTest.java +++ b/compiler/tests/org/jetbrains/jet/util/slicemap/TrackingSliceMapTest.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.util.slicemap; import junit.framework.TestCase; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.jet.util.slicedmap.ReadOnlySlice; import org.jetbrains.jet.util.slicedmap.Slices; import org.jetbrains.jet.util.slicedmap.WritableSlice; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java index a3b6b853a16..b33a6d0877e 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractControlFlowTest.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.*; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java index d9fc081a8f2..2f19f518ac9 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractDataFlowTest.java @@ -24,7 +24,7 @@ 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.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.Collections; import java.util.List; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt index d36889ae9d5..283bb54b5ae 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudoValueTest.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetTreeVisitorVoid -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import java.util.* import org.jetbrains.kotlin.cfg.pseudocode.TypePredicate import org.jetbrains.kotlin.cfg.pseudocode.getExpectedTypePredicate diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java index 9e5a5353037..727d9a31d0a 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionImpl; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDeclarationInstruction; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java index f7bf4583a2b..1dfde0f3c49 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; 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.kotlin.resolve.ScriptNameUtil; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.UtilsPackage; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index a4c95547b89..5bbe3596865 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -27,8 +27,8 @@ import org.jetbrains.jet.checkers.CheckerTestUtil; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.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.kotlin.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.Variance; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java index 7a449dbfc8b..1e9f45079a4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.Progress; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java index 39f1b9dd444..1ecb45f49f5 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; -import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; 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/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java index bea19d7d3ca..411ac582b33 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java @@ -34,8 +34,8 @@ 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream; diff --git a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java index ee287f48b7d..38f6d07d84f 100644 --- a/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java +++ b/compiler/tests/org/jetbrains/kotlin/di/InjectorForTests.java @@ -20,20 +20,20 @@ import com.intellij.openapi.project.Project; 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.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; -import org.jetbrains.jet.lang.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.jet.context.GlobalContext; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils; import org.jetbrains.kotlin.types.DynamicTypesSettings; @@ -41,9 +41,9 @@ import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; -import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver; -import org.jetbrains.jet.lang.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java index a3b14631760..2b9bedea686 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/JvmResolveUtil.java @@ -25,8 +25,8 @@ import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; -import org.jetbrains.jet.lang.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java index 9ceb79376cc..f5265f8ad27 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java @@ -25,8 +25,8 @@ import org.jetbrains.jet.context.GlobalContextImpl; 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.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.name.SpecialNames; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java index 46e75b97004..6efbd41a3cb 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JavaVisibilities.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.load.java; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; public class JavaVisibilities { private JavaVisibilities() { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java index 55e3e6f382a..fb1517f9e4c 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/DescriptorResolverUtils.java @@ -24,12 +24,15 @@ 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.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.OverridingUtil; -import java.util.*; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public final class DescriptorResolverUtils { private DescriptorResolverUtils() { diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt index ce413cfabcd..e9ac4eafceb 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/components/SamConversionResolver.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.load.java.components import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.load.java.structure.JavaMethod diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt index bbb68bcc72d..aa76c4a5ac8 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/SamConstructorDescriptor.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.load.java.descriptors 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 +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude public class SamConstructorDescriptor( containingDeclaration: DeclarationDescriptor, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt index cdb46671048..7dcbb7ce200 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaAnnotationDescriptor.kt @@ -21,12 +21,11 @@ import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext import org.jetbrains.kotlin.load.java.structure.* -import org.jetbrains.jet.lang.resolve.constants.* +import org.jetbrains.kotlin.resolve.constants.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.load.java.JvmAnnotationNames.* -import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils import org.jetbrains.kotlin.load.java.components.TypeUsage import org.jetbrains.kotlin.utils.valuesToMap @@ -34,7 +33,7 @@ import org.jetbrains.kotlin.utils.keysToMapExceptNulls import org.jetbrains.kotlin.load.java.lazy.types.toAttributes import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.platform.JavaToKotlinClassMap -import org.jetbrains.jet.lang.resolve.resolveTopLevelClass +import org.jetbrains.kotlin.resolve.resolveTopLevelClass import org.jetbrains.kotlin.load.kotlin.DeserializedResolverUtils.kotlinFqNameToJavaFqName import org.jetbrains.kotlin.resolve.jvm.PLATFORM_TYPES diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt index f9eb5620b22..4ad18561de4 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorBase -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.TypeConstructor import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.load.java.lazy.child import org.jetbrains.kotlin.load.java.components.TypeUsage import org.jetbrains.kotlin.load.java.lazy.resolveAnnotations import org.jetbrains.kotlin.load.java.lazy.types.toAttributes -import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper +import org.jetbrains.kotlin.resolve.scopes.InnerClassesScopeWrapper import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.utils.* import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt index 4495080fa80..6e7939d9dfc 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassMemberScope.kt @@ -27,7 +27,7 @@ import java.util.Collections import org.jetbrains.kotlin.utils.* import java.util.ArrayList import org.jetbrains.kotlin.load.java.lazy.types.toAttributes -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.impl.EnumEntrySyntheticClassDescriptor import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.descriptors.annotations.Annotations @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.load.java.JavaVisibilities import org.jetbrains.kotlin.load.java.descriptors.JavaConstructorDescriptor import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public class LazyJavaClassMemberScope( c: LazyJavaResolverContext, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt index eaedf806e72..f72ebe5b10b 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaMemberScope.kt @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.storage.NotNullLazyValue import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.load.java.structure.JavaMethod import org.jetbrains.kotlin.load.java.structure.JavaField import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.load.java.lazy.child import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl import org.jetbrains.kotlin.load.java.lazy.resolveAnnotations @@ -44,8 +44,8 @@ import org.jetbrains.kotlin.load.java.components.ExternalSignatureResolver import org.jetbrains.kotlin.utils.* import org.jetbrains.kotlin.resolve.jvm.PLATFORM_TYPES import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude.NonExtensions +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude.NonExtensions public abstract class LazyJavaMemberScope( protected val c: LazyJavaResolverContext, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt index b1bb02671b3..3f7d6dbba95 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaStaticClassScope.kt @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.load.java.lazy.descriptors import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.name.* import org.jetbrains.kotlin.load.java.lazy.LazyJavaResolverContext import org.jetbrains.kotlin.load.java.structure.JavaClass -import org.jetbrains.jet.lang.resolve.DescriptorFactory.* +import org.jetbrains.kotlin.resolve.DescriptorFactory.* import org.jetbrains.kotlin.utils.addIfNotNull -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public class LazyJavaStaticClassScope( c: LazyJavaResolverContext, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt index 64d09e985fe..c34decd5ee7 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyPackageFragmentScopeForJavaPackage.kt @@ -23,11 +23,11 @@ import org.jetbrains.kotlin.load.java.structure.JavaPackage import org.jetbrains.kotlin.load.java.structure.JavaClass import org.jetbrains.kotlin.load.java.lazy.findClassInJava import org.jetbrains.kotlin.load.kotlin.PackageClassUtils -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptorKindExclude -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public class LazyPackageFragmentScopeForJavaPackage( c: LazyJavaResolverContext, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt index ad6b5baee1e..0ad9cf2ef28 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.utils.sure -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.load.java.lazy.* import org.jetbrains.kotlin.storage.* import java.util.HashSet diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPropertyInitializerEvaluator.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPropertyInitializerEvaluator.java index 7d00aca71e0..9587ca2a610 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPropertyInitializerEvaluator.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/structure/JavaPropertyInitializerEvaluator.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.load.java.structure; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; public interface JavaPropertyInitializerEvaluator { @Nullable diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt index 5659230e9ac..9f2eee8a509 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/BinaryClassAnnotationAndConstantLoaderImpl.kt @@ -27,13 +27,13 @@ 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.kotlin.resolve.constants.ArrayValue +import org.jetbrains.kotlin.resolve.constants.EnumValue 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.resolve.constants.ErrorValue +import org.jetbrains.kotlin.resolve.constants.createCompileTimeConstant import org.jetbrains.kotlin.serialization.deserialization.findClassAcrossModuleDependencies -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant public class BinaryClassAnnotationAndConstantLoaderImpl( private val module: ModuleDescriptor, diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java index 5914ca19456..820d6d60c09 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java @@ -19,16 +19,16 @@ package org.jetbrains.kotlin.load.kotlin; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.load.java.components.ErrorReporter; import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.serialization.PackageData; +import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope; +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; import javax.inject.Inject; import java.util.Collection; 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 c853b140eca..cd0417cfb99 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,16 +18,16 @@ package org.jetbrains.kotlin.platform; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.kotlin.load.java.components.TypeUsage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.builtins.PrimitiveType; import java.util.*; diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt index 1b66c929c82..b6c529c77fe 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/resolve/jvm/JavaDescriptorResolver.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.resolve.jvm import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.load.java.structure.* import org.jetbrains.kotlin.load.java.lazy.LazyJavaPackageFragmentProvider -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.load.java.sources.JavaSourceElement public var PLATFORM_TYPES: Boolean = true diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt index 2d9e7960066..39f6e699f71 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/BuiltInsAnnotationAndConstantLoader.kt @@ -18,7 +18,7 @@ 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.kotlin.resolve.constants.CompileTimeConstant import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.serialization.builtins.BuiltInsProtoBuf diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java index f31573f851a..2786c88d2fe 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/InlineUtil.java @@ -25,10 +25,10 @@ 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; -import org.jetbrains.jet.lang.resolve.constants.EnumValue; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.constants.ArrayValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.EnumValue; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index f27e34df41e..8b56d4ff2ab 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -20,21 +20,21 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; 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.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.kotlin.platform.PlatformToKotlinClassMap; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.storage.LockBasedStorageManager; import java.io.InputStream; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java index d71c9323c2a..14f1ddcfb64 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ClassDescriptor.java @@ -19,7 +19,7 @@ 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.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.TypeSubstitutor; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt index 5e2eed82a7e..ff8cc2f8d4f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ModuleDescriptor.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.descriptors import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap -import org.jetbrains.jet.lang.resolve.ImportPath +import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.descriptors.impl.PackageViewDescriptorImpl diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt index 9105283348d..40f835762c6 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageFragmentDescriptor.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.descriptors import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope public trait PackageFragmentDescriptor : ClassOrPackageFragmentDescriptor { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java index 0045ad302fe..08565f9995a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/PackageViewDescriptor.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; public interface PackageViewDescriptor extends DeclarationDescriptor { @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ReceiverParameterDescriptor.java index 8a1bd0e8994..254b63a36cd 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ReceiverParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ReceiverParameterDescriptor.java @@ -18,7 +18,7 @@ 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.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java index 253c2057f6b..42f4fbeda02 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/ScriptDescriptor.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.impl.ScriptCodeDescriptor; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; public interface ScriptDescriptor extends DeclarationDescriptorNonRoot { String LAST_EXPRESSION_VALUE_FIELD_NAME = "rv"; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java index b411a25a56a..cfe8ebb6056 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/VariableDescriptor.java @@ -18,7 +18,7 @@ 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.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java index bf7ce2a04d1..b7a6023b640 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.descriptors; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ClassReceiver; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.scopes.receivers.ClassReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.java index 3d852abd5fd..e79e56419e5 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibility.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.descriptors; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; public abstract class Visibility { private final boolean isPublicAPI; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationArgumentVisitor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationArgumentVisitor.java index c2e877686e6..17665a4ec69 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationArgumentVisitor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationArgumentVisitor.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.constants.*; -import org.jetbrains.jet.lang.resolve.constants.StringValue; +import org.jetbrains.kotlin.resolve.constants.*; +import org.jetbrains.kotlin.resolve.constants.StringValue; public interface AnnotationArgumentVisitor { R visitLongValue(@NotNull LongValue value, D data); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptor.java index 5fb8e7c61fa..90332148026 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptor.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.types.JetType; import java.util.Map; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptorImpl.java index 342a2651bac..44479d70dcd 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationDescriptorImpl.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; import java.util.Map; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.java index 8326c0e8f7a..1cc9e0f08f9 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/AnnotationsImpl.java @@ -20,8 +20,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import java.util.Iterator; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java index d7fc3380bc2..56134660544 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/annotations/DefaultAnnotationArgumentVisitor.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.descriptors.annotations; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.constants.*; -import org.jetbrains.jet.lang.resolve.constants.StringValue; +import org.jetbrains.kotlin.resolve.constants.*; +import org.jetbrains.kotlin.resolve.constants.StringValue; public abstract class DefaultAnnotationArgumentVisitor implements AnnotationArgumentVisitor { public abstract R visitValue(@NotNull CompileTimeConstant value, D data); diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java index 3140f579630..78fd34c9087 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractClassDescriptor.java @@ -21,17 +21,17 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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.kotlin.types.*; +import org.jetbrains.kotlin.resolve.scopes.InnerClassesScopeWrapper; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.SubstitutingScope; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; +import org.jetbrains.kotlin.types.*; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumClass; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumClass; public abstract class AbstractClassDescriptor implements ClassDescriptor { private final Name name; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java index d37663c786c..a051f88710b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractReceiverParameterDescriptor.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.scopes.receivers.TransientReceiver; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.types.Variance; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java index 97b6dae1ba5..61e64752486 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java @@ -19,19 +19,19 @@ package org.jetbrains.kotlin.descriptors.impl; import kotlin.Function0; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.ReadOnly; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.types.*; -import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.LazyScopeAdapter; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; +import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.Collections; import java.util.Set; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java index 7ff8c52cbfb..402e53b0067 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java @@ -21,12 +21,12 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; 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; import java.util.Collections; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java index 224e8f79ee2..2e40bea0440 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java @@ -22,20 +22,20 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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.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.kotlin.types.JetType; -import org.jetbrains.kotlin.types.TypeConstructor; -import org.jetbrains.kotlin.types.TypeConstructorImpl; +import org.jetbrains.kotlin.resolve.DescriptorFactory; +import org.jetbrains.kotlin.resolve.OverridingUtil; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl; +import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.StorageManager; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeConstructor; +import org.jetbrains.kotlin.types.TypeConstructorImpl; import org.jetbrains.kotlin.utils.Printer; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java index 1b2e8ef98ce..761337f440c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java @@ -20,9 +20,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.DescriptorFactory; +import org.jetbrains.kotlin.resolve.OverridingUtil; import org.jetbrains.kotlin.types.DescriptorSubstitutor; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyClassReceiverParameterDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyClassReceiverParameterDescriptor.java index ea299fcada2..f7dfdb12912 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyClassReceiverParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazyClassReceiverParameterDescriptor.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.scopes.receivers.ClassReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; public class LazyClassReceiverParameterDescriptor extends AbstractReceiverParameterDescriptor { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java index e77c3567d83..a2963a1261f 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.SubstitutingScope; import org.jetbrains.kotlin.types.*; import java.util.ArrayList; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt index 2b74c876db9..093800521da 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ModuleDescriptorImpl.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import org.jetbrains.kotlin.descriptors.PackageFragmentProvider import java.util.ArrayList -import org.jetbrains.jet.lang.resolve.ImportPath +import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.descriptors.annotations.Annotations import org.jetbrains.kotlin.descriptors.ModuleDescriptor import kotlin.properties.Delegates diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.java index 43961790619..1144b46c490 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PackageViewDescriptorImpl.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.scopes.ChainedScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.TypeSubstitutor; import java.util.ArrayList; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java index 0f8c44a84b1..6ba6ba7d43e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java @@ -18,16 +18,16 @@ package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.DescriptorFactory; -import org.jetbrains.jet.lang.resolve.OverridingUtil; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.DescriptorFactory; +import org.jetbrains.kotlin.resolve.OverridingUtil; 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/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java index aaec62d1dc7..7a32f1b54f3 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ReceiverParameterDescriptorImpl.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; public class ReceiverParameterDescriptorImpl extends AbstractReceiverParameterDescriptor { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt index f8077d4fbd0..f9fde55b346 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/SubpackagesScope.kt @@ -19,12 +19,11 @@ package org.jetbrains.kotlin.descriptors.impl 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.resolve.scopes.JetScopeImpl import org.jetbrains.kotlin.utils.* import java.util.ArrayList -import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter public class SubpackagesScope(private val containingDeclaration: PackageViewDescriptor) : JetScopeImpl() { override fun getContainingDeclaration(): DeclarationDescriptor { diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.java index caa9a85731f..0b76f250845 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.java @@ -17,18 +17,18 @@ package org.jetbrains.kotlin.descriptors.impl; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.storage.LockBasedStorageManager; 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; import java.util.Collections; import java.util.LinkedHashSet; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorImpl.java index 7d698ec0529..281ebaf81fa 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/VariableDescriptorImpl.java @@ -20,10 +20,10 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.storage.NullableLazyValue; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/kotlin/name/FqNamesUtil.kt b/core/descriptors/src/org/jetbrains/kotlin/name/FqNamesUtil.kt index 74b17714705..988d99d0f36 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/name/FqNamesUtil.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/name/FqNamesUtil.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.name -import org.jetbrains.jet.lang.resolve.ImportPath +import org.jetbrains.kotlin.resolve.ImportPath public fun FqName.isSubpackageOf(packageName: FqName): Boolean { return when { diff --git a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java index d3a0b8bc932..5cf0cfe4cf0 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.java @@ -20,24 +20,24 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.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.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.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.constants.AnnotationValue; +import org.jetbrains.kotlin.resolve.constants.ArrayValue; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.JavaClassValue; 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.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java index 9f0d55cd085..e7b64bd7041 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.*; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver; 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.kotlin.descriptors.ReceiverParameterDescriptor.NO_RECEIVER_PARAMETER; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getDefaultConstructorVisibility; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getDefaultConstructorVisibility; public class DescriptorFactory { private static class DefaultConstructorDescriptor extends ConstructorDescriptorImpl { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java similarity index 99% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index b9f9f5c4f55..6e920492aa2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.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.resolve; +package org.jetbrains.kotlin.resolve; import kotlin.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.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.kotlin.resolve.scopes.FilteringScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; 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.*; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt index f1f6c3aaf5c..ad0688c4bd6 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/DescriptorUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.descriptorUtil +package org.jetbrains.kotlin.resolve.descriptorUtil import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.ClassKind.* public fun ClassDescriptor.getClassObjectReferenceTarget(): ClassDescriptor { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/ExternalOverridabilityCondition.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/ExternalOverridabilityCondition.java index a7127b066a0..c4bc588ee86 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ExternalOverridabilityCondition.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/ExternalOverridabilityCondition.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/ImportPath.java similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/ImportPath.java index b64e6285f90..e2101a65360 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/ImportPath.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/ImportPath.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.java index cd560f10fd0..879c9e934eb 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/MemberComparator.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/MemberComparator.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.Name; @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import java.util.Comparator; import java.util.List; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; public class MemberComparator implements Comparator { public static final MemberComparator INSTANCE = new MemberComparator(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java similarity index 99% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java index 161722fdb05..dd64f80974d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/OverridingUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.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; +package org.jetbrains.kotlin.resolve; import kotlin.Function1; import kotlin.KotlinPackage; @@ -27,7 +27,7 @@ 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.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeConstructor; import org.jetbrains.kotlin.types.checker.JetTypeChecker; @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.utils.DFS; import java.util.*; -import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.*; +import static org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.*; public class OverridingUtil { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.java index ec99bf852a2..8f18d96a6ee 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/VisibilityUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/VisibilityUtil.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; +package org.jetbrains.kotlin.resolve; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt index 1f0f0f1308d..dcfbedd4970 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/calls/inference/TypeBoundsImpl.kt @@ -25,7 +25,7 @@ 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 org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor import java.util.LinkedHashSet import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind.* import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/AnnotationValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/AnnotationValue.java index 378425a25fd..551fc128936 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/AnnotationValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/AnnotationValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ArrayValue.java similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ArrayValue.java index 833f655b59c..8aa6d762c7b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ArrayValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ArrayValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/BooleanValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/BooleanValue.java index 7a5b0009f87..ce55cd6e45b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/BooleanValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/BooleanValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ByteValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ByteValue.java index 3199a06d55c..26d036e42e8 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ByteValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ByteValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CharValue.java similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CharValue.java index c857264b0f7..1ae5504827d 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CharValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CharValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.java similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.java index e8f9451d736..f51c8ef0e5f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/CompileTimeConstant.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/CompileTimeConstant.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ConstantUtils.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ConstantUtils.kt similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ConstantUtils.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ConstantUtils.kt index d0869bf75a4..3d37e26d175 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ConstantUtils.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ConstantUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.constants +package org.jetbrains.kotlin.resolve.constants import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/DoubleValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/DoubleValue.java index 05f23795b71..f6a13def8ec 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/DoubleValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/DoubleValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/EnumValue.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/EnumValue.java index 0c6612e9f6a..7b92ed98937 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/EnumValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/EnumValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ErrorValue.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ErrorValue.java index 56e206a37ab..980988ef74f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ErrorValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ErrorValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/FloatValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/FloatValue.java index 1d059dd4583..b541ecf0246 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/FloatValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/FloatValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntValue.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntValue.java index dada04f9a43..cb390098600 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueConstant.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueConstant.java similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueConstant.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueConstant.java index 9fa62eb3f56..7c3b9de2e65 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueConstant.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueConstant.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.constants; +package org.jetbrains.kotlin.resolve.constants; public abstract class IntegerValueConstant extends CompileTimeConstant { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstant.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstant.java similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstant.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstant.java index 21d25593e09..682a70b9265 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstant.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstant.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstructor.java similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstructor.java index 172e1c9dda4..aaec9522e06 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/IntegerValueTypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/IntegerValueTypeConstructor.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/JavaClassValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/JavaClassValue.java index 26c69a813fb..905f21ef648 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/JavaClassValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/JavaClassValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/LongValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/LongValue.java index 71a15c769f7..448dd6fab72 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/LongValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/LongValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/NullValue.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/NullValue.java index 9ee0d0c2b60..379a873cb46 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/NullValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/NullValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ShortValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ShortValue.java index 8a70b02319e..b32fcc2ceb1 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/ShortValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/ShortValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/StringValue.java similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/constants/StringValue.java index 1c92d481183..d3367beb420 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/constants/StringValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/constants/StringValue.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.constants; +package org.jetbrains.kotlin.resolve.constants; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/resolveByModule.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/resolveByModule.kt similarity index 92% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/resolveByModule.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/resolveByModule.kt index 021eb965dbc..5bccc4f093a 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/resolveByModule.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/resolveByModule.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve +package org.jetbrains.kotlin.resolve import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.name.FqName diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt index 149e0c5fa42..549bb12dfe3 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/AbstractScopeAdapter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt index 79c6e81be2e..40cfa1e6622 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/ChainedScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes 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.* +import org.jetbrains.kotlin.resolve.scopes.JetScopeSelectorUtil.* public open class ChainedScope( private val containingDeclaration: DeclarationDescriptor?/* it's nullable as a hack for TypeUtils.intersect() */, diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt similarity index 96% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt index 5bf1144cf25..bb245930cec 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/FilteringScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt index c86d17531a7..45609117d65 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/InnerClassesScopeWrapper.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/InnerClassesScopeWrapper.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt similarity index 99% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt index 35a0d706edd..b7a642d2c96 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScopeImpl.kt similarity index 95% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScopeImpl.kt index 705b0d59cb7..7a16104950e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScopeImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScopeSelectorUtil.java similarity index 98% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScopeSelectorUtil.java index f7430f213b5..24847a0c1c2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeSelectorUtil.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/JetScopeSelectorUtil.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.scopes; +package org.jetbrains.kotlin.resolve.scopes; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/LazyScopeAdapter.kt similarity index 90% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/LazyScopeAdapter.kt index cd5dd53455b..0649317ff9e 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/LazyScopeAdapter.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.storage.NotNullLazyValue diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/StaticScopeForKotlinClass.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/StaticScopeForKotlinClass.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt index fc67b3fcf1a..e088eed4f45 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/StaticScopeForKotlinClass.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/StaticScopeForKotlinClass.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes 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 -import org.jetbrains.jet.lang.resolve.DescriptorFactory.* +import org.jetbrains.kotlin.resolve.DescriptorFactory.* public class StaticScopeForKotlinClass( private val containingClass: ClassDescriptor diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.kt b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt similarity index 97% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.kt rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt index 37abbad3617..88730387188 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/SubstitutingScope.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.lang.resolve.scopes +package org.jetbrains.kotlin.resolve.scopes import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/AbstractReceiverValue.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/AbstractReceiverValue.java index 8f1d32f871a..8e5538cb748 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/AbstractReceiverValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/AbstractReceiverValue.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.scopes.receivers; +package org.jetbrains.kotlin.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.types.JetType; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ClassReceiver.java similarity index 93% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ClassReceiver.java index a831dbbb74c..bec4585fed2 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ClassReceiver.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ClassReceiver.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.scopes.receivers; +package org.jetbrains.kotlin.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExtensionReceiver.java similarity index 92% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExtensionReceiver.java index 47e7aa23f41..76f56e4878b 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ExtensionReceiver.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ExtensionReceiver.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.scopes.receivers; +package org.jetbrains.kotlin.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ReceiverValue.java similarity index 94% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ReceiverValue.java index acbe3cca0eb..b585f38f1fe 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ReceiverValue.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ReceiverValue.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.scopes.receivers; +package org.jetbrains.kotlin.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.types.JetType; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ThisReceiver.java similarity index 89% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ThisReceiver.java index 14ffbeba8b6..aa7d3f6df57 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/ThisReceiver.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/ThisReceiver.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.scopes.receivers; +package org.jetbrains.kotlin.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/TransientReceiver.java similarity index 91% rename from core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java rename to core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/TransientReceiver.java index 6a5a069c5a0..7db981f0e19 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/receivers/TransientReceiver.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/scopes/receivers/TransientReceiver.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.scopes.receivers; +package org.jetbrains.kotlin.resolve.scopes.receivers; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.types.JetType; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java index 87fbd66381d..52d9db76396 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractClassTypeConstructor.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.resolve.DescriptorUtils; public abstract class AbstractClassTypeConstructor implements TypeConstructor { @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt index cd014dfadfc..3182ea05a6b 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt +++ b/core/descriptors/src/org/jetbrains/kotlin/types/AbstractLazyType.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.types import org.jetbrains.kotlin.storage.StorageManager -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.annotations.Annotations public abstract class AbstractLazyType(storageManager: StorageManager) : AbstractJetType(), LazyType { diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java b/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java index 0854b63bd97..bdcbbf616a4 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java @@ -20,13 +20,13 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.*; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java b/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java index 944cd249a0b..03d8474637e 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/DelegatingType.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java index c5dab68343e..502a4e07c77 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java @@ -19,16 +19,16 @@ 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.kotlin.builtins.KotlinBuiltIns; 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.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; +import org.jetbrains.kotlin.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.error.ErrorSimpleFunctionDescriptorImpl; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.utils.Printer; import java.util.Collection; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java b/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java index f38c083bb11..352b74572f0 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/JetType.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.annotations.Annotated; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.java b/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.java index 149bd1444c0..4197444022a 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/JetTypeImpl.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.annotations.Annotations; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import java.util.List; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java index c3b55cb738f..bf9eb472fcb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.types; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.resolve.calls.inference.InferencePackage; -import org.jetbrains.jet.lang.resolve.scopes.SubstitutingScope; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.resolve.scopes.SubstitutingScope; import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; import org.jetbrains.kotlin.types.typesApproximation.TypesApproximationPackage; diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java index a0488a8b86c..20b84b15da5 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java @@ -21,23 +21,23 @@ import kotlin.KotlinPackage; import kotlin.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.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.kotlin.resolve.constants.IntegerValueTypeConstructor; +import org.jetbrains.kotlin.resolve.scopes.ChainedScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; 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; import java.util.*; -import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.*; +import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.SPECIAL; public class TypeUtils { public static final JetType DONT_CARE = ErrorUtils.createErrorTypeWithCustomDebugName("DONT_CARE"); diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt index 8f4b878bb1d..c20a83242e6 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/AnnotationSerializer.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.serialization 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.resolve.constants.* import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value import org.jetbrains.kotlin.serialization.ProtoBuf.Annotation.Argument.Value.Type import org.jetbrains.kotlin.types.JetType diff --git a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index be401f9c915..23785fc847c 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -17,19 +17,19 @@ package org.jetbrains.kotlin.serialization; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.resolve.DescriptorFactory; +import org.jetbrains.kotlin.resolve.MemberComparator; import org.jetbrains.kotlin.types.*; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; public class DescriptorSerializer { 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 4d0b4b26cdd..ea8be8e8c84 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/AnnotationDeserializer.kt @@ -26,7 +26,7 @@ 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.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.constants.* +import org.jetbrains.kotlin.resolve.constants.* import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.name.ClassId 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 0dbae6ebb0c..4931abdbf9d 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/DeserializedType.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.serialization.ProtoBuf 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.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.* class DeserializedType( 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 358dcdb011a..32e07fd73a5 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/MemberDeserializer.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.serialization.deserialization.descriptors.* 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.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/context.kt b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt index 6d9d2182bb1..7ab932cf833 100644 --- a/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt +++ b/core/serialization/src/org/jetbrains/kotlin/serialization/deserialization/context.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.storage.StorageManager import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor public class DeserializationComponents( 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 6cdab1b2bce..bce7146675b 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 @@ -22,7 +22,7 @@ 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 +import org.jetbrains.kotlin.resolve.DescriptorUtils class DeserializedAnnotations( storageManager: StorageManager, 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 860ee2b3b9e..e510194e4a1 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 @@ -23,17 +23,17 @@ 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.kotlin.resolve.DescriptorFactory +import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.StaticScopeForKotlinClass +import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass import org.jetbrains.kotlin.types.AbstractClassTypeConstructor import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.serialization.deserialization 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 +import org.jetbrains.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import java.util.* public class DeserializedClassDescriptor( 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 44573787cfd..950b96ba652 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 @@ -20,10 +20,10 @@ import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.toReadOnlyList -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext import java.util.* 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 f57314bd4dd..9a98d7e8cd8 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 @@ -24,7 +24,7 @@ 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.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.serialization.deserialization.NameResolver public open class DeserializedPackageMemberScope( diff --git a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt index e6565a97a30..9d488cf6368 100644 --- a/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt +++ b/generators/src/org/jetbrains/kotlin/generators/injectors/GenerateInjectors.kt @@ -21,7 +21,7 @@ import org.jetbrains.jet.context.GlobalContext import org.jetbrains.jet.context.GlobalContextImpl import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl -import org.jetbrains.jet.lang.resolve.* +import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.load.java.JavaClassFinderImpl import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver import org.jetbrains.kotlin.load.java.components.* 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 15ffc2ba7d3..6540a3e6e2b 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 @@ -19,19 +19,19 @@ package org.jetbrains.jet.plugin.codeInsight import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo -import org.jetbrains.jet.lang.resolve.scopes.JetScope -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver +import org.jetbrains.kotlin.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver import java.util.* -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo +import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo 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.kotlin.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.getDescriptorsFiltered +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.checker.JetTypeChecker 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 52775b10980..d601b189a6c 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 @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.util 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.kotlin.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils import org.jetbrains.kotlin.descriptors.DeclarationDescriptor 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 62f9efd6155..e75e54a7190 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 @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.util -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.LinkedHashSet diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java index 9b162307aaf..98837f04307 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.java @@ -30,14 +30,14 @@ 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.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.ChainedScope; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.ChainedScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.TypeConstructor; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.storage.ExceptionTracker; @@ -48,7 +48,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage.getDataFlowInfo; +import static org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.getDataFlowInfo; public abstract class ElementResolver { diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt index 30246705823..688d0f84913 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/PartialBodyResolveFilter.kt @@ -27,7 +27,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.jet.JetNodeTypes import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.psi.psiUtil.isAncestor -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider import org.jetbrains.kotlin.psi.psiUtil.isProbablyNothing //TODO: do resolve anonymous object's body 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 6a67303b787..c0c29ff0000 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 @@ -43,7 +43,7 @@ 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; 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 0c8c48e5ff9..0662331ce55 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 @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.resolve.jvm.JvmResolverForModule import com.intellij.openapi.project.Project import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.psi.PsiMethod import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.asJava.KotlinLightMethod 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 6e7f8dd3cba..1a003039d50 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 @@ -26,7 +26,7 @@ import org.jetbrains.jet.analyzer.ResolverForProject import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactoryService -import org.jetbrains.jet.lang.resolve.BindingTraceContext +import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.di.InjectorForLazyResolve import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.jet.analyzer.ModuleInfo 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 923a948b221..bd5e4388afa 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 @@ -24,7 +24,7 @@ import com.intellij.openapi.diagnostic.Logger import com.intellij.util.containers.SLRUCache import com.intellij.psi.util.PsiModificationTracker import com.intellij.psi.util.CachedValueProvider -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.openapi.components.ServiceManager import org.jetbrains.jet.plugin.project.AnalyzerFacadeProvider import org.jetbrains.jet.plugin.project.TargetPlatform 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 b5f9f544cb9..936aa0be8f5 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 @@ -26,18 +26,18 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import com.intellij.util.containers.SLRUCache import com.intellij.psi.util.PsiModificationTracker import com.intellij.openapi.project.DumbService -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import org.jetbrains.jet.context.SimpleGlobalContext -import org.jetbrains.jet.lang.resolve.TopDownAnalysisParameters +import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters import com.intellij.openapi.progress.ProcessCanceledException import com.intellij.psi.util.CachedValueProvider import org.jetbrains.kotlin.asJava.LightClassUtil -import org.jetbrains.jet.lang.resolve.LibrarySourceHacks +import org.jetbrains.kotlin.resolve.LibrarySourceHacks import org.jetbrains.jet.plugin.project.TargetPlatform import org.jetbrains.jet.plugin.project.ResolveSessionForBodies import java.util.HashMap import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.JetClassInitializer import org.jetbrains.kotlin.psi.JetProperty @@ -47,7 +47,7 @@ import org.jetbrains.kotlin.psi.JetTypeConstraint import org.jetbrains.kotlin.psi.JetPackageDirective import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.resolve.CompositeBindingContext +import org.jetbrains.kotlin.resolve.CompositeBindingContext import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetDelegationSpecifierList import org.jetbrains.kotlin.psi.JetTypeParameter @@ -56,15 +56,15 @@ import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.analyzer.analyzeInContext -import org.jetbrains.jet.lang.resolve.BindingTraceContext +import org.jetbrains.kotlin.resolve.BindingTraceContext 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.resolve.scopes.ChainedScope +import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.di.InjectorForLazyBodyResolve import org.jetbrains.jet.plugin.project.TargetPlatformDetector import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import com.intellij.openapi.project.IndexNotReadyException import org.jetbrains.kotlin.psi.JetBlockExpression 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 029dcc6831a..9ce3b950232 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 @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetDeclaration 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 4bed8e8f1c6..7f5b6af82dc 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 @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.analyzer.AnalysisResult -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor 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 8ed9e015465..7e4e1962e79 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 @@ -20,7 +20,7 @@ import com.intellij.openapi.project.Project import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.decompiler.navigation.DecompiledNavigationUtils import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver import java.util.HashSet diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt index db175b8d91c..befea02c57c 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/codeInsight/JetFileReferencesResolver.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.codeInsight import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetTreeVisitorVoid import org.jetbrains.kotlin.psi.JetUserType 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 47ad106f02f..ce953531d5c 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 @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.codeInsight import com.intellij.psi.PsiElement; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import java.util.HashSet; @@ -27,14 +27,14 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.openapi.util.TextRange import com.intellij.psi.PsiDocumentManager import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import java.util.Collections import org.jetbrains.jet.analyzer.analyzeInContext import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny import java.util.LinkedHashSet -import org.jetbrains.jet.lang.resolve.ImportPath +import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElement -import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor +import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType 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 fb6ed6d4081..54c9487e3d6 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 @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.JetDeclaration; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder; import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory; @@ -36,7 +36,7 @@ import org.jetbrains.jet.plugin.decompiler.DecompilerPackage; import org.jetbrains.jet.plugin.decompiler.JetClsFile; import org.jetbrains.jet.plugin.stubindex.JetSourceFilterScope; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; public final class DecompiledNavigationUtils { 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 8e084e6b82f..5e049c6fa4f 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 @@ -44,9 +44,9 @@ 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; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt index 392f30a49f3..a77f04bbec9 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind -import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike +import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.* 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 51ee33d29e1..24c8d014db9 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 @@ -24,10 +24,10 @@ 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.kotlin.resolve.DescriptorUtils.isEnumEntry +import org.jetbrains.kotlin.resolve.DescriptorUtils.isSyntheticClassObject import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass -import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike +import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike import org.jetbrains.kotlin.types.isFlexible import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind 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 328152bbea9..bd269aad98d 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 @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder 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.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScopeImpl import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.types.error.MissingDependencyErrorClass 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 84bd8c082df..291f12de39d 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 @@ -44,7 +44,7 @@ import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.references.JetArrayAccessReference -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.references.JetInvokeFunctionReference import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.psi.JetAnnotationEntry diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java index b8cc793f1da..95c002fdf2f 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/AfterAnalysisHighlightingVisitor.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.lang.annotation.AnnotationHolder; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; abstract class AfterAnalysisHighlightingVisitor extends HighlightingVisitor { protected BindingContext bindingContext; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java index ee169e26200..3035b63ce28 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java @@ -25,7 +25,7 @@ import org.jetbrains.jet.checkers.DebugInfoUtil; import org.jetbrains.kotlin.psi.JetCodeFragment; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetReferenceExpression; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; 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 d947b799b76..f65361b951b 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 @@ -28,12 +28,12 @@ import org.jetbrains.jet.JetNodeTypes; 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; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.load.java.components.DescriptorResolverUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java index ae1d4c0f629..fbea2a52482 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/DuplicateJvmSignatureAnnotator.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.project.TargetPlatform; import org.jetbrains.jet.plugin.project.TargetPlatformDetector; 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 2b198d678eb..37b9d0d8d20 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 @@ -21,8 +21,8 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt index 06ab347f549..112e12be4be 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.kt @@ -41,8 +41,8 @@ import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetReferenceExpression -import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics import org.jetbrains.jet.plugin.util.ProjectRootsUtil import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode import org.jetbrains.jet.plugin.caches.resolve.* 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 241b7a53e8b..c739e35463c 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 @@ -26,8 +26,8 @@ import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.JetThisExpression; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.lexer.JetTokens; 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 351c83a858c..6b8ded71ed2 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 @@ -23,7 +23,7 @@ import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor { TypeKindHighlightingVisitor(AnnotationHolder holder, BindingContext 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 9502d6e0dde..8104cce0057 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 @@ -24,13 +24,13 @@ 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; 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.*; +import static org.jetbrains.kotlin.resolve.BindingContext.*; class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor { VariablesHighlightingVisitor(AnnotationHolder holder, BindingContext 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 fa413face30..ad1f75787e3 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 @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.resolve.calls.callUtil.* -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.plugin.highlighter.IdeRenderers import org.jetbrains.kotlin.types.ErrorUtils 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 13efe0eb8f7..4eee3f91d9c 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 @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.lexer.JetTokens 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.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 67ffb55c976..9344d548278 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 @@ -18,21 +18,21 @@ package org.jetbrains.jet.plugin.intentions import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetCallExpression -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall import org.jetbrains.kotlin.types.TypeUtils -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.psi.JetTypeProjection import org.jetbrains.kotlin.psi.Call import org.jetbrains.kotlin.di.InjectorForMacros -import org.jetbrains.jet.lang.resolve.BindingTraceContext +import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetTypeArgumentList import org.jetbrains.kotlin.psi.JetReturnExpression import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.psi.psiUtil.getTextWithLocation -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo +import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.plugin.util.approximateFlexibleTypes import org.jetbrains.jet.plugin.caches.resolve.findModuleDescriptor import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java index 05316001831..c2e9c4fb7fa 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java @@ -26,8 +26,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.*; import org.jetbrains.jet.plugin.stubindex.JetProbablyNothingFunctionShortNameIndex; import org.jetbrains.jet.plugin.stubindex.JetProbablyNothingPropertyShortNameIndex; 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 1d991780944..697ae4d3590 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 @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.lazy.KotlinCodeAnalyzer; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; 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 0245a1fc62f..f3ebe5ef3ef 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 @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.load.kotlin.JavaDeclarationCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesAllowed; import org.jetbrains.kotlin.types.DynamicTypesSettings; 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 e7a53575cc2..870042f2231 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 @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider; +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesSettings; public class TargetPlatformImpl implements TargetPlatform { 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 4deabc9fd61..f7d2839bf58 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 @@ -20,7 +20,7 @@ import com.intellij.openapi.components.ServiceManager; 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.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.name.FqName; import java.util.List; diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt index 1427aa915bb..fb454e444b6 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/quickfix/KotlinSuppressIntentionAction.kt @@ -22,7 +22,7 @@ import com.intellij.psi.PsiElement import org.jetbrains.kotlin.diagnostics.DiagnosticFactory import org.jetbrains.kotlin.psi.* import org.jetbrains.jet.plugin.JetBundle -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.codeInspection.SuppressIntentionAction import org.jetbrains.jet.plugin.util.JetPsiPrecedences 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 4073ad845aa..d6c68b676ed 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 @@ -42,10 +42,10 @@ import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; 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.kotlin.resolve.*; import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.utils.UtilsPackage; @@ -57,7 +57,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.unwrapFakeOverride; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.unwrapFakeOverride; public class BuiltInsReferenceResolver extends AbstractProjectComponent { private static final File BUILT_INS_COMPILABLE_SRC_DIR = 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 2061150af32..96889d91d3c 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 @@ -27,7 +27,7 @@ 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; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.lexer.JetTokens; @@ -35,8 +35,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.lang.resolve.BindingContext.INDEXED_LVALUE_GET; -import static org.jetbrains.jet.lang.resolve.BindingContext.INDEXED_LVALUE_SET; +import static org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_GET; +import static org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_SET; public class JetArrayAccessReference extends JetSimpleReference implements MultiRangeReference { 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 5ae55eb002e..ed162737085 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 @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.references import com.intellij.openapi.util.TextRange import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.JetForExpression -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import java.util.Collections public class JetForLoopInReference(element: JetForExpression) : JetMultiReference(element) { 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 fee3d8f89e1..11c6dd0d67d 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 @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; 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 2c7198d80ff..e46f7f2e734 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 @@ -17,13 +17,13 @@ package org.jetbrains.jet.plugin.references import org.jetbrains.kotlin.psi.JetMultiDeclaration -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.openapi.util.TextRange import java.util.Collections import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.source.PsiSourceElement -import org.jetbrains.jet.lang.resolve.source.getPsi +import org.jetbrains.kotlin.resolve.source.PsiSourceElement +import org.jetbrains.kotlin.resolve.source.getPsi import com.intellij.psi.PsiElement import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.psi.JetNamedFunction 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 46164b1a705..342a91f13a0 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 @@ -21,7 +21,7 @@ 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 +import org.jetbrains.kotlin.resolve.BindingContext import java.util.Collections import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType 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 67134245f6a..d53a7c43136 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 @@ -24,7 +24,7 @@ import com.intellij.psi.PsiElementResolveResult import com.intellij.util.IncorrectOperationException import com.intellij.psi.PsiReference import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import java.util.Collections import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil 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 7443426b6dc..7096c5f128c 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 @@ -31,10 +31,10 @@ import org.jetbrains.jet.plugin.refactoring.fqName.getKotlinFqName 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 org.jetbrains.kotlin.resolve.BindingContext import com.intellij.util.IncorrectOperationException import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike +import org.jetbrains.kotlin.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 6375c946636..5c07d6ca6ec 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 @@ -22,7 +22,7 @@ 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 -import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike +import org.jetbrains.kotlin.resolve.dataClassUtils.isComponentLike public val ALL_SEARCHABLE_OPERATIONS: ImmutableSet = ImmutableSet .builder() 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 cedef51ee05..e46834a1fd0 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 @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.asJava.LightClassUtil.PropertyAccessorsPsiMethods import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.lexer.JetSingleValueToken -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.references.* 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 7e49657bc83..1ab940c5c6d 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 @@ -20,13 +20,13 @@ import com.intellij.psi.PsiConstructorCall import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.psiUtil.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.psi.PsiReference -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.codegen.PropertyCodegen import org.jetbrains.kotlin.asJava.KotlinLightMethod -import org.jetbrains.jet.lang.resolve.OverrideResolver -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.OverrideResolver +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.references.* import org.jetbrains.jet.plugin.findUsages.UsageTypeUtils import org.jetbrains.jet.plugin.findUsages.UsageTypeEnum 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 618ed3a93f1..a6ef07335e9 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 @@ -20,7 +20,7 @@ import com.intellij.ide.util.InheritedMembersNodeProvider import com.intellij.ide.util.treeView.smartTree.TreeElement import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import java.util.ArrayList import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import com.intellij.psi.NavigatablePsiElement 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 3a5922332b7..00032718ca4 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 @@ -38,8 +38,8 @@ import org.jetbrains.jet.plugin.JetDescriptorIconProvider; import javax.swing.*; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.OverrideResolver.filterOutOverridden; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getAllOverriddenDeclarations; +import static org.jetbrains.kotlin.resolve.OverrideResolver.filterOutOverridden; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getAllOverriddenDeclarations; import static org.jetbrains.kotlin.renderer.DescriptorRenderer.ONLY_NAMES_WITH_SHORT_TYPES; class KotlinStructureElementPresentation implements ColoredItemPresentation, LocationPresentation { 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 30aa35579c8..30496417cad 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 @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.lazy.data.JetClassLikeInfo import org.jetbrains.kotlin.resolve.lazy.data.JetClassInfoUtil import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils import java.util.ArrayList -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.jet.plugin.stubindex.JetTopLevelFunctionByPackageIndex import com.intellij.psi.stubs.StringStubIndexExtension import org.jetbrains.jet.plugin.stubindex.JetTopLevelPropertyByPackageIndex diff --git a/idea/src/META-INF/extensions/common.xml b/idea/src/META-INF/extensions/common.xml index 454c24df7ab..34892ede779 100644 --- a/idea/src/META-INF/extensions/common.xml +++ b/idea/src/META-INF/extensions/common.xml @@ -5,8 +5,8 @@ + interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression$SuppressStringProvider"/> + interface="org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression$DiagnosticSuppressor"/> diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml index 2d5625bbbef..95ac6b22471 100644 --- a/idea/src/META-INF/plugin.xml +++ b/idea/src/META-INF/plugin.xml @@ -160,8 +160,8 @@ - + diff --git a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java index fbf7e9e0148..c3626e33c84 100644 --- a/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetPackageDirective; import org.jetbrains.kotlin.psi.JetReferenceExpression; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.asJava.KotlinLightMethod; diff --git a/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt b/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt index 8f10a0f019f..fc29970e438 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/KotlinQualifiedNameProvider.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetClassOrObject public class KotlinQualifiedNameProvider: QualifiedNameProvider { diff --git a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java index 25fcb75626d..e89866aafcd 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java @@ -27,7 +27,7 @@ import com.intellij.psi.PsiFile; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; 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 72a970b53e9..b33e308a78e 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CheckPartialBodyResolveAction.kt @@ -30,7 +30,7 @@ import com.intellij.openapi.progress.ProgressManager import org.jetbrains.kotlin.psi.JetVisitorVoid import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetReferenceExpression -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.openapi.fileEditor.FileDocumentManager import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer diff --git a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java index 5f90ec88e1d..067bc9e2fc0 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/CopyAsDiagnosticTestAction.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.jet.checkers.CheckerTestUtil; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import java.awt.*; 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 a7cf7f489d8..0fe23fb8fb6 100644 --- a/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt +++ b/idea/src/org/jetbrains/jet/plugin/actions/internal/FindImplicitNothingAction.kt @@ -30,12 +30,12 @@ import com.intellij.openapi.ui.Messages import javax.swing.SwingUtilities import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.resolve.calls.callUtil.getCalleeExpressionIfAny -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.usages.UsageViewManager import com.intellij.usages.UsageInfo2UsageAdapter import com.intellij.usageView.UsageInfo diff --git a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt index 738845203ba..bf6f6ab4ec1 100644 --- a/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt +++ b/idea/src/org/jetbrains/jet/plugin/caches/KotlinIndicesHelper.kt @@ -22,14 +22,14 @@ import org.jetbrains.jet.plugin.stubindex.* import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils 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 +import org.jetbrains.kotlin.resolve.* +import org.jetbrains.kotlin.resolve.scopes.JetScope import com.intellij.openapi.project.Project import java.util.HashSet -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo -import org.jetbrains.jet.lang.resolve.QualifiedExpressionResolver.LookupMode -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver +import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver.LookupMode +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo import com.intellij.psi.stubs.StringStubIndexExtension import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java index 2dd383aadae..17bf3c9337f 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/GotoSuperActionHandler.java @@ -34,8 +34,8 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java index dd65c80b8a4..7d79b3324fc 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/ImplementMethodsHandler.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.jet.plugin.JetBundle; import java.util.Set; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java index ca6b698f28a..f71adb7ada9 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/JetTypeDeclarationProvider.java @@ -23,8 +23,8 @@ 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt index 58ac2f87903..16e192478a3 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/KotlinCopyPasteReferenceProcessor.kt @@ -62,7 +62,7 @@ import org.jetbrains.jet.plugin.imports.* import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.utils.* import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension +import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension import com.intellij.openapi.progress.ProcessCanceledException import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java index af4f34c8f4b..2f0f3ea6050 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideMethodsHandler.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.OverridingUtil; import org.jetbrains.kotlin.resolve.calls.CallResolverUtil; import org.jetbrains.kotlin.types.JetType; @@ -31,7 +31,7 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; +import static org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityInfo.Result.OVERRIDABLE; public class OverrideMethodsHandler extends OverrideImplementMethodsHandler { @Override 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 b03e69e2c9c..0ef897170a8 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/KotlinSurrounderUtils.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; 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 be3ee105b83..343da78b364 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; 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/expression/KotlinRuntimeTypeCastSurrounder.kt b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/expression/KotlinRuntimeTypeCastSurrounder.kt index db0810e4de6..3e27dddee5b 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 @@ -37,9 +37,9 @@ import org.jetbrains.kotlin.psi.JetBinaryExpressionWithTypeRHS import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.jet.plugin.caches.resolve.analyzeFully -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.jet.plugin.JetBundle diff --git a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt index ea9f61a9626..06021d2033d 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/AllClassesCompletion.kt @@ -25,7 +25,7 @@ import org.jetbrains.jet.plugin.project.ProjectStructureUtil import org.jetbrains.jet.plugin.caches.KotlinIndicesHelper import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import com.intellij.psi.search.GlobalSearchScope -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.descriptors.ModuleDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt index 15ee6b88c83..50937e7152c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSession.kt @@ -22,7 +22,7 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.* import org.jetbrains.jet.plugin.codeInsight.ReferenceVariantsHelper import org.jetbrains.jet.plugin.completion.smart.SmartCompletion @@ -32,16 +32,16 @@ import com.intellij.openapi.project.Project import com.intellij.psi.search.DelegatingGlobalSearchScope import com.intellij.openapi.vfs.VirtualFile import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptorKindExclude -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter import org.jetbrains.kotlin.resolve.calls.smartcasts.SmartCastUtils -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo +import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.jet.plugin.refactoring.comparePossiblyOverridingDescriptors import kotlin.properties.Delegates import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import org.jetbrains.jet.plugin.util.makeNotNullable import org.jetbrains.jet.plugin.util.CallType -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindExclude +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindExclude import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import com.intellij.patterns.StandardPatterns import com.intellij.util.ProcessingContext diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt index 1a4a9f9d41c..49574f3a60e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionSorting.kt @@ -28,9 +28,9 @@ 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.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.name.isValidJavaFqName -import org.jetbrains.jet.lang.resolve.ImportPath +import org.jetbrains.kotlin.resolve.ImportPath import com.intellij.codeInsight.completion.CompletionType import org.jetbrains.jet.plugin.completion.smart.NameSimilarityWeigher import org.jetbrains.jet.plugin.completion.smart.SMART_COMPLETION_ITEM_PRIORITY_KEY diff --git a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt b/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt index 280a3fd6420..a89785cff14 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/CompletionUtils.kt @@ -37,15 +37,15 @@ import org.jetbrains.jet.plugin.completion.handlers.CastReceiverInsertHandler 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.resolve.BindingContext import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.kotlin.psi.JetValueArgument diff --git a/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt index 96523918108..a88ae2de0f1 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/DataFlowInfoUtilForCompletion.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.completion import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValue -import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.descriptors.PackageViewDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt index c398ef78972..fb21ae04a1e 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/ExpectedInfos.kt @@ -17,14 +17,14 @@ package org.jetbrains.jet.plugin.completion import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetValueArgument import org.jetbrains.kotlin.psi.JetValueArgumentList import org.jetbrains.kotlin.psi.JetCallExpression -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import com.intellij.lang.ASTNode import org.jetbrains.kotlin.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.kotlin.resolve.calls.util.CallMaker import org.jetbrains.kotlin.resolve.calls.context.ContextDependency import org.jetbrains.kotlin.resolve.calls.context.CheckValueArgumentsMode @@ -50,17 +50,17 @@ import org.jetbrains.kotlin.psi.JetWhenExpression import org.jetbrains.kotlin.psi.JetCallElement import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import org.jetbrains.kotlin.psi.JetPrefixExpression import org.jetbrains.kotlin.resolve.calls.util.DelegatingCall import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo +import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetArrayAccessExpression import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetDeclarationWithBody import org.jetbrains.kotlin.psi.JetReturnExpression -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getTargetFunctionDescriptor +import org.jetbrains.kotlin.resolve.bindingContextUtil.getTargetFunctionDescriptor import org.jetbrains.jet.plugin.completion.smart.toList import org.jetbrains.kotlin.descriptors.PropertyGetterDescriptor import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt index 385036f8c35..e282c2eeee0 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/KotlinCompletionContributor.kt @@ -53,7 +53,7 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.ClassKind diff --git a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt index 01e6f86fa94..d606444ba0d 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/LookupElementFactory.kt @@ -22,8 +22,8 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder import com.intellij.openapi.util.Iconable import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.JetDescriptorIconProvider import org.jetbrains.jet.plugin.completion.handlers.* 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 e8ac7b098fc..0035a8857dd 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinCallableInsertHandler.kt @@ -28,7 +28,7 @@ import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetQualifiedExpression -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper import com.intellij.openapi.editor.Document import org.jetbrains.kotlin.types.JetType 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 fc9c00089d5..e51045aca02 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/KotlinClassInsertHandler.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode import com.intellij.psi.PsiClass import org.jetbrains.kotlin.psi.JetNameReferenceExpression import org.jetbrains.jet.plugin.caches.resolve.getResolutionFacade -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.jet.plugin.completion.isAfterDot 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 98378a12a7e..a6e7bfee92c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/MultipleArgumentsItemProvider.kt @@ -23,9 +23,9 @@ import com.intellij.ui.LayeredIcon import com.intellij.codeInsight.lookup.LookupElementBuilder import org.jetbrains.jet.plugin.completion.Tail import org.jetbrains.jet.plugin.completion.ItemPriority -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import java.util.HashSet -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.jet.plugin.JetDescriptorIconProvider import org.jetbrains.kotlin.descriptors.VariableDescriptor 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 f6ac7b89c14..08c3fbdc77a 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.completion.smart import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.* +import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.types.* 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 f20657af4ea..1c4f66f5596 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/StaticMembers.kt @@ -19,15 +19,15 @@ package org.jetbrains.jet.plugin.completion.smart import com.intellij.codeInsight.lookup.LookupElement import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import com.intellij.codeInsight.lookup.LookupElementDecorator import com.intellij.codeInsight.lookup.LookupElementPresentation import org.jetbrains.kotlin.renderer.DescriptorRenderer import com.intellij.codeInsight.completion.InsertionContext -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.completion.ExpectedInfo import org.jetbrains.jet.plugin.completion.qualifiedNameForSourceCode -import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension +import org.jetbrains.kotlin.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 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 561a4d4a3d5..37491e9823c 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypeInstantiationItems.kt @@ -35,11 +35,11 @@ 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.psi.PsiClass import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.search.searches.ClassInheritorsSearch @@ -50,13 +50,13 @@ import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension import org.jetbrains.kotlin.load.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.kotlin.resolve.PossiblyBareType import org.jetbrains.kotlin.types.JetTypeImpl import org.jetbrains.kotlin.descriptors.annotations.Annotations -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.resolve.jvm.types.KotlinToJavaTypesMap import org.jetbrains.kotlin.descriptors.ModuleDescriptor -import org.jetbrains.jet.lang.resolve.resolveTopLevelClass +import org.jetbrains.kotlin.resolve.resolveTopLevelClass import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetDeclaration 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 84b2048a9f5..18bf7c3f018 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/TypesWithSmartCasts.kt @@ -27,9 +27,9 @@ import java.util.HashMap import com.google.common.collect.SetMultimap import org.jetbrains.kotlin.resolve.calls.smartcasts.Nullability import java.util.HashSet -import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver +import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.plugin.util.makeNotNullable class TypesWithSmartCasts(val bindingContext: BindingContext) { 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 d1575ffe18d..a737a7b1e5f 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/Utils.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.descriptors.ConstructorDescriptor import org.jetbrains.kotlin.descriptors.ClassifierDescriptor import com.intellij.openapi.util.Key import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.ResolutionFacade import org.jetbrains.kotlin.types.TypeSubstitutor import java.util.ArrayList diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt b/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt index 28d5a93a673..9bf9cd4ed4d 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/DiagnosticSuppressorForDebugger.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.plugin.debugger -import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression +import org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression import org.jetbrains.kotlin.diagnostics.Diagnostic import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.diagnostics.Errors diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt index 19d98e078cc..4576b338ebe 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/JetPositionManager.kt @@ -46,11 +46,11 @@ 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.* import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument -import org.jetbrains.jet.lang.resolve.extension.InlineAnalyzerExtension +import org.jetbrains.kotlin.resolve.extension.InlineAnalyzerExtension import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt index 4f39d9eb4c0..c6881e5e783 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/KotlinSmartStepIntoHandler.kt @@ -23,7 +23,7 @@ import java.util.Collections import com.intellij.debugger.actions.MethodSmartStepTarget import com.intellij.util.containers.OrderedSet import com.intellij.util.Range -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.asJava.LightClassUtil import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import com.intellij.psi.PsiElement @@ -37,7 +37,7 @@ import com.intellij.psi.PsiMethod import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.util.application.runReadAction import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt index ee82d540951..d34f0d2c322 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -36,7 +36,7 @@ import com.intellij.openapi.module.impl.scopes.JdkScope import com.intellij.openapi.roots.JdkOrderEntry import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.jet.lang.resolve.descriptorUtil.module +import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.jet.plugin.caches.resolve.resolveToDescriptor private val LOG = Logger.getInstance("org.jetbrains.jet.plugin.debugger") 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 4050f489c10..ca6bfd87a4a 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionCache.kt @@ -27,7 +27,7 @@ import java.util.ArrayList import com.intellij.openapi.components.ServiceManager import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils 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 850fdc62761..7d7bba9aea7 100644 --- a/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluationBuilder.kt @@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement import com.intellij.debugger.SourcePosition import com.intellij.debugger.engine.evaluation.* import com.intellij.debugger.engine.evaluation.expression.* -import org.jetbrains.jet.lang.resolve.AnalyzingUtils +import org.jetbrains.kotlin.resolve.AnalyzingUtils import org.jetbrains.kotlin.codegen.state.GenerationState import org.jetbrains.kotlin.codegen.ClassBuilderFactories import org.jetbrains.kotlin.codegen.KotlinCodegenFacade @@ -55,7 +55,7 @@ import com.sun.jdi.request.EventRequest import com.sun.jdi.ObjectReference import com.intellij.debugger.engine.SuspendContext import org.jetbrains.jet.plugin.debugger.evaluate.KotlinEvaluateExpressionCache.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import com.sun.jdi.VirtualMachine import org.jetbrains.kotlin.codegen.AsmUtil import com.sun.jdi.InvalidStackFrameException @@ -69,7 +69,7 @@ import com.intellij.psi.search.GlobalSearchScope import org.jetbrains.jet.plugin.caches.resolve.JavaResolveExtension import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl import com.intellij.openapi.project.Project -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.codegen.StackValue import org.jetbrains.kotlin.types.Flexibility import org.jetbrains.kotlin.psi.JetElement diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt index 864aadc1bfc..89d23f4fa34 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetElementDescriptionProvider.kt @@ -25,7 +25,7 @@ import com.intellij.usageView.UsageViewLongNameLocation import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.jet.plugin.search.usagesSearch.descriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import com.intellij.refactoring.util.CommonRefactoringUtil public class JetElementDescriptionProvider : ElementDescriptionProvider { diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java index 5f2977651c3..7cfed48e800 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/KotlinTypeHierarchyProvider.java @@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.util.ProjectRootsUtil; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; 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 4d0c9dfc377..58ec0d81b36 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/CalleeReferenceVisitorBase.java @@ -24,8 +24,8 @@ 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; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; public abstract class CalleeReferenceVisitorBase extends JetTreeVisitorVoid { private final BindingContext bindingContext; 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 dd0829717d4..9a96a2c5518 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallHierarchyNodeDescriptor.java @@ -41,7 +41,7 @@ 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.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index b666356d813..9e5056b92a5 100644 --- a/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/jet/plugin/hierarchy/calls/KotlinCallerMethodsTreeStructure.java @@ -35,7 +35,7 @@ import com.intellij.util.containers.HashMap; import gnu.trove.TObjectHashingStrategy; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.hierarchy.HierarchyUtils; import org.jetbrains.jet.plugin.references.JetReference; 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 1ebb47f69c6..02f098bfbe0 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/markers/SuperDeclarationMarker.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.highlighter.markers import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.lang.resolve.OverrideResolver +import org.jetbrains.kotlin.resolve.OverrideResolver import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder @@ -35,7 +35,7 @@ import com.intellij.codeInsight.daemon.GutterIconNavigationHandler import java.util.ArrayList import com.intellij.util.Function import org.jetbrains.kotlin.psi.JetDeclaration -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.analyze object SuperDeclarationMarkerTooltip: Function { diff --git a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt index 52d7c3b3eeb..5b4c2f1f96c 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/ImportsUtils.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.imports 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.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import com.intellij.psi.PsiElement import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor -import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension +import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor +import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension public val DeclarationDescriptor.importableFqName: FqName? get() { diff --git a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt index bcdfd804c66..c810344dd26 100644 --- a/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt +++ b/idea/src/org/jetbrains/jet/plugin/imports/KotlinImportOptimizer.kt @@ -22,7 +22,7 @@ import com.intellij.openapi.progress.ProgressIndicatorProvider 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.kotlin.resolve.ImportPath import org.jetbrains.kotlin.name.* import org.jetbrains.jet.plugin.references.JetReference import java.util.HashSet diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt index d7116708580..88dfaf8654b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertAssertToIfWithThrowIntention.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPrefixExpression import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.kotlin.psi.JetCallableReferenceExpression -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import kotlin.properties.Delegates import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetIfExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt index 67de169c20e..1d161f8553c 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertIfWithThrowToAssertIntention.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPrefixExpression import org.jetbrains.jet.plugin.codeInsight.ShortenReferences -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.jet.plugin.intentions.branchedTransformations.extractExpressionIfSingle import org.jetbrains.kotlin.psi.JetThrowExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt index dfe531478de..3225743dae8 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToConcatenatedStringIntention.kt @@ -7,7 +7,7 @@ import org.jetbrains.kotlin.psi.JetStringTemplateEntry import org.jetbrains.kotlin.psi.JetBinaryExpression import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.resolve.BindingContextUtils +import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetIfExpression import org.jetbrains.kotlin.psi.JetBlockExpression diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt index 58def176c83..651ca77ca65 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToForEachLoopIntention.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.kotlin.psi.JetBinaryExpression -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt index e658f33f67f..5ec881ee8eb 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ConvertToStringTemplateIntention.kt @@ -18,15 +18,15 @@ package org.jetbrains.jet.plugin.intentions import org.jetbrains.kotlin.psi.JetBinaryExpression import com.intellij.openapi.editor.Editor -import org.jetbrains.jet.lang.resolve.BindingContextUtils +import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.psi.JetConstantExpression import org.jetbrains.kotlin.psi.JetStringTemplateExpression import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace -import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace +import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.openapi.util.text.StringUtil diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt index 15490bfbdbe..6bd1bd1fe62 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt @@ -18,7 +18,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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.psi.PsiWhiteSpace diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java index d013025445e..863515f53d6 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReconstructTypeInCastOrIsAction.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.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt index 2abf65f4fa4..fe400de7235 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceExplicitFunctionLiteralParamWithItIntention.kt @@ -29,7 +29,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor import org.jetbrains.jet.plugin.references.JetReference import org.jetbrains.kotlin.descriptors.VariableDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils public class ReplaceExplicitFunctionLiteralParamWithItIntention() : PsiElementBaseIntentionAction() { override fun invoke(project: Project, editor: Editor, element: PsiElement) { diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt index 84952353c04..604e51e1697 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceItWithExplicitFunctionLiteralParamIntention.kt @@ -24,13 +24,13 @@ import com.intellij.psi.PsiElement import com.intellij.refactoring.rename.inplace.VariableInplaceRenameHandler import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.psi.JetSimpleNameExpression 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 +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt index 06c3d2f7fa5..ccaad037916 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithInfixFunctionCallIntention.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.psi.JetCallExpression import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetDotQualifiedExpression import org.jetbrains.jet.plugin.caches.resolve.analyzeFully -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.psi.JetValueArgument import org.jetbrains.kotlin.psi.JetPsiUnparsingUtils diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt index d050cf98cf5..723cbb1e720 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/ReplaceWithOperatorAssignIntention.kt @@ -21,7 +21,7 @@ import com.intellij.openapi.editor.Editor 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.util.psi.patternMatching.matches diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt index 28dffd77936..d3bb8e2831a 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SimplifyBooleanWithConstantsIntention.kt @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetParenthesizedExpression import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.resolve.CompileTimeConstantUtils -import org.jetbrains.jet.lang.resolve.DelegatingBindingTrace +import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils +import org.jetbrains.kotlin.resolve.DelegatingBindingTrace import com.intellij.psi.tree.IElementType import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.psiUtil.copied diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java index 28a9aabc9fc..12453d1e7b7 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java @@ -35,8 +35,8 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt index 44ef743bb0b..6a814ac5ec4 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/Utils.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.intentions import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.types.JetType -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.codeInsight.ShortenReferences import org.jetbrains.jet.JetNodeTypes 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 55a78bc3bac..8aacaf29f59 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/branchedTransformations/IfThenUtils.kt @@ -26,12 +26,12 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import com.intellij.openapi.editor.Editor import org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler import org.jetbrains.kotlin.psi.JetSafeQualifiedExpression -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.refactoring.inline.KotlinInlineValHandler import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowValueFactory -import org.jetbrains.jet.lang.resolve.BindingContextUtils +import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.descriptors.VariableDescriptor import com.intellij.psi.search.searches.ReferencesSearch import com.intellij.psi.search.LocalSearchScope @@ -39,9 +39,9 @@ import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetThrowExpression import org.jetbrains.kotlin.psi.JetPostfixExpression import org.jetbrains.kotlin.psi.JetCallExpression -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.psi.JetElement -import org.jetbrains.jet.lang.resolve.bindingContextUtil.isUsedAsStatement +import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsStatement import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.jet.plugin.caches.resolve.analyze 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 92dba1b014d..df24346d1c5 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/ConvertMemberToExtension.java @@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable; 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.resolve.BindingContext; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; @@ -43,7 +43,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import java.util.List; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.jet.lang.resolve.BindingContext.DECLARATION_TO_DESCRIPTOR; +import static org.jetbrains.kotlin.resolve.BindingContext.DECLARATION_TO_DESCRIPTOR; public class ConvertMemberToExtension extends BaseIntentionAction { 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 76bd41acdd1..3161f704b5b 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java +++ b/idea/src/org/jetbrains/jet/plugin/intentions/declarations/DeclarationUtils.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; diff --git a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt b/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt index 714e3e9b041..c252f1f9237 100644 --- a/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/j2k/J2kPostProcessor.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.j2k import org.jetbrains.kotlin.j2k.PostProcessor import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.intentions.RemoveExplicitTypeArguments import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import java.util.ArrayList diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java index 08afba03d56..3267e15f5b3 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/EditSignatureBalloon.java @@ -44,7 +44,7 @@ import com.intellij.ui.awt.RelativePoint; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.jet.plugin.JetFileType; import javax.swing.*; diff --git a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java index f2c314a6295..cc6d9bbb12e 100644 --- a/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java +++ b/idea/src/org/jetbrains/jet/plugin/ktSignature/KotlinSignatureInJavaMarkerProvider.java @@ -39,7 +39,7 @@ import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.load.java.JavaBindingContext; import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolver; import org.jetbrains.kotlin.resolve.jvm.JvmPackage; 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 59d2545ae1f..5b0967586ad 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/AnonymousTemplateEditingListener.java @@ -31,7 +31,7 @@ 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.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.codeInsight.ImplementMethodsHandler; 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 59acd4418e1..676890d23bc 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/BaseJetVariableMacro.java @@ -33,11 +33,11 @@ import org.jetbrains.jet.analyzer.AnalysisResult; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.util.UtilPackage; @@ -48,7 +48,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage.getDataFlowInfo; +import static org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.getDataFlowInfo; public abstract class BaseJetVariableMacro extends Macro { @Nullable 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 70e98767fc9..2e98d416706 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnonymousSuperMacro.java @@ -35,10 +35,10 @@ 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; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.scopes.DescriptorKindFilter; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; 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 e1bd43266a4..398cef6688f 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetAnyVariableMacro.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.plugin.JetBundle; 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 24f12ed6a39..fca67aaee79 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetIterableVariableMacro.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.plugin.JetBundle; 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 ba1808173c4..59047edabca 100644 --- a/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java +++ b/idea/src/org/jetbrains/jet/plugin/liveTemplates/macro/JetSuggestVariableNameMacro.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.liveTemplates.macro; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.VariableDescriptor; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.expressions.ExpressionTypingComponents; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java index 417e5649be6..3e9d79bb56f 100644 --- a/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java @@ -36,14 +36,14 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.JetVisibilityChecker; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; 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.kotlin.resolve.scopes.DescriptorKindExclude; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java index 2299e35cccd..d28796b1f73 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionParametersFix.java @@ -31,7 +31,7 @@ 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java index e7525cc0699..f1bf51a3e23 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddFunctionToSupertypeFix.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedFunction; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java index 3ee277a5a9b..2b7fa0b35ef 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AddNameToArgumentFix.java @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.psi.JetCallElement; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetValueArgument; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt index 2a234f14f6a..769c57c9f5b 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/AutoImportFix.kt @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetPsiUtil 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.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.ImportPath import org.jetbrains.kotlin.name.FqName import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.plugin.actions.JetAddImportAction @@ -49,7 +49,7 @@ 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.DeclarationDescriptorWithVisibility import org.jetbrains.kotlin.diagnostics.Errors import com.intellij.psi.util.PsiModificationTracker diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java index bdbb787acf4..0d62fa79ae8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/CastExpressionFix.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java index 35eb187d3f8..136c339b3e3 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java index bb3c3c90929..6c8b9c20a27 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralSignatureFix.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java index b4bdeae2406..b7008ca04b2 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionReturnTypeFix.java @@ -29,11 +29,11 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.SimpleFunctionDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.dataClassUtils.DataClassUtilsPackage; +import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.ErrorUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java index 8733e5c9745..b0829119f3c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionSignatureFix.java @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java index 0016812f8e6..0ed4a7cd623 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java @@ -39,11 +39,11 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.FunctionDescriptorUtil; +import org.jetbrains.kotlin.resolve.VisibilityUtil; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java index 271e282b7cd..aea6631a5cf 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeToConstructorInvocationFix.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java index edf659ce3d4..d7e955a7b4a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeTypeFix.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.diagnostics.Errors; 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.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.codeInsight.ShortenReferences; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java index c47645491ad..2dbea5bdefc 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableMutabilityFix.java @@ -28,9 +28,9 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java index 0ba7aa28986..2affc587e8c 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVariableTypeFix.java @@ -30,8 +30,8 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.types.ErrorUtils; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java index 62784edcc2d..e2366c40943 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeVisibilityModifierFix.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetModifierListOwner; import org.jetbrains.kotlin.psi.JetParameter; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.jet.plugin.JetBundle; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java index 0a87de18913..53fe6da13b4 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ImportInsertHelperImpl.java @@ -20,7 +20,7 @@ import com.intellij.codeInsight.CodeInsightSettings; import com.intellij.codeInsight.actions.OptimizeImportsProcessor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.ImportPath; +import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.NamePackage; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java index 7333698f30e..fd745fc6e0f 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MakeOverriddenMemberOpenFix.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import java.util.*; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; import static org.jetbrains.kotlin.lexer.JetTokens.OPEN_KEYWORD; public class MakeOverriddenMemberOpenFix extends JetIntentionAction { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java index 686f8ef6f74..7ee1ac530ed 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/MapPlatformClassToKotlinFix.java @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java index 83f988fafcc..a608acf4369 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixFactoryForTypeMismatchError.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java index c4759a22cac..d9897e9c2ab 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/QuickFixUtil.java @@ -32,9 +32,9 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.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.DescriptorUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.name.FqName; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java index 4ae5f4d738d..8acffa7d614 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RemoveFunctionParametersFix.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java index e1974b9d07a..f27407c5de7 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/RenameParameterToMatchOverriddenMethodFix.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; 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 22700b96896..fc551a42a62 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 @@ -30,10 +30,10 @@ import com.intellij.psi.util.PsiTreeUtil import com.intellij.util.IncorrectOperationException 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.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.scopes.JetScope +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.* import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.codeInsight.ShortenReferences @@ -45,7 +45,7 @@ import java.util.HashMap import java.util.ArrayList import java.util.Properties import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.refactoring.EmptyValidator import org.jetbrains.jet.plugin.refactoring.CollectingValidator import org.jetbrains.jet.plugin.util.isUnit 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 192d58719be..30d318fbef0 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 @@ -8,7 +8,7 @@ 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.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.util.supertypes import org.jetbrains.kotlin.types.ErrorUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns 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 33a24c9feb8..6af6215f3ba 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 @@ -3,11 +3,11 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder 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 org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.scopes.JetScope import java.util.LinkedHashSet import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetTypeConstraint import org.jetbrains.kotlin.psi.JetMultiDeclarationEntry import org.jetbrains.kotlin.psi.JetParameter @@ -23,7 +23,7 @@ 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.resolve.bindingContextUtil.isUsedAsStatement import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetPropertyDelegate 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 c68560b1aed..af7ac68ca11 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 @@ -3,7 +3,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createClass import org.jetbrains.kotlin.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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.ParameterInfo 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 a5bcb3f1dc4..2fba1c6287a 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 @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.psi.JetImportDirective import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult import org.jetbrains.kotlin.resolve.calls.callUtil.getCall import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.psi.JetReferenceExpression 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 0544168d4a3..5d1a28dbf38 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 @@ -7,7 +7,7 @@ import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import java.util.Collections import org.jetbrains.kotlin.psi.JetUserType import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.psi.JetDelegatorToSuperClass 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 f64f4b7d4a0..17e092c25a3 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 @@ -9,7 +9,7 @@ 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.types.checker.JetTypeChecker @@ -17,11 +17,11 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.TypeInfo 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 +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.Qualifier import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.noSubstitutions -import org.jetbrains.jet.lang.resolve.DescriptorUtils -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.codeInsight.intention.IntentionAction import org.jetbrains.kotlin.psi.JetSimpleNameExpression import com.intellij.codeInsight.daemon.quickFix.CreateClassOrPackageFix diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt index 80bb7ac7a09..2f0f6350a6a 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/createFunction/CreateCallableFromUsageFix.kt @@ -6,7 +6,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.jet.plugin.JetBundle import com.intellij.openapi.project.Project import com.intellij.openapi.command.CommandProcessor -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.kotlin.psi.JetClassOrObject import org.jetbrains.jet.plugin.refactoring.chooseContainerElementIfNecessary 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 2ce3123a2fc..efb0200203d 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 @@ -3,7 +3,7 @@ package org.jetbrains.jet.plugin.quickfix.createFromUsage.createFunction import org.jetbrains.jet.plugin.quickfix.JetSingleIntentionActionFactory import org.jetbrains.kotlin.diagnostics.Diagnostic import com.intellij.codeInsight.intention.IntentionAction -import org.jetbrains.jet.lang.resolve.dataClassUtils.* +import org.jetbrains.kotlin.resolve.dataClassUtils.* import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import org.jetbrains.kotlin.psi.JetMultiDeclaration 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 7156e2f72ff..caec0fe4585 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 @@ -10,8 +10,8 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.JetQualifiedExpression import org.jetbrains.kotlin.resolve.calls.callUtil.getCall -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue -import org.jetbrains.jet.lang.resolve.scopes.receivers.Qualifier +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.Qualifier import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.* import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType @@ -21,7 +21,7 @@ import org.jetbrains.jet.plugin.refactoring.getExtractionContainers import org.jetbrains.kotlin.psi.JetClassBody import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetTypeReference import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.psi.JetAnnotationEntry 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 fc09727a747..a99d835a6d0 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 @@ -8,7 +8,7 @@ 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.PropertyDescriptor import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetExpression 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 c3c95777f19..0a1457fb76f 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 @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression 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.kotlin.resolve.BindingContext import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo @@ -28,7 +28,7 @@ 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 -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetNamedFunction import org.jetbrains.kotlin.psi.psiUtil.getAssignmentByLHS import org.jetbrains.jet.plugin.quickfix.createFromUsage.callableBuilder.getExpressionForTypeGuess 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 41b71598314..92b3a09fa5a 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 @@ -24,7 +24,7 @@ import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureConfiguration import org.jetbrains.jet.plugin.refactoring.changeSignature.JetChangeSignatureData -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.psi.PsiElement import org.jetbrains.jet.plugin.refactoring.changeSignature.runChangeSignature import org.jetbrains.jet.plugin.refactoring.changeSignature.JetParameterInfo diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java index 386ecda3311..04b0c1bfe0e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameSuggester.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java index a54b617039d..f9a84199c6e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetNameValidatorImpl.java @@ -22,9 +22,9 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import java.util.HashSet; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java index c6441deb9e5..13d1e564731 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/JetRefactoringUtil.java @@ -41,9 +41,9 @@ 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; 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 ddf824746df..2ce7bb1e3f7 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeInfo.kt @@ -30,7 +30,7 @@ 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.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens 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 2836f6809ef..5716962ddaa 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignature.kt @@ -24,7 +24,7 @@ import com.intellij.openapi.ui.Messages import com.intellij.openapi.util.Disposer import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.kotlin.renderer.DescriptorRenderer import java.util.* @@ -34,7 +34,7 @@ import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.jet.plugin.quickfix.QuickFixUtil import com.intellij.CommonBundle import com.intellij.refactoring.RefactoringBundle -import org.jetbrains.jet.lang.resolve.OverrideResolver +import org.jetbrains.kotlin.resolve.OverrideResolver public trait JetChangeSignatureConfiguration { fun configure(changeSignatureData: JetChangeSignatureData, bindingContext: BindingContext) 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 12148986998..3400b3daf66 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureHandler.java @@ -38,7 +38,7 @@ 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; 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 68362e9c910..6300ddc496c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -37,11 +37,11 @@ import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.RefactoringPackage; 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 3b48e71b32f..759b46f107e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/JetParameterInfo.kt @@ -24,7 +24,7 @@ import org.jetbrains.jet.plugin.util.IdeDescriptorRenderers import org.jetbrains.jet.plugin.refactoring.changeSignature.usages.JetFunctionDefinitionUsage import com.intellij.psi.PsiElement import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.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/usages/JetFunctionDefinitionUsage.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java index a77810b9b8e..355f3f58f07 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 @@ -31,8 +31,8 @@ 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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 05e0393f111..c786010b026 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractableCodeDescriptor.kt @@ -53,7 +53,7 @@ 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.kotlin.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 @@ -65,7 +65,7 @@ import com.intellij.util.containers.ContainerUtil import org.jetbrains.kotlin.psi.JetCallElement import org.jetbrains.kotlin.psi.psiUtil.getQualifiedElementSelector import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.util.isUnit trait Parameter { 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 54516b0187b..1127622a5a0 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/ExtractionData.kt @@ -27,7 +27,7 @@ import kotlin.properties.Delegates import java.util.HashMap import org.jetbrains.jet.plugin.codeInsight.JetFileReferencesResolver import org.jetbrains.kotlin.psi.JetSimpleNameExpression -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import java.util.Collections import org.jetbrains.kotlin.psi.JetBlockExpression @@ -38,7 +38,7 @@ import java.util.ArrayList import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.psi.JetSuperExpression import org.jetbrains.kotlin.descriptors.ClassDescriptor -import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.JetDeclaration @@ -50,7 +50,7 @@ import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.psi.JetClassInitializer import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType 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 639cad9e39b..a2603a48640 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractableAnalysisUtil.kt @@ -28,10 +28,10 @@ import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.jet.plugin.refactoring.JetNameSuggester import org.jetbrains.kotlin.builtins.KotlinBuiltIns import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue -import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.cfg.pseudocode.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.cfg.Label import org.jetbrains.jet.plugin.refactoring.JetNameValidatorImpl import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil @@ -52,10 +52,10 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.jumps.* import kotlin.properties.Delegates import org.jetbrains.kotlin.cfg.pseudocodeTraverser.traverse import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getTargetFunctionDescriptor -import org.jetbrains.jet.lang.resolve.OverridingUtil -import org.jetbrains.jet.lang.resolve.bindingContextUtil.isUsedAsStatement -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.bindingContextUtil.getTargetFunctionDescriptor +import org.jetbrains.kotlin.resolve.OverridingUtil +import org.jetbrains.kotlin.resolve.bindingContextUtil.isUsedAsStatement +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.imports.importableFqNameSafe import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.Initializer import org.jetbrains.jet.plugin.refactoring.extractFunction.OutputValue.ParameterUpdate 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 7bddd9ba3ae..cc204c2dc67 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/inline/KotlinInlineValHandler.java @@ -52,7 +52,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; 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 699f180c7c8..690a364aeec 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 @@ -38,12 +38,12 @@ import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.analyzer.AnalyzerPackage; 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.BindingTraceContext; -import org.jetbrains.jet.lang.resolve.ObservableBindingTrace; -import org.jetbrains.jet.lang.resolve.bindingContextUtil.BindingContextUtilPackage; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.ObservableBindingTrace; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.jet.lang.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt index 4e45640ffbe..af3c54b314e 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/jetRefactoringUtil.kt @@ -55,7 +55,7 @@ import com.intellij.ui.components.JBList import com.intellij.openapi.ui.popup.JBPopupAdapter import com.intellij.openapi.ui.popup.LightweightWindowEvent import com.intellij.psi.PsiDocumentManager -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.psiUtil.isAncestor import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.descriptors.FunctionDescriptor @@ -68,7 +68,7 @@ import com.intellij.psi.PsiMethod import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.jet.lang.resolve.OverridingUtil +import org.jetbrains.kotlin.resolve.OverridingUtil import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import com.intellij.psi.PsiPackage diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt index 66b1278243a..f0a19548f03 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveTopLevelDeclarations/MoveKotlinTopLevelDeclarationsProcessor.kt @@ -57,7 +57,7 @@ import org.jetbrains.kotlin.psi.psiUtil.isPrivate import org.jetbrains.jet.plugin.refactoring.getUsageContext import org.jetbrains.kotlin.psi.psiUtil.isInsideOf import org.jetbrains.jet.plugin.codeInsight.JetFileReferencesResolver -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.codeInsight.DescriptorToDeclarationUtil import org.jetbrains.kotlin.psi.JetModifierListOwner import com.intellij.psi.PsiModifierListOwner 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 100a5f4e358..6a3b8039920 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/move/moveUtils.kt @@ -18,8 +18,8 @@ package org.jetbrains.jet.plugin.refactoring.move 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.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import org.jetbrains.jet.plugin.references.JetSimpleNameReference import org.jetbrains.kotlin.name.FqName @@ -54,7 +54,7 @@ import com.intellij.openapi.util.Comparing import java.util.Comparator import com.intellij.util.IncorrectOperationException import com.intellij.psi.PsiFile -import org.jetbrains.jet.lang.resolve.descriptorUtil.getImportableDescriptor +import org.jetbrains.kotlin.resolve.descriptorUtil.getImportableDescriptor import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.descriptors.CallableDescriptor import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt index ab3d157df6f..a675afca92c 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameDynamicMemberHandler.kt @@ -26,7 +26,7 @@ import com.intellij.openapi.project.Project import com.intellij.openapi.actionSystem.DataContext import org.jetbrains.jet.plugin.codeInsight.CodeInsightUtils import org.jetbrains.jet.plugin.caches.resolve.analyze -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.tasks.isDynamic public class RenameDynamicMemberHandler: VariableInplaceRenameHandler() { 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 58f08e7550e..b6344d5e3a9 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/rename/RenameKotlinPropertyProcessor.kt @@ -33,13 +33,13 @@ import com.intellij.usageView.UsageInfo import com.intellij.refactoring.listeners.RefactoringElementListener import com.intellij.openapi.editor.Editor import org.jetbrains.kotlin.lexer.JetTokens -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.psi.JetClassOrObject import com.intellij.openapi.ui.Messages 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 +import org.jetbrains.kotlin.resolve.OverrideResolver +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.util.application.runReadAction import org.jetbrains.jet.plugin.caches.resolve.analyze diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt index 10a459daf50..44c8eb2cd68 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinJavaSafeDeleteDelegate.kt @@ -24,12 +24,12 @@ import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDe import com.intellij.usageView.UsageInfo import org.jetbrains.kotlin.asJava.unwrapped import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.references.JetReference import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.psi.psiUtil.parameterIndex -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.jet.plugin.caches.resolve.analyze public class KotlinJavaSafeDeleteDelegate : JavaSafeDeleteDelegate { 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 d0b0833df4d..f3fba231586 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinOverridingDialog.java @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.psi.JetProperty; import org.jetbrains.kotlin.psi.JetPsiUtil; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.JetBundle; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; 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 3425ed8d881..7360f2c68c1 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/KotlinSafeDeleteProcessor.kt @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.asJava.* 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.resolve.BindingContext import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.jet.plugin.JetBundle import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt index c2d37866b32..d0a901194b5 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/safeDelete/SafeDeleteImportDirectiveUsageInfo.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.refactoring.safeDelete import com.intellij.refactoring.safeDelete.usageInfo.SafeDeleteReferenceSimpleDeleteUsageInfo import org.jetbrains.kotlin.psi.* -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.plugin.caches.resolve.analyze public class SafeDeleteImportDirectiveUsageInfo( diff --git a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java index 2f86ee27e49..5754eb52182 100644 --- a/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java +++ b/idea/src/org/jetbrains/jet/plugin/run/JetRunConfiguration.java @@ -43,7 +43,7 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.jet.plugin.MainFunctionDetector; 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 a34653487cb..13042855add 100644 --- a/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java +++ b/idea/src/org/jetbrains/jet/plugin/search/ideaExtensions/KotlinAnnotatedElementsSearcher.java @@ -39,8 +39,8 @@ import org.jetbrains.kotlin.psi.JetAnnotationEntry; import org.jetbrains.kotlin.psi.JetClass; 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.DescriptorUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; import org.jetbrains.jet.plugin.stubindex.JetAnnotationsIndex; import org.jetbrains.kotlin.asJava.LightClassUtil; 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 9e122957f43..c3f73d8ca6e 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 @@ -23,7 +23,7 @@ import java.util.HashMap import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.psi.PsiElement -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.types.JetType import com.intellij.util.containers.ContainerUtil @@ -31,8 +31,8 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker import java.util.Collections import org.jetbrains.kotlin.psi.JetReferenceExpression import org.jetbrains.kotlin.psi.Call -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver import com.intellij.psi.impl.source.tree.LeafPsiElement import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetTypeReference @@ -57,7 +57,7 @@ import org.jetbrains.kotlin.types.ErrorUtils import com.intellij.lang.ASTNode import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.psi.JetCallableReferenceExpression -import org.jetbrains.jet.lang.resolve.scopes.receivers.ThisReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver import org.jetbrains.kotlin.psi.JetThisExpression import org.jetbrains.kotlin.psi.JetStringTemplateEntryWithExpression import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiRange.Empty @@ -76,7 +76,7 @@ import org.jetbrains.kotlin.psi.JetClassObject import org.jetbrains.kotlin.psi.JetTypeParameter import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.psi.JetClass import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.psi.JetFile diff --git a/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt b/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt index ae92ba46bb3..118e062cc77 100644 --- a/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/util/psiModificationUtil.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.util.psiModificationUtil import org.jetbrains.kotlin.psi.JetFunctionLiteralArgument import org.jetbrains.kotlin.psi.JetCallExpression import org.jetbrains.kotlin.psi.JetExpression -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getValueArgumentsInParentheses import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.calls.model.ArgumentMatch diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt index 911e3b7646b..bc44cb7d22d 100644 --- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt @@ -26,7 +26,7 @@ import java.io.File import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase -import org.jetbrains.jet.lang.resolve.bindingContextUtil.getDataFlowInfo +import org.jetbrains.kotlin.resolve.bindingContextUtil.getDataFlowInfo import org.jetbrains.jet.plugin.caches.resolve.analyze import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java index 98bb8f15446..86fbe925e1e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetReferenceExpression; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java index 9860551afb5..c0f03f95d74 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java @@ -36,7 +36,7 @@ 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; +import org.jetbrains.kotlin.resolve.OverrideResolver; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; 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 849337b8ca0..fa304c82473 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.kotlin.psi.JetTypeReference import com.intellij.psi.util.PsiTreeUtil -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.completion.ExpectedCompletionUtils import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.completion.handlers.AbstractCompletionHandlerTest 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 76052c29e27..cbb2bf7e296 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextConsistencyTest.kt @@ -26,14 +26,14 @@ import com.intellij.openapi.project.Project 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.kotlin.resolve.resolveTopLevelClass import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM -import org.jetbrains.jet.lang.resolve.BindingTraceContext +import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.jet.lang.resolve.MemberComparator -import org.jetbrains.jet.lang.resolve.descriptorUtil.module +import org.jetbrains.kotlin.resolve.MemberComparator +import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.jet.context.GlobalContext import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import com.intellij.psi.search.GlobalSearchScope diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java index 12826a7ad02..d661baf31c9 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.jet.plugin.PluginTestCaseBase; 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 6ee07f0899d..26ac7fe3e27 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/changeSignature/JetChangeSignatureTest.java @@ -36,8 +36,8 @@ import org.jetbrains.annotations.Nullable; 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; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; 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 004da42bccd..2f878a879ca 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt @@ -35,10 +35,10 @@ import com.intellij.psi.search.GlobalSearchScope import com.intellij.psi.JavaPsiFacade import com.intellij.openapi.project.Project import com.intellij.openapi.module.Module -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import java.util.Collections import org.jetbrains.kotlin.name.Name -import org.jetbrains.jet.lang.resolve.BindingContextUtils +import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.name.FqNameUnsafe @@ -47,7 +47,7 @@ import org.jetbrains.jet.getString import org.jetbrains.jet.getNullableString import org.jetbrains.jet.plugin.search.allScope import org.jetbrains.jet.plugin.caches.resolve.analyzeFully -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintException diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java index 08d22b3c94c..714a6c1267d 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractAdditionalResolveDescriptorRendererTest.java @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.psi.JetClassInitializer; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetPsiUtil; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; import org.jetbrains.jet.plugin.project.ResolveElementCache; import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt index d0159236192..fe49f464cfb 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.resolve import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.JetTestCaseBuilder import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.JetExpression diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt index 1a88597496c..1e3c3e0b405 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.j2k.ast.Element import com.intellij.openapi.project.Project import com.intellij.psi.PsiJavaFile import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import com.intellij.openapi.diagnostic.Logger import java.util.ArrayList import org.jetbrains.kotlin.j2k.usageProcessing.UsageProcessing diff --git a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt index a4ecb6ae005..de9c167d7c1 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/TypeConverter.kt @@ -34,7 +34,7 @@ import java.util.HashSet import org.jetbrains.kotlin.asJava.KotlinLightElement import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.types.TypeUtils -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.descriptors.CallableDescriptor class TypeConverter(val converter: Converter) { 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 78abd430909..f77a8f9e226 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/di/InjectorForTopDownAnalyzerForJs.java @@ -19,17 +19,17 @@ 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.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.resolve.lazy.declarations.DeclarationProviderFactory; import org.jetbrains.kotlin.resolve.lazy.ResolveSession; -import org.jetbrains.jet.lang.resolve.LazyTopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.MutablePackageFragmentProvider; +import org.jetbrains.kotlin.resolve.LazyTopDownAnalyzer; +import org.jetbrains.kotlin.resolve.MutablePackageFragmentProvider; import org.jetbrains.kotlin.js.resolve.KotlinJsDeclarationCheckerProvider; import org.jetbrains.kotlin.types.DynamicTypesAllowed; -import org.jetbrains.jet.lang.resolve.AnnotationResolver; +import org.jetbrains.kotlin.resolve.AnnotationResolver; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -39,34 +39,34 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import org.jetbrains.kotlin.types.expressions.ForLoopConventionsChecker; import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; -import org.jetbrains.jet.lang.resolve.DescriptorResolver; -import org.jetbrains.jet.lang.resolve.DelegatedPropertyResolver; -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.kotlin.resolve.DescriptorResolver; +import org.jetbrains.kotlin.resolve.DelegatedPropertyResolver; +import org.jetbrains.kotlin.resolve.TypeResolver; +import org.jetbrains.kotlin.resolve.QualifiedExpressionResolver; +import org.jetbrains.kotlin.resolve.TypeResolver.FlexibleTypeCapabilitiesProvider; import org.jetbrains.jet.context.LazinessToken; import org.jetbrains.kotlin.resolve.calls.extensions.CallResolverExtensionProvider; -import org.jetbrains.jet.lang.resolve.PartialBodyResolveProvider; +import org.jetbrains.kotlin.resolve.PartialBodyResolveProvider; import org.jetbrains.kotlin.resolve.calls.CallCompleter; import org.jetbrains.kotlin.resolve.calls.CandidateResolver; import org.jetbrains.kotlin.resolve.calls.tasks.TaskPrioritizer; import org.jetbrains.kotlin.psi.JetImportsFactory; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider; import org.jetbrains.kotlin.resolve.lazy.ScopeProvider.AdditionalFileScopeProvider; -import org.jetbrains.jet.lang.resolve.ScriptBodyResolver; -import org.jetbrains.jet.lang.resolve.BodyResolver; -import org.jetbrains.jet.lang.resolve.ControlFlowAnalyzer; -import org.jetbrains.jet.lang.resolve.DeclarationsChecker; -import org.jetbrains.jet.lang.resolve.ModifiersChecker; -import org.jetbrains.jet.lang.resolve.FunctionAnalyzerExtension; -import org.jetbrains.jet.lang.resolve.DeclarationResolver; -import org.jetbrains.jet.lang.resolve.ImportsResolver; -import org.jetbrains.jet.lang.resolve.OverloadResolver; -import org.jetbrains.jet.lang.resolve.OverrideResolver; -import org.jetbrains.jet.lang.resolve.TopDownAnalyzer; -import org.jetbrains.jet.lang.resolve.TypeHierarchyResolver; -import org.jetbrains.jet.lang.resolve.ScriptHeaderResolver; -import org.jetbrains.jet.lang.resolve.varianceChecker.VarianceChecker; +import org.jetbrains.kotlin.resolve.ScriptBodyResolver; +import org.jetbrains.kotlin.resolve.BodyResolver; +import org.jetbrains.kotlin.resolve.ControlFlowAnalyzer; +import org.jetbrains.kotlin.resolve.DeclarationsChecker; +import org.jetbrains.kotlin.resolve.ModifiersChecker; +import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; +import org.jetbrains.kotlin.resolve.DeclarationResolver; +import org.jetbrains.kotlin.resolve.ImportsResolver; +import org.jetbrains.kotlin.resolve.OverloadResolver; +import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.TopDownAnalyzer; +import org.jetbrains.kotlin.resolve.TypeHierarchyResolver; +import org.jetbrains.kotlin.resolve.ScriptHeaderResolver; +import org.jetbrains.kotlin.resolve.varianceChecker.VarianceChecker; import org.jetbrains.annotations.NotNull; import javax.annotation.PreDestroy; 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 3fca54e16e5..f4252623142 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 @@ -26,17 +26,17 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.jet.context.ContextPackage; import org.jetbrains.jet.context.GlobalContextImpl; -import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; 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.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; -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; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.*; +import org.jetbrains.kotlin.resolve.lazy.declarations.FileBasedDeclarationProviderFactory; import java.util.Collection; import java.util.Collections; 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 1939c3176fd..cfa1e1566ec 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 @@ -26,10 +26,10 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1 import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils -import org.jetbrains.jet.lang.resolve.diagnostics.DiagnosticsWithSuppression -import org.jetbrains.jet.lang.resolve.diagnostics.SuppressDiagnosticsByAnnotations -import org.jetbrains.jet.lang.resolve.diagnostics.FUNCTION_NO_BODY_ERRORS -import org.jetbrains.jet.lang.resolve.diagnostics.PROPERTY_NOT_INITIALIZED_ERRORS +import org.jetbrains.kotlin.resolve.diagnostics.DiagnosticsWithSuppression +import org.jetbrains.kotlin.resolve.diagnostics.SuppressDiagnosticsByAnnotations +import org.jetbrains.kotlin.resolve.diagnostics.FUNCTION_NO_BODY_ERRORS +import org.jetbrains.kotlin.resolve.diagnostics.PROPERTY_NOT_INITIALIZED_ERRORS private val NATIVE_ANNOTATIONS = array(NATIVE.fqName, NATIVE_INVOKE.fqName, NATIVE_GETTER.fqName, NATIVE_SETTER.fqName) 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 5833d574946..a8146ec36f2 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 @@ -24,9 +24,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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; -import org.jetbrains.jet.lang.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingTrace; +import org.jetbrains.kotlin.resolve.BindingTraceContext; import java.util.Collection; import java.util.List; 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 0e7a66900d1..16bc56e3548 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 @@ -28,11 +28,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetPsiFactory; -import org.jetbrains.jet.lang.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.utils.PathUtil; -import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import java.io.IOException; import java.util.Arrays; 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 824ed0f635c..eb454f5b195 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 @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.js.resolve -import org.jetbrains.jet.lang.resolve.AdditionalCheckerProvider -import org.jetbrains.jet.lang.resolve.AnnotationChecker +import org.jetbrains.kotlin.resolve.AdditionalCheckerProvider +import org.jetbrains.kotlin.resolve.AnnotationChecker import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.diagnostics.DiagnosticSink @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.types.TypeUtils import org.jetbrains.kotlin.js.PredefinedAnnotation -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.types.typeUtil.isSubtypeOf 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 ae59680dd3b..2c4b8d5c07a 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 @@ -24,10 +24,10 @@ 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.kotlin.name.FqName; import org.jetbrains.kotlin.js.PredefinedAnnotation; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import java.util.List; import java.util.Set; 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 9813583fbcd..db1a4d90e18 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,14 +32,10 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.analyzer.AnalysisResult; -import org.jetbrains.kotlin.descriptors.ModuleDescriptor; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.diagnostics.Diagnostics; -import org.jetbrains.kotlin.utils.fileUtils.FileUtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.backend.common.output.SimpleOutputFile; import org.jetbrains.kotlin.backend.common.output.SimpleOutputFileCollection; +import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.facade.exceptions.TranslationException; @@ -48,6 +44,10 @@ import org.jetbrains.kotlin.js.sourceMap.JsSourceGenerationVisitor; import org.jetbrains.kotlin.js.sourceMap.SourceMap3Builder; import org.jetbrains.kotlin.js.sourceMap.SourceMapBuilder; import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; +import org.jetbrains.kotlin.utils.fileUtils.FileUtilsPackage; import java.io.File; import java.io.IOException; @@ -55,8 +55,8 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.diagnostics.DiagnosticUtils.hasError; -import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.js.facade.FacadeUtils.parseString; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; /** * An entry point of translator. 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 59af4395b79..ebedcd05af7 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 @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall 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.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForReceiver import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.* import org.jetbrains.kotlin.diagnostics.DiagnosticUtils 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 e23380e2595..fed81cb6a38 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 @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.js.translate.callTranslator 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.resolve.scopes.receivers.ExpressionReceiver import org.jetbrains.kotlin.psi.JetSuperExpression import com.google.dart.compiler.backend.js.ast.JsExpression import org.jetbrains.kotlin.descriptors.VariableDescriptor @@ -27,7 +27,7 @@ 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.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension +import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension val CallInfo.callableDescriptor: CallableDescriptor 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 17dfdf30155..5a9d14fce67 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 @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind.* import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator import org.jetbrains.kotlin.js.translate.general.Translation -import org.jetbrains.jet.lang.resolve.scopes.receivers.ExpressionReceiver -import org.jetbrains.jet.lang.resolve.scopes.receivers.ReceiverValue +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue import org.jetbrains.kotlin.resolve.calls.CallResolverUtil import org.jetbrains.kotlin.psi.Call.CallType import kotlin.test.assertNotNull 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 1e76ca6a77a..9d135df51cc 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 @@ -23,7 +23,7 @@ import com.google.dart.compiler.backend.js.ast.JsInvocation import org.jetbrains.kotlin.descriptors.CallableDescriptor import java.util.Collections import org.jetbrains.kotlin.descriptors.PropertyDescriptor -import org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure +import org.jetbrains.kotlin.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/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index 2c6c922c5b5..1aa1d5d827c 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,11 +18,11 @@ package org.jetbrains.kotlin.js.translate.context; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.ClassDescriptor; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope; import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor; 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 3a6e84c8117..4e707e9761f 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 @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.name.Name; import java.util.Map; import static com.google.dart.compiler.backend.js.ast.AstPackage.JsObjectScope; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; /** * Provides a mechanism to bind some of the Kotlin/Java declarations with library implementations. 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 0975c05d64a..17226cd3ff6 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,8 @@ import com.intellij.psi.PsiElement; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -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.kotlin.resolve.calls.tasks.TasksPackage; -import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.config.EcmaVersion; import org.jetbrains.kotlin.js.config.LibrarySourcesConfig; @@ -36,16 +32,20 @@ import org.jetbrains.kotlin.js.translate.context.generator.Generator; import org.jetbrains.kotlin.js.translate.context.generator.Rule; import org.jetbrains.kotlin.js.translate.intrinsic.Intrinsics; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; import java.util.Map; -import static org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils.descriptorToDeclaration; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isExtension; import static org.jetbrains.kotlin.js.config.LibrarySourcesConfig.BUILTINS_JS_MODULE_NAME; import static org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.*; import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.*; import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledName; import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName; +import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isExtension; /** * Aggregates all the static parts of the context. 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 6d0585b68c0..6681f88896e 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,18 +20,18 @@ import com.google.dart.compiler.backend.js.ast.*; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.lang.reflect.ReflectionTypes; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.MemberDescriptor; import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.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.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; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.resolve.BindingContext; import java.util.HashMap; import java.util.Map; 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 21ec717d8e1..3f9d83928b0 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 @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.js.translate.context import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.DescriptorUtils.isAncestor +import org.jetbrains.kotlin.resolve.DescriptorUtils.isAncestor import com.google.dart.compiler.backend.js.ast.JsName import org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getSuggestedName import com.google.dart.compiler.backend.js.ast.JsFunctionScope 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 efa19fb29e2..8ee5390593a 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 @@ -41,7 +41,6 @@ import org.jetbrains.kotlin.types.TypeConstructor; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; 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; @@ -50,6 +49,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.resolve.DescriptorUtils.*; import static org.jetbrains.kotlin.types.TypeUtils.topologicallySortSuperclassesAndRecordAllInstances; /** 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 bfc5a583c7f..d844b80f7ce 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 @@ -27,7 +27,7 @@ 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.resolve.DescriptorUtils import org.jetbrains.kotlin.backend.common.CodegenUtil import java.util.HashMap import org.jetbrains.kotlin.js.translate.declaration.propertyTranslator.addGetterAndSetter 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 da3e800dc41..0a34a223bc1 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 @@ -20,13 +20,13 @@ import com.google.dart.compiler.backend.js.ast.*; import gnu.trove.THashMap; import org.jetbrains.annotations.NotNull; 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.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; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; import java.util.*; 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 c068c27b771..15c0dbda93a 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 @@ -21,7 +21,7 @@ import com.intellij.util.SmartList import org.jetbrains.kotlin.descriptors.* import org.jetbrains.kotlin.psi.JetProperty import org.jetbrains.kotlin.psi.JetPropertyAccessor -import org.jetbrains.jet.lang.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.AbstractTranslator @@ -30,9 +30,9 @@ import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils import org.jetbrains.kotlin.js.translate.context.Namer.* import org.jetbrains.kotlin.js.translate.utils.ast.* import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.* -import org.jetbrains.jet.lang.resolve.DescriptorUtils.isExtension +import org.jetbrains.kotlin.resolve.DescriptorUtils.isExtension import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.resolve.descriptorUtil.isExtension +import org.jetbrains.kotlin.resolve.descriptorUtil.isExtension /** * Translates single property /w accessors. diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt index bb373f8ad76..ac16217c909 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.js.translate.expression import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.psi.JetCatchClause import org.jetbrains.kotlin.psi.JetTypeReference -import org.jetbrains.jet.lang.resolve.BindingContext -import org.jetbrains.jet.lang.resolve.BindingContextUtils.getNotNull -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContextUtils.getNotNull +import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns 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/expression/ExpressionVisitor.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/ExpressionVisitor.java index 4f30061564f..853d6a75e6d 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,19 +20,10 @@ 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.kotlin.builtins.InlineUtil; 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.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; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.declaration.ClassTranslator; @@ -44,10 +35,18 @@ import org.jetbrains.kotlin.js.translate.operation.UnaryOperationTranslator; import org.jetbrains.kotlin.js.translate.reference.*; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.NullValue; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeUtils; import java.util.List; -import static org.jetbrains.jet.lang.resolve.BindingContextUtils.isVarCapturedInClosure; import static org.jetbrains.kotlin.js.translate.context.Namer.getCapturedVarAccessor; import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression; import static org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator.shouldBeInlined; @@ -58,6 +57,7 @@ import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToStatem import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.newVar; import static org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils.getReceiverParameterForDeclaration; import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.translateInitializerForProperty; +import static org.jetbrains.kotlin.resolve.BindingContextUtils.isVarCapturedInClosure; public final class ExpressionVisitor extends TranslatorVisitor { @Override 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 0c99372e5b0..678da192ba9 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 @@ -29,14 +29,14 @@ 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; import org.jetbrains.kotlin.js.translate.context.AliasingContext; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.psi.JetDeclarationWithBody; +import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import java.util.Collections; import java.util.List; 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 0a401e26f6c..66340c09621 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 @@ -20,7 +20,7 @@ import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall -import org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType +import org.jetbrains.kotlin.resolve.DescriptorUtils.getClassDescriptorForType import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator import org.jetbrains.kotlin.js.translate.context.TemporaryVariable 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 2dd52b5fda7..dd5f8c6f7ef 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 @@ -24,14 +24,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.psi.JetMultiDeclaration; +import org.jetbrains.kotlin.psi.JetMultiDeclarationEntry; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import java.util.ArrayList; import java.util.List; 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 87ca59b8fa5..17e2f53b554 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 @@ -22,15 +22,15 @@ import com.google.dart.compiler.backend.js.ast.JsNameRef; import com.google.dart.compiler.backend.js.ast.JsNumberLiteral; 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.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; import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.TopLevelFIF; import org.jetbrains.kotlin.js.translate.intrinsic.functions.patterns.NamePredicate; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.types.JetType; import java.util.Collections; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java index 82026b49d65..9951d8b1ecc 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AbstractTranslator.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.js.translate.general; import com.google.dart.compiler.backend.js.ast.JsProgram; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.kotlin.js.translate.context.TranslationContext; +import org.jetbrains.kotlin.resolve.BindingContext; public abstract class AbstractTranslator { 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 a585ee30a86..43e4001b7f4 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 @@ -26,13 +26,13 @@ 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.js.translate.utils.BindingUtils; 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.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import java.util.Collection; import java.util.List; 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 784fbd77bb1..610c539b041 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,15 +19,9 @@ package org.jetbrains.kotlin.js.translate.general; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; -import org.jetbrains.kotlin.psi.JetDeclarationWithBody; -import org.jetbrains.kotlin.psi.JetExpression; -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.bindingContextUtil.BindingContextUtilPackage; -import org.jetbrains.jet.plugin.MainFunctionDetector; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.facade.MainCallParameters; import org.jetbrains.kotlin.js.facade.exceptions.MainFunctionNotFoundException; @@ -49,6 +43,12 @@ import org.jetbrains.kotlin.js.translate.test.JSTester; import org.jetbrains.kotlin.js.translate.test.QUnitTester; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.mutator.AssignToExpressionMutator; +import org.jetbrains.kotlin.psi.JetDeclarationWithBody; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; import java.util.Collection; import java.util.Collections; 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 02e1c158254..8cf6ded4ff4 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 @@ -23,6 +23,12 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; 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.DelegationTranslator; +import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; +import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator; +import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetDelegationSpecifier; import org.jetbrains.kotlin.psi.JetDelegatorToSuperCall; @@ -30,21 +36,15 @@ import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; 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; -import org.jetbrains.kotlin.js.translate.declaration.DelegationTranslator; -import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; -import org.jetbrains.kotlin.js.translate.reference.CallArgumentTranslator; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getClassDescriptorForType; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.*; import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.setDefaultValueForArguments; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getPrimaryConstructorParameters; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getClassDescriptorForType; public final class ClassInitializerTranslator extends AbstractTranslator { @NotNull 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 8e40348a0ed..7416148f5e9 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,27 +19,27 @@ 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.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.kotlin.resolve.calls.model.ResolvedCall; -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.kotlin.types.JetType; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; -import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils; +import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; +import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo; 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.js.translate.utils.AnnotationsUtils; import org.jetbrains.kotlin.js.translate.utils.BindingUtils; import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetQualifiedExpression; +import org.jetbrains.kotlin.psi.JetReferenceExpression; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.types.JetType; import java.util.List; 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 dbc7b0739e0..abc49e704c0 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 @@ -20,12 +20,12 @@ import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; -import org.jetbrains.jet.lang.resolve.OverrideResolver; -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; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.OverrideResolver; import java.util.Arrays; import java.util.List; 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 a6b34cb8532..98c2cf01040 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 @@ -21,13 +21,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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.kotlin.resolve.calls.model.ResolvedCall; -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; import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; @@ -36,13 +29,20 @@ import org.jetbrains.kotlin.js.translate.general.Translation; import org.jetbrains.kotlin.js.translate.intrinsic.operation.BinaryOperationIntrinsic; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.lexer.JetToken; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.JetBinaryExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.types.expressions.OperatorConventions; -import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; import static org.jetbrains.kotlin.js.translate.operation.AssignmentTranslator.isAssignmentOperator; import static org.jetbrains.kotlin.js.translate.operation.CompareToTranslator.isCompareToCall; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.not; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.*; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; public final class BinaryOperationTranslator extends AbstractTranslator { 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 31a965b7a99..772768743f0 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 @@ -21,27 +21,27 @@ import com.google.dart.compiler.backend.js.ast.JsExpression; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; -import org.jetbrains.kotlin.psi.JetConstantExpression; -import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.JetUnaryExpression; -import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.lang.resolve.BindingContextUtils; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.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; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.js.translate.utils.TranslationUtils; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.JetConstantExpression; +import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetUnaryExpression; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.types.JetType; -import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCompileTimeValue; import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getBaseExpression; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getOperationToken; import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.*; +import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; public final class UnaryOperationTranslator { private UnaryOperationTranslator() { 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 2534fff7a4c..bfea56ea11d 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 @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor import com.google.dart.compiler.backend.js.ast.JsLiteral import java.util.ArrayList import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.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 f60d5ef7ea7..2de787e855e 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 @@ -31,10 +31,10 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isEnumEntry; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isObject; import static org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator.translateAsFQReference; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getDescriptorForReferenceExpression; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isObject; public class ClassObjectAccessTranslator extends AbstractTranslator implements CachedAccessTranslator { @NotNull 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 f85de5cde12..1c5abf54e49 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 @@ -22,12 +22,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; 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; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; import static org.jetbrains.kotlin.js.translate.general.Translation.translateAsExpression; import static org.jetbrains.kotlin.js.translate.reference.CallExpressionTranslator.shouldBeInlined; 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 0ee985d41b9..e9d9d83edf9 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 @@ -22,12 +22,12 @@ import com.google.dart.compiler.backend.js.ast.JsStringLiteral; import org.jetbrains.annotations.NotNull; 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; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.JetTestFunctionDetector; import org.jetbrains.kotlin.js.translate.reference.ReferenceTranslator; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import java.util.Collection; import java.util.Collections; 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 b851f182e5c..c44ec244982 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 @@ -21,21 +21,21 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; 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.DescriptorToSourceUtils; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant; -import org.jetbrains.jet.lang.resolve.constants.IntegerValueTypeConstant; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import java.util.List; -import static org.jetbrains.jet.lang.resolve.BindingContext.INDEXED_LVALUE_GET; -import static org.jetbrains.jet.lang.resolve.BindingContext.INDEXED_LVALUE_SET; import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; +import static org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_GET; +import static org.jetbrains.kotlin.resolve.BindingContext.INDEXED_LVALUE_SET; /** * This class contains some code related to BindingContext use. Intention is not to pollute other classes. 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 d5c6b61c0e6..aaf1a0c95a3 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,24 +20,24 @@ 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.kotlin.builtins.KotlinBuiltIns; 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.kotlin.js.translate.context.TranslationContext; 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.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.resolve.scopes.receivers.ThisReceiver; 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; import java.util.Collection; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.*; import static org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.isNativeObject; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; public final class JsDescriptorUtils { // TODO: maybe we should use external annotations or something else. 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 7c9269a5a9b..05a4df326a6 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,18 +20,18 @@ 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.kotlin.backend.common.CodegenUtil; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.jet.lang.resolve.DescriptorUtils; 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; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import java.util.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; import static org.jetbrains.kotlin.js.translate.utils.TranslationUtils.getJetTypeFqName; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; public class ManglingUtils { private ManglingUtils() {} 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 2a7b7cc5a11..eff70f858d4 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,29 +21,29 @@ 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.kotlin.builtins.KotlinBuiltIns; 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.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; import org.jetbrains.kotlin.js.translate.general.Translation; +import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.types.JetType; +import org.jetbrains.kotlin.types.TypeProjection; import java.util.ArrayList; import java.util.Collections; import java.util.List; import static com.google.dart.compiler.backend.js.ast.JsBinaryOperator.*; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.getFqName; -import static org.jetbrains.jet.lang.resolve.DescriptorUtils.isAnonymousObject; import static org.jetbrains.kotlin.js.translate.context.Namer.getKotlinBackingFieldName; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getCallableDescriptorForOperationExpression; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.assignment; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.createDataDescriptor; import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getMangledName; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; +import static org.jetbrains.kotlin.resolve.DescriptorUtils.isAnonymousObject; public final class TranslationUtils { 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 adddd6aa9ba..2b89a40c96a 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 @@ -26,7 +26,7 @@ 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 -import org.jetbrains.jet.lang.resolve.DescriptorUtils +import org.jetbrains.kotlin.resolve.DescriptorUtils public val ID: (T) -> T = { it } diff --git a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt index ec6468d295c..d323fb26353 100644 --- a/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt +++ b/libraries/stdlib/validator/src/test/kotlin/NoInternalVisibilityInStdLibTest.kt @@ -21,19 +21,19 @@ import com.intellij.openapi.util.Disposer import org.jetbrains.jet.config.CompilerConfiguration import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.descriptors.* -import org.jetbrains.jet.lang.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils 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.kotlin.resolve.DescriptorUtils import java.util.HashSet import org.jetbrains.jet.config.CommonConfigurationKeys import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.lang.resolve.BindingTraceContext +import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.js.config.LibrarySourcesConfig import org.jetbrains.kotlin.js.config.EcmaVersion import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS 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 6501b2974da..2c6407edc2a 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 @@ -19,9 +19,9 @@ import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import org.jetbrains.kotlin.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.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils +import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.doc.*