From d140e83386e50abe927da57d5458ee07d306bd76 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Wed, 15 Apr 2015 14:11:50 +0300
Subject: [PATCH] Minor. Methods renamed to reflect tha fact that they handle
 more types than just collections

---
 .../SignaturesPropagationData.java            | 21 ++++++++++---------
 .../java/lazy/types/LazyJavaTypeResolver.kt   |  2 +-
 .../kotlin/platform/JavaToKotlinClassMap.java |  4 ++--
 .../jetbrains/kotlin/idea/util/TypeUtils.kt   |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java
index ab1fe1d5c54..510ae307971 100644
--- a/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java
+++ b/compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/kotlinSignature/SignaturesPropagationData.java
@@ -158,12 +158,13 @@ public class SignaturesPropagationData {
         if (JvmPackage.getPLATFORM_TYPES()) return autoType;
 
         List<TypeAndVariance> typesFromSuperMethods = ContainerUtil.map(superFunctions,
-                new Function<FunctionDescriptor, TypeAndVariance>() {
-                    @Override
-                    public TypeAndVariance fun(FunctionDescriptor superFunction) {
-                        return new TypeAndVariance(superFunction.getReturnType(), Variance.OUT_VARIANCE);
-                    }
-                });
+                                                                        new Function<FunctionDescriptor, TypeAndVariance>() {
+                                                                            @Override
+                                                                            public TypeAndVariance fun(FunctionDescriptor superFunction) {
+                                                                                return new TypeAndVariance(superFunction.getReturnType(),
+                                                                                                           Variance.OUT_VARIANCE);
+                                                                            }
+                                                                        });
 
         return modifyTypeAccordingToSuperMethods(autoType, typesFromSuperMethods, MEMBER_SIGNATURE_COVARIANT);
     }
@@ -629,10 +630,10 @@ public class SignaturesPropagationData {
             if (classifierFromSuper instanceof ClassDescriptor) {
                 ClassDescriptor classFromSuper = (ClassDescriptor) classifierFromSuper;
 
-                if (JavaToKotlinClassMap.INSTANCE.isMutableCollection(classFromSuper)) {
+                if (JavaToKotlinClassMap.INSTANCE.isMutable(classFromSuper)) {
                     someSupersMutable = true;
                 }
-                else if (JavaToKotlinClassMap.INSTANCE.isReadOnlyCollection(classFromSuper)) {
+                else if (JavaToKotlinClassMap.INSTANCE.isReadOnly(classFromSuper)) {
                     if (typeFromSuper.varianceOfPosition == Variance.OUT_VARIANCE) {
                         someSupersCovariantReadOnly = true;
                     }
@@ -648,12 +649,12 @@ public class SignaturesPropagationData {
             return classifier;
         }
         else if (someSupersMutable) {
-            if (JavaToKotlinClassMap.INSTANCE.isReadOnlyCollection(klass)) {
+            if (JavaToKotlinClassMap.INSTANCE.isReadOnly(klass)) {
                 return JavaToKotlinClassMap.INSTANCE.convertReadOnlyToMutable(klass);
             }
         }
         else if (someSupersNotCovariantReadOnly || someSupersCovariantReadOnly) {
-            if (JavaToKotlinClassMap.INSTANCE.isMutableCollection(klass)) {
+            if (JavaToKotlinClassMap.INSTANCE.isMutable(klass)) {
                 return JavaToKotlinClassMap.INSTANCE.convertMutableToReadOnly(klass);
             }
         }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
index 4d46b4913be..3d0e1db82c0 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/types/LazyJavaTypeResolver.kt
@@ -162,7 +162,7 @@ class LazyJavaTypeResolver(
             val kotlinDescriptor = javaToKotlin.mapJavaToKotlin(fqName) ?: return null
 
             if (howThisTypeIsUsedEffectively == MEMBER_SIGNATURE_COVARIANT || howThisTypeIsUsedEffectively == SUPERTYPE) {
-                if (javaToKotlin.isReadOnlyCollection(kotlinDescriptor)) {
+                if (javaToKotlin.isReadOnly(kotlinDescriptor)) {
                     return javaToKotlin.convertReadOnlyToMutable(kotlinDescriptor)
                 }
             }
diff --git a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
index 51100339bc1..72462feb817 100644
--- a/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
+++ b/core/descriptor.loader.java/src/org/jetbrains/kotlin/platform/JavaToKotlinClassMap.java
@@ -182,11 +182,11 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap {
         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);
     }
 
-    public boolean isReadOnlyCollection(@NotNull ClassDescriptor readOnly) {
+    public boolean isReadOnly(@NotNull ClassDescriptor readOnly) {
         return readOnlyToMutable.containsKey(readOnly);
     }
 
diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
index f69c29cee03..2b9061816df 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/util/TypeUtils.kt
@@ -43,7 +43,7 @@ public fun approximateFlexibleTypes(jetType: JetType, outermost: Boolean = true)
     if (jetType.isFlexible()) {
         val flexible = jetType.flexibility()
         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>?
         // Foo<(Mutable)Collection<T>!>! -> Foo<Collection<T>>?
         // Foo! -> Foo?