azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace KotlinPackage legacy facade with corresponding package parts.

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-01 22:31:17 +03:00
parent 80e4ba8712
commit 90e5ee8a7e
64 changed files with 214 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAnnotationNames.java
+2 -2
View File
@@ -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,
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java
+1 -1
View File
@@ -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 {
core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java
+5 -4
View File
@@ -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));
}
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/Visibilities.java
+2 -2
View File
@@ -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() {
}
core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ValueParameterDescriptorImpl.java
+2 -2
View File
@@ -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
core/descriptors/src/org/jetbrains/kotlin/resolve/OverridingUtil.java
+3 -3
View File
@@ -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
core/descriptors/src/org/jetbrains/kotlin/types/CommonSupertypes.java
+3 -3
View File
@@ -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
);
}
core/descriptors/src/org/jetbrains/kotlin/types/ErrorUtils.java
+2 -2
View File
@@ -44,8 +44,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import static kotlin.KotlinPackage.emptyList;
import static kotlin.KotlinPackage.joinToString;
import static kotlin.CollectionsKt.emptyList;
import static kotlin.CollectionsKt.joinToString;
public class ErrorUtils {
core/descriptors/src/org/jetbrains/kotlin/types/TypeUtils.java
+3 -3
View File
@@ -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