diff --git a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java index 3568edba447..8f8430aeed6 100644 --- a/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java +++ b/compiler/android-tests/src/org/jetbrains/kotlin/android/tests/ant/AntRunner.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.android.tests.OutputUtils; import org.jetbrains.kotlin.android.tests.PathManager; import org.jetbrains.kotlin.android.tests.run.RunResult; import org.jetbrains.kotlin.android.tests.run.RunUtils; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.util.ArrayList; import java.util.List; @@ -90,7 +90,7 @@ public class AntRunner { Thread.sleep(20000); } catch (InterruptedException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } return false; } diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index 6e9bb3542b6..e9e0ffa6ec7 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -23,7 +23,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.codegen.CodegenTestFiles; import org.jetbrains.kotlin.codegen.GenerationUtils; @@ -182,7 +182,7 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase { } Assert.assertTrue("Cannot create directory for compiled files", outputDir.exists()); - OutputUtilsPackage.writeAllTo(outputFiles, outputDir); + OutputUtilsKt.writeAllTo(outputFiles, outputDir); } } 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 91ad11a8366..710ee873476 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 @@ -21,24 +21,23 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.backend.common.bridges.BridgesPackage; +import org.jetbrains.kotlin.backend.common.bridges.ImplKt; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilPackage; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.*; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; - public class CodegenUtil { private CodegenUtil() { @@ -53,7 +52,7 @@ public class CodegenUtil { ) { Collection functions = owner.getDefaultType().getMemberScope().getFunctions(name, NoLookupLocation.FROM_BACKEND); for (FunctionDescriptor function : functions) { - if (!CallResolverUtilPackage.isOrOverridesSynthesized(function) + if (!CallResolverUtilKt.isOrOverridesSynthesized(function) && function.getTypeParameters().isEmpty() && valueParameterClassesMatch(function.getValueParameters(), Arrays.asList(valueParameterClassifiers)) && rawTypeMatches(function.getReturnType(), returnedClassifier)) { @@ -67,7 +66,7 @@ public class CodegenUtil { public static PropertyDescriptor getDelegatePropertyIfAny(JetExpression expression, ClassDescriptor classDescriptor, BindingContext bindingContext) { PropertyDescriptor propertyDescriptor = null; if (expression instanceof JetSimpleNameExpression) { - ResolvedCall call = CallUtilPackage.getResolvedCall(expression, bindingContext); + ResolvedCall call = CallUtilKt.getResolvedCall(expression, bindingContext); if (call != null) { CallableDescriptor callResultingDescriptor = call.getResultingDescriptor(); if (callResultingDescriptor instanceof ValueParameterDescriptor) { @@ -100,7 +99,7 @@ public class CodegenUtil { if (!(declaration instanceof CallableMemberDescriptor)) continue; CallableMemberDescriptor inheritedMember = (CallableMemberDescriptor) declaration; - CallableMemberDescriptor traitMember = BridgesPackage.findTraitImplementation(inheritedMember); + CallableMemberDescriptor traitMember = ImplKt.findTraitImplementation(inheritedMember); if (traitMember == null) continue; assert traitMember.getModality() != Modality.ABSTRACT : "Cannot delegate to abstract trait method: " + inheritedMember; @@ -171,7 +170,7 @@ public class CodegenUtil { public static boolean isEnumValueOfMethod(@NotNull FunctionDescriptor functionDescriptor) { List methodTypeParameters = functionDescriptor.getValueParameters(); - JetType nullableString = TypeUtils.makeNullable(getBuiltIns(functionDescriptor).getStringType()); + JetType nullableString = TypeUtils.makeNullable(DescriptorUtilsKt.getBuiltIns(functionDescriptor).getStringType()); return DescriptorUtils.ENUM_VALUE_OF.equals(functionDescriptor.getName()) && methodTypeParameters.size() == 1 && JetTypeChecker.DEFAULT.isSubtypeOf(methodTypeParameters.get(0).getType(), nullableString); @@ -187,7 +186,7 @@ public class CodegenUtil { public static Integer getLineNumberForElement(@NotNull PsiElement statement, boolean markEndOffset) { PsiFile file = statement.getContainingFile(); if (file instanceof JetFile) { - if (PsiPackage.getDoNotAnalyze((JetFile) file) != null) { + if (JetPsiFactoryKt.getDoNotAnalyze((JetFile) file) != null) { return null; } } 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 90e53a10512..2a292ba0b52 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 @@ -28,12 +28,11 @@ import org.jetbrains.kotlin.psi.JetParameter; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.OverrideResolver; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import java.util.Collections; import java.util.List; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; - /** * A platform-independent logic for generating data class synthetic methods. * TODO: data class with zero components gets no toString/equals/hashCode methods. This is inconsistent and should be @@ -49,7 +48,7 @@ public abstract class DataClassMethodGenerator { this.declaration = declaration; this.bindingContext = bindingContext; this.classDescriptor = BindingContextUtils.getNotNull(bindingContext, BindingContext.CLASS, declaration); - this.builtIns = getBuiltIns(classDescriptor); + this.builtIns = DescriptorUtilsKt.getBuiltIns(classDescriptor); } public void generate() { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java index 3b333bf500d..6c5e11688c6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AccessorForFunctionDescriptor.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetSuperExpression; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; public class AccessorForFunctionDescriptor extends AbstractAccessorForFunctionDescriptor implements AccessorForCallableDescriptor { private final FunctionDescriptor calleeDescriptor; @@ -40,7 +40,7 @@ public class AccessorForFunctionDescriptor extends AbstractAccessorForFunctionDe this.superCallExpression = superCallExpression; initialize(DescriptorUtils.getReceiverParameterType(descriptor.getExtensionReceiverParameter()), - descriptor instanceof ConstructorDescriptor || AnnotationsPackage.isPlatformStaticInObjectOrClass(descriptor) + descriptor instanceof ConstructorDescriptor || AnnotationUtilKt.isPlatformStaticInObjectOrClass(descriptor) ? null : descriptor.getDispatchReceiverParameter(), copyTypeParameters(descriptor), diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java index d7540193dc8..4ecb255d932 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AnnotationCodegen.java @@ -28,18 +28,13 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.resolve.AnnotationChecker; import org.jetbrains.kotlin.resolve.constants.*; import org.jetbrains.kotlin.resolve.constants.StringValue; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; -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.resolve.descriptorUtil.DescriptorUtilsKt; +import org.jetbrains.kotlin.types.*; import org.jetbrains.org.objectweb.asm.*; import java.lang.annotation.*; import java.util.*; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getClassObjectType; - public abstract class AnnotationCodegen { public static final class JvmFlagAnnotation { @@ -175,9 +170,9 @@ public abstract class AnnotationCodegen { return; } - if (TypesPackage.isFlexible(type)) { + if (FlexibleTypesKt.isFlexible(type)) { // A flexible type whose lower bound in not-null and upper bound is nullable, should not be annotated - Flexibility flexibility = TypesPackage.flexibility(type); + Flexibility flexibility = FlexibleTypesKt.flexibility(type); if (!TypeUtils.isNullableType(flexibility.getLowerBound()) && TypeUtils.isNullableType(flexibility.getUpperBound())) { AnnotationDescriptor notNull = type.getAnnotations().findAnnotation(JvmAnnotationNames.JETBRAINS_NOT_NULL_ANNOTATION); @@ -245,7 +240,7 @@ public abstract class AnnotationCodegen { } private void generateDocumentedAnnotation(@NotNull ClassDescriptor classDescriptor, @NotNull Set annotationDescriptorsAlreadyPresent) { - boolean documented = DescriptorUtilPackage.isDocumentedAnnotation(classDescriptor); + boolean documented = DescriptorUtilsKt.isDocumentedAnnotation(classDescriptor); if (!documented) return; String descriptor = Type.getType(Documented.class).getDescriptor(); if (!annotationDescriptorsAlreadyPresent.add(descriptor)) return; @@ -425,7 +420,7 @@ public abstract class AnnotationCodegen { for (ConstantValue value : values) { if (value instanceof EnumValue) { ClassDescriptor enumEntry = ((EnumValue) value).getValue(); - JetType classObjectType = getClassObjectType(enumEntry); + JetType classObjectType = DescriptorUtilsKt.getClassObjectType(enumEntry); if (classObjectType != null) { if ("java/lang/annotation/ElementType".equals(typeMapper.mapType(classObjectType).getInternalName())) { result.add(ElementType.valueOf(enumEntry.getName().asString())); @@ -442,7 +437,7 @@ public abstract class AnnotationCodegen { @NotNull private RetentionPolicy getRetentionPolicy(@NotNull Annotated descriptor) { - KotlinRetention retention = DescriptorUtilPackage.getAnnotationRetention(descriptor); + KotlinRetention retention = DescriptorUtilsKt.getAnnotationRetention(descriptor); if (retention != null) { return annotationRetentionMap.get(retention); } @@ -453,7 +448,7 @@ public abstract class AnnotationCodegen { ConstantValue compileTimeConstant = valueArguments.iterator().next(); if (compileTimeConstant instanceof EnumValue) { ClassDescriptor enumEntry = ((EnumValue) compileTimeConstant).getValue(); - JetType classObjectType = getClassObjectType(enumEntry); + JetType classObjectType = DescriptorUtilsKt.getClassObjectType(enumEntry); if (classObjectType != null) { if ("java/lang/annotation/RetentionPolicy".equals(typeMapper.mapType(classObjectType).getInternalName())) { return RetentionPolicy.valueOf(enumEntry.getName().asString()); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java index 68d9df72b1f..bcdae658ec7 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/AsmUtil.java @@ -43,17 +43,16 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.resolve.DeprecationUtilKt; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; -import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; import org.jetbrains.kotlin.resolve.inline.InlineUtil; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverKt; 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.serialization.DescriptorSerializer; import org.jetbrains.kotlin.serialization.jvm.BitEncoding; import org.jetbrains.kotlin.synthetic.SyntheticJavaPropertyDescriptor; +import org.jetbrains.kotlin.types.FlexibleTypesKt; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.types.TypesPackage; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; import org.jetbrains.org.objectweb.asm.commons.Method; @@ -177,7 +176,7 @@ public class AsmUtil { public static boolean isStaticMethod(OwnerKind kind, CallableMemberDescriptor functionDescriptor) { return isStaticKind(kind) || JetTypeMapper.isStaticAccessor(functionDescriptor) || - AnnotationsPackage.isPlatformStaticInObjectOrClass(functionDescriptor); + AnnotationUtilKt.isPlatformStaticInObjectOrClass(functionDescriptor); } public static boolean isStaticKind(OwnerKind kind) { @@ -193,7 +192,7 @@ public class AsmUtil { } } - if (AnnotationsPackage.isPlatformStaticInCompanionObject(functionDescriptor)) { + if (AnnotationUtilKt.isPlatformStaticInCompanionObject(functionDescriptor)) { // Native method will be a member of the class, the companion object method will be delegated to it flags &= ~Opcodes.ACC_NATIVE; } @@ -666,14 +665,14 @@ public class AsmUtil { @NotNull String assertMethodToCall ) { // Assertions are generated elsewhere for platform types - if (JvmPackage.getPLATFORM_TYPES()) return false; + if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) return false; if (!state.isCallAssertionsEnabled()) return false; if (!isDeclaredInJava(descriptor)) return false; JetType type = descriptor.getReturnType(); - if (type == null || isNullableType(TypesPackage.lowerIfFlexible(type))) return false; + if (type == null || isNullableType(FlexibleTypesKt.lowerIfFlexible(type))) return false; Type asmType = state.getTypeMapper().mapReturnType(descriptor); if (asmType.getSort() == Type.OBJECT || asmType.getSort() == Type.ARRAY) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java index 9af494fa4b2..940a1bd41d0 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java @@ -18,7 +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.backend.common.bridges.ImplKt; import org.jetbrains.kotlin.codegen.context.ClassContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.descriptors.*; @@ -70,7 +70,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen { for (DeclarationDescriptor memberDescriptor : descriptor.getDefaultType().getMemberScope().getAllDescriptors()) { if (memberDescriptor instanceof CallableMemberDescriptor) { CallableMemberDescriptor member = (CallableMemberDescriptor) memberDescriptor; - if (!member.getKind().isReal() && BridgesPackage.findTraitImplementation(member) == null) { + if (!member.getKind().isReal() && ImplKt.findTraitImplementation(member) == null) { if (member instanceof FunctionDescriptor) { functionCodegen.generateBridges((FunctionDescriptor) member); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java index bd03da3799d..1bec9c8b228 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java @@ -114,7 +114,7 @@ public class ClassFileFactory implements OutputFileCollection { sourceFiles.addAll(toIoFilesIgnoringNonPhysical(PackagePartClassUtils.getFilesWithCallables(codegen.getFiles()))); } - for (PackageParts part : CodegenPackage.addCompiledPartsAndSort(parts, state)) { + for (PackageParts part : ClassFileUtilsKt.addCompiledPartsAndSort(parts, state)) { PackageParts.Companion.serialize(part, builder); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java index 0ee1969a956..5086515439b 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClosureCodegen.java @@ -38,12 +38,14 @@ import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.serialization.DescriptorSerializer; import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.util.OperatorNameConventions; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.FunctionsKt; import org.jetbrains.org.objectweb.asm.AnnotationVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; @@ -60,9 +62,7 @@ import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.isConst; import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.writeModuleName; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLOSURE; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.asmTypeForAnonymousClass; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; -import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.org.objectweb.asm.Opcodes.*; @@ -119,7 +119,7 @@ public class ClosureCodegen extends MemberCodegen { } else { this.superInterfaceTypes = Collections.singletonList(samType.getType()); - this.superClassType = getBuiltIns(funDescriptor).getAnyType(); + this.superClassType = DescriptorUtilsKt.getBuiltIns(funDescriptor).getAnyType(); } this.closure = bindingContext.get(CLOSURE, classDescriptor); @@ -182,7 +182,7 @@ public class ClosureCodegen extends MemberCodegen { typeMapper.mapSignature(funDescriptor).getAsmMethod() ); - functionCodegen.generateMethod(OtherOrigin(element, funDescriptor), funDescriptor, strategy); + functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(element, funDescriptor), funDescriptor, strategy); //TODO: rewrite cause ugly hack if (samType != null) { @@ -207,7 +207,7 @@ public class ClosureCodegen extends MemberCodegen { this.constructor = generateConstructor(); if (isConst(closure)) { - generateConstInstance(asmType, asmType, UtilsPackage.doNothing()); + generateConstInstance(asmType, asmType, FunctionsKt.doNothing()); } genClosureFields(closure, v, typeMapper); @@ -270,7 +270,7 @@ public class ClosureCodegen extends MemberCodegen { if (bridge.equals(delegate)) return; MethodVisitor mv = - v.newMethod(OtherOrigin(element, funDescriptor), ACC_PUBLIC | ACC_BRIDGE, + v.newMethod(JvmDeclarationOriginKt.OtherOrigin(element, funDescriptor), ACC_PUBLIC | ACC_BRIDGE, bridge.getName(), bridge.getDescriptor(), null, ArrayUtil.EMPTY_STRING_ARRAY); if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return; @@ -284,8 +284,8 @@ public class ClosureCodegen extends MemberCodegen { Type[] myParameterTypes = bridge.getArgumentTypes(); - List calleeParameters = CollectionsKt.plus( - UtilsPackage.singletonOrEmptyList(funDescriptor.getExtensionReceiverParameter()), + List calleeParameters = CollectionsKt.plus( + org.jetbrains.kotlin.utils.CollectionsKt.singletonOrEmptyList(funDescriptor.getExtensionReceiverParameter()), funDescriptor.getValueParameters() ); @@ -382,8 +382,8 @@ public class ClosureCodegen extends MemberCodegen { Type[] argTypes = fieldListToTypeArray(args); Method constructor = new Method("", Type.VOID_TYPE, argTypes); - MethodVisitor mv = v.newMethod(OtherOrigin(element, funDescriptor), visibilityFlag, "", constructor.getDescriptor(), null, - ArrayUtil.EMPTY_STRING_ARRAY); + MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(element, funDescriptor), visibilityFlag, "", constructor.getDescriptor(), null, + ArrayUtil.EMPTY_STRING_ARRAY); if (state.getClassBuilderMode() == ClassBuilderMode.FULL) { mv.visitCode(); InstructionAdapter iv = new InstructionAdapter(mv); @@ -463,8 +463,8 @@ public class ClosureCodegen extends MemberCodegen { public static FunctionDescriptor getErasedInvokeFunction(@NotNull FunctionDescriptor elementDescriptor) { int arity = elementDescriptor.getValueParameters().size(); ClassDescriptor elementClass = elementDescriptor.getExtensionReceiverParameter() == null - ? getBuiltIns(elementDescriptor).getFunction(arity) - : getBuiltIns(elementDescriptor).getExtensionFunction(arity); + ? DescriptorUtilsKt.getBuiltIns(elementDescriptor).getFunction(arity) + : DescriptorUtilsKt.getBuiltIns(elementDescriptor).getExtensionFunction(arity); JetScope scope = elementClass.getDefaultType().getMemberScope(); return scope.getFunctions(OperatorNameConventions.INVOKE, NoLookupLocation.FROM_BACKEND).iterator().next(); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java index c0cf99dd548..a02665daa08 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethod; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicMethods; import org.jetbrains.kotlin.codegen.intrinsics.IntrinsicPropertyGetter; import org.jetbrains.kotlin.codegen.intrinsics.TypeIntrinsics; -import org.jetbrains.kotlin.codegen.pseudoInsns.PseudoInsnsPackage; +import org.jetbrains.kotlin.codegen.pseudoInsns.PseudoInsnsKt; import org.jetbrains.kotlin.codegen.signature.BothSignatureWriter; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; @@ -53,7 +53,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.jvm.RuntimeAssertionInfo; -import org.jetbrains.kotlin.jvm.bindingContextSlices.BindingContextSlicesPackage; +import org.jetbrains.kotlin.jvm.bindingContextSlices.BindingContextSlicesKt; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor; import org.jetbrains.kotlin.name.Name; @@ -63,16 +63,18 @@ 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.callResolverUtil.CallResolverUtilPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; +import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; 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.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.inline.InlineUtil; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; @@ -101,11 +103,9 @@ import static org.jetbrains.kotlin.resolve.BindingContextUtils.*; import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; 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.descriptorUtil.DescriptorUtilPackage.getBuiltIns; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.*; import static org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationUtilKt.hasJvmFieldAnnotation; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.OtherOrigin; -import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.TraitImpl; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class ExpressionCodegen extends JetVisitor implements LocalLookup { @@ -207,7 +207,7 @@ public class ExpressionCodegen extends JetVisitor implem Type asmType = asmTypeForAnonymousClass(bindingContext, objectDeclaration); ClassBuilder classBuilder = state.getFactory().newVisitor( - OtherOrigin(objectDeclaration, classDescriptor), + JvmDeclarationOriginKt.OtherOrigin(objectDeclaration, classDescriptor), asmType, literal.getContainingFile() ); @@ -285,7 +285,7 @@ public class ExpressionCodegen extends JetVisitor implem RuntimeAssertionInfo runtimeAssertionInfo = null; if (selector instanceof JetExpression) { - runtimeAssertionInfo = bindingContext.get(BindingContextSlicesPackage.getRUNTIME_ASSERTION_INFO(), (JetExpression) selector); + runtimeAssertionInfo = bindingContext.get(BindingContextSlicesKt.getRUNTIME_ASSERTION_INFO(), (JetExpression) selector); } return genNotNullAssertions(state, stackValue, runtimeAssertionInfo); @@ -331,14 +331,14 @@ public class ExpressionCodegen extends JetVisitor implem assert descriptor != null; Type asmType = asmTypeForAnonymousClass(bindingContext, declaration); - ClassBuilder classBuilder = state.getFactory().newVisitor(OtherOrigin(declaration, descriptor), asmType, declaration.getContainingFile()); + ClassBuilder classBuilder = state.getFactory().newVisitor(JvmDeclarationOriginKt.OtherOrigin(declaration, descriptor), asmType, declaration.getContainingFile()); ClassContext objectContext = context.intoAnonymousClass(descriptor, this, OwnerKind.IMPLEMENTATION); new ImplementationBodyCodegen(declaration, objectContext, classBuilder, state, getParentCodegen(), /* isLocal = */ true).generate(); if (declaration instanceof JetClass && ((JetClass) declaration).isInterface()) { Type traitImplType = state.getTypeMapper().mapDefaultImpls(descriptor); - ClassBuilder traitImplBuilder = state.getFactory().newVisitor(TraitImpl(declaration, descriptor), traitImplType, declaration.getContainingFile()); + ClassBuilder traitImplBuilder = state.getFactory().newVisitor(JvmDeclarationOriginKt.TraitImpl(declaration, descriptor), traitImplType, declaration.getContainingFile()); ClassContext traitImplContext = context.intoAnonymousClass(descriptor, this, OwnerKind.DEFAULT_IMPLS); new InterfaceImplBodyCodegen(declaration, traitImplContext, traitImplBuilder, state, parentCodegen).generate(); } @@ -497,7 +497,7 @@ public class ExpressionCodegen extends JetVisitor implem blockStackElements.push(new LoopBlockStackElement(breakLabel, continueLabel, targetLabel(expression))); - PseudoInsnsPackage.fakeAlwaysFalseIfeq(v, continueLabel); + PseudoInsnsKt.fakeAlwaysFalseIfeq(v, continueLabel); JetExpression body = expression.getBody(); JetExpression condition = expression.getCondition(); @@ -534,7 +534,7 @@ public class ExpressionCodegen extends JetVisitor implem // Is it a "1..2" or so RangeCodegenUtil.BinaryCall binaryCall = RangeCodegenUtil.getRangeAsBinaryCall(forExpression); if (binaryCall != null) { - ResolvedCall resolvedCall = getResolvedCall(binaryCall.op, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(binaryCall.op, bindingContext); if (resolvedCall != null) { if (RangeCodegenUtil.isOptimizableRangeTo(resolvedCall.getResultingDescriptor())) { generateForLoop(new ForInRangeLiteralLoopGenerator(forExpression, binaryCall)); @@ -583,7 +583,7 @@ public class ExpressionCodegen extends JetVisitor implem generator.checkPreCondition(loopExit); // Some forms of for-loop can be optimized as post-condition loops. - PseudoInsnsPackage.fakeAlwaysFalseIfeq(v, continueLabel); + PseudoInsnsKt.fakeAlwaysFalseIfeq(v, continueLabel); generator.beforeBody(); blockStackElements.push(new LoopBlockStackElement(loopExit, continueLabel, targetLabel(generator.forExpression))); @@ -805,7 +805,7 @@ public class ExpressionCodegen extends JetVisitor implem FunctionDescriptor hasNext = hasNextCall.getResultingDescriptor(); JetType type = hasNext.getReturnType(); - assert type != null && JetTypeChecker.DEFAULT.isSubtypeOf(type, getBuiltIns(hasNext).getBooleanType()); + assert type != null && JetTypeChecker.DEFAULT.isSubtypeOf(type, DescriptorUtilsKt.getBuiltIns(hasNext).getBooleanType()); Type asmType = asmType(type); StackValue.coerce(asmType, Type.BOOLEAN_TYPE, v); @@ -1244,7 +1244,7 @@ public class ExpressionCodegen extends JetVisitor implem loopBlockStackElement.targetLabel != null && labelElement.getReferencedName().equals(loopBlockStackElement.targetLabel.getReferencedName())) { Label label = isBreak ? loopBlockStackElement.breakLabel : loopBlockStackElement.continueLabel; - PseudoInsnsPackage.fixStackAndJump(v, label); + PseudoInsnsKt.fixStackAndJump(v, label); v.mark(afterBreakContinueLabel); return StackValue.none(); } @@ -1423,7 +1423,7 @@ public class ExpressionCodegen extends JetVisitor implem @Nullable FunctionDescriptor functionReferenceTarget ) { ClassBuilder cv = state.getFactory().newVisitor( - OtherOrigin(declaration, descriptor), + JvmDeclarationOriginKt.OtherOrigin(declaration, descriptor), asmTypeForAnonymousClass(bindingContext, descriptor), declaration.getContainingFile() ); @@ -1534,7 +1534,7 @@ public class ExpressionCodegen extends JetVisitor implem } - ClassDescriptor superClass = DescriptorUtilPackage.getSuperClassNotAny(classDescriptor); + ClassDescriptor superClass = DescriptorUtilsKt.getSuperClassNotAny(classDescriptor); if (superClass != null) { pushClosureOnStack( superClass, @@ -1957,7 +1957,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitSimpleNameExpression(@NotNull JetSimpleNameExpression expression, @NotNull StackValue receiver) { - ResolvedCall resolvedCall = getResolvedCall(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, bindingContext); DeclarationDescriptor descriptor; if (resolvedCall == null) { @@ -2013,7 +2013,7 @@ public class ExpressionCodegen extends JetVisitor implem (expression.getReferencedNameElementType() == JetTokens.FIELD_IDENTIFIER || isSyntheticField) && contextKind() != OwnerKind.DEFAULT_IMPLS; JetSuperExpression superExpression = - resolvedCall == null ? null : CallResolverUtilPackage.getSuperCallExpression(resolvedCall.getCall()); + resolvedCall == null ? null : CallResolverUtilKt.getSuperCallExpression(resolvedCall.getCall()); propertyDescriptor = context.accessibleDescriptor(propertyDescriptor, superExpression); if (directToField) { @@ -2266,7 +2266,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitCallExpression(@NotNull JetCallExpression expression, StackValue receiver) { - ResolvedCall resolvedCall = getResolvedCallWithAssert(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression, bindingContext); FunctionDescriptor descriptor = accessibleFunctionDescriptor(resolvedCall); if (descriptor instanceof ConstructorDescriptor) { @@ -2342,7 +2342,7 @@ public class ExpressionCodegen extends JetVisitor implem // $default method is not private, so you need no accessor to call it return usesDefaultArguments(resolvedCall) ? descriptor - : context.accessibleDescriptor(descriptor, CallResolverUtilPackage.getSuperCallExpression(resolvedCall.getCall())); + : context.accessibleDescriptor(descriptor, CallResolverUtilKt.getSuperCallExpression(resolvedCall.getCall())); } private static boolean usesDefaultArguments(@NotNull ResolvedCall resolvedCall) { @@ -2364,7 +2364,7 @@ public class ExpressionCodegen extends JetVisitor implem @NotNull public StackValue invokeFunction(@NotNull Call call, @NotNull ResolvedCall resolvedCall, @NotNull StackValue receiver) { FunctionDescriptor fd = accessibleFunctionDescriptor(resolvedCall); - JetSuperExpression superCallExpression = CallResolverUtilPackage.getSuperCallExpression(call); + JetSuperExpression superCallExpression = CallResolverUtilKt.getSuperCallExpression(call); boolean superCall = superCallExpression != null; if (superCall && !isJvmInterface(fd.getContainingDeclaration())) { @@ -2619,7 +2619,7 @@ public class ExpressionCodegen extends JetVisitor implem boolean isSingleton = calleeContainingClass.getKind().isSingleton(); if (isSingleton) { if (calleeContainingClass.equals(context.getThisDescriptor()) && - !AnnotationsPackage.isPlatformStaticInObjectOrClass(context.getContextDescriptor())) { + !AnnotationUtilKt.isPlatformStaticInObjectOrClass(context.getContextDescriptor())) { return StackValue.local(0, typeMapper.mapType(calleeContainingClass)); } else { @@ -2774,7 +2774,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitCallableReferenceExpression(@NotNull JetCallableReferenceExpression expression, StackValue data) { - ResolvedCall resolvedCall = getResolvedCallWithAssert(expression.getCallableReference(), bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression.getCallableReference(), bindingContext); FunctionDescriptor functionDescriptor = bindingContext.get(FUNCTION, expression); if (functionDescriptor != null) { FunctionReferenceGenerationStrategy strategy = new FunctionReferenceGenerationStrategy(state, functionDescriptor, resolvedCall); @@ -2800,7 +2800,7 @@ public class ExpressionCodegen extends JetVisitor implem ClassDescriptor classDescriptor = CodegenBinding.anonymousClassForCallable(bindingContext, variableDescriptor); ClassBuilder classBuilder = state.getFactory().newVisitor( - OtherOrigin(element), + JvmDeclarationOriginKt.OtherOrigin(element), typeMapper.mapClass(classDescriptor), element.getContainingFile() ); @@ -2923,7 +2923,7 @@ public class ExpressionCodegen extends JetVisitor implem expression.getRight(), reference); } else { - ResolvedCall resolvedCall = getResolvedCallWithAssert(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression, bindingContext); FunctionDescriptor descriptor = (FunctionDescriptor) resolvedCall.getResultingDescriptor(); if (descriptor instanceof ConstructorDescriptor) { @@ -2946,7 +2946,8 @@ public class ExpressionCodegen extends JetVisitor implem genInIntRange(leftValue, (JetBinaryExpression) deparenthesized); } else { - ResolvedCall resolvedCall = getResolvedCallWithAssert(operationReference, bindingContext); + ResolvedCall resolvedCall = CallUtilKt + .getResolvedCallWithAssert(operationReference, bindingContext); StackValue result = invokeFunction(resolvedCall.getCall(), resolvedCall, StackValue.none()); result.put(result.type, v); } @@ -3090,7 +3091,7 @@ public class ExpressionCodegen extends JetVisitor implem } private StackValue generateComparison(JetBinaryExpression expression, StackValue receiver) { - ResolvedCall resolvedCall = getResolvedCallWithAssert(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression, bindingContext); JetExpression left = expression.getLeft(); JetExpression right = expression.getRight(); @@ -3122,7 +3123,7 @@ public class ExpressionCodegen extends JetVisitor implem } private StackValue generateAugmentedAssignment(JetBinaryExpression expression) { - ResolvedCall resolvedCall = getResolvedCallWithAssert(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression, bindingContext); FunctionDescriptor descriptor = (FunctionDescriptor) resolvedCall.getResultingDescriptor(); Callable callable = resolveToCallable(descriptor, false, resolvedCall); JetExpression lhs = expression.getLeft(); @@ -3195,7 +3196,7 @@ public class ExpressionCodegen extends JetVisitor implem @Override public StackValue visitPrefixExpression(@NotNull JetPrefixExpression expression, @NotNull StackValue receiver) { DeclarationDescriptor originalOperation = bindingContext.get(REFERENCE_TARGET, expression.getOperationReference()); - ResolvedCall resolvedCall = getResolvedCallWithAssert(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression, bindingContext); CallableDescriptor op = resolvedCall.getResultingDescriptor(); assert op instanceof FunctionDescriptor || originalOperation == null : String.valueOf(op); @@ -3234,7 +3235,7 @@ public class ExpressionCodegen extends JetVisitor implem DeclarationDescriptor originalOperation = bindingContext.get(REFERENCE_TARGET, expression.getOperationReference()); String originalOperationName = originalOperation != null ? originalOperation.getName().asString() : null; - final ResolvedCall resolvedCall = getResolvedCallWithAssert(expression, bindingContext); + final ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(expression, bindingContext); DeclarationDescriptor op = resolvedCall.getResultingDescriptor(); if (!(op instanceof FunctionDescriptor) || originalOperation == null) { throw new UnsupportedOperationException("Don't know how to generate this postfix expression: " + originalOperationName + " " + op); @@ -3966,14 +3967,14 @@ The "returned" value of try expression with no finally is either the last expres JetType jetType = bindingContext.getType(rangeExpression); assert jetType != null; DeclarationDescriptor descriptor = jetType.getConstructor().getDeclarationDescriptor(); - return getBuiltIns(descriptor).getIntegralRanges().contains(descriptor); + return DescriptorUtilsKt.getBuiltIns(descriptor).getIntegralRanges().contains(descriptor); } } return false; } private Call makeFakeCall(ReceiverValue initializerAsReceiver) { - JetSimpleNameExpression fake = JetPsiFactory(state.getProject()).createSimpleName("fake"); + JetSimpleNameExpression fake = JetPsiFactoryKt.JetPsiFactory(state.getProject()).createSimpleName("fake"); return CallMaker.makeCall(fake, initializerAsReceiver); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java index f93656c9125..429204950f3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java @@ -25,7 +25,7 @@ import kotlin.jvm.functions.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.backend.common.bridges.ImplKt; import org.jetbrains.kotlin.codegen.annotation.AnnotatedWithOnlyTargetedAnnotations; import org.jetbrains.kotlin.codegen.context.*; import org.jetbrains.kotlin.codegen.intrinsics.TypeIntrinsics; @@ -40,19 +40,19 @@ import org.jetbrains.kotlin.jvm.RuntimeAssertionInfo; import org.jetbrains.kotlin.load.java.BuiltinMethodsWithSpecialJvmSignature; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.load.java.SpecialBuiltinMembers; -import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeDeclarationsPackage; +import org.jetbrains.kotlin.load.kotlin.nativeDeclarations.NativeKt; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetNamedFunction; 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.callResolverUtil.CallResolverUtilPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; +import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; import org.jetbrains.kotlin.resolve.constants.ArrayValue; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.KClassValue; -import org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; @@ -80,7 +80,6 @@ import static org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarg import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.getSourceFromDescriptor; import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; -import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.*; import static org.jetbrains.org.objectweb.asm.Opcodes.*; public class FunctionCodegen { @@ -111,7 +110,7 @@ public class FunctionCodegen { "in " + function.getContainingFile().getVirtualFile(); if (owner.getContextKind() != OwnerKind.DEFAULT_IMPLS || function.hasBody()) { - generateMethod(OtherOrigin(function, functionDescriptor), functionDescriptor, + generateMethod(JvmDeclarationOriginKt.OtherOrigin(function, functionDescriptor), functionDescriptor, new FunctionGenerationStrategy.FunctionDefault(state, functionDescriptor, function)); } @@ -156,7 +155,7 @@ public class FunctionCodegen { Method asmMethod = jvmSignature.getAsmMethod(); int flags = getMethodAsmFlags(functionDescriptor, contextKind); - boolean isNative = NativeDeclarationsPackage.hasNativeAnnotation(functionDescriptor); + boolean isNative = NativeKt.hasNativeAnnotation(functionDescriptor); if (isNative && owner instanceof DelegatingFacadeContext) { // Native methods are only defined in facades and do not need package part implementations @@ -183,7 +182,7 @@ public class FunctionCodegen { generateBridges(functionDescriptor); - boolean staticInCompanionObject = AnnotationsPackage.isPlatformStaticInCompanionObject(functionDescriptor); + boolean staticInCompanionObject = AnnotationUtilKt.isPlatformStaticInCompanionObject(functionDescriptor); if (staticInCompanionObject) { ImplementationBodyCodegen parentBodyCodegen = (ImplementationBodyCodegen) memberCodegen.getParentCodegen(); parentBodyCodegen.addAdditionalTask(new PlatformStaticGenerator(functionDescriptor, origin, state)); @@ -515,13 +514,13 @@ public class FunctionCodegen { if (isMethodOfAny(descriptor)) return; // If the function doesn't have a physical declaration among super-functions, it's a SAM adapter or alike and doesn't need bridges - if (CallResolverUtilPackage.isOrOverridesSynthesized(descriptor)) return; + if (CallResolverUtilKt.isOrOverridesSynthesized(descriptor)) return; boolean isSpecial = SpecialBuiltinMembers.overridesBuiltinSpecialDeclaration(descriptor); Set> bridgesToGenerate; if (!isSpecial) { - bridgesToGenerate = BridgesPackage.generateBridgesForFunctionDescriptor( + bridgesToGenerate = ImplKt.generateBridgesForFunctionDescriptor( descriptor, new Function1() { @Override @@ -566,7 +565,7 @@ public class FunctionCodegen { Method method = typeMapper.mapSignature(descriptor).getAsmMethod(); int flags = ACC_ABSTRACT | getVisibilityAccessFlag(descriptor); - v.newMethod(OtherOrigin(overridden), flags, method.getName(), method.getDescriptor(), null, null); + v.newMethod(JvmDeclarationOriginKt.OtherOrigin(overridden), flags, method.getName(), method.getDescriptor(), null, null); } } } @@ -645,7 +644,7 @@ public class FunctionCodegen { Method defaultMethod = typeMapper.mapDefaultMethod(functionDescriptor, kind); MethodVisitor mv = v.newMethod( - Synthetic(function, functionDescriptor), + JvmDeclarationOriginKt.Synthetic(function, functionDescriptor), flags, defaultMethod.getName(), defaultMethod.getDescriptor(), null, @@ -807,7 +806,7 @@ public class FunctionCodegen { int flags = ACC_PUBLIC | ACC_BRIDGE | (!isSpecialBridge ? ACC_SYNTHETIC : 0) | (isSpecialBridge ? ACC_FINAL : 0); // TODO. MethodVisitor mv = - v.newMethod(DiagnosticsPackage.Bridge(descriptor, origin), flags, bridge.getName(), bridge.getDescriptor(), null, null); + v.newMethod(JvmDeclarationOriginKt.Bridge(descriptor, origin), flags, bridge.getName(), bridge.getDescriptor(), null, null); if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return; mv.visitCode(); @@ -909,7 +908,7 @@ public class FunctionCodegen { final StackValue field ) { generateMethod( - Delegation(DescriptorToSourceUtils.descriptorToDeclaration(delegatedTo), delegateFunction), delegateFunction, + JvmDeclarationOriginKt.Delegation(DescriptorToSourceUtils.descriptorToDeclaration(delegatedTo), delegateFunction), delegateFunction, new FunctionGenerationStrategy() { @Override public void generateBody( diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java index c63f64a4c9c..39680e78082 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionReferenceGenerationStrategy.java @@ -21,10 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.psi.Call; -import org.jetbrains.kotlin.psi.JetCallExpression; -import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.ValueArgument; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.calls.model.DelegatingResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; @@ -142,7 +139,7 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat } } fakeFunctionCall.append(")"); - return (JetCallExpression) JetPsiFactory(state.getProject()).createExpression(fakeFunctionCall.toString()); + return (JetCallExpression) JetPsiFactoryKt.JetPsiFactory(state.getProject()).createExpression(fakeFunctionCall.toString()); } private void computeAndSaveArguments(@NotNull List fakeArguments, @NotNull ExpressionCodegen codegen) { @@ -168,7 +165,8 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat ) { if (receiver == null) return NO_RECEIVER; - JetExpression receiverExpression = JetPsiFactory(state.getProject()).createExpression("callableReferenceFakeReceiver"); + JetExpression receiverExpression = JetPsiFactoryKt + .JetPsiFactory(state.getProject()).createExpression("callableReferenceFakeReceiver"); codegen.tempVariables.put(receiverExpression, receiverParameterStackValue(signature)); return new ExpressionReceiver(receiverExpression, receiver.getType()); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 6de8e557047..19c10964624 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -49,16 +49,17 @@ import org.jetbrains.kotlin.psi.*; 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.callResolverUtil.CallResolverUtilPackage; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; +import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; 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.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmClassSignature; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterKind; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodParameterSignature; @@ -84,11 +85,8 @@ import static org.jetbrains.kotlin.resolve.BindingContextUtils.getNotNull; import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getResolvedCall; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getSecondaryConstructors; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.JAVA_STRING_TYPE; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.OBJECT_TYPE; -import static org.jetbrains.kotlin.resolve.jvm.diagnostics.DiagnosticsPackage.*; import static org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin.NO_ORIGIN; import static org.jetbrains.kotlin.types.Variance.INVARIANT; import static org.jetbrains.org.objectweb.asm.Opcodes.*; @@ -237,7 +235,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { if (isInterface(descriptor) && !isLocal) { Type defaultImplsType = state.getTypeMapper().mapDefaultImpls(descriptor); ClassBuilder defaultImplsBuilder = - state.getFactory().newVisitor(TraitImpl(myClass, descriptor), defaultImplsType, myClass.getContainingFile()); + state.getFactory().newVisitor(JvmDeclarationOriginKt.TraitImpl(myClass, descriptor), defaultImplsType, myClass.getContainingFile()); CodegenContext parentContext = context.getParentContext(); assert parentContext != null : "Parent context of interface declaration should not be null"; @@ -378,7 +376,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { try { lookupConstructorExpressionsInClosureIfPresent(); generatePrimaryConstructor(delegationFieldsInfo); - for (ConstructorDescriptor secondaryConstructor : getSecondaryConstructors(descriptor)) { + for (ConstructorDescriptor secondaryConstructor : DescriptorUtilsKt.getSecondaryConstructors(descriptor)) { generateSecondaryConstructor(secondaryConstructor); } } @@ -417,7 +415,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { Collection functions = descriptor.getDefaultType().getMemberScope().getFunctions(Name.identifier("toArray"), NoLookupLocation.FROM_BACKEND); for (FunctionDescriptor function : functions) { - if (CallResolverUtilPackage.isOrOverridesSynthesized(function)) { + if (CallResolverUtilKt.isOrOverridesSynthesized(function)) { continue; } @@ -430,8 +428,9 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { JetType paramType = function.getValueParameters().get(0).getType(); if (KotlinBuiltIns.isArray(returnType) && KotlinBuiltIns.isArray(paramType)) { JetType elementType = function.getTypeParameters().get(0).getDefaultType(); - if (JetTypeChecker.DEFAULT.equalTypes(elementType, getBuiltIns(descriptor).getArrayElementType(returnType)) - && JetTypeChecker.DEFAULT.equalTypes(elementType, getBuiltIns(descriptor).getArrayElementType(paramType))) { + if (JetTypeChecker.DEFAULT.equalTypes(elementType, DescriptorUtilsKt.getBuiltIns(descriptor).getArrayElementType(returnType)) + && JetTypeChecker.DEFAULT.equalTypes(elementType, DescriptorUtilsKt + .getBuiltIns(descriptor).getArrayElementType(paramType))) { return true; } } @@ -441,7 +440,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void generateToArray() { - KotlinBuiltIns builtIns = getBuiltIns(descriptor); + KotlinBuiltIns builtIns = DescriptorUtilsKt.getBuiltIns(descriptor); if (!isSubclass(descriptor, builtIns.getCollection())) return; int access = descriptor.getKind() == ClassKind.INTERFACE ? @@ -498,7 +497,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void generateEqualsMethod(@NotNull FunctionDescriptor function, @NotNull List properties) { MethodContext context = ImplementationBodyCodegen.this.context.intoFunction(function); - MethodVisitor mv = v.newMethod(OtherOrigin(function), ACC_PUBLIC, "equals", "(Ljava/lang/Object;)Z", null, null); + MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(function), ACC_PUBLIC, "equals", "(Ljava/lang/Object;)Z", null, null); InstructionAdapter iv = new InstructionAdapter(mv); mv.visitCode(); @@ -555,7 +554,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void generateHashCodeMethod(@NotNull FunctionDescriptor function, @NotNull List properties) { MethodContext context = ImplementationBodyCodegen.this.context.intoFunction(function); - MethodVisitor mv = v.newMethod(OtherOrigin(function), ACC_PUBLIC, "hashCode", "()I", null, null); + MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(function), ACC_PUBLIC, "hashCode", "()I", null, null); InstructionAdapter iv = new InstructionAdapter(mv); mv.visitCode(); @@ -604,7 +603,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void generateToStringMethod(@NotNull FunctionDescriptor function, @NotNull List properties) { MethodContext context = ImplementationBodyCodegen.this.context.intoFunction(function); - MethodVisitor mv = v.newMethod(OtherOrigin(function), ACC_PUBLIC, "toString", "()Ljava/lang/String;", null, null); + MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(function), ACC_PUBLIC, "toString", "()Ljava/lang/String;", null, null); InstructionAdapter iv = new InstructionAdapter(mv); mv.visitCode(); @@ -667,7 +666,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { @Override public void generateComponentFunction(@NotNull FunctionDescriptor function, @NotNull final ValueParameterDescriptor parameter) { PsiElement originalElement = DescriptorToSourceUtils.descriptorToDeclaration(parameter); - functionCodegen.generateMethod(OtherOrigin(originalElement, function), function, new FunctionGenerationStrategy() { + functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(originalElement, function), function, new FunctionGenerationStrategy() { @Override public void generateBody( @NotNull MethodVisitor mv, @@ -695,7 +694,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { public void generateCopyFunction(@NotNull final FunctionDescriptor function, @NotNull List constructorParameters) { final Type thisDescriptorType = typeMapper.mapType(descriptor); - functionCodegen.generateMethod(OtherOrigin(myClass, function), function, new FunctionGenerationStrategy() { + functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(myClass, function), function, new FunctionGenerationStrategy() { @Override public void generateBody( @NotNull MethodVisitor mv, @@ -793,7 +792,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } private void generateEnumValuesMethod() { - Type type = typeMapper.mapType(getBuiltIns(descriptor).getArrayType(INVARIANT, descriptor.getDefaultType())); + Type type = typeMapper.mapType(DescriptorUtilsKt.getBuiltIns(descriptor).getArrayType(INVARIANT, descriptor.getDefaultType())); FunctionDescriptor valuesFunction = CollectionsKt.single(descriptor.getStaticScope().getFunctions(ENUM_VALUES, NoLookupLocation.FROM_BACKEND), new Function1() { @@ -802,7 +801,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { return CodegenUtil.isEnumValuesMethod(descriptor); } }); - MethodVisitor mv = v.newMethod(OtherOrigin(myClass, valuesFunction), ACC_PUBLIC | ACC_STATIC, ENUM_VALUES.asString(), + MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(myClass, valuesFunction), ACC_PUBLIC | ACC_STATIC, ENUM_VALUES.asString(), "()" + type.getDescriptor(), null, null); if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return; @@ -822,7 +821,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { return CodegenUtil.isEnumValueOfMethod(descriptor); } }); - MethodVisitor mv = v.newMethod(OtherOrigin(myClass, valueOfFunction), ACC_PUBLIC | ACC_STATIC, ENUM_VALUE_OF.asString(), + MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(myClass, valueOfFunction), ACC_PUBLIC | ACC_STATIC, ENUM_VALUE_OF.asString(), "(Ljava/lang/String;)" + classAsmType.getDescriptor(), null, null); if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return; @@ -846,7 +845,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { final FunctionDescriptor accessor = (FunctionDescriptor) accessorForCallableDescriptor; final FunctionDescriptor original = (FunctionDescriptor) accessorForCallableDescriptor.getCalleeDescriptor(); functionCodegen.generateMethod( - Synthetic(null, original), accessor, + JvmDeclarationOriginKt.Synthetic(null, original), accessor, new FunctionGenerationStrategy.CodegenBased(state, accessor) { @Override public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) { @@ -900,16 +899,18 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { PropertyGetterDescriptor getter = accessor.getGetter(); assert getter != null; - functionCodegen.generateMethod(Synthetic(null, original.getGetter() != null ? original.getGetter() : original), - getter, new PropertyAccessorStrategy(getter)); + functionCodegen.generateMethod( + JvmDeclarationOriginKt.Synthetic(null, original.getGetter() != null ? original.getGetter() : original), + getter, new PropertyAccessorStrategy(getter)); if (accessor.isVar()) { PropertySetterDescriptor setter = accessor.getSetter(); assert setter != null; - functionCodegen.generateMethod(Synthetic(null, original.getSetter() != null ? original.getSetter() : original), - setter, new PropertyAccessorStrategy(setter)); + functionCodegen.generateMethod( + JvmDeclarationOriginKt.Synthetic(null, original.getSetter() != null ? original.getSetter() : original), + setter, new PropertyAccessorStrategy(setter)); } } else { @@ -953,7 +954,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { reg = 0; } else if (accessorIsConstructor || (accessorDescriptor != null && JetTypeMapper.isAccessor(accessorDescriptor))) { - if (!AnnotationsPackage.isPlatformStaticInObjectOrClass(functionDescriptor)) { + if (!AnnotationUtilKt.isPlatformStaticInObjectOrClass(functionDescriptor)) { iv.load(0, OBJECT_TYPE); } } @@ -976,11 +977,11 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { if (isObject(descriptor)) { StackValue.Field field = StackValue.singleton(descriptor, typeMapper); - v.newField(OtherOrigin(myClass), ACC_PUBLIC | ACC_STATIC | ACC_FINAL, field.name, field.type.getDescriptor(), null, null); + v.newField(JvmDeclarationOriginKt.OtherOrigin(myClass), ACC_PUBLIC | ACC_STATIC | ACC_FINAL, field.name, field.type.getDescriptor(), null, null); if (isNonCompanionObject(descriptor)) { StackValue.Field oldField = StackValue.oldSingleton(descriptor, typeMapper); - v.newField(OtherOrigin(myClass), ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_DEPRECATED, oldField.name, oldField.type.getDescriptor(), null, null); + v.newField(JvmDeclarationOriginKt.OtherOrigin(myClass), ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_DEPRECATED, oldField.name, oldField.type.getDescriptor(), null, null); } if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return; @@ -1008,7 +1009,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { assert companionObject != null : "Companion object not found: " + myClass.getText(); StackValue.Field field = StackValue.singletonForCompanion(companionObjectDescriptor, typeMapper); - v.newField(OtherOrigin(companionObject), ACC_PUBLIC | ACC_STATIC | ACC_FINAL, field.name, field.type.getDescriptor(), null, null); + v.newField(JvmDeclarationOriginKt.OtherOrigin(companionObject), ACC_PUBLIC | ACC_STATIC | ACC_FINAL, field.name, field.type.getDescriptor(), null, null); if (state.getClassBuilderMode() != ClassBuilderMode.FULL) return; @@ -1025,7 +1026,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { Type type = typeMapper.mapType(property); int modifiers = ACC_STATIC | ACC_FINAL | ACC_PUBLIC | (property.isConst() ? 0 : ACC_DEPRECATED); - FieldVisitor fv = v.newField(Synthetic(DescriptorToSourceUtils.descriptorToDeclaration(property), property), + FieldVisitor fv = v.newField(JvmDeclarationOriginKt.Synthetic(DescriptorToSourceUtils.descriptorToDeclaration(property), property), modifiers, context.getFieldName(property, false), type.getDescriptor(), typeMapper.mapFieldSignature(property.getType()), info.defaultValue); @@ -1079,7 +1080,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { ConstructorContext constructorContext = context.intoConstructor(constructorDescriptor); JetPrimaryConstructor primaryConstructor = myClass.getPrimaryConstructor(); - JvmDeclarationOrigin origin = OtherOrigin(primaryConstructor != null ? primaryConstructor : myClass, constructorDescriptor); + JvmDeclarationOrigin origin = JvmDeclarationOriginKt + .OtherOrigin(primaryConstructor != null ? primaryConstructor : myClass, constructorDescriptor); functionCodegen.generateMethod(origin, constructorDescriptor, constructorContext, new FunctionGenerationStrategy.CodegenBased(state, constructorDescriptor) { @Override @@ -1104,9 +1106,10 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { ConstructorContext constructorContext = context.intoConstructor(constructorDescriptor); - functionCodegen.generateMethod(OtherOrigin(descriptorToDeclaration(constructorDescriptor), constructorDescriptor), - constructorDescriptor, constructorContext, - new FunctionGenerationStrategy.CodegenBased(state, constructorDescriptor) { + functionCodegen.generateMethod( + JvmDeclarationOriginKt.OtherOrigin(descriptorToDeclaration(constructorDescriptor), constructorDescriptor), + constructorDescriptor, constructorContext, + new FunctionGenerationStrategy.CodegenBased(state, constructorDescriptor) { @Override public void doGenerateBody(@NotNull ExpressionCodegen codegen, @NotNull JvmMethodSignature signature) { generateSecondaryConstructorImpl(callableDescriptor, codegen); @@ -1335,7 +1338,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { lookupInContext(descriptor); } else if (descriptor instanceof CallableMemberDescriptor) { - ResolvedCall call = getResolvedCall(expr, bindingContext); + ResolvedCall call = CallUtilKt.getResolvedCall(expr, bindingContext); if (call != null) { lookupReceiver(call.getDispatchReceiver()); lookupReceiver(call.getExtensionReceiver()); @@ -1414,7 +1417,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { } } - ClassDescriptor superClass = DescriptorUtilPackage.getSuperClassNotAny(descriptor); + ClassDescriptor superClass = DescriptorUtilsKt.getSuperClassNotAny(descriptor); if (superClass != null) { if (superClass.isInner()) { context.lookupInContext(superClass.getContainingDeclaration(), StackValue.LOCAL_0, state, true); @@ -1445,7 +1448,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { private void generateDelegationToTraitImpl(@NotNull final FunctionDescriptor traitFun, @NotNull final FunctionDescriptor inheritedFun) { functionCodegen.generateMethod( - DelegationToTraitImpl(descriptorToDeclaration(traitFun), traitFun), + JvmDeclarationOriginKt.DelegationToTraitImpl(descriptorToDeclaration(traitFun), traitFun), inheritedFun, new FunctionGenerationStrategy.CodegenBased(state, inheritedFun) { @Override @@ -1676,7 +1679,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { for (JetEnumEntry enumEntry : enumEntries) { ClassDescriptor descriptor = getNotNull(bindingContext, BindingContext.CLASS, enumEntry); - FieldVisitor fv = v.newField(OtherOrigin(enumEntry, descriptor), ACC_PUBLIC | ACC_ENUM | ACC_STATIC | ACC_FINAL, + FieldVisitor fv = v.newField(JvmDeclarationOriginKt.OtherOrigin(enumEntry, descriptor), ACC_PUBLIC | ACC_ENUM | ACC_STATIC | ACC_FINAL, descriptor.getName().asString(), classAsmType.getDescriptor(), null, null); AnnotationCodegen.forField(fv, typeMapper).genAnnotations(descriptor, null); } @@ -1690,8 +1693,8 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { ExpressionCodegen codegen = createOrGetClInitCodegen(); InstructionAdapter iv = codegen.v; - Type arrayAsmType = typeMapper.mapType(getBuiltIns(descriptor).getArrayType(INVARIANT, descriptor.getDefaultType())); - v.newField(OtherOrigin(myClass), ACC_PRIVATE | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, ENUM_VALUES_FIELD_NAME, + Type arrayAsmType = typeMapper.mapType(DescriptorUtilsKt.getBuiltIns(descriptor).getArrayType(INVARIANT, descriptor.getDefaultType())); + v.newField(JvmDeclarationOriginKt.OtherOrigin(myClass), ACC_PRIVATE | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, ENUM_VALUES_FIELD_NAME, arrayAsmType.getDescriptor(), null, null); iv.iconst(enumEntries.size()); @@ -1726,7 +1729,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { List delegationSpecifiers = enumEntry.getDelegationSpecifiers(); if (delegationSpecifiers.size() == 1 && !enumEntryNeedSubclass(bindingContext, enumEntry)) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCallWithAssert(delegationSpecifiers.get(0), bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(delegationSpecifiers.get(0), bindingContext); CallableMethod method = typeMapper.mapToCallableMethod((ConstructorDescriptor) resolvedCall.getResultingDescriptor(), false); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java index 550684ea36d..4e7ec3a4530 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmCodegenUtil.java @@ -34,11 +34,10 @@ import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.load.kotlin.ModuleMapping; import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityUtilsKt; -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFunction; -import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilPackage; +import org.jetbrains.kotlin.psi.codeFragmentUtil.CodeFragmentUtilKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils; @@ -172,7 +171,7 @@ public class JvmCodegenUtil { private static boolean isDebuggerContext(@NotNull MethodContext context) { JetFile file = DescriptorToSourceUtils.getContainingFile(context.getContextDescriptor()); - return file != null && CodeFragmentUtilPackage.getSuppressDiagnosticsInDebugMode(file); + return file != null && CodeFragmentUtilKt.getSuppressDiagnosticsInDebugMode(file); } @Nullable diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java index 9d293f8cee3..58c8af520b3 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/JvmRuntimeTypes.java @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.descriptors.impl.MutablePackageFragmentDescriptor; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.TargetPlatformKt; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.types.JetType; @@ -31,8 +32,6 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import java.util.*; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; - public class JvmRuntimeTypes { private final ClassDescriptor lambda; private final ClassDescriptor functionReference; @@ -77,7 +76,7 @@ public class JvmRuntimeTypes { ReceiverParameterDescriptor receiverParameter = descriptor.getExtensionReceiverParameter(); //noinspection ConstantConditions - JetType functionType = getBuiltIns(descriptor).getFunctionType( + JetType functionType = DescriptorUtilsKt.getBuiltIns(descriptor).getFunctionType( Annotations.Companion.getEMPTY(), receiverParameter == null ? null : receiverParameter.getType(), ExpressionTypingUtils.getValueParametersTypes(descriptor.getValueParameters()), @@ -96,7 +95,7 @@ public class JvmRuntimeTypes { extensionReceiver != null ? extensionReceiver.getType() : dispatchReceiver != null ? dispatchReceiver.getType() : null; //noinspection ConstantConditions - JetType functionType = getBuiltIns(descriptor).getFunctionType( + JetType functionType = DescriptorUtilsKt.getBuiltIns(descriptor).getFunctionType( Annotations.Companion.getEMPTY(), receiverType, ExpressionTypingUtils.getValueParametersTypes(descriptor.getValueParameters()), diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java index ed732b4d03a..45972cb15f6 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.SimpleFunctionDescriptorImpl; -import org.jetbrains.kotlin.fileClasses.FileClassesPackage; +import org.jetbrains.kotlin.fileClasses.FileClasses; import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.Name; @@ -41,11 +41,12 @@ import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.TemporaryBindingTrace; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; -import org.jetbrains.kotlin.resolve.source.SourcePackage; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; +import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt; import org.jetbrains.kotlin.storage.LockBasedStorageManager; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.types.ErrorUtils; @@ -205,7 +206,7 @@ public abstract class MemberCodegen", "()V", null, null); + MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(descriptor), ACC_STATIC, "", "()V", null, null); SimpleFunctionDescriptorImpl clInit = SimpleFunctionDescriptorImpl.create(descriptor, Annotations.Companion.getEMPTY(), Name.special(""), SYNTHESIZED, - SourcePackage.toSourceElement(element)); + KotlinSourceElementKt.toSourceElement(element)); clInit.initialize(null, null, Collections.emptyList(), Collections.emptyList(), - DescriptorUtilPackage.getModule(descriptor).getBuiltIns().getUnitType(), + DescriptorUtilsKt.getModule(descriptor).getBuiltIns().getUnitType(), null, Visibilities.PRIVATE); this.clInit = new ExpressionCodegen(mv, new FrameMap(), Type.VOID_TYPE, context.intoFunction(clInit), state, this); @@ -535,7 +536,7 @@ public abstract class MemberCodegen initialization ) { - v.newField(OtherOrigin(element), ACC_STATIC | ACC_FINAL | ACC_PUBLIC, JvmAbi.INSTANCE_FIELD, fieldAsmType.getDescriptor(), + v.newField(JvmDeclarationOriginKt.OtherOrigin(element), ACC_STATIC | ACC_FINAL | ACC_PUBLIC, JvmAbi.INSTANCE_FIELD, fieldAsmType.getDescriptor(), null, null); if (state.getClassBuilderMode() == ClassBuilderMode.FULL) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index 447187b461c..8e242202d4d 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -32,13 +32,14 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorFactory; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.constants.ConstantValue; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPropertyDescriptor; import org.jetbrains.kotlin.storage.LockBasedStorageManager; @@ -197,7 +198,7 @@ public class PropertyCodegen { String name = p.getName(); if (name == null) return; MethodVisitor mv = v.newMethod( - OtherOrigin(p, descriptor), ACC_PUBLIC | ACC_ABSTRACT, name, + JvmDeclarationOriginKt.OtherOrigin(p, descriptor), ACC_PUBLIC | ACC_ABSTRACT, name, signature.getAsmMethod().getDescriptor(), signature.getGenericsSignature(), null @@ -254,7 +255,7 @@ public class PropertyCodegen { if (!isInterface(context.getContextDescriptor()) || kind == OwnerKind.DEFAULT_IMPLS) { int flags = ACC_DEPRECATED | ACC_FINAL | ACC_PRIVATE | ACC_STATIC | ACC_SYNTHETIC; - MethodVisitor mv = v.newMethod(OtherOrigin(descriptor), flags, name, desc, null, null); + MethodVisitor mv = v.newMethod(JvmDeclarationOriginKt.OtherOrigin(descriptor), flags, name, desc, null, null); AnnotationCodegen.forMethod(mv, typeMapper) .genAnnotations(new AnnotatedSimple(annotations), Type.VOID_TYPE, AnnotationUseSiteTarget.PROPERTY); mv.visitCode(); @@ -353,8 +354,8 @@ public class PropertyCodegen { v.getSerializationBindings().put(FIELD_FOR_PROPERTY, propertyDescriptor, Pair.create(type, name)); - FieldVisitor fv = builder.newField(OtherOrigin(element, propertyDescriptor), modifiers, name, type.getDescriptor(), - typeMapper.mapFieldSignature(jetType), defaultValue); + FieldVisitor fv = builder.newField(JvmDeclarationOriginKt.OtherOrigin(element, propertyDescriptor), modifiers, name, type.getDescriptor(), + typeMapper.mapFieldSignature(jetType), defaultValue); Annotated fieldAnnotated = new AnnotatedWithFakeAnnotations(propertyDescriptor, annotations); AnnotationCodegen.forField(fv, typeMapper).genAnnotations(fieldAnnotated, type, AnnotationUseSiteTarget.FIELD); @@ -425,7 +426,7 @@ public class PropertyCodegen { strategy = new FunctionGenerationStrategy.FunctionDefault(state, accessorDescriptor, accessor); } - functionCodegen.generateMethod(OtherOrigin(accessor != null ? accessor : p, accessorDescriptor), accessorDescriptor, strategy); + functionCodegen.generateMethod(JvmDeclarationOriginKt.OtherOrigin(accessor != null ? accessor : p, accessorDescriptor), accessorDescriptor, strategy); } public static int indexOfDelegatedProperty(@NotNull JetProperty property) { @@ -451,7 +452,7 @@ public class PropertyCodegen { } } - throw new IllegalStateException("Delegated property not found in its parent: " + PsiUtilPackage.getElementTextWithContext(property)); + throw new IllegalStateException("Delegated property not found in its parent: " + PsiUtilsKt.getElementTextWithContext(property)); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java index fd370416255..e9f9d722cd5 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/SamWrapperCodegen.java @@ -30,6 +30,7 @@ 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.resolve.jvm.diagnostics.JvmDeclarationOriginKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.util.OperatorNameConventions; import org.jetbrains.org.objectweb.asm.MethodVisitor; @@ -82,7 +83,7 @@ public class SamWrapperCodegen { /*copyOverrides=*/ false ); - ClassBuilder cv = state.getFactory().newVisitor(OtherOrigin(erasedInterfaceFunction), asmType, file); + ClassBuilder cv = state.getFactory().newVisitor(JvmDeclarationOriginKt.OtherOrigin(erasedInterfaceFunction), asmType, file); cv.defineClass(file, V1_6, ACC_FINAL, @@ -98,7 +99,7 @@ public class SamWrapperCodegen { // e.g. ASM type for Function2 Type functionAsmType = typeMapper.mapType(functionType); - cv.newField(OtherOrigin(erasedInterfaceFunction), + cv.newField(JvmDeclarationOriginKt.OtherOrigin(erasedInterfaceFunction), ACC_SYNTHETIC | ACC_PRIVATE | ACC_FINAL, FUNCTION_FIELD_NAME, functionAsmType.getDescriptor(), @@ -114,7 +115,7 @@ public class SamWrapperCodegen { } private void generateConstructor(Type ownerType, Type functionType, ClassBuilder cv) { - MethodVisitor mv = cv.newMethod(OtherOrigin(samType.getJavaClassDescriptor()), + MethodVisitor mv = cv.newMethod(JvmDeclarationOriginKt.OtherOrigin(samType.getJavaClassDescriptor()), NO_FLAG_PACKAGE_PRIVATE, "", Type.getMethodDescriptor(Type.VOID_TYPE, functionType), null, null); if (state.getClassBuilderMode() == ClassBuilderMode.FULL) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java index 05f4eb7d06a..f257d8ded33 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ScriptCodegen.java @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.descriptors.ScriptDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOriginKt; import org.jetbrains.kotlin.resolve.jvm.jvmSignature.JvmMethodSignature; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Type; @@ -61,7 +62,7 @@ public class ScriptCodegen extends MemberCodegen { Type classType = asmTypeForScriptDescriptor(bindingContext, scriptDescriptor); - ClassBuilder builder = state.getFactory().newVisitor(OtherOrigin(declaration, classDescriptorForScript), + ClassBuilder builder = state.getFactory().newVisitor(JvmDeclarationOriginKt.OtherOrigin(declaration, classDescriptorForScript), classType, declaration.getContainingFile()); List earlierScripts = state.getEarlierScriptsForReplInterpreter(); ScriptContext scriptContext = parentContext.intoScript( @@ -124,14 +125,14 @@ public class ScriptCodegen extends MemberCodegen { Type blockType = typeMapper.mapType(scriptDescriptor.getScriptCodeDescriptor().getReturnType()); PropertyDescriptor scriptResultProperty = scriptDescriptor.getScriptResultProperty(); - classBuilder.newField(OtherOrigin(scriptResultProperty), + classBuilder.newField(JvmDeclarationOriginKt.OtherOrigin(scriptResultProperty), ACC_PUBLIC | ACC_FINAL, scriptResultProperty.getName().asString(), blockType.getDescriptor(), null, null); JvmMethodSignature jvmSignature = typeMapper.mapScriptSignature(scriptDescriptor, context.getEarlierScripts()); MethodVisitor mv = classBuilder.newMethod( - OtherOrigin(scriptDeclaration, scriptDescriptor.getClassDescriptor().getUnsubstitutedPrimaryConstructor()), + JvmDeclarationOriginKt.OtherOrigin(scriptDeclaration, scriptDescriptor.getClassDescriptor().getUnsubstitutedPrimaryConstructor()), ACC_PUBLIC, jvmSignature.getAsmMethod().getName(), jvmSignature.getAsmMethod().getDescriptor(), null, null); @@ -216,7 +217,7 @@ public class ScriptCodegen extends MemberCodegen { for (ValueParameterDescriptor parameter : script.getScriptCodeDescriptor().getValueParameters()) { Type parameterType = typeMapper.mapType(parameter); int access = ACC_PUBLIC | ACC_FINAL; - classBuilder.newField(OtherOrigin(parameter), access, parameter.getName().getIdentifier(), parameterType.getDescriptor(), null, null); + classBuilder.newField(JvmDeclarationOriginKt.OtherOrigin(parameter), access, parameter.getName().getIdentifier(), parameterType.getDescriptor(), null, null); } } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java index 203ee57c88e..a0eaa2ff4d2 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/StackValue.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.resolve.ImportedFromObjectCallableDescriptor; -import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; @@ -548,7 +548,7 @@ public abstract class StackValue { } private static StackValue platformStaticCallIfPresent(@NotNull StackValue resultReceiver, @NotNull CallableDescriptor descriptor) { - if (AnnotationsPackage.isPlatformStaticInObjectOrClass(descriptor)) { + if (AnnotationUtilKt.isPlatformStaticInObjectOrClass(descriptor)) { if (resultReceiver.canHaveSideEffects()) { return coercion(resultReceiver, Type.VOID_TYPE); } @@ -1312,7 +1312,7 @@ public abstract class StackValue { else if (dispatchReceiver != null) { CallableDescriptor descriptor = resolvedCall.getResultingDescriptor(); - if (AnnotationsPackage.isPlatformStaticInObjectOrClass(descriptor)) { + if (AnnotationUtilKt.isPlatformStaticInObjectOrClass(descriptor)) { return Type.VOID_TYPE; } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java index 323085f0c95..7c229bba804 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/TailRecursionCodegen.java @@ -27,6 +27,7 @@ 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.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.org.objectweb.asm.Type; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -107,7 +108,7 @@ public class TailRecursionCodegen { JetExpression argumentExpression = argument == null ? null : argument.getArgumentExpression(); if (argumentExpression instanceof JetSimpleNameExpression) { - ResolvedCall resolvedCall = getResolvedCall(argumentExpression, state.getBindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(argumentExpression, state.getBindingContext()); if (resolvedCall != null && resolvedCall.getResultingDescriptor().equals(parameterDescriptor.getOriginal())) { // do nothing: we shouldn't store argument to itself again AsmUtil.pop(v, type); 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 0314a69fb54..9c14cc42571 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenAnnotatingVisitor.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.codegen.when.SwitchCodegenUtil; import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; -import org.jetbrains.kotlin.fileClasses.FileClassesPackage; +import org.jetbrains.kotlin.fileClasses.FileClasses; import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider; import org.jetbrains.kotlin.load.java.descriptors.SamConstructorDescriptor; import org.jetbrains.kotlin.name.Name; @@ -42,7 +42,7 @@ 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.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ExpressionValueArgument; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; @@ -50,7 +50,7 @@ import org.jetbrains.kotlin.resolve.constants.ConstantValue; 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.resolve.source.KotlinSourceElementKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.org.objectweb.asm.Type; @@ -99,7 +99,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { Name.special(""), Modality.FINAL, supertypes, - SourcePackage.toSourceElement(element) + KotlinSourceElementKt.toSourceElement(element) ); classDescriptor.initialize(JetScope.Empty.INSTANCE$, Collections.emptySet(), null); @@ -288,7 +288,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { @Override public void visitCallableReferenceExpression(@NotNull JetCallableReferenceExpression expression) { - ResolvedCall referencedFunction = CallUtilPackage.getResolvedCall(expression.getCallableReference(), bindingContext); + ResolvedCall referencedFunction = CallUtilKt.getResolvedCall(expression.getCallableReference(), bindingContext); if (referencedFunction == null) return; CallableDescriptor target = referencedFunction.getResultingDescriptor(); @@ -392,7 +392,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { else if (containingDeclaration instanceof PackageFragmentDescriptor) { JetFile containingFile = DescriptorToSourceUtils.getContainingFile(descriptor); assert containingFile != null : "File not found for " + descriptor; - return FileClassesPackage.getFileClassInternalName(fileClassesProvider, containingFile) + '$' + name; + return FileClasses.getFileClassInternalName(fileClassesProvider, containingFile) + '$' + name; } return null; @@ -405,7 +405,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { } private void checkSamCall(@NotNull JetCallElement expression) { - ResolvedCall call = CallUtilPackage.getResolvedCall(expression, bindingContext); + ResolvedCall call = CallUtilKt.getResolvedCall(expression, bindingContext); if (call == null) return; CallableDescriptor descriptor = call.getResultingDescriptor(); @@ -573,7 +573,7 @@ class CodegenAnnotatingVisitor extends JetVisitorVoid { } } - return FileClassesPackage.getFacadeClassInternalName(fileClassesProvider, file); + return FileClasses.getFacadeClassInternalName(fileClassesProvider, file); } private static T peekFromStack(@NotNull Stack stack) { 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 db77a47cb9d..966601a20ea 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -29,11 +29,12 @@ import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt; import org.jetbrains.kotlin.util.slicedMap.BasicWritableSlice; import org.jetbrains.kotlin.util.slicedMap.Slices; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; @@ -43,7 +44,6 @@ import java.util.*; import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; -import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; public class CodegenBinding { public static final WritableSlice CLOSURE = Slices.createSimpleSlice(); @@ -137,7 +137,7 @@ public class CodegenBinding { return asmTypeForAnonymousClass(bindingContext, variableDescriptor); } - throw new IllegalStateException("Couldn't compute ASM type for " + PsiUtilPackage.getElementTextWithContext(expression)); + throw new IllegalStateException("Couldn't compute ASM type for " + PsiUtilsKt.getElementTextWithContext(expression)); } @NotNull @@ -207,14 +207,14 @@ public class CodegenBinding { ) { ScriptDescriptor descriptor = trace.getBindingContext().get(SCRIPT, script); if (descriptor == null) { - throw new IllegalStateException("Script descriptor is not found for PSI: " + PsiUtilPackage.getElementTextWithContext(script)); + throw new IllegalStateException("Script descriptor is not found for PSI: " + PsiUtilsKt.getElementTextWithContext(script)); } String simpleName = asmType.getInternalName().substring(asmType.getInternalName().lastIndexOf('/') + 1); ClassDescriptorImpl classDescriptor = new ClassDescriptorImpl(descriptor, Name.special(""), Modality.FINAL, - Collections.singleton(DescriptorUtilPackage.getBuiltIns(descriptor).getAnyType()), - toSourceElement(script)); + Collections.singleton(DescriptorUtilsKt.getBuiltIns(descriptor).getAnyType()), + KotlinSourceElementKt.toSourceElement(script)); classDescriptor.initialize(JetScope.Empty.INSTANCE$, Collections.emptySet(), null); recordClosure(trace, classDescriptor, null, asmType, fileClassesManager); 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 06e9d24b1dc..43d1c38fb0c 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/PsiCodegenPredictor.java @@ -22,7 +22,7 @@ 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.fileClasses.FileClassesPackage; +import org.jetbrains.kotlin.fileClasses.FileClasses; import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; @@ -75,7 +75,7 @@ public final class PsiCodegenPredictor { if (declaration instanceof JetNamedFunction) { Name name = ((JetNamedFunction) declaration).getNameAsName(); - return name == null ? null : FileClassesPackage.getFileClassInternalName(fileClassesProvider, containingFile) + "$" + name.asString(); + return name == null ? null : FileClasses.getFileClassInternalName(fileClassesProvider, containingFile) + "$" + name.asString(); } parentInternalName = AsmUtil.internalNameByFqNameWithoutInnerClasses(containingFile.getPackageFqName()); diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java index d36f6d14f6d..6ed46378719 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/FieldOwnerContext.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; -import org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.jvm.annotations.AnnotationUtilKt; import java.util.HashMap; import java.util.Map; @@ -65,7 +65,7 @@ public abstract class FieldOwnerContext extends String actualName = descriptor2Name.get(descriptor); if (actualName != null) return actualName; - String newName = descriptor2Name.isEmpty() || AnnotationsPackage.hasJvmFieldAnnotation(descriptor) + String newName = descriptor2Name.isEmpty() || AnnotationUtilKt.hasJvmFieldAnnotation(descriptor) ? defaultPropertyName : defaultPropertyName + "$" + descriptor2Name.size(); descriptor2Name.put(descriptor, newName); 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 4d7fd644802..d59917095bb 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegen.java @@ -65,8 +65,6 @@ import static org.jetbrains.kotlin.codegen.AsmUtil.isPrimitive; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.CLASS_FOR_SCRIPT; import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil.addInlineMarker; import static org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil.getConstant; -import static org.jetbrains.kotlin.codegen.inline.InlinePackage.getClassFilePath; -import static org.jetbrains.kotlin.codegen.inline.InlinePackage.getSourceFilePath; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isFunctionLiteral; public class InlineCodegen extends CallGenerator { @@ -766,8 +764,8 @@ public class InlineCodegen extends CallGenerator { if (incrementalCompilationComponents == null || targetId == null) return; IncrementalCache incrementalCache = incrementalCompilationComponents.getIncrementalCache(targetId); - String sourceFile = getClassFilePath(sourceDescriptor, incrementalCache); - String targetFile = getSourceFilePath(targetDescriptor); + String sourceFile = InlineCodegenUtilsKt.getClassFilePath(sourceDescriptor, incrementalCache); + String targetFile = InlineCodegenUtilsKt.getSourceFilePath(targetDescriptor); incrementalCache.registerInline(sourceFile, jvmSignature.toString(), targetFile); } 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 0cb5e8c4dd9..27f5e48a62e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.codegen.context.MethodContext; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.fileClasses.FileClassesPackage; +import org.jetbrains.kotlin.fileClasses.FileClasses; import org.jetbrains.kotlin.fileClasses.JvmFileClassesProvider; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.JvmVirtualFileFinder; @@ -44,10 +44,9 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; -import org.jetbrains.kotlin.types.expressions.OperatorConventions; import org.jetbrains.kotlin.util.OperatorNameConventions; import org.jetbrains.org.objectweb.asm.*; import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter; @@ -173,7 +172,7 @@ public class InlineCodegenUtil { return PackageClassUtils.getPackageClassId(getFqName(containerDescriptor).toSafe()); } if (containerDescriptor instanceof ClassDescriptor) { - ClassId classId = DescriptorUtilPackage.getClassId((ClassDescriptor) containerDescriptor); + ClassId classId = DescriptorUtilsKt.getClassId((ClassDescriptor) containerDescriptor); if (isInterface(containerDescriptor)) { FqName relativeClassName = classId.getRelativeClassName(); //TODO test nested trait fun inlining @@ -205,7 +204,7 @@ public class InlineCodegenUtil { if (file == null) { implementationOwnerType = CodegenContextUtil.getImplementationOwnerClassType(codegenContext); } else { - implementationOwnerType = FileClassesPackage.getFileClassType(fileClassesProvider, (JetFile) file); + implementationOwnerType = FileClasses.getFileClassType(fileClassesProvider, (JetFile) file); } if (implementationOwnerType == null) { diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java index f45c128ebd3..c207fc5b188 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InternalFinallyBlockInliner.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.ReadOnly; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.kotlin.codegen.optimization.common.CommonPackage; +import org.jetbrains.kotlin.codegen.optimization.common.UtilKt; import org.jetbrains.org.objectweb.asm.Label; import org.jetbrains.org.objectweb.asm.Opcodes; import org.jetbrains.org.objectweb.asm.Type; @@ -153,7 +153,7 @@ public class InternalFinallyBlockInliner extends CoveringTryCatchNodeProcessor { // Each group that corresponds to try/*catches*/finally contains tryCatch block with default handler. // For each such group we should insert corresponding finally before non-local return. // So we split all try blocks on current instructions to groups and process them independently - List> clustersFromInnermost = InlinePackage.doClustering( + List> clustersFromInnermost = TryBlockClusteringKt.doClustering( currentCoveringNodesFromInnermost); Iterator> tryCatchBlockIterator = clustersFromInnermost.iterator(); @@ -304,7 +304,7 @@ public class InternalFinallyBlockInliner extends CoveringTryCatchNodeProcessor { ) { //copy tryCatchFinallies that totally in finally block - List> clusters = InlinePackage.doClustering(tryCatchBlockPresentInFinally); + List> clusters = TryBlockClusteringKt.doClustering(tryCatchBlockPresentInFinally); Map> handler2Cluster = new HashMap>(); IntervalMetaInfo tryBlocksMetaInfo = getTryBlocksMetaInfo(); @@ -522,7 +522,7 @@ public class InternalFinallyBlockInliner extends CoveringTryCatchNodeProcessor { @Nullable private static AbstractInsnNode getNextMeaningful(@NotNull AbstractInsnNode node) { AbstractInsnNode result = node.getNext(); - while (result != null && !CommonPackage.isMeaningful(result)) { + while (result != null && !UtilKt.isMeaningful(result)) { result = result.getNext(); } return result; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.java index a80ca87939b..633e0d47493 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/optimization/OptimizationMethodVisitor.java @@ -21,8 +21,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.inline.InlineCodegenUtil; import org.jetbrains.kotlin.codegen.optimization.boxing.RedundantBoxingMethodTransformer; import org.jetbrains.kotlin.codegen.optimization.boxing.RedundantNullCheckMethodTransformer; -import org.jetbrains.kotlin.codegen.optimization.common.CommonPackage; -import org.jetbrains.kotlin.codegen.optimization.fixStack.FixStackMethodTransformer; +import org.jetbrains.kotlin.codegen.optimization.common.UtilKt; import org.jetbrains.kotlin.codegen.optimization.transformer.MethodTransformer; import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; @@ -83,7 +82,7 @@ public class OptimizationMethodVisitor extends MethodVisitor { transformer.transform("fake", methodNode); } } - CommonPackage.prepareForEmitting(methodNode); + UtilKt.prepareForEmitting(methodNode); } methodNode.accept(new EndIgnoringMethodVisitorDecorator(Opcodes.ASM5, delegate)); 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 bd8288b2d20..d90971a1071 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/state/JetTypeMapper.java @@ -51,10 +51,11 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFunctionLiteral; import org.jetbrains.kotlin.psi.JetFunctionLiteralExpression; import org.jetbrains.kotlin.resolve.*; -import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; 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.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.AsmTypes; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.resolve.jvm.JvmPrimitiveType; @@ -80,7 +81,6 @@ import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.*; import static org.jetbrains.kotlin.resolve.BindingContextUtils.getDelegationConstructorCall; import static org.jetbrains.kotlin.resolve.BindingContextUtils.isVarCapturedInClosure; import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; import static org.jetbrains.kotlin.resolve.jvm.AsmTypes.DEFAULT_CONSTRUCTOR_MARKER; import static org.jetbrains.org.objectweb.asm.Opcodes.*; @@ -562,7 +562,7 @@ public class JetTypeMapper { if (declarationElement == null) { String message = "Error type encountered: %s (%s)."; - if (TypesPackage.upperIfFlexible(type) instanceof DeserializedType) { + if (FlexibleTypesKt.upperIfFlexible(type) instanceof DeserializedType) { message += " One of the possible reasons may be that this type is not directly accessible from this module. " + "To workaround this error, try adding an explicit dependency on the module or library which contains this type " + @@ -719,7 +719,7 @@ public class JetTypeMapper { boolean isStaticInvocation = (isStaticDeclaration(functionDescriptor) && !(functionDescriptor instanceof ImportedFromObjectCallableDescriptor)) || isStaticAccessor(functionDescriptor) || - AnnotationsPackage.isPlatformStaticInObjectOrClass(functionDescriptor); + AnnotationUtilKt.isPlatformStaticInObjectOrClass(functionDescriptor); if (isStaticInvocation) { invokeOpcode = INVOKESTATIC; } @@ -1161,8 +1161,8 @@ public class JetTypeMapper { ClassDescriptor containingDeclaration = descriptor.getContainingDeclaration(); if (containingDeclaration.getKind() == ClassKind.ENUM_CLASS || containingDeclaration.getKind() == ClassKind.ENUM_ENTRY) { - writeParameter(sw, JvmMethodParameterKind.ENUM_NAME_OR_ORDINAL, getBuiltIns(descriptor).getStringType()); - writeParameter(sw, JvmMethodParameterKind.ENUM_NAME_OR_ORDINAL, getBuiltIns(descriptor).getIntType()); + writeParameter(sw, JvmMethodParameterKind.ENUM_NAME_OR_ORDINAL, DescriptorUtilsKt.getBuiltIns(descriptor).getStringType()); + writeParameter(sw, JvmMethodParameterKind.ENUM_NAME_OR_ORDINAL, DescriptorUtilsKt.getBuiltIns(descriptor).getIntType()); } if (closure == null) return; 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 12060228b3f..9531deb6b37 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 @@ -41,7 +41,7 @@ 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 org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.StringsKt; import java.util.ArrayList; import java.util.Collection; @@ -114,7 +114,7 @@ public final class AnalyzerWithCompilerReport { assert unresolved != null && !unresolved.isEmpty() : "Incomplete hierarchy should be reported with names of unresolved superclasses: " + fqName; message.append(" class ").append(fqName) - .append(", unresolved supertypes: ").append(UtilsPackage.join(unresolved, ", ")) + .append(", unresolved supertypes: ").append(StringsKt.join(unresolved, ", ")) .append("\n"); } messageCollector.report(CompilerMessageSeverity.ERROR, message.toString(), CompilerMessageLocation.NO_LOCATION); 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 013a88d9ca3..4147daab9fe 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -37,12 +37,13 @@ import org.jetbrains.kotlin.cli.common.ExitCode; import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.kotlin.cli.common.arguments.K2JsArgumentConstants; import org.jetbrains.kotlin.cli.common.messages.*; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.CompilerJarLocator; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.config.Services; import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus; import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS; @@ -62,7 +63,6 @@ import java.util.List; import static org.jetbrains.kotlin.cli.common.ExitCode.COMPILATION_ERROR; import static org.jetbrains.kotlin.cli.common.ExitCode.OK; import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoots; public class K2JSCompiler extends CLICompiler { @@ -100,7 +100,7 @@ public class K2JSCompiler extends CLICompiler { configuration.put(JVMConfigurationKeys.COMPILER_JAR_LOCATOR, locator); } - addKotlinSourceRoots(configuration, arguments.freeArgs); + ContentRootsKt.addKotlinSourceRoots(configuration, arguments.freeArgs); KotlinCoreEnvironment environmentForJS = KotlinCoreEnvironment.createForProduction(rootDisposable, configuration, EnvironmentConfigFiles.JS_CONFIG_FILES); @@ -205,7 +205,7 @@ public class K2JSCompiler extends CLICompiler { ProgressIndicatorAndCompilationCanceledStatus.checkCanceled(); - OutputUtilsPackage.writeAll(outputFiles, outputDir, messageSeverityCollector); + OutputUtilsKt.writeAll(outputFiles, outputDir, messageSeverityCollector); return OK; } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java index fd44dc51639..6e890cdf256 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -40,8 +40,8 @@ import org.jetbrains.kotlin.codegen.ClassFileFactory; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.kotlin.utils.PathUtil; -import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.*; import java.util.Collection; @@ -105,10 +105,10 @@ public class CompileEnvironmentUtil { throw new CompileEnvironmentException("Invalid jar path " + jarPath, e); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } finally { - UtilsPackage.closeQuietly(outputStream); + ExceptionUtilsKt.closeQuietly(outputStream); } } 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 698b4dbc49b..13ae807f882 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 @@ -34,12 +34,15 @@ import org.jetbrains.kotlin.cli.common.CompilerPlugin; 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.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; +import org.jetbrains.kotlin.cli.jvm.config.ModuleNameKt; import org.jetbrains.kotlin.codegen.*; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.context.ModuleContext; import org.jetbrains.kotlin.idea.MainFunctionDetector; import org.jetbrains.kotlin.load.kotlin.ModuleVisibilityManager; @@ -47,8 +50,8 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents; import org.jetbrains.kotlin.modules.Module; -import org.jetbrains.kotlin.modules.ModulesPackage; import org.jetbrains.kotlin.modules.TargetId; +import org.jetbrains.kotlin.modules.TargetIdKt; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; @@ -60,8 +63,6 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.ScriptNameUtil; import org.jetbrains.kotlin.resolve.jvm.JvmClassName; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; -import org.jetbrains.kotlin.serialization.PackageData; -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; import org.jetbrains.kotlin.util.PerformanceCounter; import org.jetbrains.kotlin.utils.KotlinPaths; @@ -71,9 +72,6 @@ import java.net.URLClassLoader; import java.util.*; import java.util.concurrent.TimeUnit; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.*; -import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoots; - public class KotlinToJVMBytecodeCompiler { private KotlinToJVMBytecodeCompiler() { @@ -106,7 +104,7 @@ public class KotlinToJVMBytecodeCompiler { } else { MessageCollector messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE); - OutputUtilsPackage.writeAll(outputFiles, outputDir == null ? new File(".") : outputDir, messageCollector); + OutputUtilsKt.writeAll(outputFiles, outputDir == null ? new File(".") : outputDir, messageCollector); } } @@ -174,18 +172,18 @@ public class KotlinToJVMBytecodeCompiler { CompilerConfiguration configuration = base.copy(); for (Module module : chunk) { - addKotlinSourceRoots(configuration, getAbsolutePaths(directory, module)); + ContentRootsKt.addKotlinSourceRoots(configuration, getAbsolutePaths(directory, module)); } for (Module module : chunk) { for (String javaSourceRoot : module.getJavaSourceRoots()) { - addJavaSourceRoot(configuration, new File(javaSourceRoot)); + JvmContentRootsKt.addJavaSourceRoot(configuration, new File(javaSourceRoot)); } } for (Module module : chunk) { for (String classpathRoot : module.getClasspathRoots()) { - addJvmClasspathRoot(configuration, new File(classpathRoot)); + JvmContentRootsKt.addJvmClasspathRoot(configuration, new File(classpathRoot)); } } @@ -276,7 +274,7 @@ public class KotlinToJVMBytecodeCompiler { GeneratedClassLoader classLoader; try { List classPaths = Lists.newArrayList(paths.getRuntimePath().toURI().toURL()); - for (File file : getJvmClasspathRoots(configuration)) { + for (File file : JvmContentRootsKt.getJvmClasspathRoots(configuration)) { classPaths.add(file.toURI().toURL()); } //noinspection UnnecessaryFullyQualifiedName @@ -321,7 +319,8 @@ public class KotlinToJVMBytecodeCompiler { public AnalysisResult invoke() { BindingTrace sharedTrace = new CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(); ModuleContext moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.getProject(), - getModuleName(environment)); + ModuleNameKt + .getModuleName(environment)); return TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationWithCustomContext( moduleContext, @@ -374,7 +373,7 @@ public class KotlinToJVMBytecodeCompiler { obsoleteMultifileClasses = Collections.emptyList(); } else { - targetId = ModulesPackage.TargetId(module); + targetId = TargetIdKt.TargetId(module); IncrementalCache incrementalCache = incrementalCompilationComponents.getIncrementalCache(targetId); packagesWithObsoleteParts = new HashSet(); diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java index c3007b45491..6967832c898 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/repl/ReplFromTerminal.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.cli.jvm.repl.reader.ConsoleReplCommandReader; import org.jetbrains.kotlin.cli.jvm.repl.reader.IdeReplCommandReader; import org.jetbrains.kotlin.cli.jvm.repl.reader.ReplCommandReader; import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.io.PrintWriter; @@ -109,13 +109,13 @@ public class ReplFromTerminal { waitRepl.wait(); } catch (Throwable e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } if (replInterpreter != null) { return replInterpreter; } - throw UtilsPackage.rethrow(replInitializationFailed); + throw ExceptionUtilsKt.rethrow(replInitializationFailed); } } @@ -176,7 +176,7 @@ public class ReplFromTerminal { } } catch (Exception e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } 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 86c4cfe6b3e..692b05dff5a 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 @@ -38,8 +38,10 @@ import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; +import org.jetbrains.kotlin.cli.jvm.config.ModuleNameKt; import org.jetbrains.kotlin.cli.jvm.repl.di.ContainerForReplWithJava; -import org.jetbrains.kotlin.cli.jvm.repl.di.DiPackage; +import org.jetbrains.kotlin.cli.jvm.repl.di.InjectionKt; import org.jetbrains.kotlin.cli.jvm.repl.messages.DiagnosticMessageHolder; import org.jetbrains.kotlin.cli.jvm.repl.messages.ReplIdeDiagnosticMessageHolder; import org.jetbrains.kotlin.cli.jvm.repl.messages.ReplSystemInWrapper; @@ -68,7 +70,7 @@ 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.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.org.objectweb.asm.Type; import java.io.File; @@ -83,8 +85,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.getJvmClasspathRoots; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.getModuleName; import static org.jetbrains.kotlin.codegen.AsmUtil.asmTypeByFqNameWithoutInnerClasses; import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.registerClassNameForScript; import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; @@ -121,7 +121,8 @@ public class ReplInterpreter { Project project = environment.getProject(); this.psiFileFactory = (PsiFileFactoryImpl) PsiFileFactory.getInstance(project); this.trace = new CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(); - MutableModuleContext moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, getModuleName(environment)); + MutableModuleContext moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(project, ModuleNameKt + .getModuleName(environment)); this.module = moduleContext.getModule(); scriptDeclarationFactory = new ScriptMutableDeclarationProviderFactory(); @@ -134,7 +135,7 @@ public class ReplInterpreter { } }; - ContainerForReplWithJava container = DiPackage.createContainerForReplWithJava( + ContainerForReplWithJava container = InjectionKt.createContainerForReplWithJava( moduleContext, trace, scriptDeclarationFactory, @@ -156,12 +157,12 @@ public class ReplInterpreter { )); List classpath = Lists.newArrayList(); - for (File file : getJvmClasspathRoots(configuration)) { + for (File file : JvmContentRootsKt.getJvmClasspathRoots(configuration)) { try { classpath.add(file.toURI().toURL()); } catch (MalformedURLException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -363,7 +364,7 @@ public class ReplInterpreter { PrintWriter writer = new PrintWriter(System.err); classLoader.dumpClasses(writer); writer.flush(); - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } 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 333c14dc1a5..c5fb0515834 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 @@ -29,7 +29,7 @@ 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.JavaDescriptorResolverKt; import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.AlternativeFieldSignatureData; import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.AlternativeMethodSignatureData; import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.SignaturesPropagationData; @@ -86,7 +86,7 @@ public class TraceBasedExternalSignatureResolver implements ExternalSignatureRes ); if (data.isAnnotated() && !data.hasErrors()) { - if (JvmPackage.getPLATFORM_TYPES()) { + if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) { return new AlternativeMethodSignature(returnType, receiverType, valueParameters, typeParameters, Collections.emptyList(), hasStableParameterNames); } @@ -108,7 +108,7 @@ public class TraceBasedExternalSignatureResolver implements ExternalSignatureRes AlternativeFieldSignatureData data = new AlternativeFieldSignatureData(field, returnType, project, isVar); if (data.isAnnotated() && !data.hasErrors()) { - if (JvmPackage.getPLATFORM_TYPES()) { + if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) { return new AlternativeFieldSignature(returnType, null); } return new AlternativeFieldSignature(data.getReturnType(), null); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java index f93d1107eb1..1de6557c7cb 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/load/java/sam/SingleAbstractMethodUtils.java @@ -29,13 +29,13 @@ import org.jetbrains.kotlin.load.java.lazy.types.LazyJavaTypeResolver; import org.jetbrains.kotlin.load.java.structure.*; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverKt; import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; -import org.jetbrains.kotlin.resolve.jvm.JvmPackage; import org.jetbrains.kotlin.types.*; import java.util.*; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; import static org.jetbrains.kotlin.types.Variance.INVARIANT; public class SingleAbstractMethodUtils { @@ -103,7 +103,7 @@ public class SingleAbstractMethodUtils { JetType type = fixProjections(substitute); if (type == null) return null; - if (JvmPackage.getPLATFORM_TYPES() && TypesPackage.isNullabilityFlexible(samType)) { + if (JavaDescriptorResolverKt.getPLATFORM_TYPES() && FlexibleTypesKt.isNullabilityFlexible(samType)) { return LazyJavaTypeResolver.FlexibleJavaClassifierTypeCapabilities.create(type, TypeUtils.makeNullable(type)); } @@ -122,7 +122,7 @@ public class SingleAbstractMethodUtils { for (ValueParameterDescriptor parameter : valueParameters) { parameterTypes.add(parameter.getType()); } - return getBuiltIns(function).getFunctionType(Annotations.Companion.getEMPTY(), null, parameterTypes, returnType); + return DescriptorUtilsKt.getBuiltIns(function).getFunctionType(Annotations.Companion.getEMPTY(), null, parameterTypes, returnType); } private static boolean isSamInterface(@NotNull ClassDescriptor klass) { 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 10e215274ce..4d1846d54e0 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 @@ -21,21 +21,22 @@ import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.context.ContextKt; import org.jetbrains.kotlin.context.ModuleContext; import org.jetbrains.kotlin.context.MutableModuleContext; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentProvider; import org.jetbrains.kotlin.descriptors.PackagePartProvider; import org.jetbrains.kotlin.frontend.java.di.ContainerForTopDownAnalyzerForJvm; -import org.jetbrains.kotlin.frontend.java.di.DiPackage; +import org.jetbrains.kotlin.frontend.java.di.InjectionKt; import org.jetbrains.kotlin.incremental.components.LookupTracker; import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider; import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackagePartProvider; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents; import org.jetbrains.kotlin.modules.Module; -import org.jetbrains.kotlin.modules.ModulesPackage; import org.jetbrains.kotlin.modules.TargetId; +import org.jetbrains.kotlin.modules.TargetIdKt; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; @@ -104,13 +105,13 @@ public enum TopDownAnalyzerFacadeForJVM { targetIds = new ArrayList(modules.size()); for (Module module : modules) { - targetIds.add(ModulesPackage.TargetId(module)); + targetIds.add(TargetIdKt.TargetId(module)); } } packagePartProvider = IncrementalPackagePartProvider.create(packagePartProvider, files, targetIds, incrementalCompilationComponents, moduleContext.getStorageManager()); - ContainerForTopDownAnalyzerForJvm container = DiPackage.createContainerForTopDownAnalyzerForJvm( + ContainerForTopDownAnalyzerForJvm container = InjectionKt.createContainerForTopDownAnalyzerForJvm( moduleContext, trace, providerFactory, @@ -154,7 +155,7 @@ public enum TopDownAnalyzerFacadeForJVM { @NotNull public static MutableModuleContext createContextWithSealedModule(@NotNull Project project, @NotNull String moduleName) { - MutableModuleContext context = ContextForNewModule( + MutableModuleContext context = ContextKt.ContextForNewModule( project, Name.special("<" + moduleName + ">"), JvmPlatform.INSTANCE$ ); context.setDependencies(context.getModule(), JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsModule()); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java index 36d9e372418..f332c930504 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeFieldSignatureData.java @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.load.java.structure.JavaField; import org.jetbrains.kotlin.psi.JetProperty; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.types.JetType; import java.util.HashMap; @@ -46,7 +47,7 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa } setAnnotated(true); - JetProperty altPropertyDeclaration = JetPsiFactory(project).createProperty(signature); + JetProperty altPropertyDeclaration = JetPsiFactoryKt.JetPsiFactory(project).createProperty(signature); try { checkForSyntaxErrors(altPropertyDeclaration); diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.java index 670a6d8ca48..6e53ee27c16 100644 --- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/AlternativeMethodSignatureData.java @@ -22,7 +22,6 @@ import com.intellij.util.containers.ComparatorUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.SourceElement; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; @@ -31,16 +30,14 @@ import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.kotlin.load.java.structure.JavaMember; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverKt; import org.jetbrains.kotlin.resolve.jvm.JavaResolverUtils; -import org.jetbrains.kotlin.resolve.jvm.JvmPackage; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeSubstitutor; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.Variance; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; +import org.jetbrains.kotlin.types.typeUtil.TypeUtilsKt; import java.util.ArrayList; import java.util.List; @@ -83,7 +80,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD } setAnnotated(true); - altFunDeclaration = JetPsiFactory(project).createFunction(signature); + altFunDeclaration = JetPsiFactoryKt.JetPsiFactory(project).createFunction(signature); originalToAltTypeParameters = JavaResolverUtils.recreateTypeParametersAndReturnMapping(methodTypeParameters, null); @@ -125,7 +122,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD @NotNull List methodTypeParameters, @Nullable JetType returnType ) { - if (JvmPackage.getPLATFORM_TYPES()) return; + if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) return; TypeSubstitutor substitutor = JavaResolverUtils.createSubstitutorForTypeParameters(originalToAltTypeParameters); for (ValueParameterDescriptor parameter : valueParameters) { @@ -260,7 +257,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD if (altUpperBounds.size() != originalUpperBounds.size()) { if (altUpperBounds.isEmpty() && originalUpperBounds.size() == 1 - && TypeUtilPackage.isDefaultBound(originalUpperBounds.iterator().next())) { + && TypeUtilsKt.isDefaultBound(originalUpperBounds.iterator().next())) { // Only default bound => no error } else { 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 d7ac575708b..ebdd57fc487 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 @@ -39,11 +39,12 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; +import org.jetbrains.kotlin.resolve.jvm.JavaDescriptorResolverKt; 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.jvm.jvmSignature.KotlinToJvmSignatureMapperKt; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.*; @@ -51,7 +52,6 @@ import java.util.*; import static org.jetbrains.kotlin.load.java.components.TypeUsage.*; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; import static org.jetbrains.kotlin.types.Variance.INVARIANT; public class SignaturesPropagationData { @@ -156,7 +156,7 @@ public class SignaturesPropagationData { private JetType modifyReturnTypeAccordingToSuperMethods( @NotNull JetType autoType // type built by JavaTypeTransformer ) { - if (JvmPackage.getPLATFORM_TYPES()) return autoType; + if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) return autoType; List typesFromSuperMethods = ContainerUtil.map(superFunctions, new Function() { @@ -171,7 +171,7 @@ public class SignaturesPropagationData { } private List modifyTypeParametersAccordingToSuperMethods(List autoTypeParameters) { - if (JvmPackage.getPLATFORM_TYPES()) return autoTypeParameters; + if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) return autoTypeParameters; List result = Lists.newArrayList(); @@ -266,7 +266,7 @@ public class SignaturesPropagationData { stableName != null ? stableName : originalParam.getName(), altType, originalParam.declaresDefaultValue(), - varargCheckResult.isVararg ? getBuiltIns(originalParam).getArrayElementType(altType) : null, + varargCheckResult.isVararg ? DescriptorUtilsKt.getBuiltIns(originalParam).getArrayElementType(altType) : null, SourceElement.NO_SOURCE )); } @@ -306,7 +306,7 @@ public class SignaturesPropagationData { Collection superFunctionCandidates = supertype.getMemberScope().getFunctions(name, NoLookupLocation.WHEN_GET_SUPER_MEMBERS); for (FunctionDescriptor candidate : superFunctionCandidates) { JvmMethodSignature candidateSignature = SIGNATURE_MAPPER.mapToJvmMethodSignature(candidate); - if (JvmSignaturePackage.erasedSignaturesEqualIgnoringReturnTypes(autoSignature, candidateSignature)) { + if (KotlinToJvmSignatureMapperKt.erasedSignaturesEqualIgnoringReturnTypes(autoSignature, candidateSignature)) { superFunctions.add(candidate); } } @@ -394,7 +394,7 @@ public class SignaturesPropagationData { ) { if (autoType.isError()) return autoType; - if (JvmPackage.getPLATFORM_TYPES()) return autoType; + if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) return autoType; boolean resultNullable = typeMustBeNullable(autoType, typesFromSuper, howThisTypeIsUsed); ClassifierDescriptor resultClassifier = modifyTypeClassifier(autoType, typesFromSuper); 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 3a46b07d6e9..50b7a947e0a 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 @@ -32,7 +32,7 @@ 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.JavaDescriptorResolverKt; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.*; @@ -136,7 +136,7 @@ public class TypeTransformingVisitor extends JetVisitor { List arguments = originalType.getArguments(); if (arguments.size() != type.getTypeArgumentsAsTypes().size()) { - if (JvmPackage.getPLATFORM_TYPES()) return originalType; + if (JavaDescriptorResolverKt.getPLATFORM_TYPES()) return originalType; throw new AlternativeSignatureMismatchException("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them", DescriptorRenderer.FQ_NAMES_IN_TYPES.renderType(originalType), arguments.size(), type.getText(), @@ -189,7 +189,7 @@ public class TypeTransformingVisitor extends JetVisitor { if (type instanceof JetUserType) { JetTypeProjection typeProjection = ((JetUserType) type).getTypeArguments().get(i); altProjectionKind = TypeResolver.resolveProjectionKind(typeProjection.getProjectionKind()); - if (altProjectionKind != projectionKind && projectionKind != Variance.INVARIANT && !JvmPackage.getPLATFORM_TYPES()) { + if (altProjectionKind != projectionKind && projectionKind != Variance.INVARIANT && !JavaDescriptorResolverKt.getPLATFORM_TYPES()) { throw new AlternativeSignatureMismatchException("Projection kind mismatch, actual: %s, in alternative signature: %s", projectionKind, altProjectionKind); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java index 784a3648e0b..a85b970d8ea 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetControlFlowProcessor.java @@ -42,11 +42,12 @@ 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.psi.psiUtil.JetPsiUtilKt; 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.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; @@ -270,7 +271,7 @@ public class JetControlFlowProcessor { @NotNull private AccessTarget getResolvedCallAccessTarget(JetElement element) { - ResolvedCall resolvedCall = getResolvedCall(element, trace.getBindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(element, trace.getBindingContext()); return resolvedCall != null ? new AccessTarget.Call(resolvedCall) : AccessTarget.BlackBox.INSTANCE$; } @@ -303,7 +304,7 @@ public class JetControlFlowProcessor { @Override public void visitThisExpression(@NotNull JetThisExpression expression) { - ResolvedCall resolvedCall = getResolvedCall(expression, trace.getBindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, trace.getBindingContext()); if (resolvedCall == null) { createNonSyntheticValue(expression, MagicKind.UNRESOLVED_CALL); return; @@ -325,7 +326,7 @@ public class JetControlFlowProcessor { @Override public void visitSimpleNameExpression(@NotNull JetSimpleNameExpression expression) { - ResolvedCall resolvedCall = getResolvedCall(expression, trace.getBindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, trace.getBindingContext()); if (resolvedCall instanceof VariableAsFunctionResolvedCall) { VariableAsFunctionResolvedCall variableAsFunctionResolvedCall = (VariableAsFunctionResolvedCall) resolvedCall; generateCall(variableAsFunctionResolvedCall.getVariableCall()); @@ -360,7 +361,7 @@ public class JetControlFlowProcessor { visitAssignment(left, getDeferredValue(right), expression); } else if (OperatorConventions.ASSIGNMENT_OPERATIONS.containsKey(operationType)) { - ResolvedCall resolvedCall = getResolvedCall(expression, trace.getBindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, trace.getBindingContext()); if (resolvedCall != null) { PseudoValue rhsValue = generateCall(resolvedCall).getOutputValue(); Name assignMethodName = OperatorConventions.getNameForOperationSymbol((JetToken) expression.getOperationToken()); @@ -467,7 +468,7 @@ public class JetControlFlowProcessor { Map receiverValues = SmartFMap.emptyMap(); AccessTarget accessTarget = AccessTarget.BlackBox.INSTANCE$; if (left instanceof JetSimpleNameExpression || left instanceof JetQualifiedExpression) { - accessTarget = getResolvedCallAccessTarget(PsiUtilPackage.getQualifiedElementSelector(left)); + accessTarget = getResolvedCallAccessTarget(JetPsiUtilKt.getQualifiedElementSelector(left)); if (accessTarget instanceof AccessTarget.Call) { receiverValues = getReceiverValues(((AccessTarget.Call) accessTarget).getResolvedCall()); } @@ -602,7 +603,7 @@ public class JetControlFlowProcessor { } boolean incrementOrDecrement = isIncrementOrDecrement(operationType); - ResolvedCall resolvedCall = getResolvedCall(expression, trace.getBindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, trace.getBindingContext()); PseudoValue rhsValue; if (resolvedCall != null) { @@ -1472,7 +1473,7 @@ public class JetControlFlowProcessor { private boolean generateCall(@Nullable JetElement callElement) { if (callElement == null) return false; - return checkAndGenerateCall(getResolvedCall(callElement, trace.getBindingContext())); + return checkAndGenerateCall(CallUtilKt.getResolvedCall(callElement, trace.getBindingContext())); } private boolean checkAndGenerateCall(@Nullable ResolvedCall resolvedCall) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index f8f53aad06e..9da67e75985 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -30,10 +30,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableControlFlowState; import org.jetbrains.kotlin.cfg.PseudocodeVariablesData.VariableUseState; -import org.jetbrains.kotlin.cfg.pseudocode.PseudoValue; -import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; -import org.jetbrains.kotlin.cfg.pseudocode.PseudocodePackage; -import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeUtil; +import org.jetbrains.kotlin.cfg.pseudocode.*; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor; import org.jetbrains.kotlin.cfg.pseudocode.instructions.JetElementInstruction; @@ -44,7 +41,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.MarkInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.VariableDeclarationInstruction; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.Edges; -import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage; +import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserKt; import org.jetbrains.kotlin.cfg.pseudocodeTraverser.TraversalOrder; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptorKt; @@ -55,10 +52,10 @@ import org.jetbrains.kotlin.idea.MainFunctionDetector; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; 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.bindingContextUtil.BindingContextUtilsKt; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.resolve.calls.resolvedCallUtil.ResolvedCallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.resolvedCallUtil.ResolvedCallUtilKt; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; @@ -311,7 +308,7 @@ public class JetFlowInformationProvider { final Map> reportedDiagnosticMap = Maps.newHashMap(); - PseudocodeTraverserPackage.traverse( + PseudocodeTraverserKt.traverse( pseudocode, FORWARD, initializers, new InstructionDataAnalyzeStrategy>() { @Override @@ -424,7 +421,7 @@ public class JetFlowInformationProvider { DeclarationDescriptor descriptor = BindingContextUtils.getEnclosingDescriptor(trace.getBindingContext(), expression); PropertySetterDescriptor setterDescriptor = ((PropertyDescriptor) variableDescriptor).getSetter(); - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, trace.getBindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, trace.getBindingContext()); ReceiverValue receiverValue = ReceiverValue.IRRELEVANT_RECEIVER; if (resolvedCall != null) { receiverValue = ExpressionTypingUtils @@ -708,7 +705,7 @@ public class JetFlowInformationProvider { } } }; - PseudocodeTraverserPackage.traverse(pseudocode, TraversalOrder.BACKWARD, variableStatusData, variableStatusAnalyzeStrategy); + PseudocodeTraverserKt.traverse(pseudocode, TraversalOrder.BACKWARD, variableStatusData, variableStatusAnalyzeStrategy); } //////////////////////////////////////////////////////////////////////////////// @@ -716,7 +713,7 @@ public class JetFlowInformationProvider { public void markUnusedExpressions() { final Map> reportedDiagnosticMap = Maps.newHashMap(); - PseudocodeTraverserPackage.traverse( + PseudocodeTraverserKt.traverse( pseudocode, FORWARD, new JetFlowInformationProvider.FunctionVoid1() { @Override public void execute(@NotNull Instruction instruction) { @@ -725,8 +722,8 @@ public class JetFlowInformationProvider { JetElement element = ((JetElementInstruction)instruction).getElement(); if (!(element instanceof JetExpression)) return; - if (BindingContextUtilPackage.isUsedAsStatement((JetExpression) element, trace.getBindingContext()) - && PseudocodePackage.getSideEffectFree(instruction)) { + if (BindingContextUtilsKt.isUsedAsStatement((JetExpression) element, trace.getBindingContext()) + && PseudocodeUtilsKt.getSideEffectFree(instruction)) { VariableContext ctxt = new VariableContext(instruction, reportedDiagnosticMap); report( element instanceof JetFunctionLiteralExpression @@ -744,7 +741,7 @@ public class JetFlowInformationProvider { // Statements public void markStatements() { - PseudocodeTraverserPackage.traverse( + PseudocodeTraverserKt.traverse( pseudocode, FORWARD, new JetFlowInformationProvider.FunctionVoid1() { @Override public void execute(@NotNull Instruction instruction) { @@ -762,7 +759,7 @@ public class JetFlowInformationProvider { } public void markWhenWithoutElse() { - PseudocodeTraverserPackage.traverse( + PseudocodeTraverserKt.traverse( pseudocode, FORWARD, new JetFlowInformationProvider.FunctionVoid1() { @Override public void execute(@NotNull Instruction instruction) { @@ -810,7 +807,7 @@ public class JetFlowInformationProvider { } } final Map calls = new HashMap(); - PseudocodeTraverserPackage.traverse( + PseudocodeTraverserKt.traverse( pseudocode, FORWARD, new FunctionVoid1() { @@ -818,7 +815,7 @@ public class JetFlowInformationProvider { if (!(instruction instanceof CallInstruction)) return; CallInstruction callInstruction = (CallInstruction) instruction; - ResolvedCall resolvedCall = getResolvedCall(callInstruction.getElement(), trace.getBindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(callInstruction.getElement(), trace.getBindingContext()); if (resolvedCall == null) return; // is this a recursive call? @@ -839,7 +836,7 @@ public class JetFlowInformationProvider { return; } - boolean isTail = PseudocodeTraverserPackage.traverseFollowingInstructions( + boolean isTail = PseudocodeTraverserKt.traverseFollowingInstructions( callInstruction, new HashSet(), FORWARD, @@ -853,7 +850,7 @@ public class JetFlowInformationProvider { // } // } boolean sameDispatchReceiver = - ResolvedCallUtilPackage.hasThisOrNoDispatchReceiver(resolvedCall, trace.getBindingContext()); + ResolvedCallUtilKt.hasThisOrNoDispatchReceiver(resolvedCall, trace.getBindingContext()); TailRecursionKind kind = isTail && sameDispatchReceiver ? TAIL_CALL : NON_TAIL; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java index 368938be928..99f536dbbce 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/WhenChecker.java @@ -25,7 +25,8 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.CompileTimeConstantUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt; +import org.jetbrains.kotlin.types.FlexibleTypesKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; @@ -34,7 +35,6 @@ import java.util.Set; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumClass; -import static org.jetbrains.kotlin.types.TypesPackage.isFlexible; public final class WhenChecker { private WhenChecker() { @@ -44,7 +44,7 @@ public final class WhenChecker { JetType expectedType = trace.get(BindingContext.EXPECTED_EXPRESSION_TYPE, expression); boolean isUnit = expectedType != null && KotlinBuiltIns.isUnit(expectedType); // Some "statements" are actually expressions returned from lambdas, their expected types are non-null - boolean isStatement = BindingContextUtilPackage.isUsedAsStatement(expression, trace.getBindingContext()) && expectedType == null; + boolean isStatement = BindingContextUtilsKt.isUsedAsStatement(expression, trace.getBindingContext()) && expectedType == null; return !isUnit && !isStatement && !isWhenExhaustive(expression, trace); } @@ -173,7 +173,7 @@ public final class WhenChecker { } if (exhaustive) { if (// Flexible (nullable) enum types are also counted as exhaustive - (enumClassDescriptor != null && isFlexible(type)) + (enumClassDescriptor != null && FlexibleTypesKt.isFlexible(type)) || containsNullCase(expression, trace) || !isNullableTypeWithoutPossibleSmartCast(expression.getSubjectExpression(), type, trace.getBindingContext())) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java index c7cd508fa19..7b8c3538c88 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeImpl.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.LocalFunctionDec import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineEnterInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitInstruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction; -import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserPackage; +import org.jetbrains.kotlin.cfg.pseudocodeTraverser.PseudocodeTraverserKt; import org.jetbrains.kotlin.psi.JetElement; import java.util.*; @@ -181,13 +181,13 @@ public class PseudocodeImpl implements Pseudocode { @Override public List getReversedInstructions() { LinkedHashSet traversedInstructions = Sets.newLinkedHashSet(); - PseudocodeTraverserPackage.traverseFollowingInstructions(sinkInstruction, traversedInstructions, BACKWARD, null); + PseudocodeTraverserKt.traverseFollowingInstructions(sinkInstruction, traversedInstructions, BACKWARD, null); if (traversedInstructions.size() < instructions.size()) { List simplyReversedInstructions = Lists.newArrayList(instructions); Collections.reverse(simplyReversedInstructions); for (Instruction instruction : simplyReversedInstructions) { if (!traversedInstructions.contains(instruction)) { - PseudocodeTraverserPackage.traverseFollowingInstructions(instruction, traversedInstructions, BACKWARD, null); + PseudocodeTraverserKt.traverseFollowingInstructions(instruction, traversedInstructions, BACKWARD, null); } } } @@ -243,7 +243,7 @@ public class PseudocodeImpl implements Pseudocode { addValueUsage(mergedValue, instruction); } } - if (PseudocodePackage.calcSideEffectFree(instruction)) { + if (PseudocodeUtilsKt.calcSideEffectFree(instruction)) { sideEffectFree.add(instruction); } } @@ -421,7 +421,7 @@ public class PseudocodeImpl implements Pseudocode { private Set collectReachableInstructions() { Set visited = Sets.newHashSet(); - PseudocodeTraverserPackage.traverseFollowingInstructions(getEnterInstruction(), visited, FORWARD, null); + PseudocodeTraverserKt.traverseFollowingInstructions(getEnterInstruction(), visited, FORWARD, null); if (!visited.contains(getExitInstruction())) { visited.add(getExitInstruction()); } 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 c238202ae0a..134d90039bc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/pseudocode/PseudocodeUtil.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.resolve.calls.resolvedCallUtil.ResolvedCallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.resolvedCallUtil.ResolvedCallUtilKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; @@ -117,6 +117,6 @@ public class PseudocodeUtil { "AccessTarget.Declaration has no receivers and it's not BlackBox, so it should be Call"; ResolvedCall accessResolvedCall = ((AccessTarget.Call) accessTarget).getResolvedCall(); - return ResolvedCallUtilPackage.hasThisOrNoDispatchReceiver(accessResolvedCall, bindingContext); + return ResolvedCallUtilKt.hasThisOrNoDispatchReceiver(accessResolvedCall, bindingContext); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java index 0d64822b3cb..4099fe2a433 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/checkers/DebugInfoUtil.java @@ -34,9 +34,9 @@ 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.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.tasks.DynamicCallsKt; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; @@ -127,7 +127,7 @@ public class DebugInfoUtil { @Override public void visitThisExpression(@NotNull JetThisExpression expression) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, bindingContext); if (resolvedCall != null) { reportIfDynamic(expression, resolvedCall.getResultingDescriptor(), debugInfoReporter); } @@ -225,7 +225,7 @@ public class DebugInfoUtil { } private static boolean reportIfDynamic(JetElement element, DeclarationDescriptor declarationDescriptor, DebugInfoReporter debugInfoReporter) { - if (declarationDescriptor != null && TasksPackage.isDynamic(declarationDescriptor)) { + if (declarationDescriptor != null && DynamicCallsKt.isDynamic(declarationDescriptor)) { debugInfoReporter.reportDynamicCall(element, declarationDescriptor); return true; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters1Renderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters1Renderer.java index 1142bd5e160..de90a13a4db 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters1Renderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters1Renderer.java @@ -21,8 +21,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters1; import org.jetbrains.kotlin.renderer.Renderer; -import static org.jetbrains.kotlin.diagnostics.rendering.RenderingPackage.renderParameter; - public class DiagnosticWithParameters1Renderer extends AbstractDiagnosticWithParametersRenderer> { private final Renderer rendererForA; @@ -34,6 +32,6 @@ public class DiagnosticWithParameters1Renderer extends AbstractDiagnosticWith @NotNull @Override public Object[] renderParameters(@NotNull DiagnosticWithParameters1 diagnostic) { - return new Object[]{renderParameter(diagnostic.getA(), rendererForA)}; + return new Object[]{DiagnosticRendererUtilKt.renderParameter(diagnostic.getA(), rendererForA)}; } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters2Renderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters2Renderer.java index f8680dcf044..6dbfdb20d52 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters2Renderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters2Renderer.java @@ -21,8 +21,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.renderer.Renderer; -import static org.jetbrains.kotlin.diagnostics.rendering.RenderingPackage.renderParameter; - public class DiagnosticWithParameters2Renderer extends AbstractDiagnosticWithParametersRenderer> { private final Renderer rendererForA; private final Renderer rendererForB; @@ -37,7 +35,7 @@ public class DiagnosticWithParameters2Renderer extends AbstractDiagnosticW @Override public Object[] renderParameters(@NotNull DiagnosticWithParameters2 diagnostic) { return new Object[]{ - renderParameter(diagnostic.getA(), rendererForA), - renderParameter(diagnostic.getB(), rendererForB)}; + DiagnosticRendererUtilKt.renderParameter(diagnostic.getA(), rendererForA), + DiagnosticRendererUtilKt.renderParameter(diagnostic.getB(), rendererForB)}; } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters3Renderer.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters3Renderer.java index a1b02804c0a..2e2f547d1e7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters3Renderer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DiagnosticWithParameters3Renderer.java @@ -21,8 +21,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters3; import org.jetbrains.kotlin.renderer.Renderer; -import static org.jetbrains.kotlin.diagnostics.rendering.RenderingPackage.renderParameter; - public class DiagnosticWithParameters3Renderer extends AbstractDiagnosticWithParametersRenderer> { private final Renderer rendererForA; private final Renderer rendererForB; @@ -42,8 +40,8 @@ public class DiagnosticWithParameters3Renderer extends AbstractDiagnost @Override public Object[] renderParameters(@NotNull DiagnosticWithParameters3 diagnostic) { return new Object[]{ - renderParameter(diagnostic.getA(), rendererForA), - renderParameter(diagnostic.getB(), rendererForB), - renderParameter(diagnostic.getC(), rendererForC)}; + DiagnosticRendererUtilKt.renderParameter(diagnostic.getA(), rendererForA), + DiagnosticRendererUtilKt.renderParameter(diagnostic.getB(), rendererForB), + DiagnosticRendererUtilKt.renderParameter(diagnostic.getC(), rendererForC)}; } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java b/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java index 529747b87ae..ff8a5e0f855 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/idea/MainFunctionDetector.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeProjection; import org.jetbrains.kotlin.types.Variance; @@ -108,7 +108,7 @@ public class MainFunctionDetector { DeclarationDescriptor containingDeclaration = functionDescriptor.getContainingDeclaration(); return containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).getKind().isSingleton() - && AnnotationsPackage.hasPlatformStaticAnnotation(functionDescriptor); + && AnnotationUtilKt.hasPlatformStaticAnnotation(functionDescriptor); } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java index 8c19df8653b..c71a909b5a8 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractJetParsing.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.lexer.JetKeywordToken; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.kotlin.utils.strings.StringsPackage; +import org.jetbrains.kotlin.utils.strings.StringsKt; import java.util.HashMap; import java.util.Map; @@ -488,6 +488,6 @@ import static org.jetbrains.kotlin.lexer.JetTokens.*; @SuppressWarnings("UnusedDeclaration") @TestOnly public String currentContext() { - return StringsPackage.substringWithContext(myBuilder.getOriginalText(), myBuilder.getCurrentOffset(), myBuilder.getCurrentOffset(), 20); + return StringsKt.substringWithContext(myBuilder.getOriginalText(), myBuilder.getCurrentOffset(), myBuilder.getCurrentOffset(), 20); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java index 37a3ebd228b..27ef7d15bd2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetAnnotatedExpression.java @@ -20,10 +20,8 @@ import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.JetNodeTypes; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; public class JetAnnotatedExpression extends JetExpressionImpl implements JetAnnotated, JetAnnotationsContainer { @@ -50,6 +48,6 @@ public class JetAnnotatedExpression extends JetExpressionImpl implements JetAnno @Override @NotNull public List getAnnotationEntries() { - return PsiUtilPackage.collectAnnotationEntriesFromStubOrPsi(this); + return JetPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java index 20886ba1d4c..fdb0b6b60a5 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationImpl.java @@ -22,8 +22,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; -import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; -import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentPackage; +import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierKt; +import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentKt; import java.util.Collections; import java.util.List; @@ -47,18 +47,18 @@ abstract class JetDeclarationImpl extends JetExpressionImpl implements JetDeclar @Override public void addModifier(@NotNull JetModifierKeywordToken modifier) { - AddRemoveModifierPackage.addModifier(this, modifier); + AddRemoveModifierKt.addModifier(this, modifier); } @Override public void removeModifier(@NotNull JetModifierKeywordToken modifier) { - AddRemoveModifierPackage.removeModifier(this, modifier); + AddRemoveModifierKt.removeModifier(this, modifier); } @NotNull @Override public JetAnnotationEntry addAnnotationEntry(@NotNull JetAnnotationEntry annotationEntry) { - return AddRemoveModifierPackage.addAnnotationEntry(this, annotationEntry); + return AddRemoveModifierKt.addAnnotationEntry(this, annotationEntry); } @NotNull @@ -80,6 +80,6 @@ abstract class JetDeclarationImpl extends JetExpressionImpl implements JetDeclar @Nullable @Override public KDoc getDocComment() { - return FindDocCommentPackage.findDocComment(this); + return FindDocCommentKt.findDocComment(this); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java index b1027d8251c..140162bfdef 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetDeclarationStub.java @@ -24,7 +24,7 @@ import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.kdoc.psi.api.KDoc; -import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentPackage; +import org.jetbrains.kotlin.psi.findDocComment.FindDocCommentKt; import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub; abstract class JetDeclarationStub> extends JetModifierListOwnerStub implements JetDeclaration { @@ -51,7 +51,7 @@ abstract class JetDeclarationStub> extends JetModifierL @Nullable @Override public KDoc getDocComment() { - return FindDocCommentPackage.findDocComment(this); + return FindDocCommentKt.findDocComment(this); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFileAnnotationList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFileAnnotationList.java index a352143a560..ab67336a270 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFileAnnotationList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFileAnnotationList.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; @@ -46,6 +46,6 @@ public class JetFileAnnotationList extends JetElementImplStub getAnnotationEntries() { - return PsiUtilPackage.collectAnnotationEntriesFromStubOrPsi(this); + return JetPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java index cba9a2c9494..6ff8048b593 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetFunctionNotStubbed.java @@ -18,12 +18,9 @@ package org.jetbrains.kotlin.psi; import com.intellij.lang.ASTNode; import com.intellij.psi.PsiElement; -import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.JetNodeTypes; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; import java.util.Collections; import java.util.List; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java index 5b3e7fcb28f..bd7c89e3f70 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetImportsFactory.java @@ -45,7 +45,7 @@ public class JetImportsFactory { return directive; } - JetImportDirective createdDirective = JetPsiFactory(project).createImportDirective(importPath); + JetImportDirective createdDirective = JetPsiFactoryKt.JetPsiFactory(project).createImportDirective(importPath); importsCache.put(importPath, createdDirective); return createdDirective; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierList.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierList.java index 3c240e7049b..83d0699bbe3 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierList.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierList.java @@ -22,7 +22,7 @@ import com.intellij.psi.stubs.IStubElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinModifierListStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; @@ -50,7 +50,7 @@ public abstract class JetModifierList extends JetElementImplStub getAnnotationEntries() { - return PsiUtilPackage.collectAnnotationEntriesFromStubOrPsi(this); + return JetPsiUtilKt.collectAnnotationEntriesFromStubOrPsi(this); } public boolean hasModifier(@NotNull JetModifierKeywordToken tokenType) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java index 025864cbb93..39d714fe5d1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetModifierListOwnerStub.java @@ -22,7 +22,7 @@ import com.intellij.psi.stubs.StubElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; -import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierPackage; +import org.jetbrains.kotlin.psi.addRemoveModifier.AddRemoveModifierKt; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import java.util.Collections; @@ -51,18 +51,18 @@ public class JetModifierListOwnerStub> extends JetEleme @Override public void addModifier(@NotNull JetModifierKeywordToken modifier) { - AddRemoveModifierPackage.addModifier(this, modifier); + AddRemoveModifierKt.addModifier(this, modifier); } @Override public void removeModifier(@NotNull JetModifierKeywordToken modifier) { - AddRemoveModifierPackage.removeModifier(this, modifier); + AddRemoveModifierKt.removeModifier(this, modifier); } @NotNull @Override public JetAnnotationEntry addAnnotationEntry(@NotNull JetAnnotationEntry annotationEntry) { - return AddRemoveModifierPackage.addAnnotationEntry(this, annotationEntry); + return AddRemoveModifierKt.addAnnotationEntry(this, annotationEntry); } @Override diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java index 6306cbe924b..2243659ba21 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersKt; import java.util.Collections; import java.util.List; @@ -41,13 +41,13 @@ public class JetMultiDeclarationEntry extends JetNamedDeclarationNotStubbed impl @Override public JetTypeReference getTypeReference() { - return TypeRefHelpersPackage.getTypeReference(this); + return TypeRefHelpersKt.getTypeReference(this); } @Override @Nullable public JetTypeReference setTypeReference(@Nullable JetTypeReference typeRef) { - return TypeRefHelpersPackage.setTypeReference(this, getNameIdentifier(), typeRef); + return TypeRefHelpersKt.setTypeReference(this, getNameIdentifier(), typeRef); } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java index 2f1e11ae9a3..a1f801b941d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedDeclarationNotStubbed.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.lexer.JetTokens; -import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.JetPsiFactoryKt.JetPsiFactory; // TODO: Remove when all named declarations get stubs @Deprecated diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java index c9c1551b70a..d38593a7dac 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java @@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.stubs.KotlinFunctionStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersKt; import java.util.Collections; import java.util.List; @@ -184,13 +184,13 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub i @Override @Nullable public JetTypeReference setTypeReference(@Nullable JetTypeReference typeRef) { - return TypeRefHelpersPackage.setTypeReference(this, getNameIdentifier(), typeRef); + return TypeRefHelpersKt.setTypeReference(this, getNameIdentifier(), typeRef); } @Nullable diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java index 01b002135da..9f71540982d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; -import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersKt; import java.util.Collections; import java.util.List; @@ -142,13 +142,13 @@ public class JetProperty extends JetTypeParameterListOwnerStub superNames = PsiUtilPackage.getSuperNames(psi); + List superNames = JetPsiUtilKt.getSuperNames(psi); return new KotlinClassStubImpl( getStubType(isEnumEntry), parentStub, StringRef.fromString(fqName != null ? fqName.asString() : null), - StringRef.fromString(psi.getName()), Utils.INSTANCE$.wrapStrings(superNames), psi.isInterface(), isEnumEntry, + StringRef.fromString(psi.getName()), Utils.INSTANCE.wrapStrings(superNames), psi.isInterface(), isEnumEntry, psi.isLocal(), psi.isTopLevel()); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java index b0a9ba17607..a8315c0d5cf 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetObjectElementType.java @@ -25,7 +25,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetObjectDeclaration; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; import org.jetbrains.kotlin.psi.stubs.KotlinObjectStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinObjectStubImpl; import org.jetbrains.kotlin.psi.stubs.impl.Utils; @@ -43,8 +43,8 @@ public class JetObjectElementType extends JetStubElementType superNames = PsiUtilPackage.getSuperNames(psi); - return new KotlinObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.INSTANCE$.wrapStrings(superNames), + List superNames = JetPsiUtilKt.getSuperNames(psi); + return new KotlinObjectStubImpl(parentStub, StringRef.fromString(name), fqName, Utils.INSTANCE.wrapStrings(superNames), psi.isTopLevel(), psi.isCompanion(), psi.isLocal(), psi.isObjectLiteral()); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java index c9da7c4176a..458396d2933 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetPropertyElementType.java @@ -25,7 +25,6 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetProperty; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.psi.stubs.KotlinPropertyStub; import org.jetbrains.kotlin.psi.stubs.impl.KotlinPropertyStubImpl; import org.jetbrains.kotlin.resolve.lazy.ResolveSessionUtils; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java index 1ab50c5d558..cb76e2cf68b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnalyzingUtils.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticSink; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetTreeVisitorVoid; -import org.jetbrains.kotlin.psi.debugText.DebugTextPackage; +import org.jetbrains.kotlin.psi.debugText.DebugTextUtilKt; import java.util.ArrayList; import java.util.List; @@ -70,7 +70,7 @@ public class AnalyzingUtils { StringBuilder debugInfo = new StringBuilder(debugName); if (resolutionSubjectForMessage instanceof JetElement) { JetElement element = (JetElement) resolutionSubjectForMessage; - debugInfo.append(" ").append(DebugTextPackage.getDebugText(element)); + debugInfo.append(" ").append(DebugTextUtilKt.getDebugText(element)); debugInfo.append(" in ").append(element.getContainingFile().getName()); } else if (resolutionSubjectForMessage != null) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java index 00728bec0aa..5f703fe203e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/AnnotationResolver.java @@ -25,8 +25,7 @@ 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.resolve.annotations.*; -import org.jetbrains.kotlin.resolve.annotations.AnnotationsPackage; +import org.jetbrains.kotlin.resolve.annotations.AnnotationUtilKt; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.model.ResolvedValueArgument; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; @@ -68,7 +67,7 @@ public class AnnotationResolver { this.constantExpressionEvaluator = constantExpressionEvaluator; this.storageManager = storageManager; - modifiersAnnotations = AnnotationsPackage.buildMigrationAnnotationDescriptors(kotlinBuiltIns); + modifiersAnnotations = AnnotationUtilKt.buildMigrationAnnotationDescriptors(kotlinBuiltIns); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java index f8006e230f7..1cbb31d308c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContextUtils.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; @@ -34,14 +34,13 @@ import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppressio import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.expressions.JetTypeInfo; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import org.jetbrains.kotlin.util.slicedMap.MutableSlicedMap; import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; 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.kotlin.resolve.BindingContext.*; @@ -161,7 +160,7 @@ public class BindingContextUtils { if (!context.get(BindingContext.PROCESSED, expression)) return null; // NB: should never return null if expression is already processed JetTypeInfo result = context.get(BindingContext.EXPRESSION_TYPE_INFO, expression); - return result != null ? result : TypeInfoFactoryPackage.noTypeInfo(DataFlowInfo.EMPTY); + return result != null ? result : TypeInfoFactoryKt.noTypeInfo(DataFlowInfo.EMPTY); } public static boolean isExpressionWithValidReference( @@ -169,7 +168,7 @@ public class BindingContextUtils { @NotNull BindingContext context ) { if (expression instanceof JetCallExpression) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, context); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, context); return resolvedCall instanceof VariableAsFunctionResolvedCall; } return expression instanceof JetReferenceExpression; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java index dff0a3aa78d..38561ef870d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingTraceContext.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.JetTypeInfo; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import org.jetbrains.kotlin.util.slicedMap.*; import java.util.Collection; @@ -139,7 +139,7 @@ public class BindingTraceContext implements BindingTrace { @Override public void recordType(@NotNull JetExpression expression, @Nullable JetType type) { JetTypeInfo typeInfo = get(BindingContext.EXPRESSION_TYPE_INFO, expression); - typeInfo = typeInfo != null ? typeInfo.replaceType(type) : TypeInfoFactoryPackage.createTypeInfo(type); + typeInfo = typeInfo != null ? typeInfo.replaceType(type) : TypeInfoFactoryKt.createTypeInfo(type); record(BindingContext.EXPRESSION_TYPE_INFO, expression, typeInfo); } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 2b0b9894d64..84fbb96c562 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.descriptors.impl.SyntheticFieldDescriptor; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import org.jetbrains.kotlin.resolve.calls.CallResolver; import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.ValueParameterResolver; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import org.jetbrains.kotlin.util.Box; import org.jetbrains.kotlin.util.ReenteringLazyValueComputationException; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; @@ -330,7 +330,7 @@ public class BodyResolver { // Recording type info for callee to use later in JetObjectLiteralExpression trace.record(PROCESSED, call.getCalleeExpression(), true); trace.record(EXPRESSION_TYPE_INFO, call.getCalleeExpression(), - TypeInfoFactoryPackage.noTypeInfo(results.getResultingCall().getDataFlowInfoForArguments().getResultInfo())); + TypeInfoFactoryKt.noTypeInfo(results.getResultingCall().getDataFlowInfoForArguments().getResultInfo())); } else { recordSupertype(typeReference, trace.getBindingContext().get(BindingContext.TYPE, typeReference)); @@ -450,7 +450,7 @@ public class BodyResolver { addSupertype = false; } else if (supertypeOwner.getKind() == ClassKind.INTERFACE && - !classAppeared && !TypesPackage.isDynamic(supertype) /* avoid duplicate diagnostics */) { + !classAppeared && !DynamicTypesKt.isDynamic(supertype) /* avoid duplicate diagnostics */) { trace.report(INTERFACE_WITH_SUPERCLASS.on(typeReference)); addSupertype = false; } @@ -744,7 +744,7 @@ public class BodyResolver { JetNamedFunction declaration = entry.getKey(); LexicalScope scope = c.getDeclaringScope(declaration); - assert scope != null : "Scope is null: " + PsiUtilPackage.getElementTextWithContext(declaration); + assert scope != null : "Scope is null: " + PsiUtilsKt.getElementTextWithContext(declaration); if (!c.getTopDownAnalysisMode().isLocalDeclarations() && !(bodyResolveCache instanceof BodyResolveCache.ThrowException) && expressionTypingServices.getStatementFilter() != StatementFilter.NONE) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java index b7463d6ae3d..60d8b82e9b2 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatedPropertyResolver.java @@ -26,6 +26,7 @@ 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.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemCompleter; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; @@ -48,9 +49,8 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.psi.JetPsiFactoryKt.JetPsiFactory; 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; import static org.jetbrains.kotlin.types.TypeUtils.noExpectedType; @@ -313,7 +313,7 @@ public class DelegatedPropertyResolver { @NotNull DataFlowInfo dataFlowInfo ) { TemporaryBindingTrace traceToResolveDelegatedProperty = TemporaryBindingTrace.create(trace, "Trace to resolve delegated property"); - JetExpression calleeExpression = getCalleeExpressionIfAny(delegateExpression); + JetExpression calleeExpression = CallUtilKt.getCalleeExpressionIfAny(delegateExpression); ConstraintSystemCompleter completer = createConstraintSystemCompleter( jetProperty, propertyDescriptor, delegateExpression, accessorScope, trace); if (calleeExpression != null) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java index 4e0d6bc6f8e..5e5e437e25f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DelegatingBindingTrace.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.diagnostics.MutableDiagnosticsWithSuppression; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.JetTypeInfo; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import org.jetbrains.kotlin.util.slicedMap.*; import java.util.Collection; @@ -148,7 +148,7 @@ public class DelegatingBindingTrace implements BindingTrace { public void recordType(@NotNull JetExpression expression, @Nullable JetType type) { JetTypeInfo typeInfo = get(BindingContext.EXPRESSION_TYPE_INFO, expression); if (typeInfo == null) { - typeInfo = TypeInfoFactoryPackage.createTypeInfo(type); + typeInfo = TypeInfoFactoryKt.createTypeInfo(type); } else { typeInfo = typeInfo.replaceType(type); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index 5586a5e7cb9..471ec02244a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -38,17 +38,19 @@ 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.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; +import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsKt; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope; import org.jetbrains.kotlin.resolve.scopes.WritableScope; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; +import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt; import org.jetbrains.kotlin.storage.StorageManager; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; @@ -64,8 +66,6 @@ import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; import static org.jetbrains.kotlin.resolve.ModifiersChecker.resolveModalityFromModifiers; import static org.jetbrains.kotlin.resolve.ModifiersChecker.resolveVisibilityFromModifiers; -import static org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage.asJetScope; -import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; public class DescriptorResolver { public static final Name COPY_METHOD_NAME = Name.identifier("copy"); @@ -175,7 +175,7 @@ public class DescriptorResolver { JetTypeReference typeReference = delegationSpecifier.getTypeReference(); if (typeReference != null) { JetType supertype = resolver.resolveType(extensibleScope, typeReference, trace, checkBounds); - if (TypesPackage.isDynamic(supertype)) { + if (DynamicTypesKt.isDynamic(supertype)) { trace.report(DYNAMIC_SUPERTYPE.on(typeReference)); } else { @@ -224,7 +224,7 @@ public class DescriptorResolver { @NotNull ClassDescriptor classDescriptor, @NotNull BindingTrace trace ) { - Name functionName = DataClassUtilsPackage.createComponentName(parameterIndex); + Name functionName = DataClassUtilsKt.createComponentName(parameterIndex); JetType returnType = property.getType(); SimpleFunctionDescriptorImpl functionDescriptor = SimpleFunctionDescriptorImpl.create( @@ -366,7 +366,7 @@ public class DescriptorResolver { variableType, valueParameter.hasDefaultValue(), varargElementType, - toSourceElement(valueParameter) + KotlinSourceElementKt.toSourceElement(valueParameter) ); trace.record(BindingContext.VALUE_PARAMETER, valueParameter, valueParameterDescriptor); @@ -418,7 +418,7 @@ public class DescriptorResolver { typeParameter.getVariance(), JetPsiUtil.safeName(typeParameter.getName()), index, - toSourceElement(typeParameter) + KotlinSourceElementKt.toSourceElement(typeParameter) ); trace.record(BindingContext.TYPE_PARAMETER, typeParameter, typeParameterDescriptor); extensibleScope.addClassifierDescriptor(typeParameterDescriptor); @@ -432,7 +432,7 @@ public class DescriptorResolver { @NotNull BindingTrace trace ) { ConstructorDescriptorImpl constructorDescriptor = - DescriptorFactory.createPrimaryConstructorForObject(classDescriptor, toSourceElement(object)); + DescriptorFactory.createPrimaryConstructorForObject(classDescriptor, KotlinSourceElementKt.toSourceElement(object)); if (object != null) { JetPrimaryConstructor primaryConstructor = object.getPrimaryConstructor(); trace.record(CONSTRUCTOR, primaryConstructor != null ? primaryConstructor : object, constructorDescriptor); @@ -549,7 +549,7 @@ public class DescriptorResolver { Name name = nameExpression.getReferencedNameAsName(); - ClassifierDescriptor classifier = asJetScope(scope).getClassifier(name, NoLookupLocation.UNSORTED); + ClassifierDescriptor classifier = ScopeUtilsKt.asJetScope(scope).getClassifier(name, NoLookupLocation.UNSORTED); if (classifier instanceof TypeParameterDescriptor && classifier.getContainingDeclaration() == descriptor) continue; if (classifier != null) { @@ -580,7 +580,7 @@ public class DescriptorResolver { } trace.report(FINAL_UPPER_BOUND.on(upperBound, upperBoundType)); } - if (TypesPackage.isDynamic(upperBoundType)) { + if (DynamicTypesKt.isDynamic(upperBoundType)) { trace.report(DYNAMIC_UPPER_BOUND.on(upperBound)); } } @@ -623,7 +623,7 @@ public class DescriptorResolver { JetPsiUtil.safeName(parameter.getName()), type, false, - toSourceElement(parameter) + KotlinSourceElementKt.toSourceElement(parameter) ); trace.record(BindingContext.VALUE_PARAMETER, parameter, variableDescriptor); // Type annotations also should be resolved @@ -651,7 +651,7 @@ public class DescriptorResolver { variable.isVar(), JetPsiUtil.safeName(variable.getName()), CallableMemberDescriptor.Kind.DECLARATION, - toSourceElement(variable), + KotlinSourceElementKt.toSourceElement(variable), /* lateInit = */ false, /* isConst = */ false ); @@ -704,7 +704,7 @@ public class DescriptorResolver { JetPsiUtil.safeName(variable.getName()), type, variable.isVar(), - toSourceElement(variable) + KotlinSourceElementKt.toSourceElement(variable) ); trace.record(BindingContext.VARIABLE, variable, variableDescriptor); return variableDescriptor; @@ -750,7 +750,7 @@ public class DescriptorResolver { isVar, JetPsiUtil.safeName(property.getName()), CallableMemberDescriptor.Kind.DECLARATION, - toSourceElement(property), + KotlinSourceElementKt.toSourceElement(property), modifierList != null && modifierList.hasModifier(JetTokens.LATEINIT_KEYWORD), modifierList != null && modifierList.hasModifier(JetTokens.CONST_KEYWORD) ); @@ -998,7 +998,8 @@ public class DescriptorResolver { resolveModalityFromModifiers(setter, propertyDescriptor.getModality()), resolveVisibilityFromModifiers(setter, propertyDescriptor.getVisibility()), setter.hasBody(), false, - CallableMemberDescriptor.Kind.DECLARATION, null, toSourceElement(setter)); + CallableMemberDescriptor.Kind.DECLARATION, null, KotlinSourceElementKt + .toSourceElement(setter)); if (parameter != null) { // This check is redundant: the parser does not allow a default value, but we'll keep it just in case @@ -1078,7 +1079,8 @@ public class DescriptorResolver { resolveModalityFromModifiers(getter, propertyDescriptor.getModality()), resolveVisibilityFromModifiers(getter, propertyDescriptor.getVisibility()), getter.hasBody(), false, - CallableMemberDescriptor.Kind.DECLARATION, null, toSourceElement(getter)); + CallableMemberDescriptor.Kind.DECLARATION, null, KotlinSourceElementKt + .toSourceElement(getter)); getterDescriptor.initialize(returnType); trace.record(BindingContext.PROPERTY_ACCESSOR, getter, getterDescriptor); } @@ -1130,7 +1132,7 @@ public class DescriptorResolver { isMutable, name, CallableMemberDescriptor.Kind.DECLARATION, - toSourceElement(parameter), + KotlinSourceElementKt.toSourceElement(parameter), /* lateInit = */ false, /* isConst = */ false ); @@ -1167,12 +1169,12 @@ public class DescriptorResolver { List jetTypeArguments = typeElement.getTypeArgumentsAsTypes(); // A type reference from Kotlin code can yield a flexible type only if it's `ft`, whose bounds should not be checked - if (TypesPackage.isFlexible(type) && !TypesPackage.isDynamic(type)) { + if (FlexibleTypesKt.isFlexible(type) && !DynamicTypesKt.isDynamic(type)) { assert jetTypeArguments.size() == 2 : "Flexible type cannot be denoted in Kotlin otherwise than as ft, but was: " - + PsiUtilPackage.getElementTextWithContext(typeReference); + + PsiUtilsKt.getElementTextWithContext(typeReference); // it's really ft - Flexibility flexibility = TypesPackage.flexibility(type); + Flexibility flexibility = FlexibleTypesKt.flexibility(type); checkBounds(jetTypeArguments.get(0), flexibility.getLowerBound(), trace); checkBounds(jetTypeArguments.get(1), flexibility.getUpperBound(), trace); return; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java index 2cfb4f6339c..936b47ed4d7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorUtil.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.ValueParameterDescriptorImpl; import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.types.*; -import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; +import org.jetbrains.kotlin.types.typeUtil.TypeUtilsKt; import java.util.ArrayList; import java.util.Collections; @@ -57,7 +57,7 @@ public class FunctionDescriptorUtil { ) { if (functionDescriptor.getTypeParameters().isEmpty()) return TypeSubstitution.getEMPTY(); - return new IndexedParametersSubstitution(functionDescriptor.getTypeParameters(), TypeUtilPackage.defaultProjections(typeArguments)); + return new IndexedParametersSubstitution(functionDescriptor.getTypeParameters(), TypeUtilsKt.defaultProjections(typeArguments)); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.java index a48fca18f6a..59bcd470ab4 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadUtil.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.ConstructorDescriptor; 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.TypeCapabilitiesKt; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.List; @@ -72,7 +72,7 @@ public class OverloadUtil { JetType superValueParameterType = OverridingUtil.getUpperBound(superValueParameters.get(i)); JetType subValueParameterType = OverridingUtil.getUpperBound(subValueParameters.get(i)); if (!JetTypeChecker.DEFAULT.equalTypes(superValueParameterType, subValueParameterType) - || TypesPackage.oneMoreSpecificThanAnother(subValueParameterType, superValueParameterType)) { + || TypeCapabilitiesKt.oneMoreSpecificThanAnother(subValueParameterType, superValueParameterType)) { return OverridingUtil.OverrideCompatibilityInfo .valueParameterTypeMismatch(superValueParameterType, subValueParameterType, INCOMPATIBLE); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java index 12aa580d0d3..94a36ad7b05 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/OverrideResolver.java @@ -38,8 +38,8 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilPackage; -import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; +import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; +import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsKt; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; @@ -423,7 +423,7 @@ public class OverrideResolver { @NotNull List concreteOverridden ) { for (CallableMemberDescriptor overridden : allOverriddenDeclarations) { - if (!CallResolverUtilPackage.isOrOverridesSynthesized(overridden)) { + if (!CallResolverUtilKt.isOrOverridesSynthesized(overridden)) { if (overridden.getModality() == Modality.ABSTRACT) { abstractOverridden.add(overridden); } @@ -566,7 +566,7 @@ public class OverrideResolver { private void checkOverrideForMember(@NotNull final CallableMemberDescriptor declared) { if (declared.getKind() == CallableMemberDescriptor.Kind.SYNTHESIZED) { - if (DataClassUtilsPackage.isComponentLike(declared.getName())) { + if (DataClassUtilsKt.isComponentLike(declared.getName())) { checkOverrideForComponentFunction(declared); } return; 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 9ddaec5e62b..061dcb129ea 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ArgumentTypeResolver.java @@ -28,12 +28,13 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.TemporaryBindingTrace; import org.jetbrains.kotlin.resolve.TypeResolver; -import org.jetbrains.kotlin.resolve.callableReferences.CallableReferencesPackage; +import org.jetbrains.kotlin.resolve.callableReferences.CallableReferencesResolutionUtilsKt; import org.jetbrains.kotlin.resolve.calls.callResolverUtil.ResolveArgumentsMode; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.context.CallResolutionContext; import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode; import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; +import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImplKt; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; @@ -51,7 +52,7 @@ import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.JetTypeInfo; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import java.util.Collections; import java.util.List; @@ -62,7 +63,6 @@ import static org.jetbrains.kotlin.resolve.calls.callResolverUtil.ResolveArgumen import static org.jetbrains.kotlin.resolve.calls.callResolverUtil.ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.DEPENDENT; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.kotlin.resolve.calls.inference.InferencePackage.createTypeForFunctionPlaceholder; import static org.jetbrains.kotlin.types.TypeUtils.DONT_CARE; import static org.jetbrains.kotlin.types.TypeUtils.NO_EXPECTED_TYPE; @@ -98,7 +98,7 @@ public class ArgumentTypeResolver { @NotNull JetType expectedType ) { if (FunctionPlaceholdersKt.isFunctionPlaceholder(actualType)) { - JetType functionType = createTypeForFunctionPlaceholder(actualType, expectedType); + JetType functionType = ConstraintSystemImplKt.createTypeForFunctionPlaceholder(actualType, expectedType); return JetTypeChecker.DEFAULT.isSubtypeOf(functionType, expectedType); } return JetTypeChecker.DEFAULT.isSubtypeOf(actualType, expectedType); @@ -200,7 +200,7 @@ public class ArgumentTypeResolver { @NotNull ResolveArgumentsMode resolveArgumentsMode ) { if (expression == null) { - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } JetFunction functionLiteralArgument = getFunctionLiteralArgumentIfAny(expression, context); @@ -232,7 +232,7 @@ public class ArgumentTypeResolver { ) { if (resolveArgumentsMode == SHAPE_FUNCTION_ARGUMENTS) { JetType type = getShapeTypeOfCallableReference(callableReferenceExpression, context, true); - return TypeInfoFactoryPackage.createTypeInfo(type); + return TypeInfoFactoryKt.createTypeInfo(type); } return expressionTypingServices.getTypeInfo(expression, context.replaceContextDependency(INDEPENDENT)); } @@ -244,12 +244,12 @@ public class ArgumentTypeResolver { boolean expectedTypeIsUnknown ) { JetType receiverType = - CallableReferencesPackage.resolveCallableReferenceReceiverType(callableReferenceExpression, context, typeResolver); + CallableReferencesResolutionUtilsKt.resolveCallableReferenceReceiverType(callableReferenceExpression, context, typeResolver); OverloadResolutionResults overloadResolutionResults = - CallableReferencesPackage.resolvePossiblyAmbiguousCallableReference( + CallableReferencesResolutionUtilsKt.resolvePossiblyAmbiguousCallableReference( callableReferenceExpression, receiverType, context, ResolveArgumentsMode.SHAPE_FUNCTION_ARGUMENTS, callResolver); - return CallableReferencesPackage.getResolvedCallableReferenceShapeType( + return CallableReferencesResolutionUtilsKt.getResolvedCallableReferenceShapeType( callableReferenceExpression, overloadResolutionResults, context, expectedTypeIsUnknown, reflectionTypes, builtIns, functionPlaceholders); } @@ -263,7 +263,7 @@ public class ArgumentTypeResolver { ) { if (resolveArgumentsMode == SHAPE_FUNCTION_ARGUMENTS) { JetType type = getShapeTypeOfFunctionLiteral(functionLiteral, context.scope, context.trace, true); - return TypeInfoFactoryPackage.createTypeInfo(type, context); + return TypeInfoFactoryKt.createTypeInfo(type, context); } return expressionTypingServices.getTypeInfo(expression, context.replaceContextDependency(INDEPENDENT)); } @@ -329,7 +329,7 @@ public class ArgumentTypeResolver { // For an unsafe call, we should not do it, // otherwise not-null will propagate to successive statements // Sample: x?.foo(x.bar()) // Inside foo call, x is not-nullable - if (CallUtilPackage.isSafeCall(call)) { + if (CallUtilKt.isSafeCall(call)) { initialDataFlowInfo = initialDataFlowInfo.disequate(receiverDataFlowValue, DataFlowValue.nullValue(builtIns)); } } 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 3b7edcaf838..23ee1153f4c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallExpressionResolver.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; 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.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode; import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; @@ -49,7 +49,7 @@ import org.jetbrains.kotlin.types.expressions.DataFlowAnalyzer; import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; import org.jetbrains.kotlin.types.expressions.JetTypeInfo; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import javax.inject.Inject; import java.util.Collections; @@ -57,8 +57,6 @@ import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; -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 { @@ -129,11 +127,11 @@ public class CallExpressionResolver { } } - QualifierReceiver qualifier = createQualifier(nameExpression, receiver, context); + QualifierReceiver qualifier = QualifierKt.createQualifier(nameExpression, receiver, context); if (qualifier != null) { result[0] = true; if (!isLHSOfDot) { - resolveAsStandaloneExpression(qualifier, context, symbolUsageValidator); + QualifierKt.resolveAsStandaloneExpression(qualifier, context, symbolUsageValidator); } return null; } @@ -159,7 +157,7 @@ public class CallExpressionResolver { if (result[0]) { temporaryForVariable.commit(); - return TypeInfoFactoryPackage.createTypeInfo(type, context); + return TypeInfoFactoryKt.createTypeInfo(type, context); } Call call = CallMaker.makeCall(nameExpression, receiver, callOperationNode, nameExpression, Collections.emptyList()); @@ -174,11 +172,11 @@ public class CallExpressionResolver { boolean hasValueParameters = functionDescriptor == null || functionDescriptor.getValueParameters().size() > 0; context.trace.report(FUNCTION_CALL_EXPECTED.on(nameExpression, nameExpression, hasValueParameters)); type = functionDescriptor != null ? functionDescriptor.getReturnType() : null; - return TypeInfoFactoryPackage.createTypeInfo(type, context); + return TypeInfoFactoryKt.createTypeInfo(type, context); } temporaryForVariable.commit(); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } @NotNull @@ -221,7 +219,7 @@ public class CallExpressionResolver { context.trace.report(FUNCTION_CALL_EXPECTED.on(callExpression, callExpression, hasValueParameters)); } if (functionDescriptor == null) { - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } if (functionDescriptor instanceof ConstructorDescriptor) { DeclarationDescriptor containingDescriptor = functionDescriptor.getContainingDeclaration(); @@ -252,7 +250,7 @@ public class CallExpressionResolver { break; } } - return TypeInfoFactoryPackage.createTypeInfo(type, resultFlowInfo, jumpOutPossible, jumpFlowInfo); + return TypeInfoFactoryKt.createTypeInfo(type, resultFlowInfo, jumpOutPossible, jumpFlowInfo); } JetExpression calleeExpression = callExpression.getCalleeExpression(); @@ -266,11 +264,11 @@ public class CallExpressionResolver { temporaryForVariable.commit(); context.trace.report(FUNCTION_EXPECTED.on(calleeExpression, calleeExpression, type != null ? type : ErrorUtils.createErrorType(""))); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } } temporaryForFunction.commit(); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } private static boolean canInstantiateAnnotationClass(@NotNull JetCallExpression expression, @NotNull BindingTrace trace) { @@ -306,7 +304,7 @@ public class CallExpressionResolver { else if (selectorExpression != null) { context.trace.report(ILLEGAL_SELECTOR.on(selectorExpression, selectorExpression.getText())); } - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } /** @@ -443,11 +441,11 @@ public class CallExpressionResolver { ) { if (qualifierReceiver == null) return; JetExpression calleeExpression = - JetPsiUtil.deparenthesize(CallUtilPackage.getCalleeExpressionIfAny(qualifiedExpression.getSelectorExpression())); + JetPsiUtil.deparenthesize(CallUtilKt.getCalleeExpressionIfAny(qualifiedExpression.getSelectorExpression())); DeclarationDescriptor selectorDescriptor = calleeExpression instanceof JetReferenceExpression ? context.trace.get(BindingContext.REFERENCE_TARGET, (JetReferenceExpression) calleeExpression) : null; - ReceiversPackage.resolveAsReceiverInQualifiedExpression(qualifierReceiver, context, symbolUsageValidator, selectorDescriptor); + QualifierKt.resolveAsReceiverInQualifiedExpression(qualifierReceiver, context, symbolUsageValidator, selectorDescriptor); } private static void checkNestedClassAccess( 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 e946a3dec96..9d7de869589 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallResolver.java @@ -31,8 +31,9 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.*; -import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilPackage; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt; +import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker; import org.jetbrains.kotlin.resolve.calls.context.*; import org.jetbrains.kotlin.resolve.calls.model.MutableDataFlowInfoForArguments; @@ -45,7 +46,7 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; 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.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; @@ -65,8 +66,6 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.diagnostics.Errors.*; -import static org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.recordDataFlowInfo; -import static org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.recordScope; 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.context.CandidateResolveMode.EXIT_ON_FIRST_ERROR; @@ -357,7 +356,7 @@ public class CallResolver { ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor; Collection constructors = classDescriptor.getConstructors(); if (constructors.isEmpty()) { - context.trace.report(NO_CONSTRUCTOR.on(CallUtilPackage.getValueArgumentListOrElement(context.call))); + context.trace.report(NO_CONSTRUCTOR.on(CallUtilKt.getValueArgumentListOrElement(context.call))); return checkArgumentTypesAndFail(context); } Collection> candidates = @@ -414,7 +413,7 @@ public class CallResolver { } ClassDescriptor delegateClassDescriptor = isThisCall ? currentClassDescriptor : - DescriptorUtilPackage.getSuperClassOrAny(currentClassDescriptor); + DescriptorUtilsKt.getSuperClassOrAny(currentClassDescriptor); Collection constructors = delegateClassDescriptor.getConstructors(); if (!isThisCall && currentClassDescriptor.getUnsubstitutedPrimaryConstructor() != null) { @@ -428,7 +427,7 @@ public class CallResolver { } if (constructors.isEmpty()) { - context.trace.report(NO_CONSTRUCTOR.on(CallUtilPackage.getValueArgumentListOrElement(context.call))); + context.trace.report(NO_CONSTRUCTOR.on(CallUtilKt.getValueArgumentListOrElement(context.call))); return checkArgumentTypesAndFail(context); } @@ -489,8 +488,8 @@ public class CallResolver { TemporaryBindingTrace traceToResolveCall = TemporaryBindingTrace.create(context.trace, "trace to resolve call", call); BasicCallResolutionContext newContext = context.replaceBindingTrace(traceToResolveCall); - recordScope(newContext.trace, newContext.scope, newContext.call.getCalleeExpression()); - recordDataFlowInfo(newContext, newContext.call.getCalleeExpression()); + BindingContextUtilsKt.recordScope(newContext.trace, newContext.scope, newContext.call.getCalleeExpression()); + BindingContextUtilsKt.recordDataFlowInfo(newContext, newContext.call.getCalleeExpression()); OverloadResolutionResultsImpl results = doResolveCall(newContext, prioritizedTasks, callTransformer, tracing); DelegatingBindingTrace deltasTraceForTypeInference = ((OverloadResolutionResultsImpl) results).getTrace(); @@ -515,7 +514,7 @@ public class CallResolver { @NotNull OverloadResolutionResultsImpl results, @NotNull TracingStrategy tracing ) { - if (CallResolverUtilPackage.isInvokeCallOnVariable(context.call)) return; + if (CallResolverUtilKt.isInvokeCallOnVariable(context.call)) return; if (!results.isSingleResult()) { if (results.getResultCode() == INCOMPLETE_TYPE_INFERENCE) { argumentTypeResolver.checkTypesWithNoCallee(context, RESOLVE_FUNCTION_ARGUMENTS); @@ -535,7 +534,7 @@ public class CallResolver { @NotNull TracingStrategy tracing ) { Call call = context.call; - if (CallResolverUtilPackage.isInvokeCallOnVariable(call)) return; + if (CallResolverUtilKt.isInvokeCallOnVariable(call)) return; DelegatingBindingTrace deltasTraceToCacheResolve = new DelegatingBindingTrace( BindingContext.EMPTY, "delta trace for caching resolve of", context.call); 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 38aea343b96..eeaf4bc5e21 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CallTransformer.java @@ -277,7 +277,7 @@ public class CallTransformer { this.explicitExtensionReceiver = explicitExtensionReceiver; this.calleeExpressionAsDispatchReceiver = calleeExpressionAsDispatchReceiver; this.fakeInvokeExpression = - (JetSimpleNameExpression) JetPsiFactory(call.getCallElement()) + (JetSimpleNameExpression) JetPsiFactoryKt.JetPsiFactory(call.getCallElement()) .createExpression(OperatorNameConventions.INVOKE.asString()); } 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 99c3d0b6b5d..c8f70061f68 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/ValueArgumentsToParametersMapper.java @@ -27,10 +27,10 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.OverrideResolver; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.kotlin.resolve.calls.tasks.TracingStrategy; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import java.util.List; import java.util.Map; @@ -233,7 +233,7 @@ public class ValueArgumentsToParametersMapper { public void process() { ProcessorState state = positionedOnly; - List argumentsInParentheses = CallUtilPackage.getValueArgumentsInParentheses(call); + List argumentsInParentheses = CallUtilKt.getValueArgumentsInParentheses(call); for (int i = 0; i < argumentsInParentheses.size(); i++) { ValueArgument valueArgument = argumentsInParentheses.get(i); if (valueArgument.isNamed()) { @@ -294,7 +294,7 @@ public class ValueArgumentsToParametersMapper { List valueParameters = candidateCall.getCandidateDescriptor().getValueParameters(); for (ValueParameterDescriptor valueParameter : valueParameters) { if (!usedParameters.contains(valueParameter)) { - if (DescriptorUtilPackage.hasDefaultValue(valueParameter)) { + if (DescriptorUtilsKt.hasDefaultValue(valueParameter)) { candidateCall.recordValueArgument(valueParameter, DefaultValueArgument.DEFAULT); } else if (valueParameter.getVarargElementType() != null) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java index da16c9b6e5e..8500f120023 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/InlineChecker.java @@ -25,12 +25,13 @@ import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; 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.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.inline.InlineUtil; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ExtensionReceiver; @@ -43,7 +44,6 @@ import java.util.Set; import static org.jetbrains.kotlin.diagnostics.Errors.NON_LOCAL_RETURN_NOT_ALLOWED; import static org.jetbrains.kotlin.diagnostics.Errors.USAGE_IS_NOT_INLINABLE; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.isEffectivelyPublicApi; import static org.jetbrains.kotlin.resolve.inline.InlineUtil.allowsNonLocalReturns; import static org.jetbrains.kotlin.resolve.inline.InlineUtil.checkNonLocalReturnUsage; @@ -55,7 +55,7 @@ class InlineChecker implements CallChecker { public InlineChecker(@NotNull SimpleFunctionDescriptor descriptor) { assert InlineUtil.isInline(descriptor) : "This extension should be created only for inline functions: " + descriptor; this.descriptor = descriptor; - this.isEffectivelyPublicApiFunction = isEffectivelyPublicApi(descriptor); + this.isEffectivelyPublicApiFunction = DescriptorUtilsKt.isEffectivelyPublicApi(descriptor); for (ValueParameterDescriptor param : descriptor.getValueParameters()) { if (isInlinableParameter(param)) { @@ -186,7 +186,7 @@ class InlineChecker implements CallChecker { ) { if (!(expression instanceof JetSimpleNameExpression || expression instanceof JetThisExpression)) return null; - ResolvedCall thisCall = CallUtilPackage.getResolvedCall(expression, context.trace.getBindingContext()); + ResolvedCall thisCall = CallUtilKt.getResolvedCall(expression, context.trace.getBindingContext()); if (unwrapVariableAsFunction && thisCall instanceof VariableAsFunctionResolvedCall) { return ((VariableAsFunctionResolvedCall) thisCall).getVariableCall().getResultingDescriptor(); } @@ -236,7 +236,7 @@ class InlineChecker implements CallChecker { } private void checkVisibility(@NotNull CallableDescriptor declarationDescriptor, @NotNull JetElement expression, @NotNull BasicCallResolutionContext context){ - boolean declarationDescriptorIsPublicApi = isEffectivelyPublicApi(declarationDescriptor) || isDefinedInInlineFunction(declarationDescriptor); + boolean declarationDescriptorIsPublicApi = DescriptorUtilsKt.isEffectivelyPublicApi(declarationDescriptor) || isDefinedInInlineFunction(declarationDescriptor); if (isEffectivelyPublicApiFunction && !declarationDescriptorIsPublicApi && declarationDescriptor.getVisibility() != Visibilities.LOCAL) { context.trace.report(Errors.INVISIBLE_MEMBER_FROM_INLINE.on(expression, declarationDescriptor, descriptor)); } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ReifiedTypeParameterSubstitutionChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ReifiedTypeParameterSubstitutionChecker.java index 5b066f00f94..21b011e32a1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ReifiedTypeParameterSubstitutionChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/checkers/ReifiedTypeParameterSubstitutionChecker.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.resolve.calls.context.BasicCallResolutionContext; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; +import org.jetbrains.kotlin.types.typeUtil.TypeUtilsKt; import java.util.Map; @@ -49,7 +49,7 @@ public class ReifiedTypeParameterSubstitutionChecker implements CallChecker { Errors.TYPE_PARAMETER_AS_REIFIED.on(getCallElement(context), parameter) ); } - else if (TypeUtilPackage.cannotBeReified(argument)) { + else if (TypeUtilsKt.cannotBeReified(argument)) { context.trace.report(Errors.REIFIED_TYPE_FORBIDDEN_SUBSTITUTION.on(getCallElement(context), argument)); } } 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 f9fa07f107c..1ba6307f000 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 @@ -27,8 +27,8 @@ import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.psi.Call; import org.jetbrains.kotlin.psi.ValueArgument; import org.jetbrains.kotlin.resolve.DelegatingBindingTrace; -import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilPackage; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callResolverUtil.CallResolverUtilKt; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystem; import org.jetbrains.kotlin.resolve.calls.results.ResolutionStatus; import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; @@ -293,7 +293,7 @@ public class ResolvedCallImpl implements MutableRe @Override public boolean isSafeCall() { - return CallUtilPackage.isSafeCall(call); + return CallUtilKt.isSafeCall(call); } @NotNull @@ -306,7 +306,7 @@ public class ResolvedCallImpl implements MutableRe public boolean hasInferredReturnType() { if (!completed) { hasInferredReturnType = constraintSystem == null || - CallResolverUtilPackage.hasInferredReturnType(candidateDescriptor, constraintSystem); + CallResolverUtilKt.hasInferredReturnType(candidateDescriptor, constraintSystem); } assert hasInferredReturnType != null : "The property 'hasInferredReturnType' was not set when the call was completed."; return hasInferredReturnType; 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 e7687b2da5f..0692a83d1bb 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 @@ -244,8 +244,8 @@ public class OverloadingConflictResolver { if (!isSubtype) return false; - Specificity.Relation sThanG = TypesPackage.getSpecificityRelationTo(specific, general); - Specificity.Relation gThanS = TypesPackage.getSpecificityRelationTo(general, specific); + Specificity.Relation sThanG = TypeCapabilitiesKt.getSpecificityRelationTo(specific, general); + Specificity.Relation gThanS = TypeCapabilitiesKt.getSpecificityRelationTo(general, specific); if (sThanG == Specificity.Relation.LESS_SPECIFIC && gThanS != Specificity.Relation.LESS_SPECIFIC) { return false; } 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 06414a2dcb9..b8289a677b2 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 @@ -20,7 +20,7 @@ import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.resolve.OverrideResolver; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.context.CheckArgumentTypesMode; import org.jetbrains.kotlin.resolve.calls.model.MutableResolvedCall; import org.jetbrains.kotlin.resolve.calls.tasks.ResolutionTask; @@ -104,7 +104,7 @@ public class ResolutionResultsHandler { // This check is needed for the following case: // x.foo(unresolved) -- if there are multiple foo's, we'd report an ambiguity, and it does not make sense here if (task.checkArguments != CheckArgumentTypesMode.CHECK_VALUE_ARGUMENTS || - !CallUtilPackage.hasUnresolvedArguments(task.call, task)) { + !CallUtilKt.hasUnresolvedArguments(task.call, task)) { if (allCandidatesIncomplete) { task.tracing.cannotCompleteResolve(task.trace, results.getResultingCalls()); } 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 0a9f8b72ec6..d93f1ece959 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 @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; @@ -264,7 +264,7 @@ public class DataFlowValueFactory { ) { DeclarationDescriptor declarationDescriptor = bindingContext.get(REFERENCE_TARGET, simpleNameExpression); if (declarationDescriptor instanceof VariableDescriptor) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(simpleNameExpression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(simpleNameExpression, bindingContext); // todo uncomment assert // KT-4113 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 98282788035..ff6d1271b22 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 @@ -28,13 +28,13 @@ import org.jetbrains.kotlin.name.Name; 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.callUtil.CallUtilKt; 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.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import org.jetbrains.kotlin.types.JetType; @@ -69,7 +69,7 @@ public abstract class AbstractTracingStrategy implements TracingStrategy { @Override public void noValueForParameter(@NotNull BindingTrace trace, @NotNull ValueParameterDescriptor valueParameter) { - JetElement reportOn = CallUtilPackage.getValueArgumentListOrElement(call); + JetElement reportOn = CallUtilKt.getValueArgumentListOrElement(call); trace.report(NO_VALUE_FOR_PARAMETER.on(reportOn, valueParameter)); } @@ -140,7 +140,7 @@ public abstract class AbstractTracingStrategy implements TracingStrategy { @NotNull ExplicitReceiverKind explicitReceiverKind ) { if (explicitReceiverKind == ExplicitReceiverKind.NO_EXPLICIT_RECEIVER) { - DeclarationDescriptor importableDescriptor = DescriptorUtilPackage.getImportableDescriptor(classDescriptor); + DeclarationDescriptor importableDescriptor = DescriptorUtilsKt.getImportableDescriptor(classDescriptor); if (DescriptorUtils.getFqName(importableDescriptor).isSafe()) { FqName fqName = getFqNameFromTopLevelClass(importableDescriptor); String qualifiedName; 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 00a864b57d6..d039f9d512d 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 @@ -23,7 +23,7 @@ import org.jetbrains.annotations.NotNull; 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.kotlin.psi.debugText.DebugTextUtilKt; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; import java.util.ArrayList; @@ -326,7 +326,7 @@ public class CallMaker { @Override public String toString() { - return DebugTextPackage.getDebugText(callElement); + return DebugTextUtilKt.getDebugText(callElement); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java index bfd7ae0b562..63b6e70aff1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/diagnostics/DiagnosticsWithSuppression.java @@ -119,7 +119,7 @@ public class DiagnosticsWithSuppression implements Diagnostics { // there's no point to present such diagnostics to the user, because the user didn't write this code PsiFile file = element.getContainingFile(); if (file instanceof JetFile) { - if (PsiPackage.getDoNotAnalyze((JetFile) file) != null) return true; + if (JetPsiFactoryKt.getDoNotAnalyze((JetFile) file) != null) return true; } for (DiagnosticSuppressor suppressor : DIAGNOSTIC_SUPPRESSORS.get()) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java index 82e1645fae5..62c52f616c0 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineAnalyzerExtension.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.FunctionAnalyzerExtension; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import java.util.List; @@ -79,7 +79,7 @@ public class InlineAnalyzerExtension implements FunctionAnalyzerExtension.Analyz ) { List jetParameters = function.getValueParameters(); for (ValueParameterDescriptor parameter : functionDescriptor.getValueParameters()) { - if (DescriptorUtilPackage.hasDefaultValue(parameter)) { + if (DescriptorUtilsKt.hasDefaultValue(parameter)) { JetParameter jetParameter = jetParameters.get(parameter.getIndex()); //report not supported default only on inlinable lambda and on parameter with inherited default (there is some problems to inline it) if (checkInlinableParameter(parameter, jetParameter, functionDescriptor, null) || !parameter.declaresDefaultValue()) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineUtil.java index 54cbf6869d2..a3869c6358b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/inline/InlineUtil.java @@ -27,11 +27,10 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; 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.resolve.constants.ArrayValue; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.EnumValue; @@ -106,9 +105,9 @@ public class InlineUtil { JetExpression call = JetPsiUtil.getParentCallIfPresent(argument); if (call != null) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(call, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(call, bindingContext); if (resolvedCall != null && isInline(resolvedCall.getResultingDescriptor())) { - ValueArgument valueArgument = CallUtilPackage.getValueArgumentForExpression(resolvedCall.getCall(), argument); + ValueArgument valueArgument = CallUtilKt.getValueArgumentForExpression(resolvedCall.getCall(), argument); if (valueArgument != null) { ArgumentMapping mapping = resolvedCall.getArgumentMapping(valueArgument); if (mapping instanceof ArgumentMatch) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java index fa4746a54da..9591bdfb74d 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; @@ -73,7 +73,7 @@ public class DeclarationScopeProviderImpl implements DeclarationScopeProvider { } throw new IllegalStateException("Don't call this method for local declarations: " + jetDeclaration + "\n" + - PsiUtilPackage.getElementTextWithContext(jetDeclaration)); + PsiUtilsKt.getElementTextWithContext(jetDeclaration)); } @NotNull 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 c186073a4d2..08a21db625c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ForceResolveUtil.java @@ -20,14 +20,10 @@ import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.annotations.AnnotationWithTarget; import org.jetbrains.kotlin.descriptors.annotations.Annotations; 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; -import org.jetbrains.kotlin.types.TypesPackage; +import org.jetbrains.kotlin.types.*; import java.util.Collection; @@ -95,9 +91,9 @@ public class ForceResolveUtil { if (type == null) return null; forceResolveAllContents(type.getAnnotations()); - if (TypesPackage.isFlexible(type)) { - forceResolveAllContents(TypesPackage.flexibility(type).getLowerBound()); - forceResolveAllContents(TypesPackage.flexibility(type).getUpperBound()); + if (FlexibleTypesKt.isFlexible(type)) { + forceResolveAllContents(FlexibleTypesKt.flexibility(type).getLowerBound()); + forceResolveAllContents(FlexibleTypesKt.flexibility(type).getUpperBound()); } else { forceResolveAllContents(type.getConstructor()); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java index 0658ba9d8ee..8effadadf04 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; @@ -79,7 +79,7 @@ public class LazyDeclarationResolver { throw new IllegalArgumentException( String.format("Could not find a classifier for %s.\n" + "Found descriptor: %s (%s).\n", - PsiUtilPackage.getElementTextWithContext(classOrObject), + PsiUtilsKt.getElementTextWithContext(classOrObject), scopeDescriptor != null ? DescriptorRenderer.DEBUG_TEXT.render(scopeDescriptor) : "null", scopeDescriptor != null ? (scopeDescriptor.getContainingDeclaration().getClass()) : null)); } @@ -216,7 +216,7 @@ public class LazyDeclarationResolver { @Override public DeclarationDescriptor visitJetElement(@NotNull JetElement element, Void data) { throw new IllegalArgumentException("Unsupported declaration type: " + element + " " + - PsiUtilPackage.getElementTextWithContext(element)); + PsiUtilsKt.getElementTextWithContext(element)); } }, null); if (result == null) { @@ -240,7 +240,7 @@ public class LazyDeclarationResolver { return getClassDescriptor((JetClassOrObject) parentDeclaration, location).getUnsubstitutedMemberScope(); } else { throw new IllegalStateException("Don't call this method for local declarations: " + declaration + "\n" + - PsiUtilPackage.getElementTextWithContext(declaration)); + PsiUtilsKt.getElementTextWithContext(declaration)); } } } 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 b9ecac7bc50..cd622d8ad72 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/ResolveSessionUtils.java @@ -25,10 +25,7 @@ import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; -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.kotlin.name.*; import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.psi.JetNamedDeclarationUtil; import org.jetbrains.kotlin.resolve.scopes.JetScope; @@ -61,7 +58,7 @@ public class ResolveSessionUtils { while (true) { PackageViewDescriptor packageDescriptor = module.getPackage(packageFqName); if (!packageDescriptor.isEmpty()) { - FqName relativeClassFqName = NamePackage.tail(fqName, packageFqName); + FqName relativeClassFqName = FqNamesUtilKt.tail(fqName, packageFqName); ClassDescriptor classDescriptor = findByQualifiedName(packageDescriptor.getMemberScope(), relativeClassFqName); if (classDescriptor != null && filter.apply(classDescriptor)) { result.add(classDescriptor); 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 0cb6641ffe9..55d321869f1 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 @@ -48,6 +48,7 @@ import org.jetbrains.kotlin.resolve.lazy.declarations.ClassMemberDeclarationProv import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.StaticScopeForKotlinClass; +import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt; import org.jetbrains.kotlin.storage.MemoizedFunctionToNotNull; import org.jetbrains.kotlin.storage.NotNullLazyValue; import org.jetbrains.kotlin.storage.NullableLazyValue; @@ -64,7 +65,6 @@ import static org.jetbrains.kotlin.diagnostics.Errors.CYCLIC_INHERITANCE_HIERARC import static org.jetbrains.kotlin.diagnostics.Errors.TYPE_PARAMETERS_IN_ENUM; import static org.jetbrains.kotlin.resolve.BindingContext.TYPE; 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() { @@ -104,7 +104,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes @NotNull JetClassLikeInfo classLikeInfo ) { super(c.getStorageManager(), containingDeclaration, name, - toSourceElement(classLikeInfo.getCorrespondingClassOrObject()) + KotlinSourceElementKt.toSourceElement(classLikeInfo.getCorrespondingClassOrObject()) ); this.c = c; 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 ac25f8c8c46..258ad677946 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 @@ -25,12 +25,11 @@ import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyClassContext; import org.jetbrains.kotlin.resolve.lazy.LazyEntity; +import org.jetbrains.kotlin.resolve.source.KotlinSourceElementKt; import org.jetbrains.kotlin.types.JetType; import java.util.Set; -import static org.jetbrains.kotlin.resolve.source.SourcePackage.toSourceElement; - public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescriptor implements LazyEntity { private final LazyClassContext c; @@ -48,7 +47,7 @@ public class LazyTypeParameterDescriptor extends AbstractLazyTypeParameterDescri jetTypeParameter.getVariance(), jetTypeParameter.hasModifier(JetTokens.REIFIED_KEYWORD), index, - toSourceElement(jetTypeParameter) + KotlinSourceElementKt.toSourceElement(jetTypeParameter) ); this.c = c; this.jetTypeParameter = jetTypeParameter; 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 68fd49b2f91..0a8b0ca8f44 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/BasicExpressionTypingVisitor.java @@ -35,8 +35,8 @@ import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.*; -import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; -import org.jetbrains.kotlin.resolve.callableReferences.CallableReferencesPackage; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt; +import org.jetbrains.kotlin.resolve.callableReferences.CallableReferencesResolutionUtilsKt; import org.jetbrains.kotlin.resolve.calls.ArgumentTypeResolver; import org.jetbrains.kotlin.resolve.calls.CallExpressionResolver; import org.jetbrains.kotlin.resolve.calls.checkers.CallChecker; @@ -59,11 +59,11 @@ import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.resolve.constants.*; import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; -import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; -import org.jetbrains.kotlin.types.expressions.unqualifiedSuper.UnqualifiedSuperPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; +import org.jetbrains.kotlin.types.expressions.unqualifiedSuper.UnqualifiedSuperKt; import org.jetbrains.kotlin.util.OperatorNameConventions; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; @@ -108,7 +108,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { public JetTypeInfo visitParenthesizedExpression(@NotNull JetParenthesizedExpression expression, ExpressionTypingContext context) { JetExpression innerExpression = expression.getExpression(); if (innerExpression == null) { - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } return facade.getTypeInfo(innerExpression, context.replaceScope(context.scope)); } @@ -125,7 +125,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { boolean hasError = constantChecker.checkConstantExpressionType(constantValue, expression, context.expectedType); if (hasError) { IElementType elementType = expression.getNode().getElementType(); - return TypeInfoFactoryPackage.createTypeInfo(getDefaultType(elementType), context); + return TypeInfoFactoryKt.createTypeInfo(getDefaultType(elementType), context); } } @@ -214,7 +214,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { ) { if (actualType == null || noExpectedType(targetType) || targetType.isError()) return; - if (TypesPackage.isDynamic(targetType)) { + if (DynamicTypesKt.isDynamic(targetType)) { JetTypeReference right = expression.getRight(); assert right != null : "We know target is dynamic, but RHS is missing"; context.trace.report(DYNAMIC_NOT_ALLOWED.on(right)); @@ -319,7 +319,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { if (superTypeQualifier != null) { components.typeResolver.resolveType(context.scope, superTypeQualifier, context.trace, true); } - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } private JetType checkPossiblyQualifiedSuper( @@ -380,9 +380,9 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } } else { - if (UnqualifiedSuperPackage.isPossiblyAmbiguousUnqualifiedSuper(expression, supertypes)) { + if (UnqualifiedSuperKt.isPossiblyAmbiguousUnqualifiedSuper(expression, supertypes)) { Collection supertypesResolvedFromContext = - UnqualifiedSuperPackage.resolveUnqualifiedSuperFromExpressionContext( + UnqualifiedSuperKt.resolveUnqualifiedSuperFromExpressionContext( expression, supertypes, components.builtIns.getAnyType()); if (supertypesResolvedFromContext.size() == 1) { JetType singleResolvedType = supertypesResolvedFromContext.iterator().next(); @@ -415,7 +415,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { context.trace.record(BindingContext.REFERENCE_TARGET, expression.getInstanceReference(), result.getConstructor().getDeclarationDescriptor()); } - BindingContextUtilPackage.recordScope(context.trace, context.scope, superTypeQualifier); + BindingContextUtilsKt.recordScope(context.trace, context.scope, superTypeQualifier); return result; } @@ -440,7 +440,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } else { ReceiverParameterDescriptor result = null; - List receivers = UtilsPackage.getImplicitReceiversHierarchy(context.scope); + List receivers = ScopeUtilsKt.getImplicitReceiversHierarchy(context.scope); if (onlyClassReceivers) { for (ReceiverParameterDescriptor receiver : receivers) { if (isDeclaredInClass(receiver)) { @@ -508,7 +508,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { ); } - return TypeInfoFactoryPackage.createTypeInfo(ErrorUtils.createErrorType("Unresolved class"), c); + return TypeInfoFactoryKt.createTypeInfo(ErrorUtils.createErrorType("Unresolved class"), c); } @Nullable @@ -665,9 +665,9 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } } // Breaks are not possible inside constructor arguments, so jumpPossible or jumpFlowInfo are not necessary here - JetTypeInfo resultTypeInfo = components.dataFlowAnalyzer.checkType(TypeInfoFactoryPackage.createTypeInfo(result[0], resultFlowInfo), - expression, - context); + JetTypeInfo resultTypeInfo = components.dataFlowAnalyzer.checkType(TypeInfoFactoryKt.createTypeInfo(result[0], resultFlowInfo), + expression, + context); // We have to record it here, // otherwise ExpressionTypingVisitorDispatcher records wrong information context.trace.record(EXPRESSION_TYPE_INFO, expression, resultTypeInfo); @@ -684,7 +684,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { JetSimpleNameExpression reference = expression.getCallableReference(); boolean[] resolved = new boolean[1]; - CallableDescriptor descriptor = CallableReferencesPackage.resolveCallableReferenceTarget( + CallableDescriptor descriptor = CallableReferencesResolutionUtilsKt.resolveCallableReferenceTarget( expression, lhsType, context, resolved, components.callResolver); if (!resolved[0]) { context.trace.report(UNRESOLVED_REFERENCE.on(reference, reference)); @@ -700,7 +700,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { context.trace.report(CALLABLE_REFERENCE_TO_OBJECT_MEMBER.on(reference)); } - return CallableReferencesPackage.createReflectionTypeForResolvedCallableReference(expression, descriptor, context, components.reflectionTypes); + return CallableReferencesResolutionUtilsKt.createReflectionTypeForResolvedCallableReference(expression, descriptor, context, components.reflectionTypes); } @Override @@ -722,7 +722,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { : contextWithExpectedType.replaceContextDependency(INDEPENDENT).replaceExpectedType(NO_EXPECTED_TYPE); JetExpression baseExpression = expression.getBaseExpression(); - if (baseExpression == null) return TypeInfoFactoryPackage.noTypeInfo(context); + if (baseExpression == null) return TypeInfoFactoryKt.noTypeInfo(context); JetSimpleNameExpression operationSign = expression.getOperationReference(); @@ -870,7 +870,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { UnderscoreChecker.INSTANCE$.checkIdentifier(labelIdentifier, context.trace); } JetExpression baseExpression = expression.getBaseExpression(); - if (baseExpression == null) return TypeInfoFactoryPackage.noTypeInfo(context); + if (baseExpression == null) return TypeInfoFactoryKt.noTypeInfo(context); return facade.getTypeInfo(baseExpression, context, isStatement); } @@ -996,7 +996,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { context.trace.record(REFERENCE_TARGET, operationSign, components.builtIns.getIdentityEquals()); ensureNonemptyIntersectionOfOperandTypes(expression, context); // TODO : Check comparison pointlessness - result = TypeInfoFactoryPackage.createTypeInfo(components.builtIns.getBooleanType(), context); + result = TypeInfoFactoryKt.createTypeInfo(components.builtIns.getBooleanType(), context); } else if (OperatorConventions.IN_OPERATIONS.contains(operationType)) { ValueArgument leftArgument = CallMaker.makeValueArgument(left, left != null ? left : operationSign); @@ -1007,7 +1007,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } else { context.trace.report(UNSUPPORTED.on(operationSign, "Unknown operation")); - result = TypeInfoFactoryPackage.noTypeInfo(context); + result = TypeInfoFactoryKt.noTypeInfo(context); } CompileTimeConstant value = components.constantExpressionEvaluator.evaluateExpression( expression, contextWithExpectedType.trace, contextWithExpectedType.expectedType @@ -1028,7 +1028,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { if (right == null || left == null) { ExpressionTypingUtils.getTypeInfoOrNullType(right, context, facade); ExpressionTypingUtils.getTypeInfoOrNullType(left, context, facade); - return TypeInfoFactoryPackage.createTypeInfo(components.builtIns.getBooleanType(), context); + return TypeInfoFactoryKt.createTypeInfo(components.builtIns.getBooleanType(), context); } JetTypeInfo leftTypeInfo = getTypeInfoOrNullType(left, context, facade); @@ -1150,7 +1150,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { if (left == null || right == null) { getTypeInfoOrNullType(left, context, facade); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } Call call = createCallForSpecialConstruction(expression, expression.getOperationReference(), Lists.newArrayList(left, right)); @@ -1159,7 +1159,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { JetTypeInfo leftTypeInfo = BindingContextUtils.getRecordedTypeInfo(left, context.trace.getBindingContext()); if (ArgumentTypeResolver.isFunctionLiteralArgument(left, context)) { context.trace.report(USELESS_ELVIS_ON_FUNCTION_LITERAL.on(expression.getOperationReference())); - if (leftTypeInfo == null) return TypeInfoFactoryPackage.noTypeInfo(context); + if (leftTypeInfo == null) return TypeInfoFactoryKt.noTypeInfo(context); } assert leftTypeInfo != null : "Left expression was not processed: " + expression; JetType leftType = leftTypeInfo.getType(); @@ -1169,7 +1169,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { JetTypeInfo rightTypeInfo = BindingContextUtils.getRecordedTypeInfo(right, context.trace.getBindingContext()); if (rightTypeInfo == null && ArgumentTypeResolver.isFunctionLiteralArgument(right, context)) { // the type is computed later in call completer according to the '?:' semantics as a function - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } assert rightTypeInfo != null : "Right expression was not processed: " + expression; boolean loopBreakContinuePossible = leftTypeInfo.getJumpOutPossible() || rightTypeInfo.getJumpOutPossible(); @@ -1187,7 +1187,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { } } JetType type = resolvedCall.getResultingDescriptor().getReturnType(); - if (type == null || rightType == null) return TypeInfoFactoryPackage.noTypeInfo(dataFlowInfo); + if (type == null || rightType == null) return TypeInfoFactoryKt.noTypeInfo(dataFlowInfo); // Sometimes return type for special call for elvis operator might be nullable, // but result is not nullable if the right type is not nullable @@ -1195,14 +1195,14 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { type = TypeUtils.makeNotNullable(type); } if (context.contextDependency == DEPENDENT) { - return TypeInfoFactoryPackage.createTypeInfo(type, dataFlowInfo); + return TypeInfoFactoryKt.createTypeInfo(type, dataFlowInfo); } // If break or continue was possible, take condition check info as the jump info - return TypeInfoFactoryPackage.createTypeInfo(components.dataFlowAnalyzer.checkType(type, expression, contextWithExpectedType), - dataFlowInfo, - loopBreakContinuePossible, - context.dataFlowInfo); + return TypeInfoFactoryKt.createTypeInfo(components.dataFlowAnalyzer.checkType(type, expression, contextWithExpectedType), + dataFlowInfo, + loopBreakContinuePossible, + context.dataFlowInfo); } @NotNull @@ -1217,7 +1217,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { ExpressionTypingContext contextWithNoExpectedType = context.replaceExpectedType(NO_EXPECTED_TYPE); if (right == null) { if (left != null) facade.getTypeInfo(left, contextWithNoExpectedType); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } JetTypeInfo rightTypeInfo = facade.getTypeInfo(right, contextWithNoExpectedType); @@ -1310,7 +1310,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { private JetTypeInfo assignmentIsNotAnExpressionError(JetBinaryExpression expression, ExpressionTypingContext context) { facade.checkStatementType(expression, context); context.trace.report(ASSIGNMENT_IN_EXPRESSION_CONTEXT.on(expression)); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } @Override @@ -1330,7 +1330,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { //left here is a receiver, so it doesn't depend on expected type typeInfo = facade.getTypeInfo(left, context.replaceContextDependency(INDEPENDENT).replaceExpectedType(NO_EXPECTED_TYPE)); } else { - typeInfo = TypeInfoFactoryPackage.noTypeInfo(context); + typeInfo = TypeInfoFactoryKt.noTypeInfo(context); } ExpressionTypingContext contextWithDataFlow = context.replaceDataFlowInfo(typeInfo.getDataFlowInfo()); @@ -1356,7 +1356,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @Override public JetTypeInfo visitDeclaration(@NotNull JetDeclaration dcl, ExpressionTypingContext context) { context.trace.report(DECLARATION_IN_ILLEGAL_CONTEXT.on(dcl)); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } @Override @@ -1364,14 +1364,14 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { if (!JetPsiUtil.isLHSOfDot(expression)) { context.trace.report(PACKAGE_IS_NOT_AN_EXPRESSION.on(expression)); } - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } @Override public JetTypeInfo visitStringTemplateExpression(@NotNull JetStringTemplateExpression expression, ExpressionTypingContext contextWithExpectedType) { final ExpressionTypingContext context = contextWithExpectedType.replaceExpectedType(NO_EXPECTED_TYPE).replaceContextDependency(INDEPENDENT); class StringTemplateVisitor extends JetVisitorVoid { - private JetTypeInfo typeInfo = TypeInfoFactoryPackage.noTypeInfo(context); + private JetTypeInfo typeInfo = TypeInfoFactoryKt.noTypeInfo(context); @Override public void visitStringTemplateEntryWithExpression(@NotNull JetStringTemplateEntryWithExpression entry) { @@ -1410,7 +1410,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { JetExpression baseExpression = expression.getBaseExpression(); if (baseExpression == null) { - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } return facade.getTypeInfo(baseExpression, context, isStatement); } @@ -1418,7 +1418,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @Override public JetTypeInfo visitJetElement(@NotNull JetElement element, ExpressionTypingContext context) { context.trace.report(UNSUPPORTED.on(element, getClass().getCanonicalName())); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } @NotNull @@ -1438,7 +1438,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor { @NotNull BindingTrace traceForResolveResult, boolean isGet) { JetExpression arrayExpression = arrayAccessExpression.getArrayExpression(); - if (arrayExpression == null) return TypeInfoFactoryPackage.noTypeInfo(oldContext); + if (arrayExpression == null) return TypeInfoFactoryKt.noTypeInfo(oldContext); JetTypeInfo arrayTypeInfo = facade.safeGetTypeInfo(arrayExpression, oldContext.replaceExpectedType(NO_EXPECTED_TYPE) 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 a85cdc92306..5dce084782a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ControlStructureTypingVisitor.java @@ -30,18 +30,19 @@ 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.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.inline.InlineUtil; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; import org.jetbrains.kotlin.resolve.scopes.receivers.TransientReceiver; -import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.types.CommonSupertypes; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import java.util.ArrayList; import java.util.Collections; @@ -51,7 +52,6 @@ import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.resolve.BindingContext.*; import static org.jetbrains.kotlin.resolve.calls.context.ContextDependency.INDEPENDENT; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; import static org.jetbrains.kotlin.types.TypeUtils.*; import static org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils.createCallForSpecialConstruction; import static org.jetbrains.kotlin.types.expressions.ControlStructureTypingUtils.createDataFlowInfoForArgumentsForIfCall; @@ -111,18 +111,18 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { ? result.replaceJumpOutPossible(true).replaceJumpFlowInfo(conditionDataFlowInfo) : result; } - return TypeInfoFactoryPackage.createTypeInfo(components.dataFlowAnalyzer.checkImplicitCast( + return TypeInfoFactoryKt.createTypeInfo(components.dataFlowAnalyzer.checkImplicitCast( components.builtIns.getUnitType(), ifExpression, contextWithExpectedType, isStatement ), - thenInfo.or(elseInfo) + thenInfo.or(elseInfo) ); } if (thenBranch == null) { return getTypeInfoWhenOnlyOneBranchIsPresent( elseBranch, elseScope, elseInfo, thenInfo, contextWithExpectedType, ifExpression, isStatement); } - JetPsiFactory psiFactory = JetPsiFactory(ifExpression); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(ifExpression); JetBlockExpression thenBlock = psiFactory.wrapInABlockWrapper(thenBranch); JetBlockExpression elseBlock = psiFactory.wrapInABlockWrapper(elseBranch); Call callForIf = createCallForSpecialConstruction(ifExpression, ifExpression, Lists.newArrayList(thenBlock, elseBlock)); @@ -164,7 +164,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { JetType resultType = resolvedCall.getResultingDescriptor().getReturnType(); // If break or continue was possible, take condition check info as the jump info - return TypeInfoFactoryPackage + return TypeInfoFactoryKt .createTypeInfo(components.dataFlowAnalyzer.checkImplicitCast(resultType, ifExpression, contextWithExpectedType, isStatement), resultDataFlowInfo, loopBreakContinuePossible, conditionDataFlowInfo); } @@ -232,7 +232,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { CoercionStrategy.NO_COERCION, context.replaceDataFlowInfo(conditionInfo)); } else { - bodyTypeInfo = TypeInfoFactoryPackage.noTypeInfo(conditionInfo); + bodyTypeInfo = TypeInfoFactoryKt.noTypeInfo(conditionInfo); } // Condition is false at this point only if there is no jumps outside @@ -332,7 +332,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { writableScope, block, CoercionStrategy.NO_COERCION, context); } else { - bodyTypeInfo = TypeInfoFactoryPackage.noTypeInfo(context); + bodyTypeInfo = TypeInfoFactoryKt.noTypeInfo(context); } JetExpression condition = expression.getCondition(); DataFlowInfo conditionDataFlowInfo = checkCondition(conditionScope, condition, context); @@ -384,7 +384,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { } } else { - loopRangeInfo = TypeInfoFactoryPackage.noTypeInfo(context); + loopRangeInfo = TypeInfoFactoryKt.noTypeInfo(context); } LexicalWritableScope loopScope = newWritableScopeImpl(context, "Scope with for-loop index"); @@ -455,7 +455,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { { // http://youtrack.jetbrains.net/issue/KT-527 - VariableDescriptor olderVariable = UtilsPackage.getLocalVariable(context.scope, variableDescriptor.getName()); + VariableDescriptor olderVariable = ScopeUtilsKt.getLocalVariable(context.scope, variableDescriptor.getName()); if (olderVariable != null && isLocal(context.scope.getOwnerDescriptor(), olderVariable)) { PsiElement declaration = DescriptorToSourceUtils.descriptorToDeclaration(variableDescriptor); context.trace.report(Errors.NAME_SHADOWING.on(declaration, variableDescriptor.getName().asString())); @@ -495,7 +495,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { } } - JetTypeInfo result = TypeInfoFactoryPackage.noTypeInfo(context); + JetTypeInfo result = TypeInfoFactoryKt.noTypeInfo(context); if (finallyBlock != null) { result = facade.getTypeInfo(finallyBlock.getFinalExpression(), context.replaceExpectedType(NO_EXPECTED_TYPE)); @@ -624,7 +624,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { ) { JetType expectedType; if (function instanceof JetSecondaryConstructor) { - expectedType = getBuiltIns(descriptor).getUnitType(); + expectedType = DescriptorUtilsKt.getBuiltIns(descriptor).getUnitType(); } else if (function instanceof JetFunction) { JetFunction jetFunction = (JetFunction) function; diff --git a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java index 7d0d86895e2..266efa0bdf9 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/DataFlowAnalyzer.java @@ -31,11 +31,11 @@ import org.jetbrains.kotlin.resolve.calls.context.ResolutionContext; import org.jetbrains.kotlin.resolve.calls.smartcasts.*; import org.jetbrains.kotlin.resolve.constants.*; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; +import org.jetbrains.kotlin.types.DynamicTypesKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; -import org.jetbrains.kotlin.types.TypesPackage; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import java.util.Collection; @@ -258,7 +258,7 @@ public class DataFlowAnalyzer { public JetType checkImplicitCast(@Nullable JetType expressionType, @NotNull JetExpression expression, @NotNull ResolutionContext context, boolean isStatement) { if (expressionType != null && context.expectedType == NO_EXPECTED_TYPE && context.contextDependency == INDEPENDENT && !isStatement && (KotlinBuiltIns.isUnit(expressionType) || KotlinBuiltIns.isAnyOrNullableAny(expressionType)) - && !TypesPackage.isDynamic(expressionType)) { + && !DynamicTypesKt.isDynamic(expressionType)) { context.trace.report(IMPLICIT_CAST_TO_UNIT_OR_ANY.on(expression, expressionType)); } return expressionType; @@ -274,7 +274,7 @@ public class DataFlowAnalyzer { facade.checkStatementType( expression, context.replaceExpectedType(TypeUtils.NO_EXPECTED_TYPE).replaceContextDependency(INDEPENDENT)); context.trace.report(EXPRESSION_EXPECTED.on(expression, expression)); - return TypeInfoFactoryPackage.noTypeInfo(context); + return TypeInfoFactoryKt.noTypeInfo(context); } @NotNull @@ -298,7 +298,7 @@ public class DataFlowAnalyzer { @NotNull ResolutionContext context, @NotNull JetExpression expression ) { - return checkType(TypeInfoFactoryPackage.createTypeInfo(type, context), expression, context); + return checkType(TypeInfoFactoryKt.createTypeInfo(type, context), expression, context); } @NotNull 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 4b9395f2d04..7a6387488f1 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingServices.java @@ -32,10 +32,10 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope; import org.jetbrains.kotlin.resolve.scopes.WritableScope; -import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import java.util.Iterator; import java.util.List; @@ -158,7 +158,7 @@ public class ExpressionTypingServices { @NotNull CoercionStrategy coercionStrategyForLastExpression, @NotNull ExpressionTypingContext context ) { - List block = ResolvePackage.filterStatements(statementFilter, expression); + List block = StatementFilterKt.filterStatements(statementFilter, expression); // SCRIPT: get code descriptor for script declaration DeclarationDescriptor containingDescriptor = context.scope.getOwnerDescriptor(); @@ -185,7 +185,7 @@ public class ExpressionTypingServices { scope.changeLockLevel(WritableScope.LockLevel.READING); if (containingDescriptor instanceof ScriptDescriptor) { - context.trace.record(BindingContext.SCRIPT_SCOPE, (ScriptDescriptor) containingDescriptor, UtilsPackage.asJetScope(scope)); + context.trace.record(BindingContext.SCRIPT_SCOPE, (ScriptDescriptor) containingDescriptor, ScopeUtilsKt.asJetScope(scope)); } return r; @@ -229,14 +229,14 @@ public class ExpressionTypingServices { @NotNull ExpressionTypingContext context ) { if (block.isEmpty()) { - return TypeInfoFactoryPackage.createTypeInfo(expressionTypingComponents.builtIns.getUnitType(), context); + return TypeInfoFactoryKt.createTypeInfo(expressionTypingComponents.builtIns.getUnitType(), context); } ExpressionTypingInternals blockLevelVisitor = new ExpressionTypingVisitorDispatcher.ForBlock( expressionTypingComponents, annotationChecker, scope); ExpressionTypingContext newContext = context.replaceScope(scope).replaceExpectedType(NO_EXPECTED_TYPE); - JetTypeInfo result = TypeInfoFactoryPackage.noTypeInfo(context); + JetTypeInfo result = TypeInfoFactoryKt.noTypeInfo(context); // Jump point data flow info DataFlowInfo beforeJumpInfo = newContext.dataFlowInfo; boolean jumpOutPossible = false; 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 c99d6204271..f97131dabff 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingUtils.java @@ -35,7 +35,7 @@ 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.JetType; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import java.util.ArrayList; import java.util.List; @@ -114,7 +114,7 @@ public class ExpressionTypingUtils { @NotNull String argumentName, @NotNull JetType argumentType ) { - JetExpression fakeExpression = JetPsiFactory(project).createExpression(argumentName); + JetExpression fakeExpression = JetPsiFactoryKt.JetPsiFactory(project).createExpression(argumentName); trace.recordType(fakeExpression, argumentType); trace.record(PROCESSED, fakeExpression); return fakeExpression; @@ -164,7 +164,7 @@ public class ExpressionTypingUtils { ) { return expression != null ? facade.getTypeInfo(expression, context) - : TypeInfoFactoryPackage.noTypeInfo(context); + : TypeInfoFactoryKt.noTypeInfo(context); } @SuppressWarnings("SuspiciousMethodCalls") 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 dc89c4d7310..f2a9145be0a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java @@ -27,18 +27,17 @@ import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.AnnotationChecker; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt; import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope; import org.jetbrains.kotlin.types.DeferredType; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import org.jetbrains.kotlin.util.PerformanceCounter; import org.jetbrains.kotlin.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.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.recordDataFlowInfo; -import static org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.recordScope; public abstract class ExpressionTypingVisitorDispatcher extends JetVisitor implements ExpressionTypingInternals { @@ -182,14 +181,14 @@ public abstract class ExpressionTypingVisitorDispatcher extends JetVisitor declarationsByLabel = UtilsPackage.getDeclarationsByLabel(context.scope, labelName); + Collection declarationsByLabel = ScopeUtilsKt.getDeclarationsByLabel(context.scope, labelName); int size = declarationsByLabel.size(); if (size > 1) { @@ -194,7 +194,7 @@ public class LabelResolver { JetSimpleNameExpression targetLabel = expression.getTargetLabel(); assert targetLabel != null : expression; - Collection declarationsByLabel = UtilsPackage.getDeclarationsByLabel(context.scope, labelName); + Collection declarationsByLabel = ScopeUtilsKt.getDeclarationsByLabel(context.scope, labelName); int size = declarationsByLabel.size(); if (size == 1) { DeclarationDescriptor declarationDescriptor = declarationsByLabel.iterator().next(); 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 654e1d91458..a841bfc0044 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/types/expressions/PatternMatchingTypingVisitor.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.resolve.calls.util.CallMaker; import org.jetbrains.kotlin.resolve.scopes.LexicalWritableScope; import org.jetbrains.kotlin.types.*; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryPackage; +import org.jetbrains.kotlin.types.expressions.typeInfoFactory.TypeInfoFactoryKt; import java.util.Collections; import java.util.Set; @@ -142,14 +142,14 @@ public class PatternMatchingTypingVisitor extends ExpressionTypingVisitor { commonDataFlowInfo = commonDataFlowInfo.or(context.dataFlowInfo); } - return TypeInfoFactoryPackage.createTypeInfo(expressionTypes.isEmpty() ? null : components.dataFlowAnalyzer.checkType( + return TypeInfoFactoryKt.createTypeInfo(expressionTypes.isEmpty() ? null : components.dataFlowAnalyzer.checkType( components.dataFlowAnalyzer.checkImplicitCast( CommonSupertypes.commonSupertype(expressionTypes), expression, contextWithExpectedType, isStatement), expression, contextWithExpectedType), - commonDataFlowInfo, - loopBreakContinuePossible, - contextWithExpectedType.dataFlowInfo); + commonDataFlowInfo, + loopBreakContinuePossible, + contextWithExpectedType.dataFlowInfo); } @NotNull @@ -309,7 +309,7 @@ public class PatternMatchingTypingVisitor extends ExpressionTypingVisitor { PossiblyBareType possiblyBareTarget = components.typeResolver.resolvePossiblyBareType(typeResolutionContext, typeReferenceAfterIs); JetType targetType = TypeReconstructionUtil.reconstructBareType(typeReferenceAfterIs, possiblyBareTarget, subjectType, context.trace, components.builtIns); - if (TypesPackage.isDynamic(targetType)) { + if (DynamicTypesKt.isDynamic(targetType)) { context.trace.report(DYNAMIC_NOT_ALLOWED.on(typeReferenceAfterIs)); } ClassDescriptor targetDescriptor = TypeUtils.getClassDescriptor(targetType); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java index 32dee8adc6c..4a4c3c9d8d7 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/util/slicedMap/Slices.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.util.slicedMap; import com.intellij.openapi.diagnostic.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.JetElement; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import java.util.Arrays; import java.util.List; @@ -41,7 +41,7 @@ public class Slices { " key: " + key + " old value: " + oldValue + '@' + System.identityHashCode(oldValue) + " new value: " + newValue + '@' + System.identityHashCode(newValue) + - (key instanceof JetElement ? "\n" + PsiUtilPackage.getElementTextWithContext((JetElement) key) : "")); + (key instanceof JetElement ? "\n" + PsiUtilsKt.getElementTextWithContext((JetElement) key) : "")); } return true; } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java index c9c455728f5..fb4566600db 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/JavaElementFinder.java @@ -34,7 +34,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.NamePackage; +import org.jetbrains.kotlin.name.FqNamesUtilKt; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetEnumEntry; import org.jetbrains.kotlin.psi.JetFile; @@ -108,7 +108,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM } private PsiClass[] doFindClasses(String qualifiedNameString, GlobalSearchScope scope) { - if (!NamePackage.isValidJavaFqName(qualifiedNameString)) { + if (!FqNamesUtilKt.isValidJavaFqName(qualifiedNameString)) { return PsiClass.EMPTY_ARRAY; } @@ -184,7 +184,7 @@ public class JavaElementFinder extends PsiElementFinder implements KotlinFinderM @Override public PsiPackage findPackage(@NotNull String qualifiedNameString) { - if (!NamePackage.isValidJavaFqName(qualifiedNameString)) { + if (!FqNamesUtilKt.isValidJavaFqName(qualifiedNameString)) { return null; } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java index cf4351db2c6..377eec9d7af 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightParameter.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinLanguage; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; import java.util.List; @@ -75,7 +75,7 @@ public class KotlinLightParameter extends LightParameter implements KotlinLightE JetDeclaration declaration = method.getOrigin(); if (declaration == null) return null; - int jetIndex = PsiUtilPackage.isExtensionDeclaration(declaration) ? index - 1 : index; + int jetIndex = JetPsiUtilKt.isExtensionDeclaration(declaration) ? index - 1 : index; if (jetIndex < 0) return null; if (declaration instanceof JetFunction) { diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java index 1db791669c6..6902be7b007 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinLightTypeParameter.java @@ -51,7 +51,7 @@ public class KotlinLightTypeParameter @NotNull @Override public JetTypeParameter getOrigin() { - JetTypeParameterListOwner jetOwner = (JetTypeParameterListOwner) AsJavaPackage.getUnwrapped(owner); + JetTypeParameterListOwner jetOwner = (JetTypeParameterListOwner) LightClassUtilsKt.getUnwrapped(owner); assert (jetOwner != null) : "Invalid type parameter owner: " + owner; return jetOwner.getTypeParameters().get(index); diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java index 523e55a5fc1..898223ee9e9 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java @@ -35,7 +35,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinLanguage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import java.util.List; @@ -124,7 +124,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem JetDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(field); if (declaration instanceof JetEnumEntry) { assert field instanceof PsiEnumConstant : "Field delegate should be an enum constant (" + field.getName() + "):\n" + - PsiUtilPackage.getElementTextWithContext(declaration); + PsiUtilsKt.getElementTextWithContext(declaration); JetEnumEntry enumEntry = (JetEnumEntry) declaration; PsiEnumConstant enumConstant = (PsiEnumConstant) field; FqName enumConstantFqName = new FqName(getFqName().asString() + "." + enumEntry.getName()); diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java index 9660b591686..29bcce9b3ec 100644 --- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java +++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java @@ -29,8 +29,8 @@ import org.jetbrains.kotlin.resolve.MemberComparator; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.NullValue; import org.jetbrains.kotlin.types.*; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.kotlin.utils.Interner; -import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -57,7 +57,7 @@ public class DescriptorSerializer { return result.toByteArray(); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -359,8 +359,8 @@ public class DescriptorSerializer { public ProtoBuf.Type.Builder type(@NotNull JetType type) { assert !type.isError() : "Can't serialize error types: " + type; // TODO - if (TypesPackage.isFlexible(type)) { - Flexibility flexibility = TypesPackage.flexibility(type); + if (FlexibleTypesKt.isFlexible(type)) { + Flexibility flexibility = FlexibleTypesKt.flexibility(type); return type(flexibility.getLowerBound()) .setFlexibleTypeCapabilitiesId(getStringTable().getStringIndex(flexibility.getExtraCapabilities().getId())) diff --git a/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTableImpl.java b/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTableImpl.java index 9daa5fe2095..aec18f0f75f 100644 --- a/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTableImpl.java +++ b/compiler/serialization/src/org/jetbrains/kotlin/serialization/StringTableImpl.java @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.types.ErrorUtils; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.kotlin.utils.Interner; -import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.IOException; import java.io.OutputStream; @@ -129,7 +129,7 @@ public class StringTableImpl implements StringTable { qualifiedNameTable.build().writeDelimitedTo(output); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java index ab156eb7646..a93682f3488 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinAsJavaTestBase.java @@ -20,13 +20,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import java.io.File; import java.util.List; -import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoot; - public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment { protected JavaElementFinder finder; @@ -35,7 +34,7 @@ public abstract class KotlinAsJavaTestBase extends KotlinTestWithEnvironment { CompilerConfiguration configuration = new CompilerConfiguration(); for (File root : getKotlinSourceRoots()) { - addKotlinSourceRoot(configuration, root.getPath()); + ContentRootsKt.addKotlinSourceRoot(configuration, root.getPath()); } extraConfiguration(configuration); diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java index 5c6356d3da1..9afa98b65d9 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassStructureTest.java @@ -23,6 +23,7 @@ import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.name.SpecialNames; @@ -34,7 +35,6 @@ import java.util.List; import java.util.Set; import static org.jetbrains.kotlin.asJava.KotlinLightClassStructureTest.ClassProperty.*; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJvmClasspathRoot; @SuppressWarnings("JUnitTestClassNamingConvention") public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase { @@ -149,7 +149,7 @@ public abstract class KotlinLightClassStructureTest extends KotlinAsJavaTestBase @Override protected void extraConfiguration(@NotNull CompilerConfiguration configuration) { - addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); } } diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java index 2cbed028533..e0b9cf2e9b8 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java @@ -21,6 +21,7 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiModifierList; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.test.JetTestUtils; @@ -28,8 +29,6 @@ import java.io.File; import java.util.Collections; import java.util.List; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJvmClasspathRoot; - public class LightClassAnnotationsTest extends KotlinAsJavaTestBase { private final File testDir = new File("compiler/testData/asJava/annotations"); @@ -40,7 +39,7 @@ public class LightClassAnnotationsTest extends KotlinAsJavaTestBase { @Override protected void extraConfiguration(@NotNull CompilerConfiguration configuration) { - addJvmClasspathRoot(configuration, JetTestUtils.getAnnotationsJar()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, JetTestUtils.getAnnotationsJar()); } public void testExtraAnnotations() throws Exception { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java index 8e71576cb47..3b59674c786 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java @@ -28,6 +28,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider; +import org.jetbrains.kotlin.context.ContextKt; import org.jetbrains.kotlin.context.GlobalContext; import org.jetbrains.kotlin.context.ModuleContext; import org.jetbrains.kotlin.context.SimpleGlobalContext; @@ -55,13 +56,11 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.util.DescriptorValidator; import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.util.*; -import static org.jetbrains.kotlin.context.ContextPackage.withModule; -import static org.jetbrains.kotlin.context.ContextPackage.withProject; import static org.jetbrains.kotlin.diagnostics.Errors.*; import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.RECURSIVE; import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.RECURSIVE_ALL; @@ -128,7 +127,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest { moduleBindings.put(testModule, moduleTrace.getBindingContext()); - ModuleContext moduleContext = withModule(withProject(context, getProject()), module); + ModuleContext moduleContext = ContextKt.withModule(ContextKt.withProject(context, getProject()), module); analyzeModuleContents(moduleContext, jetFiles, moduleTrace); checkAllResolvedCallsAreCompleted(jetFiles, moduleTrace.getBindingContext()); @@ -178,13 +177,13 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest { // now we throw a previously found error, if any if (exceptionFromDescriptorValidation != null) { - throw UtilsPackage.rethrow(exceptionFromDescriptorValidation); + throw ExceptionUtilsKt.rethrow(exceptionFromDescriptorValidation); } if (exceptionFromLazyResolveLogValidation != null) { - throw UtilsPackage.rethrow(exceptionFromLazyResolveLogValidation); + throw ExceptionUtilsKt.rethrow(exceptionFromLazyResolveLogValidation); } if (exceptionFromDynamicCallDescriptorsValidation != null) { - throw UtilsPackage.rethrow(exceptionFromDynamicCallDescriptorsValidation); + throw ExceptionUtilsKt.rethrow(exceptionFromDynamicCallDescriptorsValidation); } } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java index 35c76e65597..5f0852146c4 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/BaseDiagnosticsTest.java @@ -32,7 +32,7 @@ import kotlin.CollectionsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.asJava.AsJavaPackage; +import org.jetbrains.kotlin.asJava.DuplicateJvmSignatureUtilKt; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.diagnostics.*; import org.jetbrains.kotlin.psi.JetDeclaration; @@ -400,8 +400,8 @@ public abstract class BaseDiagnosticsTest extends Set jvmSignatureDiagnostics = new HashSet(); Collection declarations = PsiTreeUtil.findChildrenOfType(jetFile, JetDeclaration.class); for (JetDeclaration declaration : declarations) { - Diagnostics diagnostics = AsJavaPackage.getJvmSignatureDiagnostics(declaration, bindingContext.getDiagnostics(), - GlobalSearchScope.allScope(getProject())); + Diagnostics diagnostics = DuplicateJvmSignatureUtilKt.getJvmSignatureDiagnostics(declaration, bindingContext.getDiagnostics(), + GlobalSearchScope.allScope(getProject())); if (diagnostics == null) continue; jvmSignatureDiagnostics.addAll(diagnostics.forElement(declaration)); } diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java index 9dffe8e5dfe..a04962195c5 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java @@ -24,11 +24,12 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetLiteFixture; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.io.IOException; @@ -38,8 +39,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoot; - public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixture { protected class ModuleAndDependencies { final M module; @@ -59,7 +58,7 @@ public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixtu return true; } catch (Exception e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -69,7 +68,7 @@ public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixtu CompilerConfiguration configuration = createCompilerConfiguration(javaFilesDir); File kotlinSourceRoot = getKotlinSourceRoot(); if (kotlinSourceRoot != null) { - addKotlinSourceRoot(configuration, kotlinSourceRoot.getPath()); + ContentRootsKt.addKotlinSourceRoot(configuration, kotlinSourceRoot.getPath()); } return createEnvironment(getTestRootDisposable(), configuration); } @@ -104,7 +103,7 @@ public abstract class KotlinMultiFileTestWithWithJava extends JetLiteFixtu JetTestUtils.mkdirs(dir); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } return dir; } diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index 81809edfae2..5bd6df39ef6 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.Tmpdir; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.junit.Rule; import org.junit.rules.TestName; @@ -60,7 +60,7 @@ public class CliBaseTest { return Pair.create(bytes.toString("utf-8"), exitCode); } catch (Exception e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } finally { System.setErr(origErr); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java index d6685437dde..183a746783e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java @@ -23,7 +23,7 @@ import com.intellij.util.Processor; import kotlin.Charsets; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.util.*; @@ -65,7 +65,7 @@ public abstract class AbstractBytecodeTextTest extends CodegenTestCase { } catch (Throwable e) { System.out.println(text); - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index fc44f5083bc..0d7bb236e6d 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -24,7 +24,7 @@ import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.codegen.state.GenerationState; @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.test.TestJdkKind; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.org.objectweb.asm.*; import java.io.File; @@ -77,7 +77,7 @@ public class AbstractLineNumberTest extends TestCaseWithTmpdir { OutputFileCollection outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile, environment); - OutputUtilsPackage.writeAllTo(outputFiles, tmpdir); + OutputUtilsKt.writeAllTo(outputFiles, tmpdir); } @NotNull @@ -90,7 +90,7 @@ public class AbstractLineNumberTest extends TestCaseWithTmpdir { text = FileUtil.loadFile(file, true); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } return new Pair(JetTestUtils.createFile(file.getName(), text, environment.getProject()), environment); @@ -122,7 +122,7 @@ public class AbstractLineNumberTest extends TestCaseWithTmpdir { private static List extractActualLineNumbersFromBytecode(@NotNull GenerationState state, boolean testFunInvoke) { ClassFileFactory factory = state.getFactory(); List actualLineNumbers = Lists.newArrayList(); - for (OutputFile outputFile : CodegenPackage.getClassFiles(factory)) { + for (OutputFile outputFile : ClassFileUtilsKt.getClassFiles(factory)) { if (PackageClassUtils.isPackageClassFqName(new FqName(FileUtil.getNameWithoutExtension(outputFile.getRelativePath())))) { // Don't test line numbers in *Package facade classes continue; @@ -134,7 +134,7 @@ public class AbstractLineNumberTest extends TestCaseWithTmpdir { } catch (Throwable e) { System.out.println(factory.createText()); - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java index f8505bb11b2..82ac5c03141 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java @@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.resolve.ScriptNameUtil; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -68,7 +68,7 @@ public abstract class AbstractScriptCodegenTest extends CodegenTestCase { } catch (Throwable e) { System.out.println(generateToText()); - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 8b3ec66bee7..6e2027c8b52 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; @@ -33,7 +34,7 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.tree.ClassNode; import org.jetbrains.org.objectweb.asm.tree.MethodNode; @@ -55,7 +56,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.getJvmClasspathRoots; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.*; import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName; import static org.jetbrains.kotlin.test.JetTestUtils.compilerConfigurationForTests; @@ -176,7 +176,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { @NotNull private URL[] getClassPathURLs() { List urls = Lists.newArrayList(); - for (File file : getJvmClasspathRoots(myEnvironment.getConfiguration())) { + for (File file : JvmContentRootsKt.getJvmClasspathRoots(myEnvironment.getConfiguration())) { try { urls.add(file.toURI().toURL()); } @@ -261,7 +261,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { private static boolean verifyAllFilesWithAsm(ClassFileFactory factory, ClassLoader loader) { boolean noErrors = true; - for (OutputFile file : CodegenPackage.getClassFiles(factory)) { + for (OutputFile file : ClassFileUtilsKt.getClassFiles(factory)) { noErrors &= verifyWithAsm(file, loader); } return noErrors; @@ -324,7 +324,7 @@ public abstract class CodegenTestCase extends UsefulTestCase { return (Class) initializedClassLoader.loadClass(fqName); } catch (ClassNotFoundException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java index 1ce6dc71ce6..c8045f186c7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.cli.jvm.compiler.JvmPackagePartProvider; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.test.JetTestUtils; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.io.IOException; @@ -145,7 +145,7 @@ public class CodegenTestUtil { return javaClassesTempDirectory; } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -175,7 +175,7 @@ public class CodegenTestUtil { return annotation.getClass().getMethod(name).invoke(annotation); } catch (Exception e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java b/compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java index e835fff8b53..c4f6b6a13d3 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/DxChecker.java @@ -44,7 +44,7 @@ public class DxChecker { array[0] = "testArgs"; arguments.parse(array); - for (OutputFile file : CodegenPackage.getClassFiles(outputFiles)) { + for (OutputFile file : ClassFileUtilsKt.getClassFiles(outputFiles)) { try { byte[] bytes = file.asByteArray(); checkFileWithDx(bytes, file.getRelativePath(), arguments); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index d30c89bca3f..86090af0c6a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys; @@ -87,7 +87,7 @@ public class GenerateNotNullAssertionsTest extends CodegenTestCase { loadFile("notNullAssertions/noAssertionsForKotlin.kt"); OutputFileCollection outputFiles = generateClassesInFile(); File compiledDirectory = new File(FileUtil.getTempDirectory(), "kotlin-classes"); - OutputUtilsPackage.writeAllTo(outputFiles, compiledDirectory); + OutputUtilsKt.writeAllTo(outputFiles, compiledDirectory); setUpEnvironment(false, true, compiledDirectory); loadFile("notNullAssertions/noAssertionsForKotlinMain.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java index 58fffa48423..6195c9aac27 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java @@ -23,7 +23,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.test.ConfigurationKind; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; @@ -201,7 +201,7 @@ public class InnerClassInfoGenTest extends CodegenTestCase { return result.isEmpty() ? "" : result.substring(1); } catch (Exception e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java index 63aa1cf08ad..6c4c0a6d936 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.name.SpecialNames; import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.utils.StringsKt; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; @@ -33,7 +34,6 @@ import java.io.File; import java.io.InputStream; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.compileJava; -import static org.jetbrains.kotlin.utils.UtilsPackage.join; public class OuterClassGenTest extends CodegenTestCase { @@ -193,7 +193,8 @@ public class OuterClassGenTest extends CodegenTestCase { return new ClassReader(file.asByteArray()); } } - throw new AssertionError("Couldn't find class by regexp: " + internalNameRegexp + " in:\n" + join(outputFiles.asList(), "\n")); + throw new AssertionError("Couldn't find class by regexp: " + internalNameRegexp + " in:\n" + StringsKt + .join(outputFiles.asList(), "\n")); } private static void checkInfo(@NotNull ClassReader kotlinReader, @NotNull ClassReader javaReader) { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java index 2670a26a015..d08746bc320 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java @@ -27,10 +27,12 @@ import org.jetbrains.kotlin.cli.common.messages.PrintingMessageCollector; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.state.JetTypeMapper; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetDeclaration; @@ -45,8 +47,6 @@ import org.jetbrains.kotlin.types.JetType; import java.io.File; import java.lang.reflect.Modifier; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJvmClasspathRoot; -import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoot; import static org.jetbrains.kotlin.types.TypeUtils.getAllSupertypes; @SuppressWarnings("JUnitTestCaseWithNoTests") @@ -83,14 +83,14 @@ public class TestlibTest extends UsefulTestCase { super.setUp(); CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.ALL, TestJdkKind.FULL_JDK); - addJvmClasspathRoot(configuration, JetTestUtils.getAnnotationsJar()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, JetTestUtils.getAnnotationsJar()); junitJar = new File("libraries/lib/junit-4.11.jar"); assertTrue(junitJar.exists()); - addJvmClasspathRoot(configuration, junitJar); + JvmContentRootsKt.addJvmClasspathRoot(configuration, junitJar); - addKotlinSourceRoot(configuration, JetTestUtils.getHomeDirectory() + "/libraries/stdlib/test"); - addKotlinSourceRoot(configuration, JetTestUtils.getHomeDirectory() + "/libraries/kunit/src"); + ContentRootsKt.addKotlinSourceRoot(configuration, JetTestUtils.getHomeDirectory() + "/libraries/stdlib/test"); + ContentRootsKt.addKotlinSourceRoot(configuration, JetTestUtils.getHomeDirectory() + "/libraries/kunit/src"); configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, PrintingMessageCollector.PLAIN_TEXT_TO_SYSTEM_ERR); myEnvironment = KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java index 8b5198a7b80..2531beddf54 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/forTestCompile/ForTestCompileRuntime.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.codegen.forTestCompile; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.lang.ref.SoftReference; @@ -26,8 +27,6 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.kotlin.utils.UtilsPackage.rethrow; - public class ForTestCompileRuntime { private static volatile SoftReference reflectJarClassLoader = new SoftReference(null); private static volatile SoftReference runtimeJarClassLoader = new SoftReference(null); @@ -80,7 +79,7 @@ public class ForTestCompileRuntime { return new URLClassLoader(urls.toArray(new URL[urls.size()]), null); } catch (MalformedURLException e) { - throw rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java index d5db4472796..5196c76f887 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -22,9 +22,10 @@ import com.intellij.util.Processor; import kotlin.Charsets; import kotlin.io.FilesKt; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.codegen.CodegenTestCase; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.config.CompilerConfiguration; @@ -34,7 +35,7 @@ import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestJdkKind; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.lang.reflect.Method; @@ -42,8 +43,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJavaSourceRoot; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJvmClasspathRoot; import static org.jetbrains.kotlin.codegen.CodegenTestUtil.compileJava; import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassFqName; @@ -62,7 +61,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { blackBoxFileWithJavaByFullPath(filename); } catch (Exception e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -150,14 +149,14 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar() ); - addJavaSourceRoot(configuration, dirFile); + JvmContentRootsKt.addJavaSourceRoot(configuration, dirFile); myEnvironment = KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); loadFiles(ArrayUtil.toStringArray(ktFilePaths)); classFileFactory = GenerationUtils.compileManyFilesGetGenerationStateForTest(myEnvironment.getProject(), myFiles.getPsiFiles(), new JvmPackagePartProvider(myEnvironment)).getFactory(); File kotlinOut = JetTestUtils.tmpDir(toString()); - OutputUtilsPackage.writeAllTo(classFileFactory, kotlinOut); + OutputUtilsKt.writeAllTo(classFileFactory, kotlinOut); List javacOptions = new ArrayList(0); for (JetFile jetFile : myFiles.getPsiFiles()) { @@ -166,7 +165,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { File javaOut = compileJava(javaFilePaths, Collections.singletonList(kotlinOut.getPath()), javacOptions); // Add javac output to classpath so that the created class loader can find generated Java classes - addJvmClasspathRoot(configuration, javaOut); + JvmContentRootsKt.addJvmClasspathRoot(configuration, javaOut); blackBox(); } @@ -189,7 +188,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { } catch (Throwable e) { System.out.println(generateToText()); - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } } diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java index 85de44eddb3..bda10b3a53b 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.integration; import com.intellij.util.ArrayUtil; import org.jetbrains.kotlin.test.JetTestUtils; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.StringsKt; import java.io.File; import java.util.ArrayList; @@ -35,7 +35,7 @@ public class CompilerSmokeTest extends KotlinIntegrationTestBase { Collection javaArgs = new ArrayList(); javaArgs.add("-cp"); - javaArgs.add(UtilsPackage.join(Arrays.asList( + javaArgs.add(StringsKt.join(Arrays.asList( getCompilerLib().getAbsolutePath() + File.separator + "kotlin-compiler.jar", new File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-runtime.jar").getAbsolutePath(), new File("dependencies/bootstrap-compiler/Kotlin/kotlinc/lib/kotlin-reflect.jar").getAbsolutePath() diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index 55e13c076d9..e2d389732a2 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.cli.common.modules.ModuleBuilder; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.codegen.ClassFileFactory; @@ -113,7 +113,7 @@ public abstract class AbstractCompileKotlinAgainstKotlinTest extends TestCaseWit ClassFileFactory outputFiles = GenerationUtils.compileFileGetClassFileFactoryForTest(psiFile, jetCoreEnvironment); - OutputUtilsPackage.writeAllTo(outputFiles, outputDir); + OutputUtilsKt.writeAllTo(outputFiles, outputDir); Disposer.dispose(disposable); return outputFiles; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index 87d09c8e7e4..fb4abdfab26 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -24,7 +24,10 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; +import org.jetbrains.kotlin.cli.jvm.config.ModuleNameKt; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.context.ModuleContext; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; @@ -55,9 +58,6 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJavaSourceRoot; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.getModuleName; -import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoot; import static org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.*; import static org.jetbrains.kotlin.test.JetTestUtils.*; import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesAllowed; @@ -140,16 +140,16 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir { CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests( ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK); - addKotlinSourceRoot(configuration, sourcesDir.getAbsolutePath()); - addJavaSourceRoot(configuration, new File("compiler/testData/loadJava/include")); - addJavaSourceRoot(configuration, tmpdir); + ContentRootsKt.addKotlinSourceRoot(configuration, sourcesDir.getAbsolutePath()); + JvmContentRootsKt.addJavaSourceRoot(configuration, new File("compiler/testData/loadJava/include")); + JvmContentRootsKt.addJavaSourceRoot(configuration, tmpdir); KotlinCoreEnvironment environment = KotlinCoreEnvironment.createForTests(getTestRootDisposable(), configuration, EnvironmentConfigFiles.JVM_CONFIG_FILES); BindingTrace trace = new CliLightClassGenerationSupport.NoScopeRecordCliBindingTrace(); ModuleContext moduleContext = TopDownAnalyzerFacadeForJVM.createContextWithSealedModule(environment.getProject(), - getModuleName(environment)); + ModuleNameKt.getModuleName(environment)); TopDownAnalyzerFacadeForJVM.analyzeFilesWithJavaIntegrationNoIncremental( moduleContext, diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index 2824f47e48c..363284f9704 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -34,6 +34,7 @@ import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.TypeTransformingVisitor; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.scopes.JetScope; @@ -43,8 +44,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.resolveTopLevelClass; - public abstract class AbstractSdkAnnotationsValidityTest extends UsefulTestCase { private static final int CLASSES_IN_CHUNK = 100; @@ -86,7 +85,7 @@ public abstract class AbstractSdkAnnotationsValidityTest extends UsefulTestCase int chunkStart = chunkIndex * CLASSES_IN_CHUNK; for (FqName javaClass : affectedClasses.subList(chunkStart, Math.min(chunkStart + CLASSES_IN_CHUNK, affectedClasses.size()))) { - ClassDescriptor topLevelClass = resolveTopLevelClass(module, javaClass, NoLookupLocation.FROM_TEST); + ClassDescriptor topLevelClass = DescriptorUtilsKt.resolveTopLevelClass(module, javaClass, NoLookupLocation.FROM_TEST); PackageViewDescriptor topLevelPackage = module.getPackage(javaClass); if (topLevelClass == null) { continue; diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 1ed4c15df6c..bfc7118cc86 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.test.*; import org.jetbrains.kotlin.test.util.DescriptorValidator; import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.ClassWriter; @@ -137,7 +137,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { return outputFile; } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java index 79b1847bd70..5a330eb099b 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java @@ -23,7 +23,7 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.analyzer.AnalysisResult; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; @@ -70,7 +70,7 @@ public final class LoadDescriptorUtil { AnalysisResult result = filesAndResult.getAnalysisResult(); List files = filesAndResult.getJetFiles(); GenerationState state = GenerationUtils.compileFilesGetGenerationState(files.get(0).getProject(), result, files); - OutputUtilsPackage.writeAllTo(state.getFactory(), outDir); + OutputUtilsKt.writeAllTo(state.getFactory(), outDir); return result; } diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index b15c0757757..ac9730e9c56 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -33,6 +33,7 @@ import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetTestUtils; @@ -45,8 +46,6 @@ import java.util.List; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.resolveTopLevelClass; - public class ResolveDescriptorsFromExternalLibraries { public static void main(String[] args) throws Exception { boolean hasErrors = run(); @@ -211,7 +210,7 @@ public class ResolveDescriptorsFromExternalLibraries { String className = entryName.substring(0, entryName.length() - ".class".length()).replace("/", "."); try { - ClassDescriptor clazz = resolveTopLevelClass(module, new FqName(className), NoLookupLocation.FROM_TEST); + ClassDescriptor clazz = DescriptorUtilsKt.resolveTopLevelClass(module, new FqName(className), NoLookupLocation.FROM_TEST); if (clazz == null) { throw new IllegalStateException("class not found by name " + className + " in " + libDescription); } diff --git a/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java b/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java index 3013d3d9429..f047e8a997c 100644 --- a/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java +++ b/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java @@ -98,22 +98,22 @@ public class FqNameTest { @Test public void isValidJavaFqName() { - Assert.assertTrue(NamePackage.isValidJavaFqName("")); - Assert.assertTrue(NamePackage.isValidJavaFqName("a")); - Assert.assertTrue(NamePackage.isValidJavaFqName("1")); - Assert.assertTrue(NamePackage.isValidJavaFqName("a.a")); - Assert.assertTrue(NamePackage.isValidJavaFqName("org.jetbrains")); - Assert.assertTrue(NamePackage.isValidJavaFqName("$")); - Assert.assertTrue(NamePackage.isValidJavaFqName("org.A$B")); + Assert.assertTrue(FqNamesUtilKt.isValidJavaFqName("")); + Assert.assertTrue(FqNamesUtilKt.isValidJavaFqName("a")); + Assert.assertTrue(FqNamesUtilKt.isValidJavaFqName("1")); + Assert.assertTrue(FqNamesUtilKt.isValidJavaFqName("a.a")); + Assert.assertTrue(FqNamesUtilKt.isValidJavaFqName("org.jetbrains")); + Assert.assertTrue(FqNamesUtilKt.isValidJavaFqName("$")); + Assert.assertTrue(FqNamesUtilKt.isValidJavaFqName("org.A$B")); - Assert.assertFalse(NamePackage.isValidJavaFqName(".")); - Assert.assertFalse(NamePackage.isValidJavaFqName("..")); - Assert.assertFalse(NamePackage.isValidJavaFqName("a.")); - Assert.assertFalse(NamePackage.isValidJavaFqName(".a")); - Assert.assertFalse(NamePackage.isValidJavaFqName("a..b")); - Assert.assertFalse(NamePackage.isValidJavaFqName("a.b..")); - Assert.assertFalse(NamePackage.isValidJavaFqName("a.b.")); - Assert.assertFalse(NamePackage.isValidJavaFqName("a.b...)")); - Assert.assertFalse(NamePackage.isValidJavaFqName("a.b.")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName(".")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName("..")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName("a.")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName(".a")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName("a..b")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName("a.b..")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName("a.b.")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName("a.b...)")); + Assert.assertFalse(FqNamesUtilKt.isValidJavaFqName("a.b.")); } } diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java index ebcd9ad71b6..cb90a82143b 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java @@ -29,10 +29,7 @@ import com.intellij.testFramework.ParsingTestCase; import com.intellij.util.PathUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.JetNodeTypes; -import org.jetbrains.kotlin.psi.IfNotParsed; -import org.jetbrains.kotlin.psi.JetElement; -import org.jetbrains.kotlin.psi.JetPsiFactory; -import org.jetbrains.kotlin.psi.JetVisitorVoid; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.test.JetTestUtils; import java.lang.annotation.Annotation; @@ -120,7 +117,7 @@ public abstract class AbstractJetParsingTest extends ParsingTestCase { } private PsiFile createFile(@NotNull String filePath, @NotNull IElementType fileType) throws Exception { - JetPsiFactory psiFactory = JetPsiFactory(myProject); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(myProject); if (fileType == JetNodeTypes.EXPRESSION_CODE_FRAGMENT) { return psiFactory.createExpressionCodeFragment(loadFile(filePath), null); } diff --git a/compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java b/compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java index 499700a721a..11d5e503685 100644 --- a/compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java @@ -73,7 +73,7 @@ public class JetPsiUtilTest extends JetLiteFixture { public void testIsLocalClass() throws IOException { String text = FileUtil.loadFile(new File(getTestDataPath() + "/psiUtil/isLocalClass.kt"), true); - JetClass aClass = JetPsiFactory(getProject()).createClass(text); + JetClass aClass = JetPsiFactoryKt.JetPsiFactory(getProject()).createClass(text); @SuppressWarnings("unchecked") Collection classOrObjects = PsiTreeUtil.collectElementsOfType(aClass, JetClassOrObject.class); @@ -104,7 +104,7 @@ public class JetPsiUtilTest extends JetLiteFixture { private ImportPath getImportPathFromParsed(String text) { JetImportDirective importDirective = - PsiTreeUtil.findChildOfType(JetPsiFactory(getProject()).createFile(text), JetImportDirective.class); + PsiTreeUtil.findChildOfType(JetPsiFactoryKt.JetPsiFactory(getProject()).createFile(text), JetImportDirective.class); assertNotNull("At least one import directive is expected", importDirective); diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.java index 32db88101c6..361c8328ffc 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/JetExpectedResolveDataUtil.java @@ -29,14 +29,14 @@ import org.jetbrains.kotlin.name.Name; 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.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; -import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.tests.di.ContainerForTests; -import org.jetbrains.kotlin.tests.di.DiPackage; +import org.jetbrains.kotlin.tests.di.InjectionKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; @@ -117,7 +117,7 @@ public class JetExpectedResolveDataUtil { @NotNull private static PsiClass findClass(String qualifiedName, Project project, KotlinCoreEnvironment environment) { ModuleDescriptor module = LazyResolveTestUtil.resolveProject(project, environment); - ClassDescriptor classDescriptor = DescriptorUtilPackage.resolveTopLevelClass(module, new FqName(qualifiedName), NoLookupLocation.FROM_TEST); + ClassDescriptor classDescriptor = DescriptorUtilsKt.resolveTopLevelClass(module, new FqName(qualifiedName), NoLookupLocation.FROM_TEST); assertNotNull("Class descriptor wasn't resolved: " + qualifiedName, classDescriptor); PsiClass psiClass = (PsiClass) DescriptorToSourceUtils.getSourceFromDescriptor(classDescriptor); assertNotNull("Class declaration wasn't found: " + classDescriptor, psiClass); @@ -132,12 +132,12 @@ public class JetExpectedResolveDataUtil { JetType... parameterTypes ) { ModuleDescriptorImpl emptyModule = JetTestUtils.createEmptyModule(); - ContainerForTests container = DiPackage.createContainerForTests(project, emptyModule); + ContainerForTests container = InjectionKt.createContainerForTests(project, emptyModule); emptyModule.setDependencies(emptyModule); emptyModule.initialize(PackageFragmentProvider.Empty.INSTANCE$); ExpressionTypingContext context = ExpressionTypingContext.newContext( - new BindingTraceContext(), UtilsPackage.memberScopeAsFileScope(classDescriptor.getDefaultType().getMemberScope()), + new BindingTraceContext(), ScopeUtilsKt.memberScopeAsFileScope(classDescriptor.getDefaultType().getMemberScope()), DataFlowInfo.EMPTY, TypeUtils.NO_EXPECTED_TYPE); OverloadResolutionResults functions = container.getFakeCallResolver().resolveFakeCall( diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java index 40f1ba420b6..c490de28c59 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/LazyResolveTestUtil.java @@ -35,8 +35,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.kotlin.resolve.lazy.LazyPackage.createResolveSessionForFiles; - public class LazyResolveTestUtil { private LazyResolveTestUtil() { } @@ -74,7 +72,7 @@ public class LazyResolveTestUtil { @NotNull KotlinCoreEnvironment environment, boolean addBuiltIns ) { - return createResolveSessionForFiles(environment.getProject(), files, addBuiltIns); + return LazyResolveTestUtilsKt.createResolveSessionForFiles(environment.getProject(), files, addBuiltIns); } public static ModuleDescriptor resolveLazily(List files, KotlinCoreEnvironment environment) { diff --git a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java index 4a61b19fbd0..48045f8feae 100644 --- a/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java @@ -20,7 +20,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.messages.*; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; @@ -30,6 +29,7 @@ import org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys; import org.jetbrains.kotlin.codegen.CompilationException; import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.config.ContentRootsKt; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; @@ -46,8 +46,6 @@ import org.junit.Test; import java.util.Collections; import java.util.List; -import static org.jetbrains.kotlin.config.ConfigPackage.addKotlinSourceRoot; - public class ScriptTest { @Test public void testScript() throws Exception { @@ -85,7 +83,7 @@ public class ScriptTest { CompilerConfiguration configuration = JetTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.FULL_JDK); configuration.put(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, messageCollector); - addKotlinSourceRoot(configuration, "compiler/testData/script/" + scriptPath); + ContentRootsKt.addKotlinSourceRoot(configuration, "compiler/testData/script/" + scriptPath); configuration.addAll(CommonConfigurationKeys.SCRIPT_DEFINITIONS_KEY, scriptDefinitions); configuration.put(JVMConfigurationKeys.SCRIPT_PARAMETERS, scriptParameters); diff --git a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java index ac35a27402b..bdb7d3bba10 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java @@ -48,6 +48,7 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; +import org.jetbrains.kotlin.cli.jvm.config.JvmContentRootsKt; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; @@ -63,6 +64,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.TargetPlatform; @@ -71,14 +73,14 @@ import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.storage.LockBasedStorageManager; -import org.jetbrains.kotlin.test.util.UtilPackage; +import org.jetbrains.kotlin.test.util.JetTestUtilsKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.JetTypeInfo; import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; import org.jetbrains.kotlin.util.slicedMap.SlicedMap; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.kotlin.utils.PathUtil; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.junit.Assert; import javax.tools.*; @@ -91,7 +93,6 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.*; import static org.jetbrains.kotlin.cli.jvm.config.JVMConfigurationKeys.MODULE_NAME; import static org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetAnalysisResult; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -432,25 +433,25 @@ public class JetTestUtils { @NotNull List javaSource ) { CompilerConfiguration configuration = new CompilerConfiguration(); - addJavaSourceRoots(configuration, javaSource); + JvmContentRootsKt.addJavaSourceRoots(configuration, javaSource); if (jdkKind == TestJdkKind.MOCK_JDK) { - addJvmClasspathRoot(configuration, findMockJdkRtJar()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, findMockJdkRtJar()); } else if (jdkKind == TestJdkKind.ANDROID_API) { - addJvmClasspathRoot(configuration, findAndroidApiJar()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, findAndroidApiJar()); } else { - addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRoots()); + JvmContentRootsKt.addJvmClasspathRoots(configuration, PathUtil.getJdkClassesRoots()); } if (configurationKind.getWithRuntime()) { - addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.runtimeJarForTests()); } if (configurationKind.getWithReflection()) { - addJvmClasspathRoot(configuration, ForTestCompileRuntime.reflectJarForTests()); + JvmContentRootsKt.addJvmClasspathRoot(configuration, ForTestCompileRuntime.reflectJarForTests()); } - addJvmClasspathRoots(configuration, classpath); + JvmContentRootsKt.addJvmClasspathRoots(configuration, classpath); configuration.put(MODULE_NAME, "compilerConfigurationForTests"); @@ -492,7 +493,7 @@ public class JetTestUtils { public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull String actual, @NotNull Function1 sanitizer) { try { - String actualText = UtilPackage.trimTrailingWhitespacesAndAddNewlineAtEOF(StringUtil.convertLineSeparators(actual.trim())); + String actualText = JetTestUtilsKt.trimTrailingWhitespacesAndAddNewlineAtEOF(StringUtil.convertLineSeparators(actual.trim())); if (!expectedFile.exists()) { FileUtil.writeToFile(expectedFile, actualText); @@ -500,7 +501,7 @@ public class JetTestUtils { } String expected = FileUtil.loadFile(expectedFile, CharsetToolkit.UTF8, true); - String expectedText = UtilPackage.trimTrailingWhitespacesAndAddNewlineAtEOF(StringUtil.convertLineSeparators(expected.trim())); + String expectedText = JetTestUtilsKt.trimTrailingWhitespacesAndAddNewlineAtEOF(StringUtil.convertLineSeparators(expected.trim())); if (!Comparing.equal(sanitizer.invoke(expectedText), sanitizer.invoke(actualText))) { throw new FileComparisonFailure("Actual data differs from file content: " + expectedFile.getName(), @@ -508,7 +509,7 @@ public class JetTestUtils { } } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -896,7 +897,7 @@ public class JetTestUtils { @NotNull public static JetFile loadJetFile(@NotNull Project project, @NotNull File ioFile) throws IOException { String text = FileUtil.loadFile(ioFile, true); - return JetPsiFactory(project).createPhysicalFile(ioFile.getName(), text); + return JetPsiFactoryKt.JetPsiFactory(project).createPhysicalFile(ioFile.getName(), text); } @NotNull diff --git a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java index 06b28eaa21a..55dfec9b232 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java @@ -28,8 +28,8 @@ import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.preloading.ClassPreloadingUtils; import org.jetbrains.kotlin.preloading.Preloader; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.kotlin.utils.PathUtil; -import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.*; import java.lang.ref.SoftReference; @@ -106,7 +106,7 @@ public class MockLibraryUtil { return createJarFile(contentDir, classesDir, sourcesPath, jarName, addSources); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -127,7 +127,7 @@ public class MockLibraryUtil { return createJarFile(contentDir, outDir, sourcesPath, jarName, addSources); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -164,7 +164,7 @@ public class MockLibraryUtil { assertEquals(new String(outStream.toByteArray()), ExitCode.OK.name(), invocationResult.name()); } catch (Throwable e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -221,7 +221,7 @@ public class MockLibraryUtil { return classLoader.loadClass(compilerClassName); } catch (Throwable e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } @@ -234,7 +234,7 @@ public class MockLibraryUtil { ); } catch (Throwable e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/kotlin/test/Tmpdir.java b/compiler/tests/org/jetbrains/kotlin/test/Tmpdir.java index d00962a5270..b4d35186e2e 100644 --- a/compiler/tests/org/jetbrains/kotlin/test/Tmpdir.java +++ b/compiler/tests/org/jetbrains/kotlin/test/Tmpdir.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.test; import com.google.common.io.Files; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -36,7 +36,7 @@ public class Tmpdir extends TestWatcher { tmpDir = Files.createTempDir().getCanonicalFile(); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java index 26bc62d1f79..92889f1c239 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; @@ -71,7 +72,7 @@ public class BoundsSubstitutorTest extends KotlinTestWithEnvironment { //} private void doTest(String text, String expected) { - JetFile jetFile = JetPsiFactory(getProject()).createFile("fun.kt", text); + JetFile jetFile = JetPsiFactoryKt.JetPsiFactory(getProject()).createFile("fun.kt", text); ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(Collections.singletonList(jetFile), getEnvironment()); Collection functions = module.getPackage(FqName.ROOT).getMemberScope().getFunctions(Name.identifier("f"), NoLookupLocation.FROM_TEST); diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java index 48145120c7c..92bc8875cc6 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.types; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; -import org.jetbrains.kotlin.context.ContextPackage; +import org.jetbrains.kotlin.context.ContextKt; import org.jetbrains.kotlin.context.ModuleContext; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; @@ -33,12 +33,12 @@ 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.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetLiteFixture; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.tests.di.ContainerForTests; -import org.jetbrains.kotlin.tests.di.DiPackage; +import org.jetbrains.kotlin.tests.di.InjectionKt; import java.util.Collections; import java.util.List; @@ -73,7 +73,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { private JetScope scope; public void setUp() throws Exception { - ContainerForTests containerForTests = DiPackage.createContainerForTests(getProject(), root); + ContainerForTests containerForTests = InjectionKt.createContainerForTests(getProject(), root); descriptorResolver = containerForTests.getDescriptorResolver(); functionDescriptorResolver = containerForTests.getFunctionDescriptorResolver(); scope = createScope(root.getBuiltIns().getBuiltInsPackageScope()); @@ -85,7 +85,8 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { } private JetScope createScope(JetScope libraryScope) { - JetFile file = JetPsiFactory(getProject()).createFile("abstract class C { abstract fun foo(); abstract val a: Int }"); + JetFile file = JetPsiFactoryKt + .JetPsiFactory(getProject()).createFile("abstract class C { abstract fun foo(); abstract val a: Int }"); List declarations = file.getDeclarations(); JetDeclaration aClass = declarations.get(0); assert aClass instanceof JetClass; @@ -100,7 +101,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { } private ClassDescriptorWithResolutionScopes createClassDescriptor(ClassKind kind, JetClass aClass) { - ModuleContext moduleContext = ContextPackage.ModuleContext(root, getProject()); + ModuleContext moduleContext = ContextKt.ModuleContext(root, getProject()); ResolveSession resolveSession = createLazyResolveSession( moduleContext, new FileBasedDeclarationProviderFactory(moduleContext.getStorageManager(), @@ -113,7 +114,7 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { } private void testClassModality(String classDeclaration, ClassKind kind, Modality expectedModality) { - JetClass aClass = JetPsiFactory(getProject()).createClass(classDeclaration); + JetClass aClass = JetPsiFactoryKt.JetPsiFactory(getProject()).createClass(classDeclaration); ClassDescriptorWithResolutionScopes classDescriptor = createClassDescriptor(kind, aClass); assertEquals(expectedModality, classDescriptor.getModality()); @@ -121,39 +122,39 @@ public class JetDefaultModalityModifiersTest extends JetLiteFixture { private void testFunctionModality(String classWithFunction, ClassKind kind, Modality expectedFunctionModality) { - JetClass aClass = JetPsiFactory(getProject()).createClass(classWithFunction); + JetClass aClass = JetPsiFactoryKt.JetPsiFactory(getProject()).createClass(classWithFunction); ClassDescriptorWithResolutionScopes classDescriptor = createClassDescriptor(kind, aClass); List declarations = aClass.getDeclarations(); JetNamedFunction function = (JetNamedFunction) declarations.get(0); SimpleFunctionDescriptor functionDescriptor = - functionDescriptorResolver.resolveFunctionDescriptor(classDescriptor, UtilsPackage.asLexicalScope(scope), function, + functionDescriptorResolver.resolveFunctionDescriptor(classDescriptor, ScopeUtilsKt.asLexicalScope(scope), function, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); assertEquals(expectedFunctionModality, functionDescriptor.getModality()); } private void testPropertyModality(String classWithProperty, ClassKind kind, Modality expectedPropertyModality) { - JetClass aClass = JetPsiFactory(getProject()).createClass(classWithProperty); + JetClass aClass = JetPsiFactoryKt.JetPsiFactory(getProject()).createClass(classWithProperty); ClassDescriptorWithResolutionScopes classDescriptor = createClassDescriptor(kind, aClass); List declarations = aClass.getDeclarations(); JetProperty property = (JetProperty) declarations.get(0); PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePropertyDescriptor( - classDescriptor, UtilsPackage.asLexicalScope(scope), property, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); + classDescriptor, ScopeUtilsKt.asLexicalScope(scope), property, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); assertEquals(expectedPropertyModality, propertyDescriptor.getModality()); } private void testPropertyAccessorModality(String classWithPropertyWithAccessor, ClassKind kind, Modality expectedPropertyAccessorModality, boolean isGetter) { - JetClass aClass = JetPsiFactory(getProject()).createClass(classWithPropertyWithAccessor); + JetClass aClass = JetPsiFactoryKt.JetPsiFactory(getProject()).createClass(classWithPropertyWithAccessor); ClassDescriptorWithResolutionScopes classDescriptor = createClassDescriptor(kind, aClass); List declarations = aClass.getDeclarations(); JetProperty property = (JetProperty) declarations.get(0); PropertyDescriptor propertyDescriptor = descriptorResolver.resolvePropertyDescriptor( - classDescriptor, UtilsPackage.asLexicalScope(scope), property, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); + classDescriptor, ScopeUtilsKt.asLexicalScope(scope), property, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); PropertyAccessorDescriptor propertyAccessor = isGetter ? propertyDescriptor.getGetter() : propertyDescriptor.getSetter(); diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java index e8405f19275..82de62b1725 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java @@ -16,21 +16,21 @@ package org.jetbrains.kotlin.types; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; import org.jetbrains.kotlin.resolve.OverloadUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.scopes.FileScope; -import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetLiteFixture; import org.jetbrains.kotlin.test.JetTestUtils; -import org.jetbrains.kotlin.tests.di.DiPackage; +import org.jetbrains.kotlin.tests.di.InjectionKt; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -47,7 +47,7 @@ public class JetOverloadTest extends JetLiteFixture { @Override public void setUp() throws Exception { super.setUp(); - functionDescriptorResolver = DiPackage.createContainerForTests(getProject(), root).getFunctionDescriptorResolver(); + functionDescriptorResolver = InjectionKt.createContainerForTests(getProject(), root).getFunctionDescriptorResolver(); } @Override @@ -174,8 +174,8 @@ public class JetOverloadTest extends JetLiteFixture { } private FunctionDescriptor makeFunction(String funDecl) { - JetNamedFunction function = JetPsiFactory(getProject()).createFunction(funDecl); - FileScope scope = UtilsPackage.memberScopeAsFileScope(JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope()); + JetNamedFunction function = JetPsiFactoryKt.JetPsiFactory(getProject()).createFunction(funDecl); + FileScope scope = ScopeUtilsKt.memberScopeAsFileScope(JvmPlatform.INSTANCE$.getBuiltIns().getBuiltInsPackageScope()); return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); } } diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java index 7923b684817..92362b1465d 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java @@ -20,15 +20,16 @@ import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.psi.JetNamedFunction; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.resolve.FunctionDescriptorResolver; import org.jetbrains.kotlin.resolve.OverridingUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; -import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetLiteFixture; import org.jetbrains.kotlin.test.JetTestUtils; -import org.jetbrains.kotlin.tests.di.DiPackage; +import org.jetbrains.kotlin.tests.di.InjectionKt; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -45,7 +46,7 @@ public class JetOverridingTest extends JetLiteFixture { @Override public void setUp() throws Exception { super.setUp(); - functionDescriptorResolver = DiPackage.createContainerForTests(getProject(), root).getFunctionDescriptorResolver(); + functionDescriptorResolver = InjectionKt.createContainerForTests(getProject(), root).getFunctionDescriptorResolver(); } @Override @@ -163,8 +164,8 @@ public class JetOverridingTest extends JetLiteFixture { } private FunctionDescriptor makeFunction(String funDecl) { - JetNamedFunction function = JetPsiFactory(getProject()).createFunction(funDecl); - LexicalScope scope = UtilsPackage.asLexicalScope(root.getBuiltIns().getBuiltInsPackageScope()); + JetNamedFunction function = JetPsiFactoryKt.JetPsiFactory(getProject()).createFunction(funDecl); + LexicalScope scope = ScopeUtilsKt.asLexicalScope(root.getBuiltIns().getBuiltInsPackageScope()); return functionDescriptorResolver.resolveFunctionDescriptor(root, scope, function, JetTestUtils.DUMMY_TRACE, DataFlowInfo.EMPTY); } diff --git a/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java index b30575dcd29..1532eec42af 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetExpression; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.TypeResolver; @@ -39,11 +40,12 @@ import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetLiteFixture; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.tests.di.ContainerForTests; -import org.jetbrains.kotlin.tests.di.DiPackage; +import org.jetbrains.kotlin.tests.di.InjectionKt; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; @@ -52,7 +54,6 @@ import java.io.IOException; import java.util.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; -import static org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage.asLexicalScope; public class JetTypeCheckerTest extends JetLiteFixture { @@ -78,7 +79,7 @@ public class JetTypeCheckerTest extends JetLiteFixture { ModuleDescriptorImpl module = JetTestUtils.createEmptyModule(); builtIns = module.getBuiltIns(); - ContainerForTests container = DiPackage.createContainerForTests(getProject(), module); + ContainerForTests container = InjectionKt.createContainerForTests(getProject(), module); module.setDependencies(Collections.singletonList(module)); module.initialize(PackageFragmentProvider.Empty.INSTANCE$); typeResolver = container.getTypeResolver(); @@ -547,15 +548,15 @@ public class JetTypeCheckerTest extends JetLiteFixture { private void assertType(String expression, JetType expectedType) { Project project = getProject(); - JetExpression jetExpression = JetPsiFactory(project).createExpression(expression); - JetType type = expressionTypingServices.getType(asLexicalScope(scopeWithImports), jetExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, JetTestUtils.DUMMY_TRACE); + JetExpression jetExpression = JetPsiFactoryKt.JetPsiFactory(project).createExpression(expression); + JetType type = expressionTypingServices.getType(ScopeUtilsKt.asLexicalScope(scopeWithImports), jetExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, JetTestUtils.DUMMY_TRACE); assertTrue(type + " != " + expectedType, type.equals(expectedType)); } private void assertErrorType(String expression) { Project project = getProject(); - JetExpression jetExpression = JetPsiFactory(project).createExpression(expression); - JetType type = expressionTypingServices.safeGetType(asLexicalScope(scopeWithImports), jetExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, JetTestUtils.DUMMY_TRACE); + JetExpression jetExpression = JetPsiFactoryKt.JetPsiFactory(project).createExpression(expression); + JetType type = expressionTypingServices.safeGetType(ScopeUtilsKt.asLexicalScope(scopeWithImports), jetExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, JetTestUtils.DUMMY_TRACE); assertTrue("Error type expected but " + type + " returned", type.isError()); } @@ -573,7 +574,7 @@ public class JetTypeCheckerTest extends JetLiteFixture { public List getImplicitReceiversHierarchy() { return Lists.newArrayList(new ReceiverParameterDescriptorImpl( getContainingDeclaration(), - new ExpressionReceiver(JetPsiFactory(getProject()).createExpression(expression), thisType) + new ExpressionReceiver(JetPsiFactoryKt.JetPsiFactory(getProject()).createExpression(expression), thisType) )); } }; @@ -586,9 +587,9 @@ public class JetTypeCheckerTest extends JetLiteFixture { private void assertType(JetScope scope, String expression, String expectedTypeStr) { Project project = getProject(); - JetExpression jetExpression = JetPsiFactory(project).createExpression(expression); + JetExpression jetExpression = JetPsiFactoryKt.JetPsiFactory(project).createExpression(expression); JetType type = expressionTypingServices.getType( - asLexicalScope(addImports(scope)), jetExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, new BindingTraceContext()); + ScopeUtilsKt.asLexicalScope(addImports(scope)), jetExpression, TypeUtils.NO_EXPECTED_TYPE, DataFlowInfo.EMPTY, new BindingTraceContext()); JetType expectedType = expectedTypeStr == null ? null : makeType(expectedTypeStr); assertEquals(expectedType, type); } @@ -636,6 +637,6 @@ public class JetTypeCheckerTest extends JetLiteFixture { } private JetType makeType(JetScope scope, String typeStr) { - return typeResolver.resolveType(asLexicalScope(scope), JetPsiFactory(getProject()).createType(typeStr), JetTestUtils.DUMMY_TRACE, true); + return typeResolver.resolveType(ScopeUtilsKt.asLexicalScope(scope), JetPsiFactoryKt.JetPsiFactory(getProject()).createType(typeStr), JetTestUtils.DUMMY_TRACE, true); } } diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java index 4e283aaf814..c8e8f63302b 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java @@ -34,6 +34,7 @@ import org.jetbrains.kotlin.incremental.components.NoLookupLocation; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.AnalyzingUtils; @@ -42,11 +43,11 @@ import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.scopes.*; -import org.jetbrains.kotlin.resolve.scopes.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.tests.di.ContainerForTests; -import org.jetbrains.kotlin.tests.di.DiPackage; +import org.jetbrains.kotlin.tests.di.InjectionKt; import java.io.File; import java.io.IOException; @@ -69,7 +70,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { protected void setUp() throws Exception { super.setUp(); - container = DiPackage.createContainerForTests(getProject(), JetTestUtils.createEmptyModule()); + container = InjectionKt.createContainerForTests(getProject(), JetTestUtils.createEmptyModule()); scope = getContextScope(); } @@ -83,7 +84,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { private JetScope getContextScope() throws IOException { // todo comments String text = FileUtil.loadFile(new File("compiler/testData/type-substitutor.kt"), true); - JetFile jetFile = JetPsiFactory(getProject()).createFile(text); + JetFile jetFile = JetPsiFactoryKt.JetPsiFactory(getProject()).createFile(text); ModuleDescriptor module = LazyResolveTestUtil.resolveLazily(Collections.singletonList(jetFile), getEnvironment()); JetScope topLevelDeclarations = module.getPackage(FqName.ROOT).getMemberScope(); ClassifierDescriptor contextClass = topLevelDeclarations.getClassifier(Name.identifier("___Context"), NoLookupLocation.FROM_TEST); @@ -139,10 +140,10 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment { } private JetType resolveType(String typeStr) { - JetTypeReference jetTypeReference = JetPsiFactory(getProject()).createType(typeStr); + JetTypeReference jetTypeReference = JetPsiFactoryKt.JetPsiFactory(getProject()).createType(typeStr); AnalyzingUtils.checkForSyntacticErrors(jetTypeReference); BindingTrace trace = new BindingTraceContext(); - JetType type = container.getTypeResolver().resolveType(UtilsPackage.asLexicalScope(scope), jetTypeReference, trace, true); + JetType type = container.getTypeResolver().resolveType(ScopeUtilsKt.asLexicalScope(scope), jetTypeReference, trace, true); if (!trace.getBindingContext().getDiagnostics().isEmpty()) { fail("Errors:\n" + StringUtil.join( trace.getBindingContext().getDiagnostics(), diff --git a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java index 1f9f7426925..5187b345ab5 100644 --- a/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.psi.JetTypeProjection; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.resolve.TypeResolver; @@ -35,11 +36,11 @@ 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.utils.UtilsPackage; +import org.jetbrains.kotlin.resolve.scopes.utils.ScopeUtilsKt; import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.test.JetLiteFixture; import org.jetbrains.kotlin.test.JetTestUtils; -import org.jetbrains.kotlin.tests.di.DiPackage; +import org.jetbrains.kotlin.tests.di.InjectionKt; import java.util.Map; import java.util.Set; @@ -66,7 +67,7 @@ public class TypeUnifierTest extends JetLiteFixture { ModuleDescriptorImpl module = JetTestUtils.createEmptyModule(); builtIns = module.getBuiltIns(); - typeResolver = DiPackage.createContainerForTests(getProject(), module).getTypeResolver(); + typeResolver = InjectionKt.createContainerForTests(getProject(), module).getTypeResolver(); x = createTypeVariable("X"); y = createTypeVariable("Y"); variables = Sets.newHashSet(x.getTypeConstructor(), y.getTypeConstructor()); @@ -209,11 +210,12 @@ public class TypeUnifierTest extends JetLiteFixture { withX.addClassifierDescriptor(y); withX.changeLockLevel(WritableScope.LockLevel.READING); - JetTypeProjection projection = JetPsiFactory(getProject()).createTypeArguments("<" + typeStr + ">").getArguments().get(0); + JetTypeProjection projection = JetPsiFactoryKt + .JetPsiFactory(getProject()).createTypeArguments("<" + typeStr + ">").getArguments().get(0); JetTypeReference typeReference = projection.getTypeReference(); assert typeReference != null; - JetType type = typeResolver.resolveType(UtilsPackage.asLexicalScope(withX), typeReference, JetTestUtils.DUMMY_TRACE, true); + JetType type = typeResolver.resolveType(ScopeUtilsKt.asLexicalScope(withX), typeReference, JetTestUtils.DUMMY_TRACE, true); return new TypeProjectionImpl(getProjectionKind(typeStr, projection), type); } diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaConstructorDescriptor.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaConstructorDescriptor.java index a4665c061e2..5459b1a9849 100644 --- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaConstructorDescriptor.java +++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/descriptors/JavaConstructorDescriptor.java @@ -106,7 +106,7 @@ public class JavaConstructorDescriptor extends ConstructorDescriptorImpl impleme enhancedReceiverType, getDispatchReceiverParameter(), getTypeParameters(), - DescriptorsPackage.copyValueParameters(enhancedValueParametersTypes, getValueParameters(), enhanced), + UtilKt.copyValueParameters(enhancedValueParametersTypes, getValueParameters(), enhanced), enhancedReturnType, getModality(), getVisibility() diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 12fb0d5d3be..a49f0b24ffe 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -54,7 +54,7 @@ public abstract class KotlinBuiltIns { public static final Set BUILT_INS_PACKAGE_FQ_NAMES = setOf( BUILT_INS_PACKAGE_FQ_NAME, ANNOTATION_PACKAGE_FQ_NAME, - BuiltinsPackage.getKOTLIN_REFLECT_FQ_NAME() + ReflectionTypesKt.getKOTLIN_REFLECT_FQ_NAME() ); protected final ModuleDescriptorImpl builtInsModule; @@ -73,7 +73,7 @@ public abstract class KotlinBuiltIns { Name.special(""), storageManager, ModuleParameters.Empty.INSTANCE$, this ); - PackageFragmentProvider packageFragmentProvider = BuiltinsPackage.createBuiltInPackageFragmentProvider( + PackageFragmentProvider packageFragmentProvider = BuiltInsPackageFragmentProviderKt.createBuiltInPackageFragmentProvider( storageManager, builtInsModule, BUILT_INS_PACKAGE_FQ_NAMES, new BuiltInFictitiousFunctionClassFactory(storageManager, builtInsModule), getAdditionalSupertypesProvider(), diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java index 2ab98d086d9..39c70c286dc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java @@ -23,7 +23,7 @@ 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.util.ModuleVisibilityHelper; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.CollectionsKt; import java.util.*; @@ -227,7 +227,7 @@ public class Visibilities { private static final Map ORDERED_VISIBILITIES; static { - Map visibilities = UtilsPackage.newHashMapWithExpectedSize(4); + Map visibilities = CollectionsKt.newHashMapWithExpectedSize(4); visibilities.put(PRIVATE_TO_THIS, 0); visibilities.put(PRIVATE, 0); visibilities.put(INTERNAL, 1); 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 09a14d54e7f..9f339ea5d9c 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeParameterDescriptor.java @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.Collections; import java.util.Set; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; public abstract class AbstractTypeParameterDescriptor extends DeclarationDescriptorNonRootImpl implements TypeParameterDescriptor { private final Variance variance; 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 d066e1fd20a..47784f43381 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java @@ -26,8 +26,8 @@ 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.utils.CollectionsKt; import org.jetbrains.kotlin.utils.SmartSet; -import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.ArrayList; import java.util.Collection; @@ -71,7 +71,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo @Nullable Modality modality, @NotNull Visibility visibility ) { - this.typeParameters = UtilsPackage.toReadOnlyList(typeParameters); + this.typeParameters = CollectionsKt.toReadOnlyList(typeParameters); this.unsubstitutedValueParameters = unsubstitutedValueParameters; this.unsubstitutedReturnType = unsubstitutedReturnType; this.modality = modality; 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 a9faefb0c91..1bcb687fe08 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.utils.SmartSet; import java.util.*; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImpl implements PropertyDescriptor { private final Modality modality; diff --git a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java index ed5390fd182..efc8c75728d 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertySetterDescriptorImpl.java @@ -27,7 +27,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; public class PropertySetterDescriptorImpl extends PropertyAccessorDescriptorImpl implements PropertySetterDescriptor { 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 71bbe69ec51..c5c2e0b1bfc 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.java +++ b/core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/TypeParameterDescriptorImpl.java @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.utils.SmartSet; import java.util.Collections; import java.util.Set; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; public class TypeParameterDescriptorImpl extends AbstractTypeParameterDescriptor { public static TypeParameterDescriptor createWithDefaultBound( diff --git a/core/descriptors/src/org/jetbrains/kotlin/name/FqName.java b/core/descriptors/src/org/jetbrains/kotlin/name/FqName.java index 65317a2218a..47ef3439e43 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/name/FqName.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/FqName.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.StringsKt; import java.util.ArrayList; import java.util.List; @@ -26,7 +26,7 @@ public final class FqName extends FqNameBase { @NotNull public static FqName fromSegments(@NotNull List names) { - return new FqName(UtilsPackage.join(names, ".")); + return new FqName(StringsKt.join(names, ".")); } public static final FqName ROOT = new FqName(""); diff --git a/core/descriptors/src/org/jetbrains/kotlin/name/FqNameUnsafe.java b/core/descriptors/src/org/jetbrains/kotlin/name/FqNameUnsafe.java index a4a0b61fe10..dd4e131fbbf 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/name/FqNameUnsafe.java +++ b/core/descriptors/src/org/jetbrains/kotlin/name/FqNameUnsafe.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.StringsKt; import java.util.ArrayList; import java.util.List; @@ -243,7 +243,7 @@ public final class FqNameUnsafe extends FqNameBase { @NotNull public static FqNameUnsafe fromSegments(@NotNull List names) { - return new FqNameUnsafe(UtilsPackage.join(names, ".")); + return new FqNameUnsafe(StringsKt.join(names, ".")); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java index 2b6267aef6d..023a7a330db 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorFactory.java @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.types.Variance; import java.util.Collections; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getDefaultConstructorVisibility; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; public class DescriptorFactory { private static class DefaultConstructorDescriptor extends ConstructorDescriptorImpl { diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java index c31f4f5a1e7..44bf4db53cb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/DescriptorUtils.java @@ -47,7 +47,7 @@ import java.util.*; import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.isAny; import static org.jetbrains.kotlin.descriptors.CallableMemberDescriptor.Kind.*; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; public class DescriptorUtils { public static final Name ENUM_VALUES = Name.identifier("values"); diff --git a/core/descriptors/src/org/jetbrains/kotlin/resolve/ImportPath.java b/core/descriptors/src/org/jetbrains/kotlin/resolve/ImportPath.java index 252db624b79..ae46f7711c7 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/resolve/ImportPath.java +++ b/core/descriptors/src/org/jetbrains/kotlin/resolve/ImportPath.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.renderer.RendererPackage; +import org.jetbrains.kotlin.renderer.RenderingUtilsKt; public final class ImportPath { private final @NotNull FqName fqName; @@ -51,7 +51,7 @@ public final class ImportPath { } public String getPathStr() { - return RendererPackage.render(fqName) + (isAllUnder ? ".*" : ""); + return RenderingUtilsKt.render(fqName) + (isAllUnder ? ".*" : ""); } @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java b/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java index 71741f58373..a6fd77b52eb 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.checker.JetTypeChecker; -import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; +import org.jetbrains.kotlin.types.typeUtil.TypeUtilsKt; import java.util.*; @@ -88,9 +88,9 @@ public class CommonSupertypes { List lower = new ArrayList(types.size()); Set capabilities = new LinkedHashSet(); for (JetType type : types) { - if (TypesPackage.isFlexible(type)) { + if (FlexibleTypesKt.isFlexible(type)) { hasFlexible = true; - Flexibility flexibility = TypesPackage.flexibility(type); + Flexibility flexibility = FlexibleTypesKt.flexibility(type); upper.add(flexibility.getUpperBound()); lower.add(flexibility.getLowerBound()); capabilities.add(flexibility.getExtraCapabilities()); @@ -114,7 +114,7 @@ public class CommonSupertypes { assert !types.isEmpty(); Collection typeSet = new HashSet(types); - JetType bestFit = TypesPackage.singleBestRepresentative(typeSet); + JetType bestFit = FlexibleTypesKt.singleBestRepresentative(typeSet); if (bestFit != null) return bestFit; // If any of the types is nullable, the result must be nullable @@ -123,7 +123,7 @@ public class CommonSupertypes { for (Iterator iterator = typeSet.iterator(); iterator.hasNext();) { JetType type = iterator.next(); assert type != null; - assert !TypesPackage.isFlexible(type) : "Flexible type " + type + " passed to commonSuperTypeForInflexible"; + assert !FlexibleTypesKt.isFlexible(type) : "Flexible type " + type + " passed to commonSuperTypeForInflexible"; if (KotlinBuiltIns.isNothingOrNullableNothing(type)) { iterator.remove(); } @@ -249,7 +249,7 @@ public class CommonSupertypes { @NotNull Set typeProjections, int recursionDepth, int maxDepth ) { - TypeProjection singleBestProjection = TypesPackage.singleBestRepresentative(typeProjections); + TypeProjection singleBestProjection = FlexibleTypesKt.singleBestRepresentative(typeProjections); if (singleBestProjection != null) { return singleBestProjection; } @@ -302,7 +302,7 @@ public class CommonSupertypes { Variance projectionKind = variance == OUT_VARIANCE ? Variance.INVARIANT : OUT_VARIANCE; JetType superType = findCommonSupertype(outs, recursionDepth + 1, maxDepth); for (JetType upperBound: parameterDescriptor.getUpperBounds()) { - if (!TypeUtilPackage.isSubtypeOf(superType, upperBound)) { + if (!TypeUtilsKt.isSubtypeOf(superType, upperBound)) { return new StarProjectionImpl(parameterDescriptor); } } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeIntersector.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeIntersector.java index 8ae68f704b1..80bcb91a450 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeIntersector.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeIntersector.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker; import java.util.*; -import static org.jetbrains.kotlin.resolve.calls.inference.InferencePackage.registerTypeVariables; +import static org.jetbrains.kotlin.resolve.calls.inference.ConstraintSystemImplKt.registerTypeVariables; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.SPECIAL; public class TypeIntersector { @@ -114,7 +114,7 @@ public class TypeIntersector { // in that case, we can safely select the best representative out of that set and return it // TODO: maybe return the most specific among the types that are subtypes to all others in the `nullabilityStripped`? // TODO: e.g. among {Int, Int?, Int!}, return `Int` (now it returns `Int!`). - JetType bestRepresentative = TypesPackage.singleBestRepresentative(nullabilityStripped); + JetType bestRepresentative = FlexibleTypesKt.singleBestRepresentative(nullabilityStripped); if (bestRepresentative == null) { throw new AssertionError("Empty intersection for types " + types); } @@ -183,7 +183,7 @@ public class TypeIntersector { } parameters.put(parameterUsage.typeParameterDescriptor, parameterUsage.howTheTypeParameterIsUsed.superpose(howTheTypeIsUsedBefore)); - return Unit.INSTANCE$; + return Unit.INSTANCE; } }; processAllTypeParameters(withParameters, Variance.INVARIANT, processor); diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java index 01c594d7557..cfac87da111 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeSubstitutor.java @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.annotations.CompositeAnnotations; import org.jetbrains.kotlin.descriptors.annotations.FilteredAnnotations; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.resolve.calls.inference.InferencePackage; +import org.jetbrains.kotlin.resolve.calls.inference.CapturedTypeConstructorKt; import org.jetbrains.kotlin.resolve.scopes.SubstitutingScope; -import org.jetbrains.kotlin.types.typeUtil.TypeUtilPackage; -import org.jetbrains.kotlin.types.typesApproximation.TypesApproximationPackage; +import org.jetbrains.kotlin.types.typeUtil.TypeUtilsKt; +import org.jetbrains.kotlin.types.typesApproximation.CapturedTypeApproximationKt; import java.util.*; @@ -106,7 +106,7 @@ public class TypeSubstitutor { if (!substitution.approximateCapturedTypes()) { return substitutedTypeProjection; } - return TypesApproximationPackage.approximateCapturedTypesIfNecessary(substitutedTypeProjection); + return CapturedTypeApproximationKt.approximateCapturedTypesIfNecessary(substitutedTypeProjection); } @Nullable @@ -132,8 +132,8 @@ public class TypeSubstitutor { JetType type = originalProjection.getType(); TypeProjection replacement = substitution.get(type); Variance originalProjectionKind = originalProjection.getProjectionKind(); - if (replacement == null && TypesPackage.isFlexible(type) && !TypesPackage.isCustomTypeVariable(type)) { - Flexibility flexibility = TypesPackage.flexibility(type); + if (replacement == null && FlexibleTypesKt.isFlexible(type) && !TypeCapabilitiesKt.isCustomTypeVariable(type)) { + Flexibility flexibility = FlexibleTypesKt.flexibility(type); TypeProjection substitutedLower = unsafeSubstitute(new TypeProjectionImpl(originalProjectionKind, flexibility.getLowerBound()), recursionDepth + 1); TypeProjection substitutedUpper = @@ -157,7 +157,7 @@ public class TypeSubstitutor { // Captured type might be substituted in an opposite projection: // out 'Captured (in Int)' = out Int // in 'Captured (out Int)' = in Int - boolean allowVarianceConflict = InferencePackage.isCaptured(type); + boolean allowVarianceConflict = CapturedTypeConstructorKt.isCaptured(type); if (!allowVarianceConflict) { //noinspection EnumSwitchStatementWhichMissesCases switch (varianceConflict) { @@ -169,7 +169,7 @@ public class TypeSubstitutor { } } JetType substitutedType; - CustomTypeVariable typeVariable = TypesPackage.getCustomTypeVariable(type); + CustomTypeVariable typeVariable = TypeCapabilitiesKt.getCustomTypeVariable(type); if (replacement.isStarProjection()) { return replacement; } @@ -184,7 +184,7 @@ public class TypeSubstitutor { // substitutionType.annotations = replacement.annotations ++ type.annotations if (!type.getAnnotations().isEmpty()) { Annotations typeAnnotations = filterOutUnsafeVariance(type.getAnnotations()); - substitutedType = TypeUtilPackage.replaceAnnotations( + substitutedType = TypeUtilsKt.replaceAnnotations( substitutedType, new CompositeAnnotations(substitutedType.getAnnotations(), typeAnnotations) ); @@ -229,7 +229,7 @@ public class TypeSubstitutor { // e.g. for return type Foo of 'add(..)' in 'class Foo { fun add(bar: Bar): Foo }' R shouldn't be substituted in the scope TypeSubstitution substitutionFilteringTypeParameters = new TypeSubstitution() { private final Collection containedOrCapturedTypeParameters = - TypeUtilPackage.getContainedAndCapturedTypeParameterConstructors(type); + TypeUtilsKt.getContainedAndCapturedTypeParameterConstructors(type); @Nullable @Override diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java index 295c4a83953..6e259c226e8 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstructor; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.utils.DFS; -import org.jetbrains.kotlin.utils.UtilsPackage; import java.util.*; @@ -95,7 +94,7 @@ public class TypeUtils { @NotNull @Override public TypeCapabilities getCapabilities() { - return TypeCapabilities.NONE.INSTANCE$; + return TypeCapabilities.NONE.INSTANCE; } @Override @@ -257,7 +256,7 @@ public class TypeUtils { for (TypeParameterDescriptor parameterDescriptor : parameters) { result.add(new TypeProjectionImpl(parameterDescriptor.getDefaultType())); } - return UtilsPackage.toReadOnlyList(result); + return org.jetbrains.kotlin.utils.CollectionsKt.toReadOnlyList(result); } @NotNull @@ -311,7 +310,7 @@ public class TypeUtils { if (type.isMarkedNullable()) { return true; } - if (TypesPackage.isFlexible(type) && isNullableType(TypesPackage.flexibility(type).getUpperBound())) { + if (FlexibleTypesKt.isFlexible(type) && isNullableType(FlexibleTypesKt.flexibility(type).getUpperBound())) { return true; } if (isTypeParameter(type)) { @@ -329,7 +328,7 @@ public class TypeUtils { if (type.isMarkedNullable()) { return true; } - if (TypesPackage.isFlexible(type) && acceptsNullable(TypesPackage.flexibility(type).getUpperBound())) { + if (FlexibleTypesKt.isFlexible(type) && acceptsNullable(FlexibleTypesKt.flexibility(type).getUpperBound())) { return true; } if (isTypeParameter(type)) { @@ -380,7 +379,8 @@ public class TypeUtils { throw new IllegalArgumentException("type parameter counts do not match: " + clazz + ", " + projections); } - Map substitutions = UtilsPackage.newHashMapWithExpectedSize(clazzTypeParameters.size()); + Map substitutions = org.jetbrains.kotlin.utils.CollectionsKt + .newHashMapWithExpectedSize(clazzTypeParameters.size()); for (int i = 0; i < clazzTypeParameters.size(); ++i) { TypeConstructor typeConstructor = clazzTypeParameters.get(i).getTypeConstructor(); @@ -572,7 +572,8 @@ public class TypeUtils { } public static TypeSubstitutor makeConstantSubstitutor(Collection typeParameterDescriptors, JetType type) { - final Set constructors = UtilsPackage.newHashSetWithExpectedSize(typeParameterDescriptors.size()); + final Set constructors = org.jetbrains.kotlin.utils.CollectionsKt + .newHashSetWithExpectedSize(typeParameterDescriptors.size()); for (TypeParameterDescriptor typeParameterDescriptor : typeParameterDescriptors) { constructors.add(typeParameterDescriptor.getTypeConstructor()); } diff --git a/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java index 02e0ae4fe12..cc9fbc9eb41 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java +++ b/core/descriptors/src/org/jetbrains/kotlin/types/checker/TypeCheckingProcedure.java @@ -20,11 +20,11 @@ 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.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.types.*; import java.util.List; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; import static org.jetbrains.kotlin.types.Variance.*; public class TypeCheckingProcedure { @@ -40,7 +40,7 @@ public class TypeCheckingProcedure { // as the second parameter, applying the substitution of type arguments to it @Nullable public static JetType findCorrespondingSupertype(@NotNull JetType subtype, @NotNull JetType supertype, @NotNull TypeCheckingProcedureCallbacks typeCheckingProcedureCallbacks) { - return CheckerPackage.findCorrespondingSupertype(subtype, supertype, typeCheckingProcedureCallbacks); + return UtilsKt.findCorrespondingSupertype(subtype, supertype, typeCheckingProcedureCallbacks); } public static JetType getOutType(TypeParameterDescriptor parameter, TypeProjection argument) { @@ -50,7 +50,7 @@ public class TypeCheckingProcedure { public static JetType getInType(@NotNull TypeParameterDescriptor parameter, @NotNull TypeProjection argument) { boolean isOutProjected = argument.getProjectionKind() == OUT_VARIANCE || parameter.getVariance() == OUT_VARIANCE; - return isOutProjected ? getBuiltIns(parameter).getNothingType() : argument.getType(); + return isOutProjected ? DescriptorUtilsKt.getBuiltIns(parameter).getNothingType() : argument.getType(); } private final TypeCheckingProcedureCallbacks constraints; @@ -61,13 +61,13 @@ public class TypeCheckingProcedure { public boolean equalTypes(@NotNull JetType type1, @NotNull JetType type2) { if (type1 == type2) return true; - if (TypesPackage.isFlexible(type1)) { - if (TypesPackage.isFlexible(type2)) { + if (FlexibleTypesKt.isFlexible(type1)) { + if (FlexibleTypesKt.isFlexible(type2)) { return !type1.isError() && !type2.isError() && isSubtypeOf(type1, type2) && isSubtypeOf(type2, type1); } return heterogeneousEquivalence(type2, type1); } - else if (TypesPackage.isFlexible(type2)) { + else if (FlexibleTypesKt.isFlexible(type2)) { return heterogeneousEquivalence(type1, type2); } @@ -118,9 +118,9 @@ public class TypeCheckingProcedure { protected boolean heterogeneousEquivalence(JetType inflexibleType, JetType flexibleType) { // This is to account for the case when we have Collection vs (Mutable)Collection! or K(java.util.Collection) - assert !TypesPackage.isFlexible(inflexibleType) : "Only inflexible types are allowed here: " + inflexibleType; - return isSubtypeOf(TypesPackage.flexibility(flexibleType).getLowerBound(), inflexibleType) - && isSubtypeOf(inflexibleType, TypesPackage.flexibility(flexibleType).getUpperBound()); + assert !FlexibleTypesKt.isFlexible(inflexibleType) : "Only inflexible types are allowed here: " + inflexibleType; + return isSubtypeOf(FlexibleTypesKt.flexibility(flexibleType).getLowerBound(), inflexibleType) + && isSubtypeOf(inflexibleType, FlexibleTypesKt.flexibility(flexibleType).getUpperBound()); } public enum EnrichedProjectionKind { @@ -179,11 +179,11 @@ public class TypeCheckingProcedure { } public boolean isSubtypeOf(@NotNull JetType subtype, @NotNull JetType supertype) { - if (TypesPackage.sameTypeConstructors(subtype, supertype)) { + if (TypeCapabilitiesKt.sameTypeConstructors(subtype, supertype)) { return !subtype.isMarkedNullable() || supertype.isMarkedNullable(); } - JetType subtypeRepresentative = TypesPackage.getSubtypeRepresentative(subtype); - JetType supertypeRepresentative = TypesPackage.getSupertypeRepresentative(supertype); + JetType subtypeRepresentative = TypeCapabilitiesKt.getSubtypeRepresentative(subtype); + JetType supertypeRepresentative = TypeCapabilitiesKt.getSupertypeRepresentative(supertype); if (subtypeRepresentative != subtype || supertypeRepresentative != supertype) { // recursive invocation for possible chain of representatives return isSubtypeOf(subtypeRepresentative, supertypeRepresentative); diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.java index 5866e0a03cf..f52a8e8f9fa 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/NameResolverImpl.java @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.serialization.ProtoBuf; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.IOException; import java.io.InputStream; @@ -38,7 +38,7 @@ public class NameResolverImpl implements NameResolver { return new NameResolverImpl(simpleNames, qualifiedNames); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } diff --git a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java index b1cba89f8c0..6fdc650f38e 100644 --- a/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java +++ b/core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedTypeParameterDescriptor.java @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.descriptors.impl.AbstractLazyTypeParameterDescriptor import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.kotlin.serialization.deserialization.Deserialization; import org.jetbrains.kotlin.serialization.deserialization.DeserializationContext; -import org.jetbrains.kotlin.serialization.deserialization.DeserializationPackage; import org.jetbrains.kotlin.serialization.deserialization.TypeDeserializer; import org.jetbrains.kotlin.types.JetType; @@ -31,7 +30,7 @@ import java.util.Collections; import java.util.LinkedHashSet; import java.util.Set; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; +import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns; public class DeserializedTypeParameterDescriptor extends AbstractLazyTypeParameterDescriptor { private final ProtoBuf.TypeParameter proto; diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java index 049a1ccf17f..e9796373884 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/ReflectionFactoryImpl.java @@ -36,7 +36,7 @@ public class ReflectionFactoryImpl extends ReflectionFactory { @Override public KClass getOrCreateKotlinClass(Class javaClass) { - return InternalPackage.getOrCreateKotlinClass(javaClass); + return KClassCacheKt.getOrCreateKotlinClass(javaClass); } // Functions diff --git a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/kClassCache.kt b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/kClassCache.kt index 7b7b32cd584..916b449c439 100644 --- a/core/reflection.jvm/src/kotlin/reflect/jvm/internal/kClassCache.kt +++ b/core/reflection.jvm/src/kotlin/reflect/jvm/internal/kClassCache.kt @@ -17,6 +17,7 @@ package kotlin.reflect.jvm.internal import java.lang.ref.WeakReference +import kotlin.reflect.KClass import kotlin.reflect.jvm.internal.pcollections.HashPMap // TODO: collect nulls periodically diff --git a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java index eea8886a4b6..c1aef61ddee 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/storage/LockBasedStorageManager.java @@ -21,7 +21,7 @@ import kotlin.jvm.functions.Function0; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.jetbrains.kotlin.utils.WrappedValues; import java.util.Arrays; @@ -37,7 +37,7 @@ public class LockBasedStorageManager implements StorageManager { @NotNull @Override public RuntimeException handleException(@NotNull Throwable throwable) { - throw UtilsPackage.rethrow(throwable); + throw ExceptionUtilsKt.rethrow(throwable); } }; diff --git a/core/util.runtime/src/org/jetbrains/kotlin/utils/WrappedValues.java b/core/util.runtime/src/org/jetbrains/kotlin/utils/WrappedValues.java index 909a4a19da1..42328dd6888 100644 --- a/core/util.runtime/src/org/jetbrains/kotlin/utils/WrappedValues.java +++ b/core/util.runtime/src/org/jetbrains/kotlin/utils/WrappedValues.java @@ -74,7 +74,7 @@ public class WrappedValues { @Nullable public static V unescapeThrowable(@Nullable Object value) { if (value instanceof ThrowableWrapper) { - throw UtilsPackage.rethrow(((ThrowableWrapper) value).getThrowable()); + throw ExceptionUtilsKt.rethrow(((ThrowableWrapper) value).getThrowable()); } //noinspection unchecked diff --git a/eval4j/test/org/jetbrains/eval4j/test/Eval4jTest.java b/eval4j/test/org/jetbrains/eval4j/test/Eval4jTest.java index 2822c17f4a4..593bf0cf9af 100644 --- a/eval4j/test/org/jetbrains/eval4j/test/Eval4jTest.java +++ b/eval4j/test/org/jetbrains/eval4j/test/Eval4jTest.java @@ -17,14 +17,15 @@ package org.jetbrains.eval4j.test; import junit.framework.TestSuite; +import org.jetbrains.eval4j.jdi.test.JdiTestKt; public class Eval4jTest extends TestSuite { @SuppressWarnings({"UnnecessaryFullyQualifiedName", "StaticMethodReferencedViaSubclass"}) public static TestSuite suite() { TestSuite eval4jSuite = new TestSuite("Eval4j Tests"); - eval4jSuite.addTest(org.jetbrains.eval4j.jdi.test.TestPackage.suite()); - eval4jSuite.addTest(org.jetbrains.eval4j.test.TestPackage.suite()); + eval4jSuite.addTest(JdiTestKt.suite()); + eval4jSuite.addTest(MainKt.suite()); return eval4jSuite; } } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java index 76dfc5abee8..f1d95230fd8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/DecompiledNavigationUtils.java @@ -38,6 +38,7 @@ import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor; import org.jetbrains.kotlin.serialization.js.KotlinJavascriptPackageFragment; import org.jetbrains.kotlin.types.ErrorUtils; @@ -46,7 +47,6 @@ import org.jetbrains.kotlin.types.expressions.ExpressionTypingUtils; import java.util.Collection; import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassId; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getClassId; public final class DecompiledNavigationUtils { @@ -150,7 +150,7 @@ public final class DecompiledNavigationUtils { || ExpressionTypingUtils.isLocal(containerDescriptor.getContainingDeclaration(), containerDescriptor)) { return getContainerClassId(project, containerDescriptor.getContainingDeclaration()); } - return getClassId((ClassDescriptor) containerDescriptor); + return DescriptorUtilsKt.getClassId((ClassDescriptor) containerDescriptor); } return null; } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java index 39c2a54c3c5..4272c153b11 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java @@ -41,9 +41,10 @@ import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.builtins.DefaultBuiltIns; import org.jetbrains.kotlin.codegen.binding.PsiCodegenPredictor; -import org.jetbrains.kotlin.context.ContextPackage; +import org.jetbrains.kotlin.context.ContextKt; import org.jetbrains.kotlin.context.MutableModuleContext; import org.jetbrains.kotlin.descriptors.CallableDescriptor; +import org.jetbrains.kotlin.descriptors.ModuleDescriptorKt; import org.jetbrains.kotlin.fileClasses.NoResolveFileClassesProvider; import org.jetbrains.kotlin.frontend.di.DiPackage; import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex; @@ -71,7 +72,6 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.kotlin.descriptors.DescriptorsPackage.ModuleParameters; import static org.jetbrains.kotlin.idea.decompiler.navigation.MemberMatching.*; public class JetSourceNavigationHelper { @@ -240,9 +240,9 @@ public class JetSourceNavigationHelper { ) { TargetPlatform platform = TargetPlatform.Default.INSTANCE$; - MutableModuleContext newModuleContext = ContextPackage.ContextForNewModule( + MutableModuleContext newModuleContext = ContextKt.ContextForNewModule( project, Name.special(""), - ModuleParameters( + ModuleDescriptorKt.ModuleParameters( JvmPlatform.defaultModuleParameters.getDefaultImports(), PlatformToKotlinClassMap.EMPTY ), diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java index dbdfad68802..2d4def1e6e8 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/DuplicateJvmSignatureAnnotator.java @@ -22,7 +22,8 @@ import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.asJava.AsJavaPackage; +import org.jetbrains.kotlin.asJava.DuplicateJvmSignatureUtilKt; +import org.jetbrains.kotlin.idea.caches.resolve.GetModuleInfoKt; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.project.TargetPlatformDetector; import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; @@ -32,8 +33,6 @@ import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; -import static org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage.getModuleInfo; - public class DuplicateJvmSignatureAnnotator implements Annotator { @Override public void annotate(@NotNull PsiElement element, @NotNull AnnotationHolder holder) { @@ -44,8 +43,8 @@ public class DuplicateJvmSignatureAnnotator implements Annotator { if (!(file instanceof JetFile) || TargetPlatformDetector.getPlatform((JetFile) file) != JvmPlatform.INSTANCE$) return; Diagnostics otherDiagnostics = ResolutionUtils.analyzeFully((JetElement) element).getDiagnostics(); - GlobalSearchScope moduleScope = getModuleInfo(element).contentScope(); - Diagnostics diagnostics = AsJavaPackage.getJvmSignatureDiagnostics(element, otherDiagnostics, moduleScope); + GlobalSearchScope moduleScope = GetModuleInfoKt.getModuleInfo(element).contentScope(); + Diagnostics diagnostics = DuplicateJvmSignatureUtilKt.getJvmSignatureDiagnostics(element, otherDiagnostics, moduleScope); if (diagnostics == null) return; new JetPsiChecker().annotateElement(element, holder, diagnostics); diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java index d183ea2a744..c56d83c0595 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/FunctionsHighlightingVisitor.java @@ -24,10 +24,10 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.psi.*; 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.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; -import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.tasks.DynamicCallsKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; @@ -65,11 +65,11 @@ public class FunctionsHighlightingVisitor extends AfterAnalysisHighlightingVisit @Override public void visitCallExpression(@NotNull JetCallExpression expression) { JetExpression callee = expression.getCalleeExpression(); - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, bindingContext); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, bindingContext); if (callee instanceof JetReferenceExpression && resolvedCall != null) { CallableDescriptor calleeDescriptor = resolvedCall.getResultingDescriptor(); - if (TasksPackage.isDynamic(calleeDescriptor)) { + if (DynamicCallsKt.isDynamic(calleeDescriptor)) { JetPsiChecker.highlightName(holder, callee, JetHighlightingColors.DYNAMIC_FUNCTION_CALL); } else if (resolvedCall instanceof VariableAsFunctionResolvedCall) { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java index 3d957e29740..251802ec265 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/HtmlTabledDescriptorRenderer.java @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.DescriptorRow; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.FunctionArgumentsRow; import org.jetbrains.kotlin.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow; +import org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilKt; import org.jetbrains.kotlin.renderer.*; import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition; import org.jetbrains.kotlin.types.JetType; @@ -34,7 +35,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderError; import static org.jetbrains.kotlin.idea.highlighter.renderersUtil.RenderersUtilPackage.renderStrong; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.RECEIVER_POSITION; import static org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.VALUE_PARAMETER_POSITION; @@ -60,10 +60,10 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { result.append(text); } else if (elementType == TextElementType.ERROR) { - result.append(renderError(text)); + result.append(RenderersUtilKt.renderError(text)); } else if (elementType == TextElementType.STRONG) { - result.append(renderStrong(text)); + result.append(RenderersUtilKt.renderStrong(text)); } } @@ -131,7 +131,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { if (isErrorPosition.apply(RECEIVER_POSITION.position())) { error = true; } - receiver = "receiver: " + renderStrong(getTypeRenderer().render(receiverType), error); + receiver = "receiver: " + RenderersUtilKt.renderStrong(getTypeRenderer().render(receiverType), error); } td(result, receiver); td(result, hasReceiver ? "arguments: " : ""); @@ -140,7 +140,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { return; } - td(result, renderStrong("(")); + td(result, RenderersUtilKt.renderStrong("(")); int i = 0; for (Iterator iterator = argumentTypes.iterator(); iterator.hasNext(); ) { JetType argumentType = iterator.next(); @@ -150,10 +150,10 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer { } String renderedArgument = getTypeRenderer().render(argumentType); - tdRight(result, renderStrong(renderedArgument, error) + (iterator.hasNext() ? renderStrong(",") : "")); + tdRight(result, RenderersUtilKt.renderStrong(renderedArgument, error) + (iterator.hasNext() ? RenderersUtilKt.renderStrong(",") : "")); i++; } - td(result, renderStrong(")")); + td(result, RenderersUtilKt.renderStrong(")")); } public static HtmlTabledDescriptorRenderer create() { diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java index 5736ac046da..a56f46c42a6 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PropertiesHighlightingVisitor.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.JetThisExpression; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.tasks.DynamicCallsKt; class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor { PropertiesHighlightingVisitor(AnnotationHolder holder, BindingContext bindingContext) { @@ -88,7 +88,7 @@ class PropertiesHighlightingVisitor extends AfterAnalysisHighlightingVisitor { @NotNull PropertyDescriptor descriptor, boolean withBackingField ) { - if (TasksPackage.isDynamic(descriptor)) { + if (DynamicCallsKt.isDynamic(descriptor)) { JetPsiChecker.highlightName(holder, elementToHighlight, JetHighlightingColors.DYNAMIC_PROPERTY_CALL); return; } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java index 31b8a1db3d4..8e8d652106e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetDynamicType; import org.jetbrains.kotlin.psi.JetSimpleNameExpression; import org.jetbrains.kotlin.psi.JetTypeParameter; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; import org.jetbrains.kotlin.resolve.BindingContext; class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor { @@ -58,7 +58,7 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor { } private void highlightAnnotation(@NotNull JetSimpleNameExpression expression) { - TextRange toHighlight = PsiUtilPackage.getCalleeHighlightingRange(expression); + TextRange toHighlight = JetPsiUtilKt.getCalleeHighlightingRange(expression); JetPsiChecker.highlightName(holder, toHighlight, JetHighlightingColors.ANNOTATION); } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java index c857db6f636..8930701aeeb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/VariablesHighlightingVisitor.java @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.descriptors.impl.LocalVariableDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.tasks.DynamicCallsKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.expressions.CaptureKind; @@ -89,7 +89,7 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor { if (descriptor instanceof VariableDescriptor) { VariableDescriptor variableDescriptor = (VariableDescriptor) descriptor; - if (TasksPackage.isDynamic(variableDescriptor)) { + if (DynamicCallsKt.isDynamic(variableDescriptor)) { JetPsiChecker.highlightName(holder, elementToHighlight, JetHighlightingColors.DYNAMIC_PROPERTY_CALL); return; } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetArrayAccessReference.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetArrayAccessReference.java index 25064420ee8..f07f838dc56 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetArrayAccessReference.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/references/JetArrayAccessReference.java @@ -96,6 +96,6 @@ public class JetArrayAccessReference extends JetSimpleReference getTargetDescriptors(@NotNull BindingContext context) { - Call call = CallUtilPackage.getCall(getElement(), context); - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(call, context); + Call call = CallUtilKt.getCall(getElement(), context); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(call, context); if (resolvedCall instanceof VariableAsFunctionResolvedCall) { return Collections.singleton( ((VariableAsFunctionResolvedCall) resolvedCall).getFunctionCall().getCandidateDescriptor()); @@ -110,6 +110,6 @@ public class JetInvokeFunctionReference extends JetSimpleReference propertiesDeclarations = new ArrayList(); // Dummy element to add new declarations at the beginning - JetPsiFactory psiFactory = JetPsiFactory(project); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(project); PsiElement dummyFirstStatement = container.addBefore(psiFactory.createExpression("dummyStatement"), statements[0]); try { @@ -96,7 +96,8 @@ public class MoveDeclarationsOutHelper { private static JetBinaryExpression createVariableAssignment(@NotNull JetProperty property) { String propertyName = property.getName(); assert propertyName != null : "Property should have a name " + property.getText(); - JetBinaryExpression assignment = (JetBinaryExpression) JetPsiFactory(property).createExpression(propertyName + " = x"); + JetBinaryExpression assignment = (JetBinaryExpression) JetPsiFactoryKt + .JetPsiFactory(property).createExpression(propertyName + " = x"); JetExpression right = assignment.getRight(); assert right != null : "Created binary expression should have a right part " + assignment.getText(); JetExpression initializer = property.getInitializer(); @@ -135,7 +136,7 @@ public class MoveDeclarationsOutHelper { typeString = IdeDescriptorRenderers.SOURCE_CODE.renderType(propertyType); } - return JetPsiFactory(property).createProperty(property.getName(), typeString, property.isVar(), initializer); + return JetPsiFactoryKt.JetPsiFactory(property).createProperty(property.getName(), typeString, property.isVar(), initializer); } private static boolean needToDeclareOut(@NotNull PsiElement element, int lastStatementOffset, @NotNull SearchScope scope) { diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinNotSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinNotSurrounder.java index 1c66e67e791..f1843c143a9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinNotSurrounder.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinNotSurrounder.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetParenthesizedExpression; import org.jetbrains.kotlin.psi.JetPrefixExpression; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.types.JetType; @@ -48,7 +49,7 @@ public class KotlinNotSurrounder extends KotlinExpressionSurrounder { @Nullable @Override public TextRange surroundExpression(@NotNull Project project, @NotNull Editor editor, @NotNull JetExpression expression) { - JetPrefixExpression prefixExpr = (JetPrefixExpression) JetPsiFactory(expression).createExpression("!(a)"); + JetPrefixExpression prefixExpr = (JetPrefixExpression) JetPsiFactoryKt.JetPsiFactory(expression).createExpression("!(a)"); JetParenthesizedExpression parenthesizedExpression = (JetParenthesizedExpression) prefixExpr.getBaseExpression(); assert parenthesizedExpression != null : "JetParenthesizedExpression should exists for " + prefixExpr.getText() + " expression"; JetExpression expressionWithoutParentheses = parenthesizedExpression.getExpression(); diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java index edd7beb532b..10c9b2711a4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinParenthesesSurrounder.java @@ -25,6 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetParenthesizedExpression; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -42,7 +43,8 @@ public class KotlinParenthesesSurrounder extends KotlinExpressionSurrounder { @Nullable @Override public TextRange surroundExpression( @NotNull Project project, @NotNull Editor editor, @NotNull JetExpression expression) { - JetParenthesizedExpression parenthesizedExpression = (JetParenthesizedExpression) JetPsiFactory(expression).createExpression("(a)"); + JetParenthesizedExpression parenthesizedExpression = (JetParenthesizedExpression) JetPsiFactoryKt + .JetPsiFactory(expression).createExpression("(a)"); JetExpression expressionWithoutParentheses = parenthesizedExpression.getExpression(); assert expressionWithoutParentheses != null : "JetExpression should exists for " + parenthesizedExpression.getText() + " expression"; expressionWithoutParentheses.replace(expression); diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java index ab44a2bdf74..7bf0feb660b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinStringTemplateSurrounder.java @@ -23,10 +23,7 @@ import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.JetBundle; -import org.jetbrains.kotlin.psi.JetConstantExpression; -import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.JetStringTemplateEntry; -import org.jetbrains.kotlin.psi.JetStringTemplateExpression; +import org.jetbrains.kotlin.psi.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -44,7 +41,7 @@ public class KotlinStringTemplateSurrounder extends KotlinExpressionSurrounder { @Nullable @Override public TextRange surroundExpression(@NotNull Project project, @NotNull Editor editor, @NotNull JetExpression expression) { - JetStringTemplateExpression stringTemplateExpression = (JetStringTemplateExpression) JetPsiFactory(expression).createExpression( + JetStringTemplateExpression stringTemplateExpression = (JetStringTemplateExpression) JetPsiFactoryKt.JetPsiFactory(expression).createExpression( getCodeTemplate(expression) ); JetStringTemplateEntry templateEntry = stringTemplateExpression.getEntries()[0]; diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java index d8e462b167c..2554a812973 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/expression/KotlinWhenSurrounder.java @@ -27,10 +27,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; -import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.psi.JetWhenCondition; -import org.jetbrains.kotlin.psi.JetWhenEntry; -import org.jetbrains.kotlin.psi.JetWhenExpression; +import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.types.JetType; @@ -50,7 +47,8 @@ public class KotlinWhenSurrounder extends KotlinExpressionSurrounder { @Nullable @Override public TextRange surroundExpression(@NotNull Project project, @NotNull Editor editor, @NotNull JetExpression expression) { - JetWhenExpression whenExpression = (JetWhenExpression) JetPsiFactory(expression).createExpression(getCodeTemplate(expression)); + JetWhenExpression whenExpression = (JetWhenExpression) JetPsiFactoryKt + .JetPsiFactory(expression).createExpression(getCodeTemplate(expression)); JetExpression subjectExpression = whenExpression.getSubjectExpression(); assert subjectExpression != null : "JetExpression should exists for " + whenExpression.getText() + " expression"; subjectExpression.replace(expression); diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java index 2f6a49fb233..ad876d1a2f1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinFunctionLiteralSurrounder.java @@ -40,7 +40,7 @@ public class KotlinFunctionLiteralSurrounder extends KotlinStatementsSurrounder return null; } - JetPsiFactory psiFactory = JetPsiFactory(project); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(project); JetCallExpression callExpression = (JetCallExpression) psiFactory.createExpression("run {\n}"); callExpression = (JetCallExpression) container.addAfter(callExpression, statements[statements.length - 1]); container.addBefore(psiFactory.createWhiteSpace(), callExpression); diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java index 334532eb853..b4e83264b99 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinIfSurrounderBase.java @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.idea.codeInsight.surroundWith.MoveDeclarationsOutHel import org.jetbrains.kotlin.psi.JetBlockExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetIfExpression; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -44,7 +45,7 @@ public abstract class KotlinIfSurrounderBase extends KotlinStatementsSurrounder return null; } - JetIfExpression ifExpression = (JetIfExpression) JetPsiFactory(project).createExpression(getCodeTemplate()); + JetIfExpression ifExpression = (JetIfExpression) JetPsiFactoryKt.JetPsiFactory(project).createExpression(getCodeTemplate()); ifExpression = (JetIfExpression) container.addAfter(ifExpression, statements[statements.length - 1]); // TODO move a comment for first statement diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java index bccfef099af..c90d18b7520 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/surroundWith/statement/KotlinTrySurrounderBase.java @@ -25,10 +25,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.codeInsight.surroundWith.KotlinSurrounderUtils; import org.jetbrains.kotlin.idea.codeInsight.surroundWith.MoveDeclarationsOutHelper; -import org.jetbrains.kotlin.psi.JetBlockExpression; -import org.jetbrains.kotlin.psi.JetElement; -import org.jetbrains.kotlin.psi.JetParameter; -import org.jetbrains.kotlin.psi.JetTryExpression; +import org.jetbrains.kotlin.psi.*; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -44,7 +41,7 @@ public abstract class KotlinTrySurrounderBase extends KotlinStatementsSurrounder return null; } - JetTryExpression tryExpression = (JetTryExpression) JetPsiFactory(project).createExpression(getCodeTemplate()); + JetTryExpression tryExpression = (JetTryExpression) JetPsiFactoryKt.JetPsiFactory(project).createExpression(getCodeTemplate()); tryExpression = (JetTryExpression) container.addAfter(tryExpression, statements[statements.length - 1]); // TODO move a comment for first statement diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrappers.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrappers.java index b99832ab1a1..56148ace053 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrappers.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/unwrap/KotlinUnwrappers.java @@ -77,7 +77,7 @@ public class KotlinUnwrappers { @Override protected void doUnwrap(PsiElement element, Context context) throws IncorrectOperationException { JetIfExpression ifExpr = (JetIfExpression) element; - context.replace(ifExpr, JetPsiFactory(ifExpr).createIf(ifExpr.getCondition(), ifExpr.getThen(), null)); + context.replace(ifExpr, JetPsiFactoryKt.JetPsiFactory(ifExpr).createIf(ifExpr.getCondition(), ifExpr.getThen(), null)); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractJetUpDownMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractJetUpDownMover.java index 5741eab3491..83ad99698d4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractJetUpDownMover.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/AbstractJetUpDownMover.java @@ -28,7 +28,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.core.refactoring.RefactoringPackage; +import org.jetbrains.kotlin.idea.core.refactoring.JetRefactoringUtilKt; import org.jetbrains.kotlin.psi.JetBlockExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFunctionLiteral; @@ -74,7 +74,7 @@ public abstract class AbstractJetUpDownMover extends LineMover { } if (comment != null) { - int extension = RefactoringPackage.getLineCount(comment); + int extension = JetRefactoringUtilKt.getLineCount(comment); if (extendDown) { bottomExtension = extension; } diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java index ff70ecd0907..4e2d0839cce 100644 --- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java +++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetExpressionMover.java @@ -27,10 +27,10 @@ import com.intellij.psi.util.PsiTreeUtil; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.idea.core.refactoring.RefactoringPackage; +import org.jetbrains.kotlin.idea.core.refactoring.JetRefactoringUtilKt; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import java.util.List; @@ -395,7 +395,7 @@ public class JetExpressionMover extends AbstractJetUpDownMover { @Nullable private static PsiElement getMovableElement(@NotNull PsiElement element, boolean lookRight) { //noinspection unchecked - PsiElement movableElement = PsiUtilPackage.getParentOfTypesAndPredicate( + PsiElement movableElement = PsiUtilsKt.getParentOfTypesAndPredicate( element, false, MOVABLE_ELEMENT_CLASSES, @@ -447,7 +447,7 @@ public class JetExpressionMover extends AbstractJetUpDownMover { } if (whiteSpaceTestSubject instanceof PsiWhiteSpace) { - if (RefactoringPackage.isMultiLine(whiteSpaceTestSubject)) { + if (JetRefactoringUtilKt.isMultiLine(whiteSpaceTestSubject)) { int nearLine = down ? sourceRange.endLine : sourceRange.startLine - 1; info.toMove = sourceRange; @@ -550,7 +550,7 @@ public class JetExpressionMover extends AbstractJetUpDownMover { PsiElement parent = element.getParent(); assert parent != null; - parent.addAfter(JetPsiFactory(parent.getProject()).createComma(), element); + parent.addAfter(JetPsiFactoryKt.JetPsiFactory(parent.getProject()).createComma(), element); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinLineBreakpointType.java b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinLineBreakpointType.java index cbff8e4ea9b..6d6e933b002 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinLineBreakpointType.java +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/KotlinLineBreakpointType.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.idea.debugger.breakpoints; -import com.intellij.debugger.DebuggerBundle; import com.intellij.debugger.SourcePosition; import com.intellij.debugger.ui.breakpoints.JavaLineBreakpointType; import com.intellij.debugger.ui.breakpoints.LineBreakpoint; @@ -66,7 +65,7 @@ public class KotlinLineBreakpointType extends JavaLineBreakpointType { @Override public boolean canPutAt(@NotNull VirtualFile file, int line, @NotNull Project project) { - return BreakpointsPackage.canPutAt(file, line, project, getClass()); + return BreakpointTypeUtilsKt.canPutAt(file, line, project, getClass()); } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java index 7e4766c41ab..8f2df8a73de 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/breakpoints/dialog/AddFieldBreakpointDialog.java @@ -85,7 +85,7 @@ public abstract class AddFieldBreakpointDialog extends DialogWrapper { @Override public void actionPerformed(@NotNull ActionEvent e) { PsiClass selectedClass = getSelectedClass(); - DescriptorMemberChooserObject[] properties = DialogPackage.collectProperties(selectedClass); + DescriptorMemberChooserObject[] properties = FieldBreakpointDialogUtilKt.collectProperties(selectedClass); MemberChooser chooser = new MemberChooser(properties, false, false, myProject); chooser.setTitle(DebuggerBundle.message("add.field.breakpoint.dialog.field.chooser.title", properties.length)); chooser.setCopyJavadocVisible(false); diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java index 5ca7c408751..0dd5cee2640 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/KotlinFindClassUsagesDialog.java @@ -30,14 +30,14 @@ import com.intellij.psi.PsiModifier; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.StateRestoringCheckBox; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.jetbrains.kotlin.asJava.LightClassUtil; +import org.jetbrains.kotlin.asJava.LightClassUtilsKt; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.findUsages.KotlinClassFindUsagesOptions; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetClassOrObject; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; import javax.swing.*; @@ -90,7 +90,7 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog { //noinspection ConstantConditions javaClass.getModifierList().setModifierProperty( PsiModifier.FINAL, - !(classOrObject instanceof JetClass && PsiUtilPackage.isInheritable((JetClass) classOrObject)) + !(classOrObject instanceof JetClass && JetPsiUtilKt.isInheritable((JetClass) classOrObject)) ); javaClass.putUserData(ORIGINAL_CLASS, classOrObject); @@ -146,7 +146,7 @@ public class KotlinFindClassUsagesDialog extends FindClassUsagesDialog { @Override public void configureLabelComponent(@NotNull SimpleColoredComponent coloredComponent) { - PsiElement klass = AsJavaPackage.getUnwrapped(getPsiElement()); + PsiElement klass = LightClassUtilsKt.getUnwrapped(getPsiElement()); //noinspection ConstantConditions JetClassOrObject originalClass = klass instanceof JetClassOrObject ? (JetClassOrObject) klass diff --git a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java index 67fcb059bcd..606b7968f6d 100644 --- a/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java +++ b/idea/src/org/jetbrains/kotlin/idea/findUsages/dialogs/Utils.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.idea.findUsages.dialogs; import com.intellij.ui.SimpleColoredComponent; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchPackage; +import org.jetbrains.kotlin.idea.search.usagesSearch.UtilsKt; import org.jetbrains.kotlin.psi.JetNamedDeclaration; import org.jetbrains.kotlin.renderer.DescriptorRenderer; @@ -32,7 +32,7 @@ class Utils { public static void configureLabelComponent( @NotNull SimpleColoredComponent coloredComponent, @NotNull JetNamedDeclaration declaration) { - coloredComponent.append(DescriptorRenderer.COMPACT.render(UsagesSearchPackage.getDescriptor(declaration))); + coloredComponent.append(DescriptorRenderer.COMPACT.render(UtilsKt.getDescriptor(declaration))); } static boolean renameCheckbox(@NotNull JPanel panel, @NotNull String srcText, @NotNull String destText) { diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java b/idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java index bced977efbc..97c4ce9cf17 100644 --- a/idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java +++ b/idea/src/org/jetbrains/kotlin/idea/formatter/JetFormattingModelBuilder.java @@ -38,7 +38,7 @@ public class JetFormattingModelBuilder implements FormattingModelBuilder { PsiFile containingFile = element.getContainingFile().getViewProvider().getPsi(KotlinLanguage.INSTANCE); JetBlock block = new JetBlock( containingFile.getNode(), NodeAlignmentStrategy.getNullStrategy(), Indent.getNoneIndent(), null, settings, - FormatterPackage.createSpacingBuilder(settings)); + KotlinSpacingRulesKt.createSpacingBuilder(settings)); //TODO: this is temporary code to allow formatting non-physical files in non-UI thread (used by conversion from Java to Kotlin) // it's needed until IDEA's issue with this document being created with wrong threading policy is fixed diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java index c227c0bf33f..c6a759a1741 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java @@ -39,7 +39,7 @@ import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator; import org.jetbrains.kotlin.idea.configuration.RuntimeLibraryFiles; import org.jetbrains.kotlin.idea.framework.ui.CreateLibraryDialog; import org.jetbrains.kotlin.idea.framework.ui.FileUIUtils; -import org.jetbrains.kotlin.idea.util.projectStructure.ProjectStructurePackage; +import org.jetbrains.kotlin.idea.util.projectStructure.ProjectStructureUtilKt; import javax.swing.*; import java.io.File; @@ -97,7 +97,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi DeferredCopyFileRequests deferredCopyFileRequests = getCopyFileRequests(); if (deferredCopyFileRequests == null) return; - Library library = ProjectStructurePackage.findLibrary(rootModel.orderEntries(), new Function1() { + Library library = ProjectStructureUtilKt.findLibrary(rootModel.orderEntries(), new Function1() { @Override public Boolean invoke(@NotNull Library library) { LibraryPresentationManager libraryPresentationManager = LibraryPresentationManager.getInstance(); @@ -113,7 +113,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi Library.ModifiableModel model = library.getModifiableModel(); try { - deferredCopyFileRequests.performRequests(ProjectStructurePackage.getModuleDir(module), model); + deferredCopyFileRequests.performRequests(ProjectStructureUtilKt.getModuleDir(module), model); } finally { model.commit(); @@ -137,7 +137,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi File resultFile = configurator.copyFileToDir(request.file, destinationPath); if (request.replaceInLib) { - ProjectStructurePackage.replaceFileRoot(model, request.file, resultFile); + ProjectStructureUtilKt.replaceFileRoot(model, request.file, resultFile); } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java index 1c159bb6500..3205a18d27c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/HierarchyUtils.java @@ -27,7 +27,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; public class HierarchyUtils { public static final Function1 IS_CALL_HIERARCHY_ELEMENT = new Function1() { @@ -60,7 +60,7 @@ public class HierarchyUtils { public static PsiElement getCallHierarchyElement(PsiElement element) { //noinspection unchecked - return PsiUtilPackage.getParentOfTypesAndPredicate(element, false, ArrayUtil.EMPTY_CLASS_ARRAY, IS_CALL_HIERARCHY_ELEMENT); + return PsiUtilsKt.getParentOfTypesAndPredicate(element, false, ArrayUtil.EMPTY_CLASS_ARRAY, IS_CALL_HIERARCHY_ELEMENT); } } diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java index 3319f32b12e..f803de41b6b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallTreeStructure.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; import java.util.Map; @@ -76,7 +76,7 @@ public abstract class KotlinCallTreeStructure extends HierarchyTreeStructure { @Nullable protected static PsiMethod getRepresentativePsiMethod(PsiElement element) { while (true) { - element = PsiUtilPackage.getParentOfTypesAndPredicate(element, false, ArrayUtil.EMPTY_CLASS_ARRAY, IS_NON_LOCAL_DECLARATION); + element = PsiUtilsKt.getParentOfTypesAndPredicate(element, false, ArrayUtil.EMPTY_CLASS_ARRAY, IS_NON_LOCAL_DECLARATION); if (element == null) return null; PsiMethod method = getRepresentativePsiMethodForNonLocalDeclaration(element); diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java index 5a4fbfdb930..6e7b61cf074 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCalleeMethodsTreeStructure.java @@ -27,7 +27,7 @@ import com.intellij.psi.PsiReference; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.asJava.KotlinLightMethod; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; -import org.jetbrains.kotlin.idea.references.ReferencesPackage; +import org.jetbrains.kotlin.idea.references.ReferenceUtilKt; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; @@ -92,7 +92,7 @@ public class KotlinCalleeMethodsTreeStructure extends KotlinCallTreeStructure { new CalleeReferenceVisitorBase(ResolutionUtils.analyze(element, BodyResolveMode.FULL), false) { @Override protected void processDeclaration(JetSimpleNameExpression reference, PsiElement declaration) { - referencesToCalleeElements.put(ReferencesPackage.getMainReference(reference), declaration); + referencesToCalleeElements.put(ReferenceUtilKt.getMainReference(reference), declaration); } } ); diff --git a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java index db4aa3b9ec4..db18ced80b5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java +++ b/idea/src/org/jetbrains/kotlin/idea/hierarchy/calls/KotlinCallerMethodsTreeStructure.java @@ -39,8 +39,8 @@ import org.jetbrains.kotlin.asJava.LightClassUtil; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.hierarchy.HierarchyUtils; import org.jetbrains.kotlin.idea.references.JetReference; -import org.jetbrains.kotlin.idea.references.ReferencesPackage; -import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchPackage; +import org.jetbrains.kotlin.idea.references.ReferenceUtilKt; +import org.jetbrains.kotlin.idea.search.usagesSearch.UtilsKt; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; @@ -86,7 +86,7 @@ public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure { } if (container != null) { - referencesToElements.put(ReferencesPackage.getMainReference(reference), container); + referencesToElements.put(ReferenceUtilKt.getMainReference(reference), container); } } }); @@ -174,7 +174,7 @@ public class KotlinCallerMethodsTreeStructure extends KotlinCallTreeStructure { new Condition() { @Override public boolean value(PsiReference reference) { - return UsagesSearchPackage.isConstructorUsage(reference, classOrObject); + return UtilsKt.isConstructorUsage(reference, classOrObject); } }, defaultQueryProcessor(descriptor, methodToDescriptorMap, false) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java index c1e053890f0..61fd486ede9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/JetPsiCheckerAndHighlightingUpdater.java @@ -32,11 +32,11 @@ public class JetPsiCheckerAndHighlightingUpdater extends JetPsiChecker { super.annotate(element, holder); if (element instanceof JetFile) { //noinspection StaticMethodReferencedViaSubclass - HighlighterPackage.updateHighlightingResult((JetFile) element, false); + ErrorDuringFileAnalyzeNotificationProviderKt.updateHighlightingResult((JetFile) element, false); } } catch (ProcessCanceledException e) { - HighlighterPackage.updateHighlightingResult((JetFile)element.getContainingFile(), false); + ErrorDuringFileAnalyzeNotificationProviderKt.updateHighlightingResult((JetFile)element.getContainingFile(), false); throw e; } } diff --git a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java index 0a15205b476..5f68084d855 100644 --- a/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java +++ b/idea/src/org/jetbrains/kotlin/idea/liveTemplates/macro/BaseJetVariableMacro.java @@ -41,6 +41,7 @@ import org.jetbrains.kotlin.idea.util.ExtensionUtils; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.scopes.DescriptorKindFilter; @@ -48,8 +49,6 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope; import java.util.*; -import static org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage.getDataFlowInfo; - public abstract class BaseJetVariableMacro extends Macro { @Nullable private JetNamedDeclaration[] getVariables(Expression[] params, ExpressionContext context) { @@ -74,7 +73,7 @@ public abstract class BaseJetVariableMacro extends Macro { IterableTypesDetector detector = resolutionFacade.getIdeService(IterableTypesDetection.class).createDetector(scope); - DataFlowInfo dataFlowInfo = getDataFlowInfo(bindingContext, contextExpression); + DataFlowInfo dataFlowInfo = BindingContextUtilsKt.getDataFlowInfo(bindingContext, contextExpression); List filteredDescriptors = new ArrayList(); for (DeclarationDescriptor declarationDescriptor : getAllVariables(scope)) { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java index 913e7c1465c..e1886a8bc6b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionBodyFix.java @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetFunction; import org.jetbrains.kotlin.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -58,7 +59,7 @@ public class AddFunctionBodyFix extends JetIntentionAction { @Override public void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException { JetFunction newElement = (JetFunction) element.copy(); - JetPsiFactory psiFactory = JetPsiFactory(file); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(file); if (!(newElement.getLastChild() instanceof PsiWhiteSpace)) { newElement.add(psiFactory.createWhiteSpace()); } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java index 788895af679..798e18776d8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/AddOpenModifierToClassDeclarationFix.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil; -import org.jetbrains.kotlin.idea.references.ReferencesPackage; +import org.jetbrains.kotlin.idea.references.ReferenceUtilKt; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; @@ -51,7 +51,7 @@ public class AddOpenModifierToClassDeclarationFix extends JetIntentionAction PsiElement whenCloseBrace = element.getCloseBrace(); assert (whenCloseBrace != null) : "isAvailable should check if close brace exist"; - JetPsiFactory psiFactory = JetPsiFactory(file); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(file); JetWhenEntry entry = psiFactory.createWhenEntry(ELSE_ENTRY_TEXT); PsiElement insertedBranch = element.addBefore(entry, whenCloseBrace); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java index edda9b447f0..e5e3b7c4fed 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/CastExpressionFix.java @@ -32,8 +32,8 @@ import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.jvm.diagnostics.ErrorsJvm; +import org.jetbrains.kotlin.types.FlexibleTypesKt; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.types.TypesPackage; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -77,7 +77,7 @@ public class CastExpressionFix extends JetIntentionAction { public void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException { String renderedType = IdeDescriptorRenderers.SOURCE_CODE.renderType(type); - JetPsiFactory psiFactory = JetPsiFactory(file); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(file); JetBinaryExpressionWithTypeRHS castExpression = (JetBinaryExpressionWithTypeRHS) psiFactory.createExpression("(" + element.getText() + ") as " + renderedType); if (JetPsiUtil.areParenthesesUseless((JetParenthesizedExpression) castExpression.getLeft())) { @@ -122,7 +122,7 @@ public class CastExpressionFix extends JetIntentionAction { DiagnosticWithParameters2 diagnosticWithParameters = ErrorsJvm.JAVA_TYPE_MISMATCH.cast(diagnostic); return new CastExpressionFix( - diagnosticWithParameters.getPsiElement(), TypesPackage.flexibility(diagnosticWithParameters.getB()).getUpperBound() + diagnosticWithParameters.getPsiElement(), FlexibleTypesKt.flexibility(diagnosticWithParameters.getB()).getUpperBound() ); } }; diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java index 6a6bec9213d..a14351a8ce2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeAccessorTypeFix.java @@ -68,7 +68,8 @@ public class ChangeAccessorTypeFix extends JetIntentionAction resolvedCall = CallUtilPackage.getParentResolvedCall( + ResolvedCall resolvedCall = CallUtilKt.getParentResolvedCall( functionLiteralExpression, context, true); if (resolvedCall != null) { - ValueArgument valueArgument = CallUtilPackage.getValueArgumentForExpression(resolvedCall.getCall(), functionLiteralExpression); + ValueArgument valueArgument = CallUtilKt.getValueArgumentForExpression(resolvedCall.getCall(), functionLiteralExpression); JetParameter correspondingParameter = QuickFixUtil.getParameterDeclarationForValueArgument(resolvedCall, valueArgument); if (correspondingParameter != null) { JetTypeReference correspondingParameterTypeRef = correspondingParameter.getTypeReference(); @@ -135,7 +135,7 @@ public class ChangeFunctionLiteralReturnTypeFix extends JetIntentionAction parameterTypes; @@ -58,11 +56,11 @@ public class ChangeFunctionLiteralSignatureFix extends ChangeFunctionSignatureFi @Override protected void invoke(@NotNull Project project, Editor editor, JetFile file) { BindingContext bindingContext = ResolutionUtils.analyzeFully(file); - runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() { + JetChangeSignatureKt.runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() { @NotNull @Override public JetMethodDescriptor configure(@NotNull JetMethodDescriptor originalDescriptor, @NotNull BindingContext bindingContext) { - return ChangeSignaturePackage.modify( + return JetChangeSignatureKt.modify( originalDescriptor, new Function1() { @Override diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java index dfaa1c47418..cd1d7a93801 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java @@ -37,12 +37,12 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; 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.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; +import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsKt; import org.jetbrains.kotlin.types.ErrorUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.checker.JetTypeChecker; @@ -65,7 +65,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction if (element instanceof JetFunctionLiteral) { JetFunctionLiteralExpression functionLiteralExpression = PsiTreeUtil.getParentOfType(element, JetFunctionLiteralExpression.class); assert functionLiteralExpression != null : "FunctionLiteral outside any FunctionLiteralExpression: " + - PsiUtilPackage.getElementTextWithContext(element); + PsiUtilsKt.getElementTextWithContext(element); changeFunctionLiteralReturnTypeFix = new ChangeFunctionLiteralReturnTypeFix(functionLiteralExpression, type); } else { @@ -113,7 +113,8 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction } else { if (!(KotlinBuiltIns.isUnit(type) && element.hasBlockBody())) { - JetTypeReference newTypeRef = JetPsiFactory(project).createType(IdeDescriptorRenderers.SOURCE_CODE.renderType(type)); + JetTypeReference newTypeRef = JetPsiFactoryKt + .JetPsiFactory(project).createType(IdeDescriptorRenderers.SOURCE_CODE.renderType(type)); newTypeRef = element.setTypeReference(newTypeRef); assert newTypeRef != null; ShortenReferences.DEFAULT.process(newTypeRef); @@ -127,7 +128,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction @NotNull public static JetMultiDeclarationEntry getMultiDeclarationEntryThatTypeMismatchComponentFunction(Diagnostic diagnostic) { Name componentName = COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH.cast(diagnostic).getA(); - int componentIndex = DataClassUtilsPackage.getComponentIndex(componentName); + int componentIndex = DataClassUtilsKt.getComponentIndex(componentName); JetMultiDeclaration multiDeclaration = QuickFixUtil.getParentElementOfType(diagnostic, JetMultiDeclaration.class); assert multiDeclaration != null : "COMPONENT_FUNCTION_RETURN_TYPE_MISMATCH reported on expression that is not within any multi declaration"; return multiDeclaration.getEntries().get(componentIndex - 1); @@ -185,7 +186,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction JetBinaryExpression expression = QuickFixUtil.getParentElementOfType(diagnostic, JetBinaryExpression.class); assert expression != null : "COMPARE_TO_TYPE_MISMATCH reported on element that is not within any expression"; BindingContext context = ResolutionUtils.analyze(expression); - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, context); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, context); if (resolvedCall == null) return null; CallableDescriptor compareToDescriptor = resolvedCall.getCandidateDescriptor(); PsiElement compareTo = DescriptorToSourceUtils.descriptorToDeclaration(compareToDescriptor); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java index 703ef2b2fcc..7ce74ec06cb 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeMemberFunctionSignatureFix.java @@ -385,7 +385,7 @@ public class ChangeMemberFunctionSignatureFix extends JetHintAction { @Override public void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException { - JetTypeReference newTypeRef = JetPsiFactory(file).createType(IdeDescriptorRenderers.SOURCE_CODE.renderType(type)); + JetTypeReference newTypeRef = JetPsiFactoryKt.JetPsiFactory(file).createType(IdeDescriptorRenderers.SOURCE_CODE.renderType(type)); newTypeRef = element.setTypeReference(newTypeRef); assert newTypeRef != null; ShortenReferences.DEFAULT.process(newTypeRef); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java index da716f74a00..25862303d9a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeToFunctionInvocationFix.java @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -48,7 +49,7 @@ public class ChangeToFunctionInvocationFix extends JetIntentionAction { @Override public void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException { - JetTypeReference newTypeRef = (JetTypeReference) element.replace(JetPsiFactory(file).createType(renderedType)); + JetTypeReference newTypeRef = (JetTypeReference) element.replace(JetPsiFactoryKt.JetPsiFactory(file).createType(renderedType)); ShortenReferences.DEFAULT.process(newTypeRef); } diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java index 6d1fe645143..2510eccce24 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java @@ -82,7 +82,7 @@ public class ChangeVariableTypeFix extends JetIntentionAction { @@ -58,7 +58,7 @@ public class MakeClassAnAnnotationClassFix extends JetIntentionAction int cursorOffset = editor.getCaretModel().getOffset() - elseEntry.getTextOffset(); PsiElement insertedBranch = element.addAfter(elseEntry, lastEntry); - element.addAfter(JetPsiFactory(file).createNewLine(), lastEntry); + element.addAfter(JetPsiFactoryKt.JetPsiFactory(file).createNewLine(), lastEntry); element.deleteChildRange(elseEntry, elseEntry); JetWhenEntry insertedWhenEntry = (JetWhenEntry) CodeInsightUtilBase.forcePsiPostprocessAndRestoreElement(insertedBranch); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java index 549edfa6ce4..0592492127b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixFactoryForTypeMismatchError.java @@ -29,13 +29,13 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticWithParameters2; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; -import org.jetbrains.kotlin.idea.core.CorePackage; +import org.jetbrains.kotlin.idea.core.UtilsKt; import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil; import org.jetbrains.kotlin.idea.util.TypeUtils; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.scopes.LexicalScope; import org.jetbrains.kotlin.types.JetType; @@ -104,7 +104,7 @@ public class QuickFixFactoryForTypeMismatchError extends JetIntentionActionsFact JetExpression initializer = property.getInitializer(); if (QuickFixUtil.canEvaluateTo(initializer, expression) || (getter != null && QuickFixUtil.canFunctionOrGetterReturnExpression(property.getGetter(), expression))) { - LexicalScope scope = CorePackage.getResolutionScope(property, context, ResolutionUtils.getResolutionFacade(property)); + LexicalScope scope = UtilsKt.getResolutionScope(property, context, ResolutionUtils.getResolutionFacade(property)); JetType typeToInsert = TypeUtils.approximateWithResolvableType(expressionType, scope, false); actions.add(new ChangeVariableTypeFix(property, typeToInsert)); } @@ -115,17 +115,17 @@ public class QuickFixFactoryForTypeMismatchError extends JetIntentionActionsFact // Mismatch in returned expression: JetCallableDeclaration function = expressionParent instanceof JetReturnExpression - ? BindingContextUtilPackage.getTargetFunction((JetReturnExpression) expressionParent, context) + ? BindingContextUtilsKt.getTargetFunction((JetReturnExpression) expressionParent, context) : PsiTreeUtil.getParentOfType(expression, JetFunction.class, true); if (function instanceof JetFunction && QuickFixUtil.canFunctionOrGetterReturnExpression(function, expression)) { - LexicalScope scope = CorePackage.getResolutionScope(function, context, ResolutionUtils.getResolutionFacade(function)); + LexicalScope scope = UtilsKt.getResolutionScope(function, context, ResolutionUtils.getResolutionFacade(function)); JetType typeToInsert = TypeUtils.approximateWithResolvableType(expressionType, scope, false); actions.add(new ChangeFunctionReturnTypeFix((JetFunction) function, typeToInsert)); } // Fixing overloaded operators: if (expression instanceof JetOperationExpression) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, context); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, context); if (resolvedCall != null) { JetFunction declaration = getFunctionDeclaration(resolvedCall); if (declaration != null) { @@ -136,7 +136,7 @@ public class QuickFixFactoryForTypeMismatchError extends JetIntentionActionsFact // Change function return type when TYPE_MISMATCH is reported on call expression: if (expression instanceof JetCallExpression) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, context); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, context); if (resolvedCall != null) { JetFunction declaration = getFunctionDeclaration(resolvedCall); if (declaration != null) { @@ -145,13 +145,13 @@ public class QuickFixFactoryForTypeMismatchError extends JetIntentionActionsFact } } - ResolvedCall resolvedCall = CallUtilPackage.getParentResolvedCall(expression, context, true); + ResolvedCall resolvedCall = CallUtilKt.getParentResolvedCall(expression, context, true); if (resolvedCall != null) { // to fix 'type mismatch' on 'if' branches // todo: the same with 'when' JetExpression parentIf = QuickFixUtil.getParentIfForBranch(expression); JetExpression argumentExpression = (parentIf != null) ? parentIf : expression; - ValueArgument valueArgument = CallUtilPackage.getValueArgumentForExpression(resolvedCall.getCall(), argumentExpression); + ValueArgument valueArgument = CallUtilKt.getValueArgumentForExpression(resolvedCall.getCall(), argumentExpression); if (valueArgument != null) { JetParameter correspondingParameter = QuickFixUtil.getParameterDeclarationForValueArgument(resolvedCall, valueArgument); JetType valueArgumentType = diagnostic.getFactory() == Errors.NULL_FOR_NONNULL_TYPE @@ -159,7 +159,7 @@ public class QuickFixFactoryForTypeMismatchError extends JetIntentionActionsFact : context.getType(valueArgument.getArgumentExpression()); if (correspondingParameter != null && valueArgumentType != null) { JetCallableDeclaration callable = PsiTreeUtil.getParentOfType(correspondingParameter, JetCallableDeclaration.class, true); - LexicalScope scope = callable != null ? CorePackage.getResolutionScope(callable, context, ResolutionUtils + LexicalScope scope = callable != null ? UtilsKt.getResolutionScope(callable, context, ResolutionUtils .getResolutionFacade(callable)) : null; JetType typeToInsert = TypeUtils.approximateWithResolvableType(valueArgumentType, scope, true); actions.add(new ChangeParameterTypeFix(correspondingParameter, typeToInsert)); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java index 42597353d08..dd043c3304b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveFunctionParametersFix.java @@ -26,17 +26,12 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePackage; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeSignatureConfiguration; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMethodDescriptor; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetMutableMethodDescriptor; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.*; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import java.util.Collection; -import static org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePackage.runChangeSignature; - public class RemoveFunctionParametersFix extends ChangeFunctionSignatureFix { private final ValueParameterDescriptor parameterToRemove; @@ -58,11 +53,11 @@ public class RemoveFunctionParametersFix extends ChangeFunctionSignatureFix { @Override protected void invoke(@NotNull Project project, Editor editor, JetFile file) { BindingContext bindingContext = ResolutionUtils.analyzeFully(file); - runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() { + JetChangeSignatureKt.runChangeSignature(project, functionDescriptor, new JetChangeSignatureConfiguration() { @NotNull @Override public JetMethodDescriptor configure(@NotNull JetMethodDescriptor originalDescriptor, @NotNull BindingContext bindingContext) { - return ChangeSignaturePackage.modify( + return JetChangeSignatureKt.modify( originalDescriptor, new Function1() { @Override diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java index 00a39d12eca..ede2126b891 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.idea.JetBundle; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetParameter; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; public class RemoveValVarFromParameterFix extends JetIntentionAction { private final String varOrVal; @@ -35,7 +35,7 @@ public class RemoveValVarFromParameterFix extends JetIntentionAction result, @NotNull PsiParameter parameter) { - int parameterIndex = PsiUtilPackage.parameterIndex(AsJavaPackage.getUnwrapped(parameter)); + int parameterIndex = JetPsiUtilKt.parameterIndex(LightClassUtilsKt.getUnwrapped(parameter)); if (method instanceof KotlinLightMethod) { JetDeclaration declaration = ((KotlinLightMethod) method).getOrigin(); @@ -482,7 +482,7 @@ public class JetRefactoringUtil { } public static String getExpressionShortText(@NotNull JetElement element) { //todo: write appropriate implementation - return StringPackage.collapseSpaces(StringUtil.shortenTextWithEllipsis(element.getText(), 53, 0)); + return StringUtilKt.collapseSpaces(StringUtil.shortenTextWithEllipsis(element.getText(), 53, 0)); } @Nullable diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java index a7b1b0fd305..a56457e4807 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureUsageProcessor.java @@ -42,8 +42,8 @@ import kotlin.*; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.asJava.AsJavaPackage; import org.jetbrains.kotlin.asJava.KotlinLightMethod; +import org.jetbrains.kotlin.asJava.LightClassUtilsKt; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.idea.analysis.AnalysisPackage; @@ -51,23 +51,24 @@ import org.jetbrains.kotlin.idea.caches.resolve.JavaResolutionUtils; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde; import org.jetbrains.kotlin.idea.codeInsight.JetFileReferencesResolver; -import org.jetbrains.kotlin.idea.core.refactoring.RefactoringPackage; +import org.jetbrains.kotlin.idea.core.refactoring.JetRefactoringUtilKt; +import org.jetbrains.kotlin.idea.refactoring.CallableRefactoringKt; import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.*; import org.jetbrains.kotlin.idea.references.JetSimpleNameReference; -import org.jetbrains.kotlin.idea.references.ReferencesPackage; -import org.jetbrains.kotlin.idea.search.usagesSearch.UsagesSearchPackage; +import org.jetbrains.kotlin.idea.references.ReferenceUtilKt; +import org.jetbrains.kotlin.idea.search.usagesSearch.UtilsKt; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.ScopeUtils; import org.jetbrains.kotlin.kdoc.psi.impl.KDocName; import org.jetbrains.kotlin.load.java.descriptors.JavaClassDescriptor; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersKt; import org.jetbrains.kotlin.renderer.DescriptorRenderer; 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.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.tasks.ExplicitReceiverKind; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; @@ -139,7 +140,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro } private static void findAllMethodUsages(JetChangeInfo changeInfo, Set result) { - for (UsageInfo functionUsageInfo : ChangeSignaturePackage.getAffectedCallables(changeInfo)) { + for (UsageInfo functionUsageInfo : JetChangeInfoKt.getAffectedCallables(changeInfo)) { if (functionUsageInfo instanceof JetCallableDefinitionUsage) { findOneMethodUsages((JetCallableDefinitionUsage) functionUsageInfo, changeInfo, result); } @@ -189,7 +190,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro } } - JetElement body = ChangeSignaturePackage.getDeclarationBody(element); + JetElement body = ChangeSignatureUtilsKt.getDeclarationBody(element); final Set newParameterNames = CollectionsKt.mapTo( changeInfo.getNonReceiverParameters(), new HashSet(), @@ -210,7 +211,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro final String currentName = expression.getReferencedName(); if (!newParameterNames.contains(currentName)) return; - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, context); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, context); if (resolvedCall == null) return; if (resolvedCall.getExplicitReceiverKind() != ExplicitReceiverKind.NO_EXPLICIT_RECEIVER) return; @@ -286,12 +287,12 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro } } - String oldName = ChangeSignaturePackage.getOldName(changeInfo); + String oldName = JetChangeInfoKt.getOldName(changeInfo); if (oldName != null) TextOccurrencesUtil.findNonCodeUsages(functionPsi, oldName, true, true, changeInfo.getNewName(), result); - List oldParameters = PsiUtilPackage.getValueParameters((JetNamedDeclaration) functionPsi); + List oldParameters = JetPsiUtilKt.getValueParameters((JetNamedDeclaration) functionPsi); JetParameterInfo newReceiverInfo = changeInfo.getReceiverParameterInfo(); @@ -328,7 +329,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro } } - UsagesSearchPackage.processDelegationCallConstructorUsages( + UtilsKt.processDelegationCallConstructorUsages( functionPsi, functionPsi.getUseScope(), new Function1() { @@ -408,7 +409,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro @Override public Void visitSimpleNameExpression(@NotNull JetSimpleNameExpression expression, BindingContext context) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, context); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, context); if (resolvedCall == null) return null; CallableDescriptor resultingDescriptor = resolvedCall.getResultingDescriptor(); @@ -433,7 +434,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro private static void findSAMUsages(ChangeInfo changeInfo, Set result) { PsiElement method = changeInfo.getMethod(); - if (!RefactoringPackage.isTrueJavaMethod(method)) return; + if (!JetRefactoringUtilKt.isTrueJavaMethod(method)) return; if (((PsiMethod) method).getContainingClass() == null) return; @@ -476,12 +477,12 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro private static void findConstructorDelegationUsages(@NotNull ChangeInfo changeInfo, @NotNull final Set result) { PsiElement method = changeInfo.getMethod(); - if (!(RefactoringPackage.isTrueJavaMethod(method))) return; + if (!(JetRefactoringUtilKt.isTrueJavaMethod(method))) return; PsiMethod psiMethod = (PsiMethod) method; if (!psiMethod.isConstructor()) return; - UsagesSearchPackage.processDelegationCallConstructorUsages( + UtilsKt.processDelegationCallConstructorUsages( psiMethod, psiMethod.getUseScope(), new Function1() { @@ -498,10 +499,10 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro private static void findKotlinOverrides(ChangeInfo changeInfo, Set result) { PsiElement method = changeInfo.getMethod(); - if (!RefactoringPackage.isTrueJavaMethod(method)) return; + if (!JetRefactoringUtilKt.isTrueJavaMethod(method)) return; for (PsiMethod overridingMethod : OverridingMethodsSearch.search((PsiMethod) method)) { - PsiElement unwrappedElement = AsJavaPackage.getNamedUnwrappedElement(overridingMethod); + PsiElement unwrappedElement = LightClassUtilsKt.getNamedUnwrappedElement(overridingMethod); if (!(unwrappedElement instanceof JetNamedFunction)) continue; JetNamedFunction function = (JetNamedFunction) unwrappedElement; @@ -515,7 +516,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro private static void findKotlinCallers(JavaChangeInfo changeInfo, Set result) { PsiElement method = changeInfo.getMethod(); - if (!RefactoringPackage.isTrueJavaMethod(method)) return; + if (!JetRefactoringUtilKt.isTrueJavaMethod(method)) return; for (PsiMethod primaryCaller : changeInfo.getMethodsToPropagateParameters()) { addDeferredCallerIfPossible(result, primaryCaller); @@ -526,7 +527,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro } private static void addDeferredCallerIfPossible(Set result, PsiMethod overridingCaller) { - PsiElement unwrappedElement = AsJavaPackage.getNamedUnwrappedElement(overridingCaller); + PsiElement unwrappedElement = LightClassUtilsKt.getNamedUnwrappedElement(overridingCaller); if (unwrappedElement instanceof JetFunction || unwrappedElement instanceof JetClass) { result.add(new DeferredJavaMethodKotlinCallerUsage((JetNamedDeclaration) unwrappedElement)); } @@ -540,7 +541,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro ) { final JetCallableDefinitionUsage functionInfoForParameters = new JetCallableDefinitionUsage(function, functionDescriptor, null, null); - List oldParameters = PsiUtilPackage.getValueParameters(function); + List oldParameters = JetPsiUtilKt.getValueParameters(function); ParameterInfo[] parameters = changeInfo.getNewParameters(); for (int i = 0; i < parameters.length; i++) { final int paramIndex = i; @@ -608,18 +609,18 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro PsiElement function = info.getMethod(); PsiElement element = function != null ? function : changeInfo.getContext(); BindingContext bindingContext = ResolutionUtils.analyze((JetElement) element, BodyResolveMode.FULL); - CallableDescriptor oldDescriptor = ChangeSignaturePackage.getOriginalBaseFunctionDescriptor(changeInfo); + CallableDescriptor oldDescriptor = JetChangeInfoKt.getOriginalBaseFunctionDescriptor(changeInfo); DeclarationDescriptor containingDeclaration = oldDescriptor.getContainingDeclaration(); JetScope parametersScope = null; if (oldDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptorWithResolutionScopes) parametersScope = ScopeUtilsKt.asJetScope(((ClassDescriptorWithResolutionScopes) containingDeclaration).getScopeForInitializerResolution()); else if (function instanceof JetFunction) - parametersScope = org.jetbrains.kotlin.idea.refactoring.RefactoringPackage.getBodyScope((JetFunction) function, bindingContext); + parametersScope = CallableRefactoringKt.getBodyScope((JetFunction) function, bindingContext); - JetScope callableScope = org.jetbrains.kotlin.idea.refactoring.RefactoringPackage.getContainingScope(oldDescriptor, bindingContext); + JetScope callableScope = CallableRefactoringKt.getContainingScope(oldDescriptor, bindingContext); - JetMethodDescriptor.Kind kind = ChangeSignaturePackage.getKind(changeInfo); + JetMethodDescriptor.Kind kind = JetChangeInfoKt.getKind(changeInfo); if (!kind.isConstructor() && callableScope != null && !info.getNewName().isEmpty()) { Name newName = Name.identifier(info.getNewName()); Collection conflicts = oldDescriptor instanceof FunctionDescriptor @@ -693,7 +694,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro JetNamedDeclaration caller, DeclarationDescriptor callerDescriptor ) { - List valueParameters = PsiUtilPackage.getValueParameters(caller); + List valueParameters = JetPsiUtilKt.getValueParameters(caller); Map existingParameters = CollectionsKt.toMap( valueParameters, new Function1() { @@ -801,7 +802,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro new Function1, Boolean>() { @Override public Boolean invoke(Map.Entry entry) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(entry.getKey(), entry.getValue()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(entry.getKey(), entry.getValue()); return resolvedCall != null && !resolvedCall.getDispatchReceiver().exists() && !resolvedCall.getExtensionReceiver().exists(); @@ -810,7 +811,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro ); JetPsiFactory psiFactory = new JetPsiFactory(callable.getProject()); - JetFile tempFile = RefactoringPackage.createTempCopy( + JetFile tempFile = JetRefactoringUtilKt.createTempCopy( (JetFile) callable.getContainingFile(), new Function1() { @Override @@ -822,7 +823,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro JetNamedFunction functionWithReceiver = PsiTreeUtil.getParentOfType(tempFile.findElementAt(callable.getTextOffset()), JetNamedFunction.class); JetTypeReference receiverTypeRef = psiFactory.createType(newReceiverInfo.getCurrentTypeText()); - TypeRefHelpersPackage.setReceiverTypeReference(functionWithReceiver, receiverTypeRef); + TypeRefHelpersKt.setReceiverTypeReference(functionWithReceiver, receiverTypeRef); //noinspection ConstantConditions BindingContext newContext = ResolutionUtils.analyze(functionWithReceiver.getBodyExpression(), BodyResolveMode.FULL); @@ -837,13 +838,13 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro newBody.findElementAt(originalRef.getTextOffset() - originalOffset), JetReferenceExpression.class ); - ResolvedCall newResolvedCall = CallUtilPackage.getResolvedCall(newRef, newContext); + ResolvedCall newResolvedCall = CallUtilKt.getResolvedCall(newRef, newContext); if (newResolvedCall == null || newResolvedCall.getExtensionReceiver().exists() || newResolvedCall.getDispatchReceiver().exists()) { //noinspection ConstantConditions CallableDescriptor descriptor = - CallUtilPackage.getResolvedCall(originalRef, originalContext).getCandidateDescriptor(); + CallUtilKt.getResolvedCall(originalRef, originalContext).getCandidateDescriptor(); PsiElement declaration = DescriptorToSourceUtilsIde.INSTANCE$.getAnyDeclaration(callable.getProject(), descriptor); String prefix = declaration != null ? RefactoringUIUtil.getDescription(declaration, true) : originalRef.getText(); result.putValue( @@ -882,7 +883,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro PsiElement refTarget = ref != null ? ref.resolve() : null; return new JavaMethodKotlinCallUsage(callElement, javaMethodChangeInfo, - refTarget != null && ChangeSignaturePackage.isCaller(refTarget, allUsages)); + refTarget != null && ChangeSignatureUtilsKt.isCaller(refTarget, allUsages)); } private static boolean canCreateReplacementUsage(UsageInfo originalUsageInfo) { @@ -1051,7 +1052,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro JetMethodDescriptor methodDescriptor = descriptorWrapper != null ? descriptorWrapper.originalJavaMethodDescriptor : null; if (methodDescriptor == null) return true; - JetChangeInfo javaMethodChangeInfo = ChangeSignaturePackage.toJetChangeInfo(changeInfo, methodDescriptor); + JetChangeInfo javaMethodChangeInfo = JetChangeInfoKt.toJetChangeInfo(changeInfo, methodDescriptor); for (UsageInfo info : usages) { if (info instanceof JavaMethodKotlinUsageWithDelegate) { ((JavaMethodKotlinUsageWithDelegate) info).setJavaMethodChangeInfo(javaMethodChangeInfo); @@ -1064,7 +1065,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro if (usageInfo instanceof MoveRenameUsageInfo && isJavaMethodUsage) { JetSimpleNameExpression callee = PsiTreeUtil.getParentOfType(usageInfo.getElement(), JetSimpleNameExpression.class, false); - PsiReference ref = callee != null ? ReferencesPackage.getMainReference(callee) : null; + PsiReference ref = callee != null ? ReferenceUtilKt.getMainReference(callee) : null; if (ref instanceof JetSimpleNameReference) { ((JetSimpleNameReference) ref).handleElementRename(((PsiMethod)method).getName()); return true; diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java index 96c46afb54b..f3c569a79af 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/JetCallableParameterTableModel.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetPsiFactory; +import org.jetbrains.kotlin.psi.JetPsiFactoryKt; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; @@ -51,7 +52,7 @@ public abstract class JetCallableParameterTableModel extends ParameterTableModel if (parameterInfo == null) { parameterInfo = new JetParameterInfo(methodDescriptor.getBaseDescriptor(), -1, "", null, null, null, JetValVar.None, null); } - JetPsiFactory psiFactory = JetPsiFactory(project); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(project); PsiCodeFragment paramTypeCodeFragment = psiFactory.createTypeCodeFragment(parameterInfo.getTypeText(), myTypeContext); JetExpression defaultValueForCall = parameterInfo.getDefaultValueForCall(); PsiCodeFragment defaultValueCodeFragment = psiFactory.createExpressionCodeFragment( diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java index 51a2c70474c..c14acacc983 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetCallableDefinitionUsage.java @@ -32,19 +32,17 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.idea.caches.resolve.JavaResolutionUtils; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; -import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenPackage; +import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenWaitingSetKt; import org.jetbrains.kotlin.idea.core.DescriptorUtilsKt; import org.jetbrains.kotlin.idea.core.PsiModificationUtilsKt; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePackage; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.*; import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.ShortenReferences.Options; import org.jetbrains.kotlin.lexer.JetModifierKeywordToken; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; -import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilsKt; +import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersKt; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; @@ -118,7 +116,7 @@ public class JetCallableDefinitionUsage extends JetUsageIn if (typeSubstitutor == null) { if (samCallType == null) { - typeSubstitutor = ChangeSignaturePackage.getCallableSubstitutor(baseFunction, this); + typeSubstitutor = ChangeSignatureUtilsKt.getCallableSubstitutor(baseFunction, this); } else { DeclarationDescriptor currentBaseDescriptor = baseFunction.getCurrentCallableDescriptor(); @@ -172,7 +170,7 @@ public class JetCallableDefinitionUsage extends JetUsageIn public boolean processUsage(@NotNull JetChangeInfo changeInfo, @NotNull PsiElement element, @NotNull UsageInfo[] allUsages) { if (!(element instanceof JetNamedDeclaration)) return true; - JetPsiFactory psiFactory = JetPsiFactory(element.getProject()); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(element.getProject()); if (changeInfo.isNameChanged()) { PsiElement identifier = ((JetCallableDeclaration) element).getNameIdentifier(); @@ -184,7 +182,7 @@ public class JetCallableDefinitionUsage extends JetUsageIn changeReturnTypeIfNeeded(changeInfo, element); - JetParameterList parameterList = PsiUtilPackage.getValueParameterList((JetNamedDeclaration) element); + JetParameterList parameterList = JetPsiUtilKt.getValueParameterList((JetNamedDeclaration) element); if (changeInfo.isParameterSetOrOrderChanged()) { processParameterListWithStructuralChanges(changeInfo, element, parameterList, psiFactory); @@ -198,16 +196,17 @@ public class JetCallableDefinitionUsage extends JetUsageIn paramIndex++; } - ShortenPackage.addToShorteningWaitSet(parameterList, Options.DEFAULT); + ShortenWaitingSetKt.addToShorteningWaitSet(parameterList, Options.DEFAULT); } if (element instanceof JetCallableDeclaration && changeInfo.isReceiverTypeChanged()) { //noinspection unchecked String receiverTypeText = changeInfo.renderReceiverType((JetCallableDefinitionUsage) this); JetTypeReference receiverTypeRef = receiverTypeText != null ? psiFactory.createType(receiverTypeText) : null; - JetTypeReference newReceiverTypeRef = TypeRefHelpersPackage.setReceiverTypeReference((JetCallableDeclaration) element, receiverTypeRef); + JetTypeReference newReceiverTypeRef = TypeRefHelpersKt + .setReceiverTypeReference((JetCallableDeclaration) element, receiverTypeRef); if (newReceiverTypeRef != null) { - ShortenPackage.addToShorteningWaitSet(newReceiverTypeRef, ShortenReferences.Options.DEFAULT); + ShortenWaitingSetKt.addToShorteningWaitSet(newReceiverTypeRef, ShortenReferences.Options.DEFAULT); } } @@ -239,8 +238,8 @@ public class JetCallableDefinitionUsage extends JetUsageIn //TODO use ChangeFunctionReturnTypeFix.invoke when JetTypeCodeFragment.getType() is ready if (!(returnTypeText.equals("Unit") || returnTypeText.equals("kotlin.Unit"))) { - ShortenPackage.addToShorteningWaitSet( - callable.setTypeReference(JetPsiFactory(callable).createType(returnTypeText)), + ShortenWaitingSetKt.addToShorteningWaitSet( + callable.setTypeReference(JetPsiFactoryKt.JetPsiFactory(callable).createType(returnTypeText)), Options.DEFAULT ); } @@ -312,7 +311,7 @@ public class JetCallableDefinitionUsage extends JetUsageIn } if (newParameterList != null) { - ShortenPackage.addToShorteningWaitSet(newParameterList, Options.DEFAULT); + ShortenWaitingSetKt.addToShorteningWaitSet(newParameterList, Options.DEFAULT); } } @@ -352,14 +351,14 @@ public class JetCallableDefinitionUsage extends JetUsageIn else if (element instanceof JetClass) { PsiModificationUtilsKt.setVisibility(createPrimaryConstructorIfAbsent((JetClass) element), newVisibilityToken); } - else throw new AssertionError("Invalid element: " + PsiUtilPackage.getElementTextWithContext(element)); + else throw new AssertionError("Invalid element: " + PsiUtilsKt.getElementTextWithContext(element)); } private void changeParameter(int parameterIndex, JetParameter parameter, JetParameterInfo parameterInfo) { PsiElement valOrVarKeyword = parameter.getValOrVarKeyword(); JetValVar valOrVar = parameterInfo.getValOrVar(); - JetPsiFactory psiFactory = JetPsiFactory(getProject()); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(getProject()); if (valOrVarKeyword != null) { PsiElement newKeyword = valOrVar.createKeyword(psiFactory); if (newKeyword != null) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java index 504d21097bf..e4505c0faf1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionCallUsage.java @@ -32,19 +32,19 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; -import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenPackage; -import org.jetbrains.kotlin.idea.core.CorePackage; -import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePackage; +import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenWaitingSetKt; +import org.jetbrains.kotlin.idea.core.PsiModificationUtilsKt; +import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignatureUtilsKt; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo; import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo; -import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractionEnginePackage; +import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.ExtractorUtilKt; import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler; import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.*; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; @@ -85,7 +85,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { super(element); this.callee = callee; this.context = ResolutionUtils.analyze(element, BodyResolveMode.FULL); - this.resolvedCall = CallUtilPackage.getResolvedCall(element, context); + this.resolvedCall = CallUtilKt.getResolvedCall(element, context); } @Override @@ -152,7 +152,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { else if (JvmAbi.isSetterName(currentName)) newName = JvmAbi.setterName(newName); } - callee.replace(JetPsiFactory(getProject()).createSimpleName(newName)); + callee.replace(JetPsiFactoryKt.JetPsiFactory(getProject()).createSimpleName(newName)); } @Nullable @@ -202,7 +202,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { if (element instanceof JetCallExpression) { ResolvedCall resolvedCall = - CallUtilPackage.getResolvedCall((JetCallExpression) element, context); + CallUtilKt.getResolvedCall((JetCallExpression) element, context); return resolvedCall != null && resolvedCall.getResultingDescriptor() instanceof ConstructorDescriptor; } @@ -223,7 +223,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { JetExpression newExpression = (JetExpression) expression.copy(); Map nameCounterpartMap = - ExtractionEnginePackage.createNameCounterpartMap(expression, newExpression); + ExtractorUtilKt.createNameCounterpartMap(expression, newExpression); Map valueArguments = resolvedCall.getValueArguments(); @@ -350,7 +350,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { JetExpression defaultValueForCall = parameterInfo.getDefaultValueForCall(); String defaultValueText; - if (ChangeSignaturePackage.isInsideOfCallerBody(element, allUsages)) { + if (ChangeSignatureUtilsKt.isInsideOfCallerBody(element, allUsages)) { defaultValueText = parameterInfo.getName(); } else { @@ -370,7 +370,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { } parametersBuilder.append(')'); - JetValueArgumentList newArgumentList = JetPsiFactory(getProject()).createCallArguments(parametersBuilder.toString()); + JetValueArgumentList newArgumentList = JetPsiFactoryKt.JetPsiFactory(getProject()).createCallArguments(parametersBuilder.toString()); Map argumentMap = getParamIndexToArgumentMap(changeInfo, oldArguments); @@ -438,7 +438,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { //TODO: this is not correct! JetValueArgument lastArgument = CollectionsKt.lastOrNull(newArgumentList.getArguments()); boolean hasTrailingLambdaInArgumentListAfter = - lastArgument != null && PsiPackage.unpackFunctionLiteral(lastArgument.getArgumentExpression()) != null; + lastArgument != null && JetFunctionLiteralArgumentKt.unpackFunctionLiteral(lastArgument.getArgumentExpression()) != null; arguments = (JetValueArgumentList) arguments.replace(newArgumentList); @@ -455,7 +455,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { ); for (JetElement argument : argumentsToShorten) { - ShortenPackage.addToShorteningWaitSet(argument, SHORTEN_ARGUMENTS_OPTIONS); + ShortenWaitingSetKt.addToShorteningWaitSet(argument, SHORTEN_ARGUMENTS_OPTIONS); } JetElement newElement = element; @@ -470,7 +470,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { : defaultValueForCall != null ? defaultValueForCall : psiFactory.createExpression("_"); - replacingElement = PsiPackage.createExpressionByPattern(psiFactory, "$0.$1", receiver, element); + replacingElement = CreateByPatternKt.createExpressionByPattern(psiFactory, "$0.$1", receiver, element); } else { replacingElement = psiFactory.createExpression(element.getText()); @@ -484,7 +484,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { (JetCallExpression) (newElement instanceof JetQualifiedExpression ? ((JetQualifiedExpression) newElement).getSelectorExpression() : newElement); - CorePackage.moveFunctionLiteralOutsideParentheses(newCallExpression); + PsiModificationUtilsKt.moveFunctionLiteralOutsideParentheses(newCallExpression); } } @@ -575,7 +575,7 @@ public class JetFunctionCallUsage extends JetUsageInfo { if (identifier != null) { String newName = parameterInfo.getInheritedName(callee); - identifier.replace(JetPsiFactory(getProject()).createIdentifier(newName)); + identifier.replace(JetPsiFactoryKt.JetPsiFactory(getProject()).createIdentifier(newName)); } } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java index 85420a8e986..6544a1adc07 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/inline/KotlinInlineValHandler.java @@ -61,7 +61,7 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.types.ErrorUtils; @@ -317,7 +317,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { } } - JetPsiFactory psiFactory = JetPsiFactory(containingFile); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(containingFile); for (JetFunctionLiteralExpression functionLiteralExpression : functionsToAddParameters) { JetFunctionLiteral functionLiteral = functionLiteralExpression.getFunctionLiteral(); @@ -371,7 +371,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { ResolutionFacade resolutionFacade = ResolutionUtils.getResolutionFacade(containingFile); for (JetExpression inlinedExpression : inlinedExpressions) { BindingContext context = resolutionFacade.analyze(inlinedExpression, BodyResolveMode.FULL); - Call call = CallUtilPackage.getCallWithAssert(inlinedExpression, context); + Call call = CallUtilKt.getCallWithAssert(inlinedExpression, context); JetElement callElement = call.getCallElement(); if (callElement instanceof JetCallExpression && hasIncompleteTypeInferenceDiagnostic(call, context) && @@ -380,7 +380,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { } } - JetPsiFactory psiFactory = JetPsiFactory(containingFile); + JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(containingFile); for (JetCallExpression call : callsToAddArguments) { call.addAfter(psiFactory.createTypeArguments("<" + typeArguments + ">"), call.getCalleeExpression()); ShortenReferences.DEFAULT.process(call.getTypeArgumentList()); @@ -390,7 +390,7 @@ public class KotlinInlineValHandler extends InlineActionHandler { @Nullable private static String getTypeArgumentsStringForCall(@NotNull JetExpression initializer) { BindingContext context = ResolutionUtils.analyze(initializer, BodyResolveMode.FULL); - ResolvedCall call = CallUtilPackage.getResolvedCall(initializer, context); + ResolvedCall call = CallUtilKt.getResolvedCall(initializer, context); if (call == null) return null; List typeArguments = Lists.newArrayList(); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java index fb06d504935..39bade5702e 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractFunction/ui/KotlinExtractFunctionDialog.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.JetFileType; import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; -import org.jetbrains.kotlin.idea.core.refactoring.RefactoringPackage; +import org.jetbrains.kotlin.idea.core.refactoring.JetRefactoringUtilKt; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; @@ -87,7 +87,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper { } private boolean isVisibilitySectionAvailable() { - return ExtractionEnginePackage.isVisibilityApplicable(originalDescriptor.getDescriptor().getExtractionData()); + return ExtractableAnalysisUtilKt.isVisibilityApplicable(originalDescriptor.getDescriptor().getExtractionData()); } private String getFunctionName() { @@ -114,9 +114,9 @@ public class KotlinExtractFunctionDialog extends DialogWrapper { setOKActionEnabled(checkNames()); signaturePreviewField.setText( - ExtractionEnginePackage.getDeclarationText(getCurrentConfiguration(), - false, - IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES) + ExtractorUtilKt.getDeclarationText(getCurrentConfiguration(), + false, + IdeDescriptorRenderers.SOURCE_CODE_SHORT_NAMES_IN_TYPES) ); } @@ -142,7 +142,7 @@ public class KotlinExtractFunctionDialog extends DialogWrapper { functionNamePanel.add(functionNameField, BorderLayout.CENTER); functionNameLabel.setLabelFor(functionNameField); - List possibleReturnTypes = ExtractionEnginePackage.getPossibleReturnTypes(extractableCodeDescriptor.getControlFlow()); + List possibleReturnTypes = ExtractableCodeDescriptorKt.getPossibleReturnTypes(extractableCodeDescriptor.getControlFlow()); if (possibleReturnTypes.size() > 1) { DefaultComboBoxModel returnTypeBoxModel = new DefaultComboBoxModel(possibleReturnTypes.toArray()); returnTypeBox.setModel(returnTypeBoxModel); @@ -216,10 +216,10 @@ public class KotlinExtractFunctionDialog extends DialogWrapper { @SuppressWarnings("SuspiciousMethodCalls") @Override protected void doOKAction() { - MultiMap conflicts = ExtractionEnginePackage.validate(currentDescriptor).getConflicts(); + MultiMap conflicts = ExtractableAnalysisUtilKt.validate(currentDescriptor).getConflicts(); conflicts.values().removeAll(originalDescriptor.getConflicts().values()); - RefactoringPackage.checkConflictsInteractively( + JetRefactoringUtilKt.checkConflictsInteractively( project, conflicts, new Function0() { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java index 0a07f81d31a..647ce2c9003 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java @@ -42,7 +42,7 @@ import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.intentions.SpecifyTypeExplicitlyIntention; -import org.jetbrains.kotlin.idea.references.ReferencesPackage; +import org.jetbrains.kotlin.idea.references.ReferenceUtilKt; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; @@ -396,7 +396,7 @@ public class KotlinInplaceVariableIntroducer e new Function1() { @Override public PsiReference invoke(JetSimpleNameExpression expression) { - return ReferencesPackage.getMainReference(expression); + return ReferenceUtilKt.getMainReference(expression); } } ); diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java index 0f60454ae45..e6febb96197 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinIntroduceVariableHandler.java @@ -40,27 +40,27 @@ import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.idea.analysis.AnalysisPackage; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils; -import org.jetbrains.kotlin.idea.core.CorePackage; import org.jetbrains.kotlin.idea.core.KotlinNameSuggester; import org.jetbrains.kotlin.idea.core.NewDeclarationNameValidator; +import org.jetbrains.kotlin.idea.core.PsiModificationUtilsKt; import org.jetbrains.kotlin.idea.intentions.ConvertToBlockBodyIntention; import org.jetbrains.kotlin.idea.intentions.RemoveCurlyBracesFromTemplateIntention; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil; -import org.jetbrains.kotlin.idea.refactoring.introduce.IntroducePackage; +import org.jetbrains.kotlin.idea.refactoring.introduce.IntroduceUtilKt; import org.jetbrains.kotlin.idea.refactoring.introduce.KotlinIntroduceHandlerBase; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRange; +import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiRangeKt; import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier; -import org.jetbrains.kotlin.idea.util.psi.patternMatching.PatternMatchingPackage; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; +import org.jetbrains.kotlin.psi.psiUtil.JetPsiUtilKt; 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.bindingContextUtil.BindingContextUtilsKt; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.scopes.JetScope; @@ -142,7 +142,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { final JetType expressionType = bindingContext.getType(expression); //can be null or error type JetScope scope = bindingContext.get(BindingContext.RESOLUTION_SCOPE, expression); if (scope != null) { - DataFlowInfo dataFlowInfo = BindingContextUtilPackage.getDataFlowInfo(bindingContext, expression); + DataFlowInfo dataFlowInfo = BindingContextUtilsKt.getDataFlowInfo(bindingContext, expression); ObservableBindingTrace bindingTrace = new ObservableBindingTrace(new BindingTraceContext()); JetType typeNoExpectedType = AnalysisPackage.computeTypeInfoInContext( @@ -276,7 +276,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { final JetType expressionType, final BindingContext bindingContext ) { - final JetPsiFactory psiFactory = JetPsiFactory(expression); + final JetPsiFactory psiFactory = JetPsiFactoryKt.JetPsiFactory(expression); return new Runnable() { @Override public void run() { @@ -299,9 +299,10 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { JetBlockExpression newCommonContainer = (JetBlockExpression) newDeclaration.getBodyExpression(); assert newCommonContainer != null : "New body is not found: " + newDeclaration; - JetExpression newExpression = IntroducePackage.findExpressionByCopyableDataAndClearIt(newCommonContainer, EXPRESSION_KEY); - PsiElement newCommonParent = IntroducePackage.findElementByCopyableDataAndClearIt(newCommonContainer, COMMON_PARENT_KEY); - List newAllReplaces = IntroducePackage.findExpressionsByCopyableDataAndClearIt(newCommonContainer, REPLACE_KEY); + JetExpression newExpression = IntroduceUtilKt.findExpressionByCopyableDataAndClearIt(newCommonContainer, EXPRESSION_KEY); + PsiElement newCommonParent = IntroduceUtilKt.findElementByCopyableDataAndClearIt(newCommonContainer, COMMON_PARENT_KEY); + List newAllReplaces = IntroduceUtilKt + .findExpressionsByCopyableDataAndClearIt(newCommonContainer, REPLACE_KEY); run(newExpression, newCommonContainer, newCommonParent, newAllReplaces); } @@ -475,10 +476,10 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { JetExpression replacement = psiFactory.createExpression(nameSuggestion); JetExpression result; - if (PsiUtilPackage.isFunctionLiteralOutsideParentheses(replace)) { + if (JetPsiUtilKt.isFunctionLiteralOutsideParentheses(replace)) { JetFunctionLiteralArgument functionLiteralArgument = PsiTreeUtil.getParentOfType(replace, JetFunctionLiteralArgument.class); - JetCallExpression newCallExpression = CorePackage + JetCallExpression newCallExpression = PsiModificationUtilsKt .moveInsideParenthesesAndReplaceWith(functionLiteralArgument, replacement, bindingContext); result = CollectionsKt.last(newCallExpression.getValueArguments()).getArgumentExpression(); } @@ -529,7 +530,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { private static List findOccurrences(PsiElement occurrenceContainer, @NotNull JetExpression originalExpression) { return CollectionsKt.map( - PatternMatchingPackage.toRange(originalExpression).match(occurrenceContainer, JetPsiUnifier.DEFAULT), + JetPsiRangeKt.toRange(originalExpression).match(occurrenceContainer, JetPsiUnifier.DEFAULT), new Function1() { @Override public JetExpression invoke(JetPsiRange.Match match) { @@ -549,7 +550,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase { @NotNull BindingContext bindingContext, @Nullable PsiElement container ) { - return BindingContextUtilPackage.isUsedAsExpression(expression, bindingContext) || container != expression.getParent(); + return BindingContextUtilsKt.isUsedAsExpression(expression, bindingContext) || container != expression.getParent(); } @Nullable diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinOrJavaClassCellRenderer.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinOrJavaClassCellRenderer.java index ccb3248696f..1c4f3e096ad 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinOrJavaClassCellRenderer.java +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/KotlinOrJavaClassCellRenderer.java @@ -27,7 +27,7 @@ public class KotlinOrJavaClassCellRenderer extends ListCellRendererWrapper sourceFiles) { for (JetFile sourceFile : sourceFiles) { - if (!CorePackage.packageMatchesDirectory(sourceFile)) return false; + if (!PackageUtilsKt.packageMatchesDirectory(sourceFile)) return false; } return true; } @@ -235,7 +235,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { ); String suggestedText = previousDeclarations.isEmpty() ? "" - : MovePackage.guessNewFileName(previousDeclarations); + : MoveUtilsKt.guessNewFileName(previousDeclarations); return tfFileNameInPackage.getText().equals(suggestedText); } @@ -254,7 +254,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { } private void updateSuggestedFileName() { - tfFileNameInPackage.setText(MovePackage.guessNewFileName(getSelectedElementsToMove())); + tfFileNameInPackage.setText(MoveUtilsKt.guessNewFileName(getSelectedElementsToMove())); } @@ -349,7 +349,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { ? targetFile.getVirtualFile().getPath() : sourceFiles.get(0).getVirtualFile().getParent().getPath() + "/" + - MovePackage.guessNewFileName(elementsToMove); + MoveUtilsKt.guessNewFileName(elementsToMove); fileChooser.setText(initialTargetPath); } @@ -538,7 +538,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { new Function1() { @Override public JetFile invoke(@NotNull JetFile originalFile) { - return RefactoringPackage.getOrCreateKotlinFile( + return JetRefactoringUtilKt.getOrCreateKotlinFile( targetFileName != null ? targetFileName : originalFile.getName(), moveDestination.getTargetDirectory(originalFile) ); @@ -549,7 +549,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { final File targetFile = new File(getTargetFilePath()); if (!checkTargetFileName(targetFile.getName())) return null; - JetFile jetFile = (JetFile) RefactoringPackage.toPsiFile(targetFile, myProject); + JetFile jetFile = (JetFile) JetRefactoringUtilKt.toPsiFile(targetFile, myProject); if (jetFile != null) { if (sourceFiles.size() == 1 && sourceFiles.contains(jetFile)) { setErrorText("Can't move to the original file"); @@ -560,7 +560,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { } File targetDir = targetFile.getParentFile(); - final PsiDirectory psiDirectory = RefactoringPackage.toPsiDirectory(targetDir, myProject); + final PsiDirectory psiDirectory = JetRefactoringUtilKt.toPsiDirectory(targetDir, myProject); assert psiDirectory != null : "No directory found: " + targetDir.getPath(); PsiPackage psiPackage = JavaDirectoryService.getInstance().getPackage(psiDirectory); @@ -575,7 +575,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { new Function1() { @Override public JetFile invoke(@NotNull JetFile originalFile) { - return RefactoringPackage.getOrCreateKotlinFile(targetFile.getName(), psiDirectory); + return JetRefactoringUtilKt.getOrCreateKotlinFile(targetFile.getName(), psiDirectory); } } ); @@ -592,7 +592,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { } } else { - PsiFile targetFile = RefactoringPackage.toPsiFile(new File(getTargetFilePath()), myProject); + PsiFile targetFile = JetRefactoringUtilKt.toPsiFile(new File(getTargetFilePath()), myProject); if (!(targetFile == null || targetFile instanceof JetFile)) { return JetRefactoringBundle.message("refactoring.move.non.kotlin.file"); } @@ -673,7 +673,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { final String targetFileName = sourceFiles.size() > 1 ? null : tfFileNameInPackage.getText(); List filesExistingInTargetDir = getFilesExistingInTargetDir(sourceFiles, targetFileName, targetDir); if (filesExistingInTargetDir.isEmpty()) { - PsiDirectory targetDirectory = ApplicationPackage.runWriteAction( + PsiDirectory targetDirectory = ApplicationUtilsKt.runWriteAction( new Function0() { @Override public PsiDirectory invoke() { @@ -683,7 +683,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog { ); for (JetFile sourceFile : sourceFiles) { - MovePackage.setUpdatePackageDirective(sourceFile, cbUpdatePackageDirective.isSelected()); + MoveUtilsKt.setUpdatePackageDirective(sourceFile, cbUpdatePackageDirective.isSelected()); } invokeRefactoring( diff --git a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java index dd041861c76..d18bb29f885 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.test.InTextDirectivesUtils; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.io.IOException; @@ -67,7 +67,7 @@ public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase { return FileUtil.loadFile(configureFile, true); } catch (IOException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java b/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java index b498dbdf6a2..6256a9f62c2 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java +++ b/idea/tests/org/jetbrains/kotlin/idea/KotlinLightQuickFixTestCase.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; import org.jetbrains.kotlin.idea.test.RunnableWithException; -import org.jetbrains.kotlin.idea.test.TestPackage; import org.jetbrains.kotlin.idea.test.TestUtilsKt; import org.jetbrains.kotlin.test.JetTestUtils; @@ -35,7 +34,7 @@ abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase protected void tearDown() throws Exception { VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory()); - TestPackage.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() { + TestUtilsKt.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() { @Override public void run() throws Exception { KotlinLightQuickFixTestCase.super.tearDown(); diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java index 4848abea588..679e042609c 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractJetPositionManagerTest.java @@ -46,7 +46,8 @@ import org.jetbrains.kotlin.idea.test.JetLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.utils.UtilsPackage; +import org.jetbrains.kotlin.utils.CollectionsKt; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import java.io.File; import java.util.ArrayList; @@ -149,7 +150,7 @@ public abstract class AbstractJetPositionManagerTest extends JetLightCodeInsight } } catch (NoDataException e) { - throw UtilsPackage.rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } } }); @@ -251,7 +252,7 @@ public abstract class AbstractJetPositionManagerTest extends JetLightCodeInsight @Override public List classesByName(String name) { - return UtilsPackage.emptyOrSingletonList(referencesByName.get(name)); + return CollectionsKt.emptyOrSingletonList(referencesByName.get(name)); } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java index 357dc1a8bc4..0bab9f1f298 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/NavigateToStdlibSourceRegressionTest.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiElement; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.test.ProjectDescriptorWithStdlibSources; -import org.jetbrains.kotlin.idea.test.TestPackage; +import org.jetbrains.kotlin.idea.test.TestUtilsKt; public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegressionTest { /** @@ -37,7 +37,7 @@ public class NavigateToStdlibSourceRegressionTest extends NavigateToLibraryRegre // Workaround for IDEA's bug during tests. // After tests IDEA disposes VirtualFiles within LocalFileSystem, but doesn't rebuild indices. // This causes library source files to be impossible to find via indices - TestPackage.closeAndDeleteProject(); + TestUtilsKt.closeAndDeleteProject(); } @NotNull diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java index e1989c3e168..7b15da4b0e3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractDiagnosticMessageTest.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.idea.highlighter.formatHtml.FormatHtmlUtilKt; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; @@ -43,8 +44,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.jetbrains.kotlin.idea.highlighter.formatHtml.FormatHtmlPackage.formatHtml; - public abstract class AbstractDiagnosticMessageTest extends JetLiteFixture { private static final String DIAGNOSTICS_NUMBER_DIRECTIVE = "DIAGNOSTICS_NUMBER"; private static final String DIAGNOSTICS_DIRECTIVE = "DIAGNOSTICS"; @@ -108,7 +107,7 @@ public abstract class AbstractDiagnosticMessageTest extends JetLiteFixture { String readableDiagnosticText; String extension; if (messageType != MessageType.TEXT && IdeErrorMessages.hasIdeSpecificMessage(diagnostic)) { - readableDiagnosticText = formatHtml(IdeErrorMessages.render(diagnostic)); + readableDiagnosticText = FormatHtmlUtilKt.formatHtml(IdeErrorMessages.render(diagnostic)); extension = MessageType.HTML.extension; } else { diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java index c95e8bbb61e..d6bdeffee92 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; -import org.jetbrains.kotlin.idea.util.application.ApplicationPackage; +import org.jetbrains.kotlin.idea.util.application.ApplicationUtilsKt; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.junit.Assert; @@ -153,7 +153,7 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase { try { if (isApplicableExpected) { - ApplicationPackage.executeWriteCommand( + ApplicationUtilsKt.executeWriteCommand( getProject(), intentionAction.getText(), null, diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java index 55ff31c72f3..f9bf5445274 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java @@ -38,7 +38,7 @@ import kotlin.ArraysKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase; -import org.jetbrains.kotlin.idea.quickfix.utils.UtilsPackage; +import org.jetbrains.kotlin.idea.quickfix.utils.QuickfixTestUtilsKt; import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; @@ -77,7 +77,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer } private void enableInspections(String beforeFileName) throws IOException, ClassNotFoundException { - File inspectionFile = UtilsPackage.findInspectionFile(new File(beforeFileName).getParentFile()); + File inspectionFile = QuickfixTestUtilsKt.findInspectionFile(new File(beforeFileName).getParentFile()); if (inspectionFile != null) { String className = FileUtil.loadFile(inspectionFile).trim(); Class inspectionClass = Class.forName(className); diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java index 1241616f46a..8ff18fca1d1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java @@ -41,7 +41,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase; import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager; -import org.jetbrains.kotlin.idea.quickfix.utils.UtilsPackage; +import org.jetbrains.kotlin.idea.quickfix.utils.QuickfixTestUtilsKt; import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil; import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; @@ -176,7 +176,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase { } private void enableInspections(String beforeFileName) throws IOException, ClassNotFoundException { - File inspectionFile = UtilsPackage.findInspectionFile(new File(beforeFileName).getParentFile()); + File inspectionFile = QuickfixTestUtilsKt.findInspectionFile(new File(beforeFileName).getParentFile()); if (inspectionFile != null) { String className = FileUtil.loadFile(inspectionFile).trim(); Class inspectionClass = Class.forName(className); diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java index 680a13e99e2..ded042775d8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java @@ -37,11 +37,11 @@ import kotlin.CollectionsKt; import kotlin.SetsKt; import kotlin.jvm.functions.Function1; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.asJava.AsJavaPackage; +import org.jetbrains.kotlin.asJava.LightClassUtilsKt; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.Visibilities; -import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; +import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle; import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinMethodNode; import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex; @@ -51,7 +51,7 @@ import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; import org.jetbrains.kotlin.idea.test.PluginTestCaseBase; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsPackage; +import org.jetbrains.kotlin.resolve.dataClassUtils.DataClassUtilsKt; import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.test.InTextDirectivesUtils; @@ -106,7 +106,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { getChangeInfo(); } catch (CommonRefactoringUtil.RefactoringErrorHintException e) { - assertEquals(JetRefactoringBundle.message("cannot.refactor.synthesized.function", DataClassUtilsPackage.createComponentName(1).asString()), e.getMessage()); + assertEquals(JetRefactoringBundle.message("cannot.refactor.synthesized.function", DataClassUtilsKt.createComponentName(1).asString()), e.getMessage()); return; } fail(); @@ -264,10 +264,10 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { return false; } }; - BindingContext context = ResolvePackage.analyze(method, BodyResolveMode.FULL); + BindingContext context = ResolutionUtils.analyze(method, BodyResolveMode.FULL); - ChangeSignaturePackage - .runChangeSignature(getProject(), ChangeSignaturePackage.getOriginalBaseFunctionDescriptor(changeInfo), empty, context, method, "test"); + JetChangeSignatureKt + .runChangeSignature(getProject(), JetChangeInfoKt.getOriginalBaseFunctionDescriptor(changeInfo), empty, context, method, "test"); } catch (RuntimeException e) { assertTrue(e.getMessage().startsWith("Refactoring cannot be")); @@ -1173,7 +1173,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { JetTopLevelFunctionFqnNameIndex.getInstance().get("test", getProject(), GlobalSearchScope.allScope(getProject())) .iterator().next(); - return SetsKt.setOf(methodBar, AsJavaPackage.getRepresentativeLightMethod(functionTest)); + return SetsKt.setOf(methodBar, LightClassUtilsKt.getRepresentativeLightMethod(functionTest)); } } ); @@ -1281,7 +1281,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { new JetPsiFactory(getProject()).createExpression("1"), JetValVar.None, null); changeInfo.addParameter(newParameter); - PsiMethod constructor = AsJavaPackage.getRepresentativeLightMethod(changeInfo.getMethod()); + PsiMethod constructor = LightClassUtilsKt.getRepresentativeLightMethod(changeInfo.getMethod()); assert constructor != null; changeInfo.setPrimaryPropagationTargets(findCallers(constructor)); @@ -1296,7 +1296,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { new JetPsiFactory(getProject()).createExpression("1"), JetValVar.None, null); changeInfo.addParameter(newParameter); - PsiMethod constructor = AsJavaPackage.getRepresentativeLightMethod(changeInfo.getMethod()); + PsiMethod constructor = LightClassUtilsKt.getRepresentativeLightMethod(changeInfo.getMethod()); assert constructor != null; changeInfo.setPrimaryPropagationTargets(findCallers(constructor)); @@ -1357,7 +1357,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { LinkedHashSet callers = new LinkedHashSet(); for (int i = 0; i < rootNode.getChildCount(); i++) { PsiElement element = ((KotlinMethodNode) rootNode.getChildAt(i)).getMethod(); - callers.addAll(AsJavaPackage.toLightMethods(element)); + callers.addAll(LightClassUtilsKt.toLightMethods(element)); } return callers; } @@ -1398,14 +1398,14 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase { JetElement element = (JetElement) new JetChangeSignatureHandler().findTargetMember(file, editor); assertNotNull("Target element is null", element); - BindingContext bindingContext = ResolvePackage.analyze(element, BodyResolveMode.FULL); + BindingContext bindingContext = ResolutionUtils.analyze(element, BodyResolveMode.FULL); PsiElement context = file.findElementAt(editor.getCaretModel().getOffset()); assertNotNull(context); CallableDescriptor callableDescriptor = JetChangeSignatureHandler.Companion.findDescriptor(element, project, editor, bindingContext); assertNotNull(callableDescriptor); - return ChangeSignaturePackage.createChangeInfo( + return JetChangeSignatureKt.createChangeInfo( project, callableDescriptor, JetChangeSignatureConfiguration.Empty.INSTANCE$, bindingContext, context ); } diff --git a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java index 05a54d5d98a..1e5b3e8c3ad 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/stubs/AbstractResolveByStubTest.java @@ -23,10 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.idea.caches.resolve.ResolutionUtils; -import org.jetbrains.kotlin.idea.test.AstAccessControl; -import org.jetbrains.kotlin.idea.test.JetWithJdkAndRuntimeLightProjectDescriptor; -import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase; -import org.jetbrains.kotlin.idea.test.TestPackage; +import org.jetbrains.kotlin.idea.test.*; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; @@ -44,7 +41,7 @@ public abstract class AbstractResolveByStubTest extends KotlinCodeInsightTestCas private void doTest(@NotNull final String path, final boolean checkPrimaryConstructors, final boolean checkPropertyAccessors) throws Exception { configureByFile(path); - TestPackage.configureAs(getModule(), JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE); + TestUtilsKt.configureAs(getModule(), JetWithJdkAndRuntimeLightProjectDescriptor.INSTANCE); boolean shouldFail = getTestName(false).equals("ClassWithConstVal"); AstAccessControl.INSTANCE$.testWithControlledAccessToAst( shouldFail, getProject(), getTestRootDisposable(), diff --git a/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java b/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java index 5b8c8e070d0..ea0dbc4c9f5 100644 --- a/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java +++ b/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java @@ -22,7 +22,7 @@ import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase; -import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonPackage; +import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonKt; import java.io.File; import java.io.IOException; @@ -76,10 +76,9 @@ public class KannotatorJpsTest extends AbstractKotlinJpsBuildTestCase { System.out.println("Checking output directories after make and rebuild"); - ClassFilesComparisonPackage + ClassFilesComparisonKt .assertEqualDirectories(new File(getOutDirAfterRebuild(), "production"), new File(getOutDir(), "production"), false); - ClassFilesComparisonPackage - .assertEqualDirectories(new File(getOutDirAfterRebuild(), "test"), new File(getOutDir(), "test"), false); + ClassFilesComparisonKt.assertEqualDirectories(new File(getOutDirAfterRebuild(), "test"), new File(getOutDir(), "test"), false); System.out.println("Test successfully finished. File: " + root.getName()); System.out.println("-----"); 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 2ad108a7e67..68f3974bb7b 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 @@ -16,20 +16,17 @@ package org.jetbrains.kotlin.js.analyze; -import com.google.common.collect.ImmutableList; import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.context.ContextPackage; +import org.jetbrains.kotlin.context.ContextKt; import org.jetbrains.kotlin.context.ModuleContext; import org.jetbrains.kotlin.context.MutableModuleContext; -import org.jetbrains.kotlin.descriptors.ModuleParameters; import org.jetbrains.kotlin.descriptors.PackageFragmentProvider; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; -import org.jetbrains.kotlin.frontend.js.di.DiPackage; +import org.jetbrains.kotlin.frontend.js.di.InjectionKt; import org.jetbrains.kotlin.js.analyzer.JsAnalysisResult; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.resolve.JsPlatform; 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; @@ -50,7 +47,7 @@ public final class TopDownAnalyzerFacadeForJS { ) { BindingTrace trace = new BindingTraceContext(); - MutableModuleContext newModuleContext = ContextPackage.ContextForNewModule( + MutableModuleContext newModuleContext = ContextKt.ContextForNewModule( config.getProject(), Name.special("<" + config.getModuleId() + ">"), JsPlatform.INSTANCE$ ); newModuleContext.setDependencies(computeDependencies(newModuleContext.getModule(), config)); @@ -75,7 +72,7 @@ public final class TopDownAnalyzerFacadeForJS { ) { Collection allFiles = Config.withJsLibAdded(files, config); - LazyTopDownAnalyzerForTopLevel analyzerForJs = DiPackage.createTopDownAnalyzerForJs( + LazyTopDownAnalyzerForTopLevel analyzerForJs = InjectionKt.createTopDownAnalyzerForJs( moduleContext, trace, new FileBasedDeclarationProviderFactory(moduleContext.getStorageManager(), allFiles) ); diff --git a/js/js.frontend/src/org/jetbrains/kotlin/js/patterns/PatternBuilder.java b/js/js.frontend/src/org/jetbrains/kotlin/js/patterns/PatternBuilder.java index 933ac26df18..1bcf62aa2e4 100644 --- a/js/js.frontend/src/org/jetbrains/kotlin/js/patterns/PatternBuilder.java +++ b/js/js.frontend/src/org/jetbrains/kotlin/js/patterns/PatternBuilder.java @@ -20,6 +20,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.kotlin.js.descriptorUtils.DescriptorUtilsKt; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.idea.KotlinLanguage; import org.jetbrains.kotlin.resolve.DescriptorUtils; @@ -28,9 +29,6 @@ import org.jetbrains.kotlin.resolve.OverrideResolver; import java.util.Arrays; import java.util.List; -import static org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsPackage.getNameIfStandardType; -import static org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsPackage.getJetTypeFqName; - public final class PatternBuilder { @NotNull @@ -162,7 +160,7 @@ public final class PatternBuilder { } for (int i = 0; i < valueParameterDescriptors.size(); i++) { ValueParameterDescriptor valueParameterDescriptor = valueParameterDescriptors.get(i); - Name name = getNameIfStandardType(valueParameterDescriptor.getType()); + Name name = DescriptorUtilsKt.getNameIfStandardType(valueParameterDescriptor.getType()); NamePredicate namePredicate = argumentCheckers.get(i); if (!namePredicate.apply(name)) return false; } @@ -242,7 +240,7 @@ public final class PatternBuilder { if (actualReceiver != null) { if (receiverFqName == null) return false; - String actualReceiverFqName = getJetTypeFqName(actualReceiver.getType(), false); + String actualReceiverFqName = DescriptorUtilsKt.getJetTypeFqName(actualReceiver.getType(), false); if (!actualReceiverFqName.equals(receiverFqName)) return false; } diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java index e109178e66d..22a071a2012 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/JsInliner.java @@ -25,10 +25,12 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.diagnostics.DiagnosticSink; import org.jetbrains.kotlin.diagnostics.Errors; +import org.jetbrains.kotlin.js.inline.clean.RemoveUnusedFunctionDefinitionsKt; +import org.jetbrains.kotlin.js.inline.clean.RemoveUnusedLocalFunctionDeclarationsKt; import org.jetbrains.kotlin.js.inline.context.FunctionContext; import org.jetbrains.kotlin.js.inline.context.InliningContext; import org.jetbrains.kotlin.js.inline.context.NamingContext; -import org.jetbrains.kotlin.js.inline.util.ExpressionDecomposer; +import org.jetbrains.kotlin.js.inline.util.*; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.resolve.inline.InlineStrategy; @@ -36,17 +38,14 @@ import java.util.*; import static org.jetbrains.kotlin.js.inline.FunctionInlineMutator.canBeExpression; import static org.jetbrains.kotlin.js.inline.FunctionInlineMutator.getInlineableCallReplacement; -import static org.jetbrains.kotlin.js.inline.clean.CleanPackage.removeUnusedFunctionDefinitions; -import static org.jetbrains.kotlin.js.inline.clean.CleanPackage.removeUnusedLocalFunctionDeclarations; -import static org.jetbrains.kotlin.js.inline.util.UtilPackage.*; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.flattenStatement; public class JsInliner extends JsVisitorWithContextImpl { private final IdentityHashMap functions; private final Stack inliningContexts = new Stack(); - private final Set processedFunctions = IdentitySet(); - private final Set inProcessFunctions = IdentitySet(); + private final Set processedFunctions = CollectionUtilsKt.IdentitySet(); + private final Set inProcessFunctions = CollectionUtilsKt.IdentitySet(); private final FunctionReader functionReader; private final DiagnosticSink trace; @@ -71,10 +70,10 @@ public class JsInliner extends JsVisitorWithContextImpl { public static JsProgram process(@NotNull TranslationContext context) { JsProgram program = context.program(); - IdentityHashMap functions = collectNamedFunctions(program); + IdentityHashMap functions = CollectUtilsKt.collectNamedFunctions(program); JsInliner inliner = new JsInliner(functions, new FunctionReader(context), context.bindingTrace()); inliner.accept(program); - removeUnusedFunctionDefinitions(program, functions); + RemoveUnusedFunctionDefinitionsKt.removeUnusedFunctionDefinitions(program, functions); return program; } @@ -104,9 +103,9 @@ public class JsInliner extends JsVisitorWithContextImpl { @Override public void endVisit(@NotNull JsFunction function, @NotNull JsContext context) { super.endVisit(function, context); - refreshLabelNames(getInliningContext().newNamingContext(), function); + NamingUtilsKt.refreshLabelNames(getInliningContext().newNamingContext(), function); - removeUnusedLocalFunctionDeclarations(function); + RemoveUnusedLocalFunctionDeclarationsKt.removeUnusedLocalFunctionDeclarations(function); processedFunctions.add(function); assert inProcessFunctions.contains(function); @@ -206,7 +205,7 @@ public class JsInliner extends JsVisitorWithContextImpl { if (currentStatement instanceof JsExpressionStatement && ((JsExpressionStatement) currentStatement).getExpression() == call && - (resultExpression == null || !canHaveSideEffect(resultExpression)) + (resultExpression == null || !SideEffectUtilsKt.canHaveSideEffect(resultExpression)) ) { statementContext.removeMe(); } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java index c3a1ecfce96..0e8eb5f1ec1 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java @@ -29,7 +29,7 @@ import com.intellij.psi.PsiManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsKt; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; @@ -200,7 +200,7 @@ public abstract class BasicTest extends KotlinTestWithEnvironment { OutputFileCollection outputFiles = successResult.getOutputFiles(outputFile, getOutputPrefixFile(), getOutputPostfixFile()); File outputDir = outputFile.getParentFile(); assert outputDir != null : "Parent file for output file should not be null, outputFilePath: " + outputFile.getPath(); - OutputUtilsPackage.writeAllTo(outputFiles, outputDir); + OutputUtilsKt.writeAllTo(outputFiles, outputDir); processJsProgram(successResult.getProgram(), jetFiles); } diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java index 0aaf9243183..fe73f3f5c04 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/rhino/RhinoUtils.java @@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.js.config.EcmaVersion; import org.jetbrains.kotlin.js.facade.K2JSTranslator; +import org.jetbrains.kotlin.utils.ExceptionUtilsKt; import org.mozilla.javascript.*; import java.io.File; @@ -35,7 +36,6 @@ import java.util.Set; import static org.jetbrains.kotlin.js.config.LibrarySourcesConfig.*; import static org.jetbrains.kotlin.js.test.BasicTest.DIST_DIR_PATH; import static org.jetbrains.kotlin.js.test.BasicTest.TEST_DATA_DIR_PATH; -import static org.jetbrains.kotlin.utils.UtilsPackage.rethrow; public final class RhinoUtils { private static final String KOTLIN_JS_LIB_ECMA_5 = TEST_DATA_DIR_PATH + "kotlin_lib_ecma5.js"; @@ -204,7 +204,7 @@ public final class RhinoUtils { } } catch (Exception e) { - throw rethrow(e); + throw ExceptionUtilsKt.rethrow(e); } //scope.sealObject(); return scope; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java index c63ebd7f674..16b7fda0216 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.utils.JsAstUtils; import org.jetbrains.kotlin.psi.JetClassOrObject; import org.jetbrains.kotlin.psi.JetParameter; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import java.util.ArrayList; import java.util.List; @@ -64,7 +64,7 @@ class JsDataClassGenerator extends DataClassMethodGenerator { JsExpression argumentValue; JsExpression parameterValue = new JsNameRef(paramName); if (!constructorParam.hasValOrVar()) { - assert !DescriptorUtilPackage.hasDefaultValue(function.getValueParameters().get(i)); + assert !DescriptorUtilsKt.hasDefaultValue(function.getValueParameters().get(i)); // Caller cannot rely on default value and pass undefined here. argumentValue = parameterValue; } 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 bd847f3ad2e..af98b972547 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 @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.js.translate.expression; import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperties; -import com.google.dart.compiler.backend.js.ast.metadata.MetadataProperty; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -40,7 +39,7 @@ 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.bindingContextUtil.BindingContextUtilsKt; import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.resolve.constants.ConstantValue; import org.jetbrains.kotlin.resolve.constants.NullValue; @@ -213,7 +212,7 @@ public final class ExpressionVisitor extends TranslatorVisitor { return testExpression; } - boolean isKotlinExpression = BindingContextUtilPackage.isUsedAsExpression(expression, context.bindingContext()); + boolean isKotlinExpression = BindingContextUtilsKt.isUsedAsExpression(expression, context.bindingContext()); JetExpression thenExpression = expression.getThen(); JetExpression elseExpression = expression.getElse(); @@ -297,7 +296,7 @@ public final class ExpressionVisitor extends TranslatorVisitor { JetExpression baseExpression = expression.getBaseExpression(); assert baseExpression != null; - if (BindingContextUtilPackage.isUsedAsExpression(expression, context.bindingContext())) { + if (BindingContextUtilsKt.isUsedAsExpression(expression, context.bindingContext())) { return Translation.translateAsExpression(baseExpression, context).source(expression); } @@ -425,7 +424,7 @@ public final class ExpressionVisitor extends TranslatorVisitor { MetadataProperties.setStaticRef(name, alias); } - boolean isExpression = BindingContextUtilPackage.isUsedAsExpression(expression, context.bindingContext()); + boolean isExpression = BindingContextUtilsKt.isUsedAsExpression(expression, context.bindingContext()); JsNode result = isExpression ? alias : JsAstUtils.newVar(name, alias); return result.source(expression); 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 36119423223..8c08fc56285 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 @@ -30,7 +30,7 @@ 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 org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import java.util.HashMap; import java.util.List; @@ -41,7 +41,6 @@ import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getFunctionDe import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; import static org.jetbrains.kotlin.js.translate.utils.FunctionBodyTranslator.translateFunctionBody; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.setParameters; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.isEffectivelyPublicApi; public final class FunctionTranslator extends AbstractTranslator { @NotNull @@ -99,7 +98,7 @@ public final class FunctionTranslator extends AbstractTranslator { JsName functionName = context().getNameForDescriptor(descriptor); generateFunctionObject(); - if (shouldBeInlined(descriptor) && isEffectivelyPublicApi(descriptor)) { + if (shouldBeInlined(descriptor) && DescriptorUtilsKt.isEffectivelyPublicApi(descriptor)) { InlineMetadata metadata = InlineMetadata.compose(functionObject, descriptor); return new JsPropertyInitializer(functionName.makeRef(), metadata.getFunctionWithMetadata()); } @@ -148,7 +147,7 @@ public final class FunctionTranslator extends AbstractTranslator { public static void addParameters(List list, FunctionDescriptor descriptor, TranslationContext context) { for (ValueParameterDescriptor valueParameter : descriptor.getValueParameters()) { JsParameter jsParameter = new JsParameter(context.getNameForDescriptor(valueParameter)); - MetadataProperties.setHasDefaultValue(jsParameter, DescriptorUtilPackage.hasDefaultValue(valueParameter)); + MetadataProperties.setHasDefaultValue(jsParameter, DescriptorUtilsKt.hasDefaultValue(valueParameter)); list.add(jsParameter); } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java index a75b4f8d989..f44af6ddf0b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java @@ -20,6 +20,7 @@ import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsKt; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; @@ -36,7 +37,6 @@ import org.jetbrains.kotlin.types.JetType; import static org.jetbrains.kotlin.js.translate.utils.BindingUtils.getTypeByReference; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.*; -import static org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsPackage.getNameIfStandardType; public final class PatternTranslator extends AbstractTranslator { @@ -95,7 +95,7 @@ public final class PatternTranslator extends AbstractTranslator { @Nullable private JsExpression getIsTypeCheckCallableForBuiltin(@NotNull JetType type) { - Name typeName = getNameIfStandardType(type); + Name typeName = DescriptorUtilsKt.getNameIfStandardType(type); if (NamePredicate.STRING.apply(typeName)) { return namer().isTypeOf(program().getStringLiteral("string")); 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 a36230498a1..036691f01e9 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,6 +22,7 @@ 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.js.descriptorUtils.DescriptorUtilsKt; import org.jetbrains.kotlin.js.patterns.NamePredicate; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; @@ -29,14 +30,12 @@ import org.jetbrains.kotlin.js.translate.general.Translation; import org.jetbrains.kotlin.js.translate.intrinsic.functions.factories.TopLevelFIF; 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; import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.message; import static org.jetbrains.kotlin.js.translate.utils.JsAstUtils.sum; -import static org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsPackage.getNameIfStandardType; public final class StringTemplateTranslator extends AbstractTranslator { private final JetStringTemplateEntry[] expressionEntries; @@ -102,7 +101,7 @@ public final class StringTemplateTranslator extends AbstractTranslator { } private boolean mustCallToString(@NotNull JetType type) { - Name typeName = getNameIfStandardType(type); + Name typeName = DescriptorUtilsKt.getNameIfStandardType(type); if (typeName != null) { //TODO: this is a hacky optimization, should use some generic approach if (NamePredicate.STRING.apply(typeName)) { 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 6eb83dd06f3..08190319468 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 @@ -47,9 +47,8 @@ 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.BindingTrace; -import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage; +import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilsKt; import java.util.Collection; import java.util.Collections; @@ -97,7 +96,7 @@ public final class Translation { context.moveVarsFrom(innerContext); block.getStatements().addAll(innerContext.dynamicContext().jsBlock().getStatements()); - if (BindingContextUtilPackage.isUnreachableCode(expression, context.bindingContext())) { + if (BindingContextUtilsKt.isUnreachableCode(expression, context.bindingContext())) { return context.getEmptyExpression(); } @@ -127,7 +126,7 @@ public final class Translation { } assert jsNode instanceof JsStatement : "Unexpected node of type: " + jsNode.getClass().toString(); - if (BindingContextUtilPackage.isUsedAsExpression(expression, context.bindingContext())) { + if (BindingContextUtilsKt.isUsedAsExpression(expression, context.bindingContext())) { TemporaryVariable result = context.declareTemporary(null); AssignToExpressionMutator saveResultToTemporaryMutator = new AssignToExpressionMutator(result.reference()); block.getStatements().add(mutateLastExpression(jsNode, saveResultToTemporaryMutator)); 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 e4f41a535fc..55e34a61bc0 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 @@ -27,9 +27,10 @@ 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.js.translate.utils.jsAstUtils.AstUtilsKt; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; @@ -40,7 +41,6 @@ import java.util.List; 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.js.translate.utils.jsAstUtils.JsAstUtilsPackage.toInvocationWith; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getClassDescriptorForType; public final class ClassInitializerTranslator extends AbstractTranslator { @@ -137,7 +137,7 @@ public final class ClassInitializerTranslator extends AbstractTranslator { if (classDeclaration instanceof JetEnumEntry) { JsExpression expression = CallTranslator.translate(context(), superCall, null); - JsExpression fixedInvocation = toInvocationWith(expression, JsLiteral.THIS); + JsExpression fixedInvocation = AstUtilsKt.toInvocationWith(expression, JsLiteral.THIS); initializerStatements.add(0, fixedInvocation.makeStmt()); } else { @@ -162,7 +162,7 @@ public final class ClassInitializerTranslator extends AbstractTranslator { if (specifier instanceof JetDelegatorToSuperCall) { JetDelegatorToSuperCall superCall = (JetDelegatorToSuperCall) specifier; //noinspection unchecked - return (ResolvedCall) CallUtilPackage.getResolvedCallWithAssert(superCall, bindingContext()); + return (ResolvedCall) CallUtilKt.getResolvedCallWithAssert(superCall, bindingContext()); } } return null; 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 b3e1716c878..45d0cdec963 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 @@ -22,6 +22,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; +import org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsKt; import org.jetbrains.kotlin.js.patterns.DescriptorPredicate; import org.jetbrains.kotlin.js.patterns.NamePredicate; import org.jetbrains.kotlin.js.resolve.JsPlatform; @@ -42,7 +43,6 @@ import org.jetbrains.kotlin.types.JetType; import java.util.List; -import static org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsPackage.getNameIfStandardType; import static org.jetbrains.kotlin.js.patterns.PatternBuilder.pattern; import static org.jetbrains.kotlin.js.translate.intrinsic.functions.basic.FunctionIntrinsic.CallParametersAwareFunctionIntrinsic; import static org.jetbrains.kotlin.js.translate.utils.ManglingUtils.getStableMangledNameForDescriptor; @@ -221,7 +221,7 @@ public final class TopLevelFIF extends CompositeFIF { @NotNull TranslationContext context ) { JetType keyType = callInfo.getResolvedCall().getTypeArguments().values().iterator().next(); - Name keyTypeName = getNameIfStandardType(keyType); + Name keyTypeName = DescriptorUtilsKt.getNameIfStandardType(keyType); String collectionClassName = null; if (keyTypeName != null) { if (NamePredicate.PRIMITIVE_NUMBERS.apply(keyTypeName)) { 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 5ea45866e6f..1f079c8ca30 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 @@ -34,7 +34,8 @@ 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.bindingContextUtil.BindingContextUtilsKt; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; @@ -47,7 +48,6 @@ import static org.jetbrains.kotlin.js.translate.operation.CompareToTranslator.is 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 { @@ -137,7 +137,7 @@ public final class BinaryOperationTranslator extends AbstractTranslator { JsExpression result; JsIf ifStatement; - if (BindingContextUtilPackage.isUsedAsExpression(expression, context().bindingContext())) { + if (BindingContextUtilsKt.isUsedAsExpression(expression, context().bindingContext())) { if (TranslationUtils.isCacheNeeded(leftExpression)) { TemporaryVariable resultVar = context().declareTemporary(leftExpression); result = resultVar.reference(); @@ -229,7 +229,7 @@ public final class BinaryOperationTranslator extends AbstractTranslator { JsIf ifStatement; JsExpression result; - if (BindingContextUtilPackage.isUsedAsExpression(expression, context().bindingContext())) { + if (BindingContextUtilsKt.isUsedAsExpression(expression, context().bindingContext())) { if (!JsAstUtils.isEmptyExpression(rightExpression)) { if (rightExpression instanceof JsNameRef) { result = rightExpression; // Reuse tmp variable @@ -279,7 +279,7 @@ public final class BinaryOperationTranslator extends AbstractTranslator { @NotNull private JsExpression translateAsOverloadedBinaryOperation() { - ResolvedCall resolvedCall = getFunctionResolvedCallWithAssert(expression, bindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getFunctionResolvedCallWithAssert(expression, bindingContext()); JsExpression result = CallTranslator.translate(context(), resolvedCall, getReceiver()); return mayBeWrapWithNegation(result); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java index 612995de214..9ab83c240b3 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/IncrementTranslator.java @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.js.translate.reference.CachedAccessTranslator; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetUnaryExpression; -import org.jetbrains.kotlin.resolve.calls.tasks.TasksPackage; +import org.jetbrains.kotlin.resolve.calls.tasks.DynamicCallsKt; import org.jetbrains.kotlin.types.expressions.OperatorConventions; import java.util.List; @@ -128,6 +128,6 @@ public abstract class IncrementTranslator extends AbstractTranslator { private static boolean isDynamic(TranslationContext context, JetUnaryExpression expression) { CallableDescriptor operationDescriptor = getCallableDescriptorForOperationExpression(context.bindingContext(), expression); - return TasksPackage.isDynamic(operationDescriptor); + return DynamicCallsKt.isDynamic(operationDescriptor); } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java index 964be2b7ff2..768ea0a5e19 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedAssignmentTranslator.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.psi.JetBinaryExpression; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; public final class OverloadedAssignmentTranslator extends AssignmentTranslator { @@ -39,7 +39,7 @@ public final class OverloadedAssignmentTranslator extends AssignmentTranslator { private OverloadedAssignmentTranslator(@NotNull JetBinaryExpression expression, @NotNull TranslationContext context) { super(expression, context); - resolvedCall = CallUtilPackage.getFunctionResolvedCallWithAssert(expression, context.bindingContext()); + resolvedCall = CallUtilKt.getFunctionResolvedCallWithAssert(expression, context.bindingContext()); } @NotNull diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java index 390d31a538a..11a6b9d367a 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/operation/OverloadedIncrementTranslator.java @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.psi.JetUnaryExpression; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; public final class OverloadedIncrementTranslator extends IncrementTranslator { @@ -35,7 +35,7 @@ public final class OverloadedIncrementTranslator extends IncrementTranslator { @NotNull TranslationContext context ) { super(expression, context); - this.resolvedCall = CallUtilPackage.getFunctionResolvedCallWithAssert(expression, context.bindingContext()); + this.resolvedCall = CallUtilKt.getFunctionResolvedCallWithAssert(expression, context.bindingContext()); } 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 73b1e1ced05..56681ac4706 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 @@ -30,6 +30,7 @@ import org.jetbrains.kotlin.psi.JetConstantExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetUnaryExpression; import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; @@ -41,7 +42,6 @@ import static org.jetbrains.kotlin.js.translate.utils.ErrorReportingUtils.messag 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() { @@ -81,7 +81,7 @@ public final class UnaryOperationTranslator { return translateExclForBinaryEqualLikeExpr((JsBinaryOperation) baseExpression); } - ResolvedCall resolvedCall = getFunctionResolvedCallWithAssert(expression, context.bindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getFunctionResolvedCallWithAssert(expression, context.bindingContext()); return CallTranslator.translate(context, resolvedCall, baseExpression); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java index 3d3cf8ee51b..61c26c827f0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/AbstractCallExpressionTranslator.java @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.psi.JetCallExpression; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; public abstract class AbstractCallExpressionTranslator extends AbstractTranslator { @@ -42,7 +42,7 @@ public abstract class AbstractCallExpressionTranslator extends AbstractTranslato ) { super(context); this.expression = expression; - this.resolvedCall = CallUtilPackage.getFunctionResolvedCallWithAssert(expression, bindingContext()); + this.resolvedCall = CallUtilKt.getFunctionResolvedCallWithAssert(expression, bindingContext()); this.receiver = receiver; } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java index 4bbd31e7b9e..a557646fe98 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/CallExpressionTranslator.java @@ -21,13 +21,14 @@ import com.google.gwt.dev.js.ThrowExceptionOnErrorReporter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.js.parser.ParserPackage; +import org.jetbrains.kotlin.js.parser.ParserUtilsKt; import org.jetbrains.kotlin.js.resolve.diagnostics.JsCallChecker; import org.jetbrains.kotlin.js.translate.callTranslator.CallTranslator; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.psi.JetCallExpression; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.ValueArgument; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.inline.InlineUtil; @@ -36,7 +37,6 @@ import java.util.List; import static org.jetbrains.kotlin.js.resolve.diagnostics.JsCallChecker.isJsCall; import static org.jetbrains.kotlin.js.translate.utils.PsiUtils.getFunctionDescriptor; import static org.jetbrains.kotlin.js.translate.utils.InlineUtils.setInlineCallMetadata; -import static org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage.getFunctionResolvedCallWithAssert; import static org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator.getConstant; public final class CallExpressionTranslator extends AbstractCallExpressionTranslator { @@ -47,7 +47,7 @@ public final class CallExpressionTranslator extends AbstractCallExpressionTransl @Nullable JsExpression receiver, @NotNull TranslationContext context ) { - ResolvedCall resolvedCall = getFunctionResolvedCallWithAssert(expression, context.bindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getFunctionResolvedCallWithAssert(expression, context.bindingContext()); if (isJsCall(resolvedCall)) { return (new CallExpressionTranslator(expression, receiver, context)).translateJsCode(); @@ -131,6 +131,6 @@ public final class CallExpressionTranslator extends AbstractCallExpressionTransl assert currentScope instanceof JsFunctionScope : "Usage of js outside of function is unexpected"; JsScope temporaryRootScope = new JsRootScope(new JsProgram("")); JsScope scope = new DelegatingJsFunctionScopeWithTemporaryParent((JsFunctionScope) currentScope, temporaryRootScope); - return ParserPackage.parse(jsCode, ThrowExceptionOnErrorReporter.INSTANCE$, scope); + return ParserUtilsKt.parse(jsCode, ThrowExceptionOnErrorReporter.INSTANCE$, scope); } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java index c45977c1a24..6c15c67211b 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/reference/VariableAccessTranslator.java @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.js.translate.context.TemporaryVariable; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.js.translate.general.AbstractTranslator; import org.jetbrains.kotlin.psi.JetReferenceExpression; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; @@ -38,7 +38,7 @@ public class VariableAccessTranslator extends AbstractTranslator implements Acce @NotNull JetReferenceExpression referenceExpression, @Nullable JsExpression receiver ) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCallWithAssert(referenceExpression, context.bindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCallWithAssert(referenceExpression, context.bindingContext()); if (resolvedCall instanceof VariableAsFunctionResolvedCall) { resolvedCall = ((VariableAsFunctionResolvedCall) resolvedCall).getVariableCall(); } 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 f5d833de722..44b256d5ee6 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 @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; @@ -177,7 +177,7 @@ public final class BindingUtils { @NotNull ValueParameterDescriptor parameterDescriptor ) { ValueParameterDescriptor result = parameterDescriptor; - assert DescriptorUtilPackage.hasDefaultValue(result) : message(parameterDescriptor, "Unsupplied parameter must have default value"); + assert DescriptorUtilsKt.hasDefaultValue(result) : message(parameterDescriptor, "Unsupplied parameter must have default value"); // TODO: this seems incorrect, as the default value may come from _not the first_ overridden parameter while (!result.declaresDefaultValue()) { result = result.getOverriddenDescriptors().iterator().next(); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java index 67294d48ba0..3a61f4fe279 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/FunctionBodyTranslator.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.js.translate.general.Translation; import org.jetbrains.kotlin.js.translate.utils.mutator.Mutator; import org.jetbrains.kotlin.psi.JetDeclarationWithBody; import org.jetbrains.kotlin.psi.JetExpression; -import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage; +import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt; import org.jetbrains.kotlin.types.JetType; import java.util.ArrayList; @@ -53,7 +53,7 @@ public final class FunctionBodyTranslator extends AbstractTranslator { List result = new ArrayList(valueParameters.size()); for (ValueParameterDescriptor valueParameter : valueParameters) { - if (!DescriptorUtilPackage.hasDefaultValue(valueParameter)) continue; + if (!DescriptorUtilsKt.hasDefaultValue(valueParameter)) continue; JsNameRef jsNameRef = functionBodyContext.getNameForDescriptor(valueParameter).makeRef(); JetExpression defaultArgument = getDefaultArgument(valueParameter); 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 bfb5b1aa507..9a9e460e6ad 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 @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.js.config.LibrarySourcesConfig; -import org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsPackage; +import org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsKt; import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetExpression; @@ -42,7 +42,6 @@ import static org.jetbrains.kotlin.js.config.LibrarySourcesConfig.BUILTINS_JS_MO import static org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils.isNativeObject; import static org.jetbrains.kotlin.resolve.DescriptorToSourceUtils.descriptorToDeclaration; import static org.jetbrains.kotlin.resolve.DescriptorUtils.*; -import static org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage.getBuiltIns; public final class JsDescriptorUtils { // TODO: maybe we should use external annotations or something else. @@ -157,13 +156,13 @@ public final class JsDescriptorUtils { public static boolean isBuiltin(@NotNull DeclarationDescriptor descriptor) { PackageFragmentDescriptor containingPackageFragment = DescriptorUtils.getParentOfType(descriptor, PackageFragmentDescriptor.class); - return containingPackageFragment == getBuiltIns(descriptor).getBuiltInsPackageFragment(); + return containingPackageFragment == org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilsKt.getBuiltIns(descriptor).getBuiltInsPackageFragment(); } @Nullable public static Name getNameIfStandardType(@NotNull JetExpression expression, @NotNull TranslationContext context) { JetType type = context.bindingContext().getType(expression); - return type != null ? DescriptorUtilsPackage.getNameIfStandardType(type) : null; + return type != null ? DescriptorUtilsKt.getNameIfStandardType(type) : null; } @NotNull 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 39050c6c0f2..5e71ee1a191 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 @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.ConstructorDescriptorImpl; import org.jetbrains.kotlin.incremental.components.NoLookupLocation; +import org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsKt; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.DescriptorUtils; @@ -35,8 +36,6 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope; import java.util.*; -import static org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsPackage.getJetTypeFqName; -import static org.jetbrains.kotlin.js.descriptorUtils.DescriptorUtilsPackage.hasPrimaryConstructor; import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName; public class ManglingUtils { @@ -185,7 +184,7 @@ public class ManglingUtils { ClassDescriptor classDescriptor = (ClassDescriptor) declarationDescriptor; Collection constructors = classDescriptor.getConstructors(); - if (!hasPrimaryConstructor(classDescriptor)) { + if (!DescriptorUtilsKt.hasPrimaryConstructor(classDescriptor)) { ConstructorDescriptorImpl fakePrimaryConstructor = ConstructorDescriptorImpl.create(classDescriptor, Annotations.Companion.getEMPTY(), true, SourceElement.NO_SOURCE); return CollectionsKt.plus(constructors, fakePrimaryConstructor); @@ -231,13 +230,13 @@ public class ManglingUtils { ReceiverParameterDescriptor receiverParameter = descriptor.getExtensionReceiverParameter(); if (receiverParameter != null) { - argTypes.append(getJetTypeFqName(receiverParameter.getType(), true)).append("."); + argTypes.append(DescriptorUtilsKt.getJetTypeFqName(receiverParameter.getType(), true)).append("."); } argTypes.append(StringUtil.join(descriptor.getValueParameters(), new Function() { @Override public String fun(ValueParameterDescriptor descriptor) { - return getJetTypeFqName(descriptor.getType(), true); + return DescriptorUtilsKt.getJetTypeFqName(descriptor.getType(), true); } }, ",")); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java index 67e695c204c..eee10a906cf 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/PsiUtils.java @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.js.translate.context.TranslationContext; import org.jetbrains.kotlin.lexer.JetToken; import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.psi.*; -import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; +import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilKt; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.calls.model.VariableAsFunctionResolvedCall; @@ -136,7 +136,7 @@ public final class PsiUtils { @NotNull JetCallExpression expression, @NotNull TranslationContext context ) { - ResolvedCall resolvedCall = CallUtilPackage.getResolvedCall(expression, context.bindingContext()); + ResolvedCall resolvedCall = CallUtilKt.getResolvedCall(expression, context.bindingContext()); assert resolvedCall != null; return getFunctionDescriptor(resolvedCall); diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java index c5f96311ee2..3b665e6a385 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java +++ b/plugins/android-idea-plugin/tests/org/jetbrains/kotlin/android/KotlinAndroidTestCaseBase.java @@ -34,7 +34,7 @@ import org.jetbrains.android.sdk.AndroidSdkAdditionalData; import org.jetbrains.android.sdk.AndroidSdkData; import org.jetbrains.android.sdk.AndroidSdkType; import org.jetbrains.kotlin.idea.test.RunnableWithException; -import org.jetbrains.kotlin.idea.test.TestPackage; +import org.jetbrains.kotlin.idea.test.TestUtilsKt; import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; @@ -72,7 +72,7 @@ public abstract class KotlinAndroidTestCaseBase extends UsefulTestCase { @Override protected void tearDown() throws Exception { - TestPackage.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() { + TestUtilsKt.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() { @Override public void run() throws Exception { KotlinAndroidTestCaseBase.super.tearDown();