Replace KotlinPackage legacy facade with corresponding package parts.

2015-10-01 22:31:17 +03:00
parent 80e4ba8712
commit 90e5ee8a7e
64 changed files with 214 additions and 206 deletions
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.io.DataOutputStream;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -120,7 +120,7 @@ public class ClassFileFactory implements OutputFileCollection {
        if (builder.getPackagePartsCount() != 0) {
            state.getProgress().reportOutput(sourceFiles, new File(outputFilePath));
-            generators.put(outputFilePath, new OutAndSourceFileList(KotlinPackage.toList(sourceFiles)) {
+            generators.put(outputFilePath, new OutAndSourceFileList(CollectionsKt.toList(sourceFiles)) {
                @Override
                public byte[] asBytes(ClassBuilderFactory factory) {
                    try {
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
 import com.google.common.collect.Lists;
 import com.intellij.util.ArrayUtil;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -283,7 +283,7 @@ public class ClosureCodegen extends MemberCodegen<JetElement> {
        Type[] myParameterTypes = bridge.getArgumentTypes();
-        List<ParameterDescriptor> calleeParameters = KotlinPackage.plus(
+        List<ParameterDescriptor> calleeParameters = CollectionsKt.plus(
                UtilsPackage.<ParameterDescriptor>singletonOrEmptyList(funDescriptor.getExtensionReceiverParameter()),
                funDescriptor.getValueParameters()
        );
@@ -24,7 +24,7 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.Stack;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -1489,7 +1489,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
                Collection<ConstructorDescriptor> constructors = classDescriptor.getConstructors();
                assert constructors.size() == 1 : "Unexpected number of constructors for class: " + classDescriptor + " " + constructors;
-                ConstructorDescriptor constructorDescriptor = KotlinPackage.single(constructors);
+                ConstructorDescriptor constructorDescriptor = CollectionsKt.single(constructors);
                JvmMethodSignature constructor = typeMapper.mapSignature(SamCodegenUtil.resolveSamAdapter(constructorDescriptor));
                v.invokespecial(type.getInternalName(), "<init>", constructor.getAsmMethod().getDescriptor(), false);
@@ -2750,7 +2750,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
        assert state.getReflectionTypes().getKClass().getTypeConstructor().equals(type.getConstructor())
                : "::class expression should be type checked to a KClass: " + type;
-        return generateClassLiteralReference(typeMapper, KotlinPackage.single(type.getArguments()).getType());
+        return generateClassLiteralReference(typeMapper, CollectionsKt.single(type.getArguments()).getType());
    }
    @Override
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.codegen;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.codegen.state.GenerationState;
@@ -149,7 +149,7 @@ public class FunctionReferenceGenerationStrategy extends FunctionGenerationStrat
        int receivers = (referencedFunction.getDispatchReceiverParameter() != null ? 1 : 0) +
                        (referencedFunction.getExtensionReceiverParameter() != null ? 1 : 0);
-        List<ValueParameterDescriptor> parameters = KotlinPackage.drop(callableDescriptor.getValueParameters(), receivers);
+        List<ValueParameterDescriptor> parameters = CollectionsKt.drop(callableDescriptor.getValueParameters(), receivers);
        for (int i = 0; i < parameters.size(); i++) {
            ValueParameterDescriptor parameter = parameters.get(i);
            ValueArgument fakeArgument = fakeArguments.get(i);
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ArrayUtil;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
@@ -76,7 +76,6 @@ import org.jetbrains.org.objectweb.asm.commons.Method;
 import java.util.*;
 import static kotlin.KotlinPackage.firstOrNull;
 import static org.jetbrains.kotlin.codegen.AsmUtil.*;
 import static org.jetbrains.kotlin.codegen.JvmCodegenUtil.*;
 import static org.jetbrains.kotlin.codegen.binding.CodegenBinding.enumEntryNeedSubclass;
@@ -809,7 +808,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
        Type type = typeMapper.mapType(getBuiltIns(descriptor).getArrayType(INVARIANT, descriptor.getDefaultType()));
        FunctionDescriptor valuesFunction =
-                KotlinPackage.single(descriptor.getStaticScope().getFunctions(ENUM_VALUES, NoLookupLocation.FROM_BACKEND), new Function1<FunctionDescriptor, Boolean>() {
+                CollectionsKt.single(descriptor.getStaticScope().getFunctions(ENUM_VALUES, NoLookupLocation.FROM_BACKEND), new Function1<FunctionDescriptor, Boolean>() {
                    @Override
                    public Boolean invoke(FunctionDescriptor descriptor) {
                        return CodegenUtil.isEnumValuesMethod(descriptor);
@@ -829,7 +828,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
    private void generateEnumValueOfMethod() {
        FunctionDescriptor valueOfFunction =
-                KotlinPackage.single(descriptor.getStaticScope().getFunctions(ENUM_VALUE_OF, NoLookupLocation.FROM_BACKEND), new Function1<FunctionDescriptor, Boolean>() {
+                CollectionsKt.single(descriptor.getStaticScope().getFunctions(ENUM_VALUE_OF, NoLookupLocation.FROM_BACKEND), new Function1<FunctionDescriptor, Boolean>() {
                    @Override
                    public Boolean invoke(FunctionDescriptor descriptor) {
                        return CodegenUtil.isEnumValueOfMethod(descriptor);
@@ -1005,7 +1004,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
            return;
        }
-        JetObjectDeclaration companionObject = firstOrNull(((JetClass) myClass).getCompanionObjects());
+        JetObjectDeclaration companionObject = CollectionsKt.firstOrNull(((JetClass) myClass).getCompanionObjects());
        assert companionObject != null : "Companion object not found: " + myClass.getText();
        StackValue.Field field = StackValue.singleton(companionObjectDescriptor, typeMapper);
@@ -1067,7 +1066,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
    private void generateCompanionObjectInitializer(@NotNull ClassDescriptor companionObject) {
        ExpressionCodegen codegen = createOrGetClInitCodegen();
        FunctionDescriptor constructor = (FunctionDescriptor) context.accessibleDescriptor(
-                KotlinPackage.single(companionObject.getConstructors()), /* superCallExpression = */ null
+                CollectionsKt.single(companionObject.getConstructors()), /* superCallExpression = */ null
        );
        generateMethodCallTo(constructor, null, codegen.v);
        codegen.v.dup();
@@ -1674,7 +1673,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
    private void generateEnumEntries() {
        if (descriptor.getKind() != ClassKind.ENUM_CLASS) return;
-        List<JetEnumEntry> enumEntries = KotlinPackage.filterIsInstance(element.getDeclarations(), JetEnumEntry.class);
+        List<JetEnumEntry> enumEntries = CollectionsKt.filterIsInstance(element.getDeclarations(), JetEnumEntry.class);
        for (JetEnumEntry enumEntry : enumEntries) {
            ClassDescriptor descriptor = getNotNull(bindingContext, BindingContext.CLASS, enumEntry);
@@ -17,7 +17,8 @@
 package org.jetbrains.kotlin.codegen;
 import com.intellij.psi.PsiElement;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.StringsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -123,7 +124,7 @@ public class JvmCodegenUtil {
    }
    public static boolean hasAbstractMembers(@NotNull ClassDescriptor classDescriptor) {
-        return KotlinPackage.any(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors(),
+        return CollectionsKt.any(classDescriptor.getDefaultType().getMemberScope().getAllDescriptors(),
                                 new Function1<DeclarationDescriptor, Boolean>() {
                                     @Override
                                     public Boolean invoke(DeclarationDescriptor descriptor) {
@@ -220,7 +221,7 @@ public class JvmCodegenUtil {
    @NotNull
    public static String getModuleName(ModuleDescriptor module) {
-        return KotlinPackage.removeSurrounding(module.getName().asString(), "<", ">");
+        return StringsKt.removeSurrounding(module.getName().asString(), "<", ">");
    }
    @NotNull
@@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import kotlin.StringsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
@@ -44,9 +45,6 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils;
 import org.jetbrains.kotlin.resolve.descriptorUtil.DescriptorUtilPackage;
 import org.jetbrains.kotlin.resolve.jvm.AsmTypes;
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName;
 import org.jetbrains.kotlin.serialization.ProtoBuf;
 import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedSimpleFunctionDescriptor;
 import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf;
 import org.jetbrains.kotlin.types.expressions.OperatorConventions;
 import org.jetbrains.org.objectweb.asm.*;
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter;
@@ -59,7 +57,6 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ListIterator;
 import static kotlin.KotlinPackage.substringAfterLast;
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName;
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.isInterface;
@@ -157,7 +154,7 @@ public class InlineCodegenUtil {
    @Nullable
    public static VirtualFile findVirtualFile(@NotNull Project project, @NotNull String internalClassName) {
        FqName packageFqName = JvmClassName.byInternalName(internalClassName).getPackageFqName();
-        String classNameWithDollars = substringAfterLast(internalClassName, "/", internalClassName);
+        String classNameWithDollars = StringsKt.substringAfterLast(internalClassName, "/", internalClassName);
        JvmVirtualFileFinder fileFinder = JvmVirtualFileFinder.SERVICE.getInstance(project);
        //TODO: we cannot construct proper classId at this point, we need to read InnerClasses info from class file
        // we construct valid.package.name/RelativeClassNameAsSingleName that should work in compiler, but fails for inner classes in IDE
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cli.common.messages;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.util.LineSeparator;
-import kotlin.KotlinPackage;
+import kotlin.StringsKt;
 import org.fusesource.jansi.Ansi;
 import org.fusesource.jansi.internal.CLibrary;
 import org.jetbrains.annotations.NotNull;
@@ -100,7 +100,7 @@ public abstract class PlainTextMessageRenderer implements MessageRenderer {
            result.append(LINE_SEPARATOR);
            result.append(lineContent);
            result.append(LINE_SEPARATOR);
-            result.append(KotlinPackage.repeat(" ", column - 1));
+            result.append(StringsKt.repeat(" ", column - 1));
            result.append("^");
        }
@@ -120,7 +120,7 @@ public abstract class PlainTextMessageRenderer implements MessageRenderer {
            return message;
        }
-        return KotlinPackage.decapitalize(message);
+        return StringsKt.decapitalize(message);
    }
    @NotNull
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.java.structure.impl;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiSubstitutorImpl;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -98,7 +98,7 @@ public class JavaClassImpl extends JavaClassifierImpl<PsiClass> implements JavaC
    @Override
    @NotNull
    public Collection<JavaMethod> getMethods() {
-        return methods(KotlinPackage.filter(getPsi().getMethods(), new Function1<PsiMethod, Boolean>() {
+        return methods(ArraysKt.filter(getPsi().getMethods(), new Function1<PsiMethod, Boolean>() {
            @Override
            public Boolean invoke(PsiMethod method) {
                return !method.isConstructor();
@@ -110,7 +110,7 @@ public class JavaClassImpl extends JavaClassifierImpl<PsiClass> implements JavaC
    @NotNull
    public Collection<JavaField> getFields() {
        // ex. Android plugin generates LightFields for resources started from '.' (.DS_Store file etc)
-        return fields(KotlinPackage.filter(getPsi().getFields(), new Function1<PsiField, Boolean>() {
+        return fields(ArraysKt.filter(getPsi().getFields(), new Function1<PsiField, Boolean>() {
            @Override
            public Boolean invoke(PsiField field) {
                String name = field.getName();
@@ -122,7 +122,7 @@ public class JavaClassImpl extends JavaClassifierImpl<PsiClass> implements JavaC
    @Override
    @NotNull
    public Collection<JavaConstructor> getConstructors() {
-        return constructors(KotlinPackage.filter(getPsi().getConstructors(), new Function1<PsiMethod, Boolean>() {
+        return constructors(ArraysKt.filter(getPsi().getConstructors(), new Function1<PsiMethod, Boolean>() {
            @Override
            public Boolean invoke(PsiMethod method) {
                // See for example org.jetbrains.plugins.scala.lang.psi.light.ScFunctionWrapper,
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.load.java.structure.impl;
 import com.intellij.psi.*;
 import com.intellij.psi.search.GlobalSearchScope;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.load.java.structure.*;
@@ -138,7 +138,7 @@ public class JavaElementCollectionFromPsiArrayUtil {
    @NotNull
    private static <Psi, Java> List<Java> convert(@NotNull Iterable<Psi> elements, @NotNull final Factory<Psi, Java> factory) {
        if (!elements.iterator().hasNext()) return Collections.emptyList();
-        return KotlinPackage.map(elements, new Function1<Psi, Java>() {
+        return CollectionsKt.map(elements, new Function1<Psi, Java>() {
            @Override
            public Java invoke(Psi psi) {
                return factory.create(psi);
@@ -36,7 +36,8 @@ import com.intellij.util.ConcurrencyUtil;
 import com.intellij.util.Query;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.MessageBus;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus;
@@ -153,7 +154,7 @@ public class KotlinJavaPsiFacade {
        List<KotlinPsiElementFinderWrapper> elementFinders = new ArrayList<KotlinPsiElementFinderWrapper>();
        elementFinders.add(new KotlinPsiElementFinderImpl(getProject()));
-        List<PsiElementFinder> nonKotlinFinders = KotlinPackage.filter(
+        List<PsiElementFinder> nonKotlinFinders = ArraysKt.filter(
                getProject().getExtensions(PsiElementFinder.EP_NAME), new Function1<PsiElementFinder, Boolean>() {
                    @Override
                    public Boolean invoke(PsiElementFinder finder) {
@@ -161,7 +162,7 @@ public class KotlinJavaPsiFacade {
                    }
                });
-        elementFinders.addAll(KotlinPackage.map(nonKotlinFinders, new Function1<PsiElementFinder, KotlinPsiElementFinderWrapper>() {
+        elementFinders.addAll(CollectionsKt.map(nonKotlinFinders, new Function1<PsiElementFinder, KotlinPsiElementFinderWrapper>() {
            @Override
            public KotlinPsiElementFinderWrapper invoke(PsiElementFinder finder) {
                return wrap(finder);
@@ -21,7 +21,7 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -274,7 +274,7 @@ public class SignaturesPropagationData {
            }
        }
-        boolean hasStableParameterNames = KotlinPackage.any(superFunctions, new Function1<FunctionDescriptor, Boolean>() {
+        boolean hasStableParameterNames = CollectionsKt.any(superFunctions, new Function1<FunctionDescriptor, Boolean>() {
            @Override
            public Boolean invoke(FunctionDescriptor descriptor) {
                return descriptor.hasStableParameterNames();
@@ -286,7 +286,7 @@ public class SignaturesPropagationData {
    @NotNull
    private static List<TypeAndVariance> convertToTypeVarianceList(@NotNull List<TypeAndName> list) {
-        return KotlinPackage.map(list, new Function1<TypeAndName, TypeAndVariance>() {
+        return CollectionsKt.map(list, new Function1<TypeAndName, TypeAndVariance>() {
            @Override
            public TypeAndVariance invoke(TypeAndName tvn) {
                return new TypeAndVariance(tvn.type, INVARIANT);
@@ -22,7 +22,8 @@ import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.SmartFMap;
 import com.intellij.util.containers.ContainerUtil;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -244,8 +245,8 @@ public class JetControlFlowProcessor {
        private List<PseudoValue> elementsToValues(List<? extends JetElement> from) {
            if (from.isEmpty()) return Collections.emptyList();
-            return KotlinPackage.filterNotNull(
+            return CollectionsKt.filterNotNull(
-                    KotlinPackage.map(
+                    CollectionsKt.map(
                            from,
                            new Function1<JetElement, PseudoValue>() {
                                @Override
@@ -496,7 +497,7 @@ public class JetControlFlowProcessor {
            if (setResolvedCall == null) {
                generateArrayAccess(lhs, null);
-                List<PseudoValue> arguments = KotlinPackage.filterNotNull(
+                List<PseudoValue> arguments = CollectionsKt.filterNotNull(
                        Arrays.asList(getBoundOrUnreachableValue(lhs), rhsDeferredValue.invoke())
                );
                builder.magic(parentExpression, parentExpression, arguments, MagicKind.UNRESOLVED_CALL);
@@ -527,7 +528,7 @@ public class JetControlFlowProcessor {
                Function0<PseudoValue> rhsDeferredValue,
                final ResolvedCall<FunctionDescriptor> setResolvedCall
        ) {
-            List<ValueArgument> valueArguments = KotlinPackage.flatMapTo(
+            List<ValueArgument> valueArguments = CollectionsKt.flatMapTo(
                    setResolvedCall.getResultingDescriptor().getValueParameters(),
                    new ArrayList<ValueArgument>(),
                    new Function1<ValueParameterDescriptor, Iterable<? extends ValueArgument>>() {
@@ -541,7 +542,7 @@ public class JetControlFlowProcessor {
                    }
            );
-            ValueArgument rhsArgument = KotlinPackage.lastOrNull(valueArguments);
+            ValueArgument rhsArgument = CollectionsKt.lastOrNull(valueArguments);
            SmartFMap<PseudoValue, ValueParameterDescriptor> argumentValues = SmartFMap.emptyMap();
            for (ValueArgument valueArgument : valueArguments) {
                ArgumentMapping argumentMapping = setResolvedCall.getArgumentMapping(valueArgument);
@@ -1051,7 +1052,7 @@ public class JetControlFlowProcessor {
                builder.loadUnit(expression);
            }
            else {
-                copyValue(KotlinPackage.lastOrNull(statements), expression);
+                copyValue(CollectionsKt.lastOrNull(statements), expression);
            }
            if (declareLexicalScope) {
                builder.exitLexicalScope(expression);
@@ -1279,7 +1280,7 @@ public class JetControlFlowProcessor {
                if (!isElse) {
                    nextLabel = builder.createUnboundLabel("next 'when' entry");
-                    JetWhenCondition lastCondition = KotlinPackage.lastOrNull(conditions);
+                    JetWhenCondition lastCondition = ArraysKt.lastOrNull(conditions);
                    builder.nondeterministicJump(nextLabel, expression, builder.getBoundValue(lastCondition));
                }
@@ -1415,7 +1416,7 @@ public class JetControlFlowProcessor {
        private void generateCallOrMarkUnresolved(@Nullable JetCallElement call) {
            if (call == null) return;
            if (!generateCall(call)) {
-                List<JetExpression> arguments = KotlinPackage.map(
+                List<JetExpression> arguments = CollectionsKt.map(
                        call.getValueArguments(),
                        new Function1<ValueArgument, JetExpression>() {
                            @Override
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.cfg.pseudocode;
 import com.google.common.collect.*;
 import com.intellij.util.containers.BidirectionalMap;
-import kotlin.KotlinPackage;
+import kotlin.MapsKt;
 import kotlin.jvm.functions.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -315,7 +315,7 @@ public class PseudocodeImpl implements Pseudocode {
    private void addValueUsage(PseudoValue value, Instruction usage) {
        if (usage instanceof MergeInstruction) return;
-        KotlinPackage.getOrPut(
+        MapsKt.getOrPut(
                valueUsages,
                value,
                new Function0<List<Instruction>>() {
@@ -20,7 +20,7 @@ import com.google.common.collect.Lists;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.TokenSet;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -98,7 +98,7 @@ public class JetClassBody extends JetElementImplStub<KotlinPlaceHolderStub<JetCl
     */
    @NotNull
    public List<JetAnnotationEntry> getDanglingAnnotations() {
-        return KotlinPackage.flatMap(
+        return CollectionsKt.flatMap(
                getStubOrPsiChildrenAsList(MODIFIER_LIST),
                new Function1<JetModifierList, Iterable<JetAnnotationEntry>>() {
                    @Override
@@ -26,7 +26,7 @@ import com.intellij.psi.PsiClassOwner;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.util.PsiTreeUtil;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -252,7 +252,7 @@ public class JetFile extends PsiFileBase implements JetDeclarationContainer, Jet
                                                          JetStubElementTypes.MODIFIER_LIST,
                                                          JetStubElementTypes.MODIFIER_LIST.getArrayFactory()
                                                  );
-        return KotlinPackage.flatMap(
+        return ArraysKt.flatMap(
                danglingModifierLists,
                new Function1<JetModifierList, Iterable<JetAnnotationEntry>>() {
                    @Override
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.resolve;
-import kotlin.KotlinPackage;
+import kotlin.SetsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
@@ -51,7 +51,7 @@ import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumClass;
 public class CompileTimeConstantUtils {
-    private final static Set<String> ARRAY_CALL_NAMES = KotlinPackage.hashSetOf(
+    private final static Set<String> ARRAY_CALL_NAMES = SetsKt.hashSetOf(
            "kotlin.arrayOf", "kotlin.doubleArrayOf", "kotlin.floatArrayOf", "kotlin.longArrayOf", "kotlin.intArrayOf", "kotlin.charArrayOf",
            "kotlin.shortArrayOf", "kotlin.byteArrayOf", "kotlin.booleanArrayOf"
    );
@@ -20,7 +20,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.intellij.psi.PsiElement;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.SetsKt;
 import kotlin.jvm.functions.Function0;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -351,7 +352,7 @@ public class DescriptorResolver {
        if (modifierList != null) {
            if (valueParameter.hasValOrVar()) {
                AnnotationSplitter annotationSplitter = AnnotationSplitter.create(
-                        storageManager, allAnnotations, KotlinPackage.setOf(CONSTRUCTOR_PARAMETER));
+                        storageManager, allAnnotations, SetsKt.setOf(CONSTRUCTOR_PARAMETER));
                valueParameterAnnotations = annotationSplitter.getAnnotationsForTarget(CONSTRUCTOR_PARAMETER);
            }
            else {
@@ -736,7 +737,7 @@ public class DescriptorResolver {
            }
        });
-        Annotations propertyAnnotations = new CompositeAnnotations(KotlinPackage.listOf(
+        Annotations propertyAnnotations = new CompositeAnnotations(CollectionsKt.listOf(
                annotationSplitter.getAnnotationsForTargets(PROPERTY, FIELD),
                annotationSplitter.getOtherAnnotations()));
@@ -987,7 +988,7 @@ public class DescriptorResolver {
        JetPropertyAccessor setter = property.getSetter();
        PropertySetterDescriptorImpl setterDescriptor = null;
        if (setter != null) {
-            Annotations annotations = new CompositeAnnotations(KotlinPackage.listOf(
+            Annotations annotations = new CompositeAnnotations(CollectionsKt.listOf(
                    annotationSplitter.getAnnotationsForTarget(PROPERTY_SETTER),
                    annotationResolver.resolveAnnotationsWithoutArguments(scope, setter.getModifierList(), trace)));
            JetParameter parameter = setter.getParameter();
@@ -1057,7 +1058,7 @@ public class DescriptorResolver {
        PropertyGetterDescriptorImpl getterDescriptor;
        JetPropertyAccessor getter = property.getGetter();
        if (getter != null) {
-            Annotations getterAnnotations = new CompositeAnnotations(KotlinPackage.listOf(
+            Annotations getterAnnotations = new CompositeAnnotations(CollectionsKt.listOf(
                    annotationSplitter.getAnnotationsForTarget(PROPERTY_GETTER),
                    annotationSplitter.getOtherAnnotations(),
                    annotationResolver.resolveAnnotationsWithoutArguments(scope, getter.getModifierList(), trace)));
@@ -1137,7 +1138,7 @@ public class DescriptorResolver {
                                   getDispatchReceiverParameterIfNeeded(classDescriptor), (ReceiverParameterDescriptor) null);
        Annotations setterAnnotations = annotationSplitter.getAnnotationsForTarget(PROPERTY_SETTER);
-        Annotations getterAnnotations = new CompositeAnnotations(KotlinPackage.listOf(
+        Annotations getterAnnotations = new CompositeAnnotations(CollectionsKt.listOf(
                annotationSplitter.getAnnotationsForTarget(PROPERTY_GETTER)));
        PropertyGetterDescriptorImpl getter = DescriptorFactory.createDefaultGetter(propertyDescriptor, getterAnnotations);
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.resolve;
 import com.intellij.psi.PsiElement;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.descriptors.PackageFragmentProvider;
 import org.jetbrains.kotlin.descriptors.impl.CompositePackageFragmentProvider;
@@ -56,7 +56,7 @@ public class LazyTopDownAnalyzerForTopLevel {
            provider = codeAnalyzer.getPackageFragmentProvider();
        }
        else {
-            provider = new CompositePackageFragmentProvider(KotlinPackage.plus(
+            provider = new CompositePackageFragmentProvider(CollectionsKt.plus(
                    Arrays.asList(codeAnalyzer.getPackageFragmentProvider()),
                    additionalProviders));
        }
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.resolve;
 import com.google.common.collect.Maps;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -159,7 +159,7 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
    @NotNull
    public Collection<ClassDescriptorWithResolutionScopes> getAllClasses() {
        // SCRIPT: all classes are declared classes + script classes
-        Collection<ClassDescriptorWithResolutionScopes> scriptClasses = KotlinPackage.map(
+        Collection<ClassDescriptorWithResolutionScopes> scriptClasses = CollectionsKt.map(
                getScripts().values(),
                new Function1<ScriptDescriptor, ClassDescriptorWithResolutionScopes>() {
                    @Override
@@ -168,6 +168,6 @@ public class TopDownAnalysisContext implements BodiesResolveContext {
                    }
                }
        );
-        return KotlinPackage.plus(getDeclaredClasses().values(), scriptClasses);
+        return CollectionsKt.plus(getDeclaredClasses().values(), scriptClasses);
    }
 }
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.resolve.calls.smartcasts;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -73,10 +73,10 @@ public class SmartCastManager {
    ) {
        final List<JetType> variants = getSmartCastVariants(receiverToCast, bindingContext,
                                                            containingDeclarationOrModule, dataFlowInfo);
-        return KotlinPackage.filter(variants, new Function1<JetType, Boolean>() {
+        return CollectionsKt.filter(variants, new Function1<JetType, Boolean>() {
            @Override
            public Boolean invoke(final JetType type) {
-                return !KotlinPackage.any(variants, new Function1<JetType, Boolean>() {
+                return !CollectionsKt.any(variants, new Function1<JetType, Boolean>() {
                    @Override
                    public Boolean invoke(JetType another) {
                        return another != type && JetTypeChecker.DEFAULT.isSubtypeOf(another, type);
@@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.constants.ArrayValue;
 import org.jetbrains.kotlin.resolve.constants.ConstantValue;
 import org.jetbrains.kotlin.resolve.constants.EnumValue;
-import static kotlin.KotlinPackage.firstOrNull;
+import static kotlin.CollectionsKt.firstOrNull;
 public class InlineUtil {
    public static boolean isInlineLambdaParameter(@NotNull ParameterDescriptor valueParameterOrReceiver) {
@@ -21,7 +21,7 @@ import com.google.common.collect.Collections2;
 import com.google.common.collect.Lists;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiNameIdentifierOwner;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
@@ -59,7 +59,7 @@ import org.jetbrains.kotlin.types.TypeUtils;
 import java.util.*;
-import static kotlin.KotlinPackage.firstOrNull;
+import static kotlin.CollectionsKt.firstOrNull;
 import static org.jetbrains.kotlin.diagnostics.Errors.CYCLIC_INHERITANCE_HIERARCHY;
 import static org.jetbrains.kotlin.diagnostics.Errors.TYPE_PARAMETERS_IN_ENUM;
 import static org.jetbrains.kotlin.resolve.BindingContext.TYPE;
@@ -280,7 +280,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
    @Override
    public Collection<CallableMemberDescriptor> getDeclaredCallableMembers() {
        //noinspection unchecked
-        return (Collection) KotlinPackage.filter(
+        return (Collection) CollectionsKt.filter(
                unsubstitutedMemberScope.getAllDescriptors(),
                new Function1<DeclarationDescriptor, Boolean>() {
                    @Override
@@ -325,8 +325,8 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
    public List<ClassDescriptor> getDescriptorsForExtraCompanionObjects() {
        final JetObjectDeclaration allowedCompanionObject = getCompanionObjectIfAllowed();
-        return KotlinPackage.map(
+        return CollectionsKt.map(
-                KotlinPackage.filter(
+                CollectionsKt.filter(
                        declarationProvider.getOwnerInfo().getCompanionObjects(),
                        new Function1<JetObjectDeclaration, Boolean>() {
                            @Override
@@ -492,7 +492,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
        @NotNull
        public Collection<JetType> getAllSupertypes() {
-            return KotlinPackage.plus(trueSupertypes, cyclicSupertypes);
+            return CollectionsKt.plus(trueSupertypes, cyclicSupertypes);
        }
    }
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -574,7 +574,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
    private static JetType substituteWithStarProjections(@NotNull ClassDescriptor descriptor) {
        TypeConstructor typeConstructor = descriptor.getTypeConstructor();
        List<TypeProjection> arguments =
-                KotlinPackage.map(typeConstructor.getParameters(), new Function1<TypeParameterDescriptor, TypeProjection>() {
+                CollectionsKt.map(typeConstructor.getParameters(), new Function1<TypeParameterDescriptor, TypeProjection>() {
                    @Override
                    public TypeProjection invoke(TypeParameterDescriptor descriptor) {
                        return TypeUtils.makeStarProjection(descriptor);
@@ -28,7 +28,7 @@ import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -145,7 +145,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem
    @NotNull
    @Override
    public List<PsiMethod> getOwnMethods() {
-        return KotlinPackage.map(getDelegate().getMethods(), new Function1<PsiMethod, PsiMethod>() {
+        return ArraysKt.map(getDelegate().getMethods(), new Function1<PsiMethod, PsiMethod>() {
            @Override
            public PsiMethod invoke(PsiMethod method) {
                JetDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(method);
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.serialization;
 import com.google.protobuf.MessageLite;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -474,7 +474,7 @@ public class DescriptorSerializer {
        }
        Set<JetType> upperBounds = typeParameter.getUpperBounds();
-        if (upperBounds.size() == 1 && KotlinBuiltIns.isDefaultBound(KotlinPackage.single(upperBounds))) return builder;
+        if (upperBounds.size() == 1 && KotlinBuiltIns.isDefaultBound(CollectionsKt.single(upperBounds))) return builder;
        for (JetType upperBound : upperBounds) {
            builder.addUpperBound(type(upperBound));
@@ -22,7 +22,7 @@ import com.google.common.collect.Sets;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -77,7 +77,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
    @Override
    protected void analyzeAndCheck(File testDataFile, List<TestFile> testFiles) {
-        Map<TestModule, List<TestFile>> groupedByModule = KotlinPackage.groupByTo(
+        Map<TestModule, List<TestFile>> groupedByModule = CollectionsKt.groupByTo(
                testFiles,
                new LinkedHashMap<TestModule, List<TestFile>>(),
                new Function1<TestFile, TestModule>() {
@@ -88,7 +88,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
                }
        );
-        boolean checkLazyResolveLog = KotlinPackage.any(testFiles, new Function1<TestFile, Boolean>() {
+        boolean checkLazyResolveLog = CollectionsKt.any(testFiles, new Function1<TestFile, Boolean>() {
            @Override
            public Boolean invoke(TestFile file) {
                return file.checkLazyLog;
@@ -255,7 +255,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
            List<TestFile> testFiles,
            Map<TestModule, ModuleDescriptorImpl> modules
    ) {
-        if (KotlinPackage.any(testFiles, new Function1<TestFile, Boolean>() {
+        if (CollectionsKt.any(testFiles, new Function1<TestFile, Boolean>() {
            @Override
            public Boolean invoke(TestFile file) {
                return InTextDirectivesUtils.isDirectiveDefined(file.expectedText, "// SKIP_TXT");
@@ -270,7 +270,7 @@ public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest {
        boolean isMultiModuleTest = modules.size() != 1;
        StringBuilder rootPackageText = new StringBuilder();
-        for (TestModule module : KotlinPackage.sort(modules.keySet())) {
+        for (TestModule module : CollectionsKt.sorted(modules.keySet())) {
            ModuleDescriptorImpl moduleDescriptor = modules.get(module);
            PackageViewDescriptor aPackage = moduleDescriptor.getPackage(FqName.ROOT);
            assertFalse(aPackage.isEmpty());
@@ -28,7 +28,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -96,7 +96,7 @@ public abstract class BaseDiagnosticsTest extends
    @Override
    protected void doMultiFileTest(File file, final Map<String, ModuleAndDependencies> modules, List<TestFile> testFiles) {
        for (final ModuleAndDependencies moduleAndDependencies : modules.values()) {
-            List<TestModule> dependencies = KotlinPackage.map(
+            List<TestModule> dependencies = CollectionsKt.map(
                    moduleAndDependencies.dependencies,
                    new Function1<String, TestModule>() {
                        @Override
@@ -347,7 +347,7 @@ public abstract class BaseDiagnosticsTest extends
            final boolean[] ok = { true };
            List<Diagnostic> diagnostics = ContainerUtil.filter(
-                    KotlinPackage.plus(CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, jetFile, markDynamicCalls, dynamicCallDescriptors),
+                    CollectionsKt.plus(CheckerTestUtil.getDiagnosticsIncludingSyntaxErrors(bindingContext, jetFile, markDynamicCalls, dynamicCallDescriptors),
                                       jvmSignatureDiagnostics),
                    whatDiagnosticsToConsider
            );
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.codegen;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Processor;
@@ -69,7 +69,7 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte
        myEnvironment = KotlinCoreEnvironment.createForTests(
                getTestRootDisposable(),
                JetTestUtils.compilerConfigurationForTests(ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK,
-                                                           KotlinPackage.plus(classPath, JetTestUtils.getAnnotationsJar()), classPath),
+                                                           CollectionsKt.plus(classPath, JetTestUtils.getAnnotationsJar()), classPath),
                EnvironmentConfigFiles.JVM_CONFIG_FILES);
        loadFiles(ArrayUtil.toStringArray(sourceFiles));
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.codegen;
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
-import kotlin.KotlinPackage;
+import kotlin.StringsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.analyzer.AnalysisResult;
@@ -128,7 +128,7 @@ public class CodegenTestUtil {
            classpath.addAll(additionalClasspath);
            List<String> options = new ArrayList<String>(Arrays.asList(
-                    "-classpath", KotlinPackage.join(classpath, File.pathSeparator, "", "", -1, ""),
+                    "-classpath", StringsKt.join(classpath, File.pathSeparator, "", "", -1, ""),
                    "-d", javaClassesTempDirectory.getPath()
            ));
            options.addAll(additionalOptions);
@@ -18,6 +18,7 @@ package org.jetbrains.kotlin.serialization.builtins;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.containers.ContainerUtil;
 import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -51,7 +52,6 @@ import java.io.InputStream;
 import java.util.List;
 import java.util.regex.Pattern;
 import static kotlin.KotlinPackage.single;
 import static org.jetbrains.kotlin.builtins.BuiltInsPackageFragmentProviderKt.createBuiltInPackageFragmentProvider;
 import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAME;
 import static org.jetbrains.kotlin.builtins.KotlinBuiltIns.BUILT_INS_PACKAGE_FQ_NAMES;
@@ -122,7 +122,7 @@ public class LoadBuiltinsTest extends KotlinTestWithEnvironment {
        builtInsModule.initialize(packageFragmentProvider);
        builtInsModule.setDependencies(builtInsModule);
-        return single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME));
+        return CollectionsKt.single(packageFragmentProvider.getPackageFragments(BUILT_INS_PACKAGE_FQ_NAME));
    }
    @NotNull
@@ -38,7 +38,8 @@ import com.intellij.util.Function;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import junit.framework.TestCase;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.SetsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -719,7 +720,7 @@ public class JetTestUtils {
    @NotNull
    public static String getLastCommentInFile(@NotNull JetFile file) {
-        return KotlinPackage.first(getLastCommentsInFile(file, CommentType.ALL, true));
+        return CollectionsKt.first(getLastCommentsInFile(file, CommentType.ALL, true));
    }
    @NotNull
@@ -821,7 +822,7 @@ public class JetTestUtils {
        File rootFile = new File(rootPath);
        Set<String> filePaths = collectPathsMetadata(testCaseClass);
-        Set<String> exclude = KotlinPackage.setOf(excludeDirs);
+        Set<String> exclude = SetsKt.setOf(excludeDirs);
        File[] files = testDataDir.listFiles();
        if (files != null) {
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.utils;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -61,7 +61,7 @@ public final class Interner<T> {
    @NotNull
    public List<T> getAllInternedObjects() {
-        return KotlinPackage.sortedBy(interned.keySet(), new Function1<T, Integer>() {
+        return CollectionsKt.sortedBy(interned.keySet(), new Function1<T, Integer>() {
            @Override
            public Integer invoke(T key) {
                return interned.get(key);
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.load.java;
-import kotlin.KotlinPackage;
+import kotlin.SetsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.name.ClassId;
 import org.jetbrains.kotlin.name.FqName;
@@ -93,7 +93,7 @@ public final class JvmAnnotationNames {
    // When these annotations appear on a declaration, they are copied to the _type_ of the declaration, becoming type annotations
    // See also DescriptorRendererOptions#excludedTypeAnnotationClasses
-    public static final Set<FqName> ANNOTATIONS_COPIED_TO_TYPES = KotlinPackage.setOf(
+    public static final Set<FqName> ANNOTATIONS_COPIED_TO_TYPES = SetsKt.setOf(
            JETBRAINS_READONLY_ANNOTATION,
            JETBRAINS_MUTABLE_ANNOTATION,
            JETBRAINS_NOT_NULL_ANNOTATION,
@@ -36,7 +36,7 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil;
 import javax.inject.Inject;
 import java.util.*;
-import static kotlin.KotlinPackage.setOf;
+import static kotlin.SetsKt.setOf;
 import static org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader.Kind.*;
 public final class DeserializedDescriptorResolver {
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.builtins;
-import kotlin.KotlinPackage;
+import kotlin.SetsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -40,7 +40,8 @@ import org.jetbrains.kotlin.types.checker.JetTypeChecker;
 import java.io.InputStream;
 import java.util.*;
-import static kotlin.KotlinPackage.*;
+import static kotlin.CollectionsKt.*;
 import static kotlin.SetsKt.*;
 import static org.jetbrains.kotlin.builtins.PrimitiveType.*;
 import static org.jetbrains.kotlin.resolve.DescriptorUtils.getFqName;
@@ -305,7 +306,7 @@ public abstract class KotlinBuiltIns {
    @NotNull
    public Set<DeclarationDescriptor> getIntegralRanges() {
-        return KotlinPackage.<DeclarationDescriptor>setOf(
+        return SetsKt.<DeclarationDescriptor>setOf(
                getBuiltInClassByName("ByteRange"),
                getBuiltInClassByName("ShortRange"),
                getBuiltInClassByName("CharRange"),
@@ -1081,7 +1082,7 @@ public abstract class KotlinBuiltIns {
    @NotNull
    public FunctionDescriptor getIdentityEquals() {
-        return KotlinPackage.first(getBuiltInsPackageFragment().getMemberScope().getFunctions(Name.identifier("identityEquals"),
+        return first(getBuiltInsPackageFragment().getMemberScope().getFunctions(Name.identifier("identityEquals"),
                                                                                              NoLookupLocation.FROM_BUILTINS));
    }
 }
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.descriptors;
-import kotlin.KotlinPackage;
+import kotlin.SetsKt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.resolve.DescriptorUtils;
@@ -199,7 +199,7 @@ public class Visibilities {
    };
    public static final Set<Visibility> INVISIBLE_FROM_OTHER_MODULES =
-            Collections.unmodifiableSet(KotlinPackage.setOf(PRIVATE, PRIVATE_TO_THIS, INTERNAL, LOCAL));
+            Collections.unmodifiableSet(SetsKt.setOf(PRIVATE, PRIVATE_TO_THIS, INTERNAL, LOCAL));
    private Visibilities() {
    }
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.descriptors.impl;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -122,7 +122,7 @@ public class ValueParameterDescriptorImpl extends VariableDescriptorImpl impleme
    @NotNull
    @Override
    public Collection<? extends ValueParameterDescriptor> getOverriddenDescriptors() {
-        return KotlinPackage.map(
+        return CollectionsKt.map(
                getContainingDeclaration().getOverriddenDescriptors(),
                new Function1<CallableDescriptor, ValueParameterDescriptor>() {
                    @Override
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.resolve;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.KotlinSignature;
 import kotlin.jvm.functions.Function1;
@@ -40,7 +40,7 @@ import static org.jetbrains.kotlin.resolve.OverridingUtil.OverrideCompatibilityI
 public class OverridingUtil {
    private static final List<ExternalOverridabilityCondition> EXTERNAL_CONDITIONS =
-            KotlinPackage.toList(ServiceLoader.load(
+            CollectionsKt.toList(ServiceLoader.load(
                    ExternalOverridabilityCondition.class,
                    ExternalOverridabilityCondition.class.getClassLoader()
            ));
@@ -364,7 +364,7 @@ public class OverridingUtil {
            @NotNull final ClassDescriptor current,
            @NotNull Collection<CallableMemberDescriptor> toFilter
    ) {
-        return KotlinPackage.filter(toFilter, new Function1<CallableMemberDescriptor, Boolean>() {
+        return CollectionsKt.filter(toFilter, new Function1<CallableMemberDescriptor, Boolean>() {
            @Override
            public Boolean invoke(CallableMemberDescriptor descriptor) {
                //nested class could capture private member, so check for private visibility added
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.types;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -68,7 +68,7 @@ public class CommonSupertypes {
    }
    private static int depth(@NotNull final JetType type) {
-        return 1 + maxDepth(KotlinPackage.map(type.getArguments(), new Function1<TypeProjection, JetType>() {
+        return 1 + maxDepth(CollectionsKt.map(type.getArguments(), new Function1<TypeProjection, JetType>() {
            @Override
            public JetType invoke(TypeProjection projection) {
                if (projection.isStarProjection()) {
@@ -105,7 +105,7 @@ public class CommonSupertypes {
        return DelegatingFlexibleType.create(
                commonSuperTypeForInflexible(lower, recursionDepth, maxDepth),
                commonSuperTypeForInflexible(upper, recursionDepth, maxDepth),
-                KotlinPackage.single(capabilities) // mixing different capabilities is not supported
+                CollectionsKt.single(capabilities) // mixing different capabilities is not supported
        );
    }
@@ -44,8 +44,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import static kotlin.KotlinPackage.emptyList;
+import static kotlin.CollectionsKt.emptyList;
-import static kotlin.KotlinPackage.joinToString;
+import static kotlin.CollectionsKt.joinToString;
 public class ErrorUtils {
@@ -16,7 +16,7 @@
 package org.jetbrains.kotlin.types;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -362,7 +362,7 @@ public class TypeUtils {
    @NotNull
    public static JetType substituteParameters(@NotNull ClassDescriptor clazz, @NotNull List<JetType> typeArguments) {
-        List<TypeProjection> projections = KotlinPackage.map(typeArguments, new Function1<JetType, TypeProjection>() {
+        List<TypeProjection> projections = CollectionsKt.map(typeArguments, new Function1<JetType, TypeProjection>() {
            @Override
            public TypeProjection invoke(JetType type) {
                return new TypeProjectionImpl(type);
@@ -394,7 +394,7 @@ public class TypeUtils {
    }
    public static boolean dependsOnTypeParameters(@NotNull JetType type, @NotNull Collection<TypeParameterDescriptor> typeParameters) {
-        return dependsOnTypeConstructors(type, KotlinPackage.map(
+        return dependsOnTypeConstructors(type, CollectionsKt.map(
                typeParameters,
                new Function1<TypeParameterDescriptor, TypeConstructor>() {
                    @Override
@@ -36,7 +36,7 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.Set;
-import static kotlin.KotlinPackage.single;
+import static kotlin.CollectionsKt.single;
 public class TestGenerator {
@@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.configuration.ui.NonConfiguredKotlinProjectComp
 import javax.swing.event.HyperlinkEvent;
 import java.util.Collection;
-import static kotlin.KotlinPackage.first;
+import static kotlin.CollectionsKt.first;
 public class ConfigureKotlinNotification extends Notification {
    private static final String TITLE = "Configure Kotlin";
@@ -23,7 +23,7 @@ import com.intellij.execution.filters.OpenFileHyperlinkInfo;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.search.GlobalSearchScope;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -95,7 +95,7 @@ public class JetExceptionFilter implements Filter {
        final HyperlinkInfo newHyperlinkInfo = createHyperlinkInfo(line);
        if (newHyperlinkInfo == null) return result;
-        return new Result(KotlinPackage.map(result.getResultItems(), new Function1<ResultItem, ResultItem>() {
+        return new Result(CollectionsKt.map(result.getResultItems(), new Function1<ResultItem, ResultItem>() {
            @Override
            public ResultItem invoke(ResultItem item) {
                return new ResultItem(item.getHighlightStartOffset(), item.getHighlightEndOffset(), newHyperlinkInfo,
@@ -38,7 +38,7 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.containers.MultiMap;
-import kotlin.KotlinPackage;
+import kotlin.*;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -109,7 +109,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
    @Nullable
    private static OriginalJavaMethodDescriptorWrapper getOriginalJavaMethodDescriptorWrapper(@NotNull UsageInfo[] usages) {
-        return KotlinPackage.firstOrNull(KotlinPackage.filterIsInstance(usages, OriginalJavaMethodDescriptorWrapper.class));
+        return CollectionsKt.firstOrNull(ArraysKt.filterIsInstance(usages, OriginalJavaMethodDescriptorWrapper.class));
    }
    // It's here to prevent O(usage_count^2) performance
@@ -190,7 +190,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
        }
        JetElement body = ChangeSignaturePackage.getDeclarationBody(element);
-        final Set<String> newParameterNames = KotlinPackage.mapTo(
+        final Set<String> newParameterNames = CollectionsKt.mapTo(
                changeInfo.getNonReceiverParameters(),
                new HashSet<String>(),
                new Function1<JetParameterInfo, String>() {
@@ -588,7 +588,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
        // Delete OverriderUsageInfo and CallerUsageInfo for Kotlin declarations since they can't be processed correctly
        // TODO (OverriderUsageInfo only): Drop when OverriderUsageInfo.getElement() gets deleted
        UsageInfo[] usageInfos = refUsages.get();
-        List<UsageInfo> adjustedUsages = KotlinPackage.filterNot(
+        List<UsageInfo> adjustedUsages = ArraysKt.filterNot(
                usageInfos,
                new Function1<UsageInfo, Boolean>() {
                    @Override
@@ -694,7 +694,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
            DeclarationDescriptor callerDescriptor
    ) {
        List<JetParameter> valueParameters = PsiUtilPackage.getValueParameters(caller);
-        Map<String, JetParameter> existingParameters = KotlinPackage.toMap(
+        Map<String, JetParameter> existingParameters = CollectionsKt.toMap(
                valueParameters,
                new Function1<JetParameter, String>() {
                    @Override
@@ -796,7 +796,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
            JetParameterInfo newReceiverInfo
    ) {
        if (newReceiverInfo != null && (callable instanceof JetNamedFunction) && ((JetNamedFunction) callable).getBodyExpression() != null) {
-            Map<JetReferenceExpression, BindingContext> noReceiverRefToContext = KotlinPackage.filter(
+            Map<JetReferenceExpression, BindingContext> noReceiverRefToContext = MapsKt.filter(
                    JetFileReferencesResolver.INSTANCE$.resolve((JetNamedFunction) callable, true, true),
                    new Function1<Map.Entry<? extends JetReferenceExpression, ? extends BindingContext>, Boolean>() {
                        @Override
@@ -848,7 +848,7 @@ public class JetChangeSignatureUsageProcessor implements ChangeSignatureUsagePro
                    String prefix = declaration != null ? RefactoringUIUtil.getDescription(declaration, true) : originalRef.getText();
                    result.putValue(
                            originalRef,
-                            KotlinPackage.capitalize(prefix + " will no longer be accessible after signature change")
+                            StringsKt.capitalize(prefix + " will no longer be accessible after signature change")
                    );
                }
            }
@@ -22,7 +22,7 @@ import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.usageView.UsageInfo;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -331,7 +331,7 @@ public class JetCallableDefinitionUsage<T extends PsiElement> extends JetUsageIn
        if (oldCount > commonCount) {
            parameterList.deleteChildRange(oldParameters.get(commonCount - 1).getNextSibling(),
-                                           KotlinPackage.last(oldParameters));
+                                           CollectionsKt.last(oldParameters));
        }
        else if (newCount > commonCount) {
            parameterList.addRangeAfter(newParameters.get(commonCount - 1).getNextSibling(),
@@ -24,7 +24,7 @@ import com.intellij.usageView.UsageInfo;
 import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.TIntArrayList;
 import gnu.trove.TIntProcedure;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Pair;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
@@ -432,11 +432,11 @@ public class JetFunctionCallUsage extends JetUsageInfo<JetCallElement> {
        List<JetFunctionLiteralArgument> lambdaArguments = element.getFunctionLiteralArguments();
        if (!lambdaArguments.isEmpty()) {
-            element.deleteChildRange(KotlinPackage.first(lambdaArguments), KotlinPackage.last(lambdaArguments));
+            element.deleteChildRange(CollectionsKt.first(lambdaArguments), CollectionsKt.last(lambdaArguments));
        }
        //TODO: this is not correct!
-        JetValueArgument lastArgument = KotlinPackage.lastOrNull(newArgumentList.getArguments());
+        JetValueArgument lastArgument = CollectionsKt.lastOrNull(newArgumentList.getArguments());
        boolean hasTrailingLambdaInArgumentListAfter =
                lastArgument != null && PsiPackage.unpackFunctionLiteral(lastArgument.getArgumentExpression()) != null;
@@ -42,7 +42,7 @@ import com.intellij.refactoring.RefactoringBundle;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
 import com.intellij.refactoring.util.RefactoringMessageDialog;
 import com.intellij.util.Function;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Pair;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -139,7 +139,7 @@ public class KotlinInlineValHandler extends InlineActionHandler {
        final String typeArgumentsForCall = getTypeArgumentsStringForCall(initializer);
        final String parametersForFunctionLiteral = getParametersForFunctionLiteral(initializer);
-        final boolean canHighlight = KotlinPackage.all(
+        final boolean canHighlight = CollectionsKt.all(
                referenceExpressions,
                new Function1<JetExpression, Boolean>() {
                    @Override
@@ -25,7 +25,7 @@ import com.intellij.ui.table.JBTable;
 import com.intellij.util.Function;
 import com.intellij.util.ui.AbstractTableCellEditor;
 import com.intellij.util.ui.EditableModel;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -108,9 +108,9 @@ public class KotlinParameterTablePanel extends JPanel {
    }
    public void init(@Nullable Parameter receiver, @NotNull List<Parameter> parameters) {
-        parameterInfos = KotlinPackage.mapTo(
+        parameterInfos = CollectionsKt.mapTo(
                parameters,
-                receiver != null ? KotlinPackage.arrayListOf(new ParameterInfo(receiver, true)) : new ArrayList<ParameterInfo>(),
+                receiver != null ? CollectionsKt.arrayListOf(new ParameterInfo(receiver, true)) : new ArrayList<ParameterInfo>(),
                new Function1<Parameter, ParameterInfo>() {
                    @Override
                    public ParameterInfo invoke(Parameter parameter) {
@@ -386,7 +386,7 @@ public class KotlinParameterTablePanel extends JPanel {
    @Nullable
    public ParameterInfo getReceiverInfo() {
-        return KotlinPackage.singleOrNull(
+        return CollectionsKt.singleOrNull(
                parameterInfos,
                new Function1<ParameterInfo, Boolean>() {
                    @Override
@@ -399,7 +399,7 @@ public class KotlinParameterTablePanel extends JPanel {
    @NotNull
    public List<ParameterInfo> getParameterInfos() {
-        return KotlinPackage.filter(
+        return CollectionsKt.filter(
                parameterInfos,
                new Function1<ParameterInfo, Boolean>() {
                    @Override
@@ -35,7 +35,8 @@ import com.intellij.psi.search.SearchScope;
 import com.intellij.refactoring.introduce.inplace.InplaceVariableIntroducer;
 import com.intellij.ui.NonFocusableCheckBox;
 import com.intellij.util.ui.PositionTracker;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -390,8 +391,8 @@ public class KotlinInplaceVariableIntroducer<D extends JetCallableDeclaration> e
    @Override
    protected Collection<PsiReference> collectRefs(SearchScope referencesSearchScope) {
-        return KotlinPackage.map(
+        return CollectionsKt.map(
-                KotlinPackage.filterIsInstance(getOccurrences(), JetSimpleNameExpression.class),
+                ArraysKt.filterIsInstance(getOccurrences(), JetSimpleNameExpression.class),
                new Function1<JetSimpleNameExpression, PsiReference>() {
                    @Override
                    public PsiReference invoke(JetSimpleNameExpression expression) {
@@ -31,7 +31,7 @@ import com.intellij.psi.PsiWhiteSpace;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.refactoring.HelpID;
 import com.intellij.refactoring.introduce.inplace.OccurrencesChooser;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -480,7 +480,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
                            PsiTreeUtil.getParentOfType(replace, JetFunctionLiteralArgument.class);
                    JetCallExpression newCallExpression = CorePackage
                            .moveInsideParenthesesAndReplaceWith(functionLiteralArgument, replacement, bindingContext);
-                    result = KotlinPackage.last(newCallExpression.getValueArguments()).getArgumentExpression();
+                    result = CollectionsKt.last(newCallExpression.getValueArguments()).getArgumentExpression();
                }
                else {
                    result = (JetExpression)replace.replace(replacement);
@@ -528,7 +528,7 @@ public class KotlinIntroduceVariableHandler extends KotlinIntroduceHandlerBase {
    }
    private static List<JetExpression> findOccurrences(PsiElement occurrenceContainer, @NotNull JetExpression originalExpression) {
-        return KotlinPackage.map(
+        return CollectionsKt.map(
                PatternMatchingPackage.toRange(originalExpression).match(occurrenceContainer, JetPsiUnifier.DEFAULT),
                new Function1<JetPsiRange.Match, JetExpression>() {
                    @Override
@@ -55,7 +55,8 @@ import com.intellij.util.Function;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.text.UniqueNameGenerator;
 import com.intellij.util.ui.UIUtil;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function0;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -143,8 +144,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
    }
    private static List<JetFile> getSourceFiles(@NotNull Collection<JetNamedDeclaration> elementsToMove) {
-        return KotlinPackage.distinct(
+        return CollectionsKt.distinct(
-                KotlinPackage.map(
+                CollectionsKt.map(
                        elementsToMove,
                        new Function1<JetNamedDeclaration, JetFile>() {
                            @Override
@@ -158,9 +159,9 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
    @NotNull
    private static PsiDirectory getSourceDirectory(@NotNull Collection<JetFile> sourceFiles) {
-        return KotlinPackage.single(
+        return CollectionsKt.single(
-                KotlinPackage.distinct(
+                CollectionsKt.distinct(
-                        KotlinPackage.map(
+                        CollectionsKt.map(
                                sourceFiles,
                                new Function1<JetFile, PsiDirectory>() {
                                    @Override
@@ -174,8 +175,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
    }
    private static List<JetNamedDeclaration> getAllDeclarations(Collection<JetFile> sourceFiles) {
-        return KotlinPackage.filterIsInstance(
+        return CollectionsKt.filterIsInstance(
-                KotlinPackage.flatMap(
+                CollectionsKt.flatMap(
                        sourceFiles,
                        new Function1<JetFile, Iterable<?>>() {
                            @Override
@@ -199,7 +200,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
            @NotNull final Set<JetNamedDeclaration> elementsToMove,
            @NotNull List<JetFile> sourceFiles
    ) {
-        final List<KotlinMemberInfo> memberInfos = KotlinPackage.map(
+        final List<KotlinMemberInfo> memberInfos = CollectionsKt.map(
                getAllDeclarations(sourceFiles),
                new Function1<JetNamedDeclaration, KotlinMemberInfo>() {
                    @Override
@@ -221,8 +222,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
                    private boolean shouldUpdateFileNameField(final Collection<KotlinMemberInfo> changedMembers) {
                        if (!tfFileNameInPackage.isEnabled()) return true;
-                        Collection<JetNamedDeclaration> previousDeclarations = KotlinPackage.filterNotNull(
+                        Collection<JetNamedDeclaration> previousDeclarations = CollectionsKt.filterNotNull(
-                                KotlinPackage.map(
+                                CollectionsKt.map(
                                        memberInfos,
                                        new Function1<KotlinMemberInfo, JetNamedDeclaration>() {
                                            @Override
@@ -389,7 +390,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
    }
    private boolean isFullFileMove() {
-        Map<JetFile, List<? extends JetNamedDeclaration>> fileToElements = KotlinPackage.groupBy(
+        Map<JetFile, List<? extends JetNamedDeclaration>> fileToElements = CollectionsKt.groupBy(
                getSelectedElementsToMove(),
                new Function1<JetNamedDeclaration, JetFile>() {
                    @Override
@@ -451,7 +452,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
        List<String> fileNames =
                targetFileName != null
                ? Collections.singletonList(targetFileName)
-                : KotlinPackage.map(
+                : CollectionsKt.map(
                        sourceFiles,
                        new Function1<JetFile, String>() {
                            @Override
@@ -461,8 +462,8 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
                        }
                );
-        return KotlinPackage.filterNotNull(
+        return CollectionsKt.filterNotNull(
-                KotlinPackage.map(
+                CollectionsKt.map(
                        fileNames,
                        new Function1<String, PsiFile>() {
                            @Override
@@ -498,7 +499,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
            List<PsiFile> filesExistingInTargetDir = getFilesExistingInTargetDir(sourceFiles, targetFileName, targetDirectory);
            if (!filesExistingInTargetDir.isEmpty()) {
-                if (!KotlinPackage.intersect(sourceFiles, filesExistingInTargetDir).isEmpty()) {
+                if (!CollectionsKt.intersect(sourceFiles, filesExistingInTargetDir).isEmpty()) {
                    setErrorText("Can't move to the original file(s)");
                    return null;
                }
@@ -605,7 +606,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
    }
    private List<JetNamedDeclaration> getSelectedElementsToMove() {
-        return KotlinPackage.map(
+        return CollectionsKt.map(
                memberTable.getSelectedMemberInfos(),
                new Function1<KotlinMemberInfo, JetNamedDeclaration>() {
                    @Override
@@ -698,7 +699,7 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
                                            public void refactoringCompleted() {
                                                try {
                                                    if (targetFileName != null) {
-                                                        KotlinPackage.single(sourceFiles).setName(targetFileName);
+                                                        CollectionsKt.single(sourceFiles).setName(targetFileName);
                                                    }
                                                }
                                                finally {
@@ -712,19 +713,19 @@ public class MoveKotlinTopLevelDeclarationsDialog extends RefactoringDialog {
                                ) {
                                    @Override
                                    protected String getCommandName() {
-                                        return targetFileName != null ? "Move " + KotlinPackage.single(sourceFiles).getName() : "Move";
+                                        return targetFileName != null ? "Move " + CollectionsKt.single(sourceFiles).getName() : "Move";
                                    }
                                    @Override
                                    protected void performRefactoring(@NotNull UsageInfo[] usages) {
                                        if (targetFileName != null) {
-                                            JetFile sourceFile = KotlinPackage.single(sourceFiles);
+                                            JetFile sourceFile = CollectionsKt.single(sourceFiles);
                                            //noinspection ConstantConditions
                                            String temporaryName = UniqueNameGenerator.generateUniqueName(
                                                    "temp",
                                                    "",
                                                    ".kt",
-                                                    KotlinPackage.map(
+                                                    ArraysKt.map(
                                                            sourceFile.getContainingDirectory().getFiles(),
                                                            new Function1<PsiFile, String>() {
                                                                @Override
@@ -43,7 +43,8 @@ import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiPackage;
 import com.intellij.refactoring.listeners.RefactoringElementAdapter;
 import com.intellij.refactoring.listeners.RefactoringElementListener;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
@@ -306,8 +307,8 @@ public class JetRunConfiguration extends ModuleBasedConfiguration<RunConfigurati
    @NotNull
    private static Collection<JetNamedFunction> getMainFunCandidates(@NotNull PsiClass psiClass) {
-        return KotlinPackage.filterNotNull(
+        return CollectionsKt.filterNotNull(
-                KotlinPackage.map(
+                ArraysKt.map(
                        psiClass.getAllMethods(),
                        new Function1<PsiMethod, JetNamedFunction>() {
                            @Override
@@ -32,7 +32,8 @@ import com.intellij.util.CommonProcessors;
 import com.intellij.util.indexing.FileBasedIndex;
 import com.intellij.util.indexing.ID;
 import com.intellij.util.indexing.ScalarIndexExtension;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -278,11 +279,11 @@ public class KotlinRuntimeLibraryUtil {
        Module[] modules = ModuleManager.getInstance(project).getModules();
-        List<Module> modulesToCheck = KotlinPackage.filter(modules, checkModule);
+        List<Module> modulesToCheck = ArraysKt.filter(modules, checkModule);
        if (modulesToCheck.isEmpty()) return Collections.emptyList();
        Collection<BinaryVersion> versions = collectAllKeys(id, modulesToCheck);
-        Set<BinaryVersion> badVersions = Sets.newHashSet(KotlinPackage.filter(versions, checkVersion));
+        Set<BinaryVersion> badVersions = Sets.newHashSet(CollectionsKt.filter(versions, checkVersion));
        Set<VirtualFile> badRoots = Sets.newHashSet();
        ProjectFileIndex fileIndex = ProjectFileIndex.SERVICE.getInstance(project);
@@ -25,7 +25,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.ArrayUtil;
 import com.siyeh.ig.bugs.StaticCallOnSubclassInspection;
 import com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase;
@@ -78,7 +78,7 @@ public class KotlinAndJavaCheckerTest extends KotlinDaemonAnalyzerTestCase {
        List<String> toolsStrings = InTextDirectivesUtils.findListWithPrefixes(configFileText, "TOOL:");
-        return ArrayUtil.toObjectArray(KotlinPackage.map(toolsStrings, new Function1<String, LocalInspectionTool>() {
+        return ArrayUtil.toObjectArray(CollectionsKt.map(toolsStrings, new Function1<String, LocalInspectionTool>() {
            @Override
            public LocalInspectionTool invoke(String toolString) {
                return mapStringToTool(toolString);
@@ -48,7 +48,7 @@ import com.intellij.usages.rules.UsageFilteringRule;
 import com.intellij.usages.rules.UsageGroupingRule;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.CommonProcessors;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -383,8 +383,8 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu
        Collection<UsageInfo2UsageAdapter> filteredUsages = getUsageAdapters(filteringRules, usageInfos);
-        List<String> usageFiles = KotlinPackage.distinct(
+        List<String> usageFiles = CollectionsKt.distinct(
-                KotlinPackage.map(
+                CollectionsKt.map(
                        filteredUsages,
                        new Function1<UsageInfo2UsageAdapter, String>() {
                            @Override
@@ -402,7 +402,7 @@ public abstract class AbstractJetFindUsagesTest extends JetLightCodeInsightFixtu
                assert usageAdapter != null;
                String groupAsString = Joiner.on(", ").join(
-                        KotlinPackage.map(
+                        CollectionsKt.map(
                                groupingRules,
                                new Function1<UsageGroupingRule, String>() {
                                    @Override
@@ -26,7 +26,7 @@ import com.intellij.lang.Language;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
 import com.intellij.testFramework.UsefulTestCase;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -84,7 +84,7 @@ public abstract class AbstractKotlinGotoTest extends JetLightCodeInsightFixtureT
        Assert.assertFalse("There's no search text in test data file given. Use '// SEARCH_TEXT:' directive",
                           searchTextList.isEmpty());
-        List<String> expectedReferences = KotlinPackage.map(
+        List<String> expectedReferences = CollectionsKt.map(
                InTextDirectivesUtils.findLinesWithPrefixesRemoved(documentText, "// REF:"),
                new Function1<String, String>() {
                    @Override
@@ -34,7 +34,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import junit.framework.ComparisonFailure;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase;
@@ -142,7 +142,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
                List<String> testFiles = new ArrayList<String>();
                testFiles.add(beforeFileName);
-                KotlinPackage.mapTo(
+                ArraysKt.mapTo(
                        extraFiles,
                        testFiles,
                        new Function1<File, String>() {
@@ -35,7 +35,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.stubs.StubUpdatingIndex;
 import com.intellij.rt.execution.junit.FileComparisonFailure;
 import com.intellij.util.indexing.FileBasedIndex;
-import kotlin.KotlinPackage;
+import kotlin.StringsKt;
 import org.apache.commons.lang.SystemUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -88,7 +88,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
    private static QuickFixTestCase myWrapper;
    private void doTestFor(final String testName, final QuickFixTestCase quickFixTestCase) {
-        String relativePath = notNull(quickFixTestCase.getBasePath(), "") + "/" + KotlinPackage.decapitalize(testName);
+        String relativePath = notNull(quickFixTestCase.getBasePath(), "") + "/" + StringsKt.decapitalize(testName);
        final String testFullPath = quickFixTestCase.getTestDataPath().replace(File.separatorChar, '/') + relativePath;
        final File testFile = new File(testFullPath);
        CommandProcessor.getInstance().executeCommand(quickFixTestCase.getProject(), new Runnable() {
@@ -143,7 +143,7 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase {
        File file = new File(filePath);
        String afterFileName = file.getName();
        assert afterFileName.startsWith(AFTER_PREFIX);
-        String newAfterFileName = KotlinPackage.decapitalize(afterFileName.substring(AFTER_PREFIX.length())) + ".after";
+        String newAfterFileName = StringsKt.decapitalize(afterFileName.substring(AFTER_PREFIX.length())) + ".after";
        super.checkResultByFile(message, new File(file.getParent(), newAfterFileName).getPath(), ignoreTrailingSpaces);
    }
@@ -32,7 +32,9 @@ import com.intellij.refactoring.util.CanonicalTypes;
 import com.intellij.refactoring.util.CommonRefactoringUtil;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.VisibilityUtil;
-import kotlin.KotlinPackage;
+import kotlin.ArraysKt;
 import kotlin.CollectionsKt;
 import kotlin.SetsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.asJava.AsJavaPackage;
@@ -1112,7 +1114,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
        JetClassOrObject classA =
                JetFullClassNameIndex.getInstance().get("A", getProject(), GlobalSearchScope.allScope(getProject()))
                        .iterator().next();
-        JetDeclaration functionBar = KotlinPackage.first(
+        JetDeclaration functionBar = CollectionsKt.first(
                classA.getDeclarations(),
                new Function1<JetDeclaration, Boolean>() {
                    @Override
@@ -1148,7 +1150,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
                    @NotNull
                    @Override
                    Set<PsiMethod> getParameterPropagationTargets(@NotNull PsiMethod method) {
-                        PsiClass classA = KotlinPackage.first(
+                        PsiClass classA = CollectionsKt.first(
                                JavaFullClassNameIndex.getInstance()
                                        .get("A".hashCode(), getProject(), GlobalSearchScope.allScope(getProject())),
                                new Function1<PsiClass, Boolean>() {
@@ -1158,7 +1160,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
                                    }
                                }
                        );
-                        PsiMethod methodBar = KotlinPackage.first(
+                        PsiMethod methodBar = ArraysKt.first(
                                classA.getMethods(),
                                new Function1<PsiMethod, Boolean>() {
                                    @Override
@@ -1171,7 +1173,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
                                JetTopLevelFunctionFqnNameIndex.getInstance().get("test", getProject(), GlobalSearchScope.allScope(getProject()))
                                        .iterator().next();
-                        return KotlinPackage.setOf(methodBar, AsJavaPackage.getRepresentativeLightMethod(functionTest));
+                        return SetsKt.setOf(methodBar, AsJavaPackage.getRepresentativeLightMethod(functionTest));
                    }
                }
        );
@@ -1222,7 +1224,7 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
        JetClassOrObject classA =
                JetFullClassNameIndex.getInstance().get("A", getProject(), GlobalSearchScope.allScope(getProject()))
                        .iterator().next();
-        JetDeclaration functionBar = KotlinPackage.first(
+        JetDeclaration functionBar = CollectionsKt.first(
                classA.getDeclarations(),
                new Function1<JetDeclaration, Boolean>() {
                    @Override
@@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.MultiMap;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.io.IoPackage;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -173,7 +173,7 @@ public class KotlinBuilderModuleScriptGenerator {
            }
        }
-        return KotlinPackage.toList(annotationRootFiles);
+        return CollectionsKt.toList(annotationRootFiles);
    }
    @NotNull
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.config;
 import com.google.common.collect.Lists;
 import com.intellij.openapi.project.Project;
 import com.intellij.util.SmartList;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.Unit;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
@@ -165,7 +165,7 @@ public abstract class Config {
    }
    private static void setDependencies(ModuleDescriptorImpl module, List<ModuleDescriptorImpl> modules) {
-        module.setDependencies(KotlinPackage.plus(modules, JsPlatform.INSTANCE$.getBuiltIns().getBuiltInsModule()));
+        module.setDependencies(CollectionsKt.plus(modules, JsPlatform.INSTANCE$.getBuiltIns().getBuiltInsModule()));
    }
    @NotNull
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.translate.utils;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
-import kotlin.KotlinPackage;
+import kotlin.CollectionsKt;
 import kotlin.jvm.functions.Function1;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.backend.common.CodegenUtil;
@@ -178,7 +178,7 @@ public class ManglingUtils {
            Collection<DeclarationDescriptor> declarations = jetScope.getDescriptors(DescriptorKindFilter.CALLABLES, JetScope.ALL_NAME_FILTER);
            List<CallableDescriptor> overloadedFunctions =
-                    KotlinPackage.flatMap(declarations, new Function1<DeclarationDescriptor, Iterable<? extends CallableDescriptor>>() {
+                    CollectionsKt.flatMap(declarations, new Function1<DeclarationDescriptor, Iterable<? extends CallableDescriptor>>() {
                @Override
                public Iterable<? extends CallableDescriptor> invoke(DeclarationDescriptor declarationDescriptor) {
                    if (declarationDescriptor instanceof ClassDescriptor && finalNameToCompare.equals(declarationDescriptor.getName().asString())) {
@@ -188,7 +188,7 @@ public class ManglingUtils {
                        if (!hasPrimaryConstructor(classDescriptor)) {
                            ConstructorDescriptorImpl fakePrimaryConstructor =
                                    ConstructorDescriptorImpl.create(classDescriptor, Annotations.EMPTY, true, SourceElement.NO_SOURCE);
-                            return KotlinPackage.plus(constructors, fakePrimaryConstructor);
+                            return CollectionsKt.plus(constructors, fakePrimaryConstructor);
                        }
                        return constructors;