CreateExpect: should prefer type aliases

#KT-32571 Fixed

idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt

@@ -231,13 +231,11 @@ private val EXPECT_RENDERER = OVERRIDE_RENDERER.withOptions {
     secondaryConstructorsAsPrimary = false
     renderDefaultVisibility = false
     renderDefaultModality = false
-    renderTypeExpansions = true
 }
 
 private val ACTUAL_RENDERER = EXPECT_RENDERER.withOptions {
     modifiers = modifiers + ACTUAL
     actualPropertiesInPrimaryConstructor = true
-    renderTypeExpansions = false
     renderConstructorDelegation = true
 }
 

idea/src/org/jetbrains/kotlin/idea/quickfix/expectactual/ExpectActualUtils.kt

@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.resolve.checkers.ExpectedActualDeclarationChecker
 import org.jetbrains.kotlin.resolve.checkers.ExperimentalUsageChecker
 import org.jetbrains.kotlin.resolve.descriptorUtil.fqNameOrNull
 import org.jetbrains.kotlin.resolve.source.KotlinSourceElement
+import org.jetbrains.kotlin.types.AbbreviatedType
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
@@ -329,4 +330,8 @@ class KotlinTypeInaccessibleException(fqNames: Collection<FqName?>) : Exception(
 fun KtNamedDeclaration.isAlwaysActual(): Boolean = safeAs<KtParameter>()?.parent?.parent?.safeAs<KtPrimaryConstructor>()
     ?.mustHaveValOrVar() ?: false
 
-val KotlinType.fqName: FqName? get() = constructor.declarationDescriptor?.fqNameOrNull()
+val KotlinType.fqName: FqName?
+    get() = when (this) {
+        is AbbreviatedType -> abbreviation.fqName
+        else -> constructor.declarationDescriptor?.fqNameOrNull()
+    }

idea/testData/multiModuleQuickFix/createExpect/funWithAccessibleAlias/common/foo.kt.after

@@ -1,3 +1,3 @@
 expect class SomeString
 // It would be great to have SomeString in foo() below, but it's problematic
-expect fun foo(): String
+expect fun foo(): SomeString

idea/testData/multiModuleQuickFix/createExpect/funWithAccessibleExpansion/common/foo.kt.after

@@ -1 +0,0 @@
-expect fun foo(): String

idea/testData/multiModuleQuickFix/createExpect/funWithAccessibleExpansion/jvm/Utils.kt

@@ -1,4 +1,5 @@
 // "Create expected function in common module testModule_Common" "true"
+// SHOULD_FAIL_WITH: You cannot create the expect declaration from:,fun foo() = ""
 // DISABLE-ERRORS
 
 typealias SomeString = String

idea/testData/multiModuleQuickFix/createExpect/funWithAccessibleExpansion/jvm/Utils.kt.after

@@ -1,6 +0,0 @@
-// "Create expected function in common module testModule_Common" "true"
-// DISABLE-ERRORS
-
-typealias SomeString = String
-
-actual fun foo(): SomeString = ""

idea/testData/multiModuleQuickFix/createExpect/funWithJdk/proj_common/createList.kt.after

@@ -1 +0,0 @@
-expect fun <T> createList(): java.util.ArrayList<T>

idea/testData/multiModuleQuickFix/createExpect/stdlibWithJavaAlias/proj_common_dep(stdlib)/some.kt.after

@@ -0,0 +1 @@
+expect val some: HashMap<Int, Int>

idea/testData/multiModuleQuickFix/createExpect/stdlibWithJavaAlias/proj_jvm_dep(stdlib)/My.kt

@@ -0,0 +1,4 @@
+// "Create expected property in common module proj_Common" "true"
+// DISABLE-ERRORS
+
+actual val some<caret>: HashMap<Int, Int> = TODO()

idea/testData/multiModuleQuickFix/createExpect/stdlibWithJavaAlias/proj_jvm_dep(stdlib)/My.kt.after

@@ -0,0 +1,4 @@
+// "Create expected property in common module proj_Common" "true"
+// DISABLE-ERRORS
+
+actual val some: HashMap<Int, Int> = TODO()

idea/testData/multiModuleQuickFix/createExpect/superTypeFromStdlib/proj_common_dep(stdlib)/A.kt.after

@@ -0,0 +1 @@
+expect class <caret>A : HashMap<Int, Int>

idea/testData/multiModuleQuickFix/createExpect/superTypeFromStdlib/proj_jvm_dep(stdlib)/My.kt

@@ -0,0 +1,4 @@
+// "Create expected class in common module proj_Common" "true"
+// DISABLE-ERRORS
+
+actual class <caret>A : HashMap<Int, Int>()

idea/testData/multiModuleQuickFix/createExpect/withAliases/common/My.kt.after

@@ -1,5 +1,4 @@
 expect class My {
-    fun foo(): Int
     val some: Double
 
 }

idea/testData/multiModuleQuickFix/createExpect/withAliases/jvm/My.kt.after

@@ -6,7 +6,7 @@ import kotlin.Double as MyDouble
 typealias MyInt = Int
 
 actual class <caret>My {
-    actual fun foo(): MyInt = 42
+    fun foo(): MyInt = 42
 
     actual val some: MyDouble = 4.0
 }

idea/testData/multiModuleQuickFix/createExpect/withAliases/log.log

@@ -0,0 +1,2 @@
+These declarations cannot be transformed:
+fun foo() = 42

idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTestGenerated.java

@@ -477,6 +477,16 @@ public class QuickFixMultiModuleTestGenerated extends AbstractQuickFixMultiModul
             runTest("idea/testData/multiModuleQuickFix/createExpect/sealedClass/");
         }
 
+        @TestMetadata("stdlibWithJavaAlias")
+        public void testStdlibWithJavaAlias() throws Exception {
+            runTest("idea/testData/multiModuleQuickFix/createExpect/stdlibWithJavaAlias/");
+        }
+
+        @TestMetadata("superTypeFromStdlib")
+        public void testSuperTypeFromStdlib() throws Exception {
+            runTest("idea/testData/multiModuleQuickFix/createExpect/superTypeFromStdlib/");
+        }
+
         @TestMetadata("topLevelFunctionWithAnnotations")
         public void testTopLevelFunctionWithAnnotations() throws Exception {
             runTest("idea/testData/multiModuleQuickFix/createExpect/topLevelFunctionWithAnnotations/");