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

Minor. Methods renamed to reflect tha fact that they handle more types than just collections

Browse Source
This commit is contained in:
Andrey Breslav
2015-04-15 14:11:50 +03:00
committed by Denis Zharkov
parent 579ca9c1f2
commit d140e83386
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java
+11 -10
View File
@@ -158,12 +158,13 @@ public class SignaturesPropagationData {
if (JvmPackage.getPLATFORM_TYPES()) return autoType; if (JvmPackage.getPLATFORM_TYPES()) return autoType;
List<TypeAndVariance> typesFromSuperMethods = ContainerUtil.map(superFunctions, List<TypeAndVariance> typesFromSuperMethods = ContainerUtil.map(superFunctions,
new Function<FunctionDescriptor, TypeAndVariance>() { new Function<FunctionDescriptor, TypeAndVariance>() {
@Override @Override
public TypeAndVariance fun(FunctionDescriptor superFunction) { public TypeAndVariance fun(FunctionDescriptor superFunction) {
return new TypeAndVariance(superFunction.getReturnType(), Variance.OUT_VARIANCE); return new TypeAndVariance(superFunction.getReturnType(),
} Variance.OUT_VARIANCE);
}); }
});
return modifyTypeAccordingToSuperMethods(autoType, typesFromSuperMethods, MEMBER_SIGNATURE_COVARIANT); return modifyTypeAccordingToSuperMethods(autoType, typesFromSuperMethods, MEMBER_SIGNATURE_COVARIANT);
} }
@@ -629,10 +630,10 @@ public class SignaturesPropagationData {
if (classifierFromSuper instanceof ClassDescriptor) { if (classifierFromSuper instanceof ClassDescriptor) {
ClassDescriptor classFromSuper = (ClassDescriptor) classifierFromSuper; ClassDescriptor classFromSuper = (ClassDescriptor) classifierFromSuper;
if (JavaToKotlinClassMap.INSTANCE.isMutableCollection(classFromSuper)) { if (JavaToKotlinClassMap.INSTANCE.isMutable(classFromSuper)) {
someSupersMutable = true; someSupersMutable = true;
} }
else if (JavaToKotlinClassMap.INSTANCE.isReadOnlyCollection(classFromSuper)) { else if (JavaToKotlinClassMap.INSTANCE.isReadOnly(classFromSuper)) {
if (typeFromSuper.varianceOfPosition == Variance.OUT_VARIANCE) { if (typeFromSuper.varianceOfPosition == Variance.OUT_VARIANCE) {
someSupersCovariantReadOnly = true; someSupersCovariantReadOnly = true;
} }
@@ -648,12 +649,12 @@ public class SignaturesPropagationData {
return classifier; return classifier;
} }
else if (someSupersMutable) { else if (someSupersMutable) {
if (JavaToKotlinClassMap.INSTANCE.isReadOnlyCollection(klass)) { if (JavaToKotlinClassMap.INSTANCE.isReadOnly(klass)) {
return JavaToKotlinClassMap.INSTANCE.convertReadOnlyToMutable(klass); return JavaToKotlinClassMap.INSTANCE.convertReadOnlyToMutable(klass);
} }
} }
else if (someSupersNotCovariantReadOnly || someSupersCovariantReadOnly) { else if (someSupersNotCovariantReadOnly || someSupersCovariantReadOnly) {
if (JavaToKotlinClassMap.INSTANCE.isMutableCollection(klass)) { if (JavaToKotlinClassMap.INSTANCE.isMutable(klass)) {
return JavaToKotlinClassMap.INSTANCE.convertMutableToReadOnly(klass); return JavaToKotlinClassMap.INSTANCE.convertMutableToReadOnly(klass);
} }
} }
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+1 -1
View File
@@ -162,7 +162,7 @@ class LazyJavaTypeResolver(
val kotlinDescriptor = javaToKotlin.mapJavaToKotlin(fqName) ?: return null val kotlinDescriptor = javaToKotlin.mapJavaToKotlin(fqName) ?: return null
if (howThisTypeIsUsedEffectively == MEMBER_SIGNATURE_COVARIANT || howThisTypeIsUsedEffectively == SUPERTYPE) { if (howThisTypeIsUsedEffectively == MEMBER_SIGNATURE_COVARIANT || howThisTypeIsUsedEffectively == SUPERTYPE) {
if (javaToKotlin.isReadOnlyCollection(kotlinDescriptor)) { if (javaToKotlin.isReadOnly(kotlinDescriptor)) {
return javaToKotlin.convertReadOnlyToMutable(kotlinDescriptor) return javaToKotlin.convertReadOnlyToMutable(kotlinDescriptor)
} }
} }
core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
+2 -2
View File
@@ -182,11 +182,11 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap {
return className.isSafe() ? mapPlatformClass(className.toSafe()) : Collections.<ClassDescriptor>emptySet(); return className.isSafe() ? mapPlatformClass(className.toSafe()) : Collections.<ClassDescriptor>emptySet();
} }
public boolean isMutableCollection(@NotNull ClassDescriptor mutable) { public boolean isMutable(@NotNull ClassDescriptor mutable) {
return mutableToReadOnly.containsKey(mutable); return mutableToReadOnly.containsKey(mutable);
} }
public boolean isReadOnlyCollection(@NotNull ClassDescriptor readOnly) { public boolean isReadOnly(@NotNull ClassDescriptor readOnly) {
return readOnlyToMutable.containsKey(readOnly); return readOnlyToMutable.containsKey(readOnly);
} }
idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
+1 -1
View File
@@ -43,7 +43,7 @@ public fun approximateFlexibleTypes(jetType: JetType, outermost: Boolean = true)
if (jetType.isFlexible()) { if (jetType.isFlexible()) {
val flexible = jetType.flexibility() val flexible = jetType.flexibility()
val lowerClass = flexible.lowerBound.getConstructor().getDeclarationDescriptor() as? ClassDescriptor? val lowerClass = flexible.lowerBound.getConstructor().getDeclarationDescriptor() as? ClassDescriptor?
val isCollection = lowerClass != null && JavaToKotlinClassMap.INSTANCE.isMutableCollection(lowerClass) val isCollection = lowerClass != null && JavaToKotlinClassMap.INSTANCE.isMutable(lowerClass)
// (Mutable)Collection<T>! -> MutableCollection<T>? // (Mutable)Collection<T>! -> MutableCollection<T>?
// Foo<(Mutable)Collection<T>!>! -> Foo<Collection<T>>? // Foo<(Mutable)Collection<T>!>! -> Foo<Collection<T>>?
// Foo! -> Foo? // Foo! -> Foo?