[Misc] Move TypeAliasExpander to core

compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java

@@ -1352,21 +1352,6 @@ public class DescriptorResolver {
         }
     }
 
-    public static void checkBoundsInTypeAlias(
-            @NotNull TypeAliasExpansionReportStrategy reportStrategy,
-            @NotNull KotlinType unsubstitutedArgument,
-            @NotNull KotlinType typeArgument,
-            @NotNull TypeParameterDescriptor typeParameterDescriptor,
-            @NotNull TypeSubstitutor substitutor
-    ) {
-        for (KotlinType bound : typeParameterDescriptor.getUpperBounds()) {
-            KotlinType substitutedBound = substitutor.safeSubstitute(bound, Variance.INVARIANT);
-            if (!KotlinTypeChecker.DEFAULT.isSubtypeOf(typeArgument, substitutedBound)) {
-                reportStrategy.boundsViolationInSubstitution(substitutedBound, unsubstitutedArgument, typeArgument, typeParameterDescriptor);
-            }
-        }
-    }
-
     public static boolean checkHasOuterClassInstance(
             @NotNull LexicalScope scope,
             @NotNull BindingTrace trace,

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/CandidateResolver.kt

@@ -693,7 +693,7 @@ class CandidateResolver(
             val typeParameter = typeParameters[i]
             val substitutedTypeArgument = substitutedTypeProjection.type
             val unsubstitutedTypeArgument = unsubstitutedType.arguments[i].type
-            DescriptorResolver.checkBoundsInTypeAlias(
+            TypeAliasExpander.checkBoundsInTypeAlias(
                 reportStrategy,
                 unsubstitutedTypeArgument,
                 substitutedTypeArgument,

core/descriptors/src/org/jetbrains/kotlin/types/TypeAliasExpander.kt

@@ -1,27 +1,16 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- *
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
-package org.jetbrains.kotlin.resolve
+package org.jetbrains.kotlin.types
 
 import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.descriptors.annotations.composeAnnotations
 import org.jetbrains.kotlin.resolve.scopes.MemberScope
-import org.jetbrains.kotlin.types.*
+import org.jetbrains.kotlin.types.checker.KotlinTypeChecker
 import org.jetbrains.kotlin.types.typeUtil.containsTypeAliasParameters
 import org.jetbrains.kotlin.types.typeUtil.requiresTypeAliasExpansion
 
@@ -49,7 +38,10 @@ class TypeAliasExpander(
         recursionDepth: Int,
         withAbbreviatedType: Boolean
     ): SimpleType {
-        val underlyingProjection = TypeProjectionImpl(Variance.INVARIANT, typeAliasExpansion.descriptor.underlyingType)
+        val underlyingProjection = TypeProjectionImpl(
+            Variance.INVARIANT,
+            typeAliasExpansion.descriptor.underlyingType
+        )
         val expandedProjection = expandTypeProjection(underlyingProjection, typeAliasExpansion, null, recursionDepth)
         val expandedType = expandedProjection.type.asSimpleType()
 
@@ -205,7 +197,8 @@ class TypeAliasExpander(
                     expandTypeProjection(typeAliasArgument, typeAliasExpansion, typeConstructor.parameters[i], recursionDepth + 1)
                 }
 
-                val nestedExpansion = TypeAliasExpansion.create(typeAliasExpansion, typeDescriptor, expandedArguments)
+                val nestedExpansion =
+                    TypeAliasExpansion.create(typeAliasExpansion, typeDescriptor, expandedArguments)
 
                 val nestedExpandedType = expandRecursively(
                     nestedExpansion, type.annotations,
@@ -257,7 +250,7 @@ class TypeAliasExpander(
                 val unsubstitutedArgument = unsubstitutedType.arguments[i]
                 val typeParameter = unsubstitutedType.constructor.parameters[i]
                 if (shouldCheckBounds) {
-                    DescriptorResolver.checkBoundsInTypeAlias(
+                    checkBoundsInTypeAlias(
                         reportStrategy,
                         unsubstitutedArgument.type,
                         substitutedArgument.type,
@@ -272,12 +265,33 @@ class TypeAliasExpander(
     companion object {
         private const val MAX_RECURSION_DEPTH = 100
 
+        fun checkBoundsInTypeAlias(
+            reportStrategy: TypeAliasExpansionReportStrategy,
+            unsubstitutedArgument: KotlinType,
+            typeArgument: KotlinType,
+            typeParameterDescriptor: TypeParameterDescriptor,
+            substitutor: TypeSubstitutor
+        ) {
+            for (bound in typeParameterDescriptor.upperBounds) {
+                val substitutedBound = substitutor.safeSubstitute(bound, Variance.INVARIANT)
+                if (!KotlinTypeChecker.DEFAULT.isSubtypeOf(typeArgument, substitutedBound)) {
+                    reportStrategy.boundsViolationInSubstitution(
+                        substitutedBound,
+                        unsubstitutedArgument,
+                        typeArgument,
+                        typeParameterDescriptor
+                    )
+                }
+            }
+        }
+
         private fun assertRecursionDepth(recursionDepth: Int, typeAliasDescriptor: TypeAliasDescriptor) {
             if (recursionDepth > MAX_RECURSION_DEPTH) {
                 throw AssertionError("Too deep recursion while expanding type alias ${typeAliasDescriptor.name}")
             }
         }
 
-        val NON_REPORTING = TypeAliasExpander(TypeAliasExpansionReportStrategy.DO_NOTHING, false)
+        val NON_REPORTING =
+            TypeAliasExpander(TypeAliasExpansionReportStrategy.DO_NOTHING, false)
     }
 }

core/descriptors/src/org/jetbrains/kotlin/types/TypeAliasExpansion.kt

@@ -1,25 +1,12 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- *
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
-package org.jetbrains.kotlin.resolve
+package org.jetbrains.kotlin.types
 
 import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
-import org.jetbrains.kotlin.types.TypeConstructor
-import org.jetbrains.kotlin.types.TypeProjection
 
 class TypeAliasExpansion private constructor(
     val parent: TypeAliasExpansion?,

core/descriptors/src/org/jetbrains/kotlin/types/TypeAliasExpansionReportStrategy.kt

@@ -1,25 +1,13 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- *
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
  */
 
-package org.jetbrains.kotlin.resolve
+package org.jetbrains.kotlin.types
 
 import org.jetbrains.kotlin.descriptors.TypeAliasDescriptor
 import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
-import org.jetbrains.kotlin.types.KotlinType
 
 interface TypeAliasExpansionReportStrategy {
     fun wrongNumberOfTypeArguments(typeAlias: TypeAliasDescriptor, numberOfParameters: Int)
@@ -54,4 +42,4 @@ interface TypeAliasExpansionReportStrategy {
 
         override fun repeatedAnnotation(annotation: AnnotationDescriptor) {}
     }
-}
+}