[NI] Fix exception on capturing type with inner typealiased typed

compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/inference/components/NewTypeSubstitutor.kt

@@ -46,13 +46,14 @@ interface NewTypeSubstitutor {
         if (type is AbbreviatedType) {
             val substitutedExpandedType = substitute(type.expandedType, keepAnnotation, runCapturedChecks)
             val substitutedAbbreviation = substitute(type.abbreviation, keepAnnotation, runCapturedChecks)
-            if (substitutedExpandedType is SimpleType? && substitutedAbbreviation is SimpleType?) {
+            return when {
-                return AbbreviatedType(
+                substitutedExpandedType == null && substitutedAbbreviation == null -> null
-                    substitutedExpandedType ?: type.expandedType,
+                substitutedExpandedType is SimpleType? && substitutedAbbreviation is SimpleType? ->
-                    substitutedAbbreviation ?: type.abbreviation
+                    AbbreviatedType(
-                )
+                        substitutedExpandedType ?: type.expandedType,
-            } else {
+                        substitutedAbbreviation ?: type.abbreviation
-                return substitutedExpandedType
+                    )
+                else -> substitutedExpandedType
             }
         }
 

compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeWithInnerTypealias.kt

@@ -0,0 +1,12 @@
+// !LANGUAGE: +NewInference
+
+import kotlin.reflect.KClass
+
+typealias MyString = String
+
+fun test(k: KClass<out MyString>) {
+    k::class.java
+}
+
+@Suppress("UPPER_BOUND_VIOLATED")
+public val <T> KClass<T>.java: Class<T> get() = TODO()

compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeWithInnerTypealias.txt

@@ -0,0 +1,5 @@
+package
+
+@kotlin.Suppress(names = {"UPPER_BOUND_VIOLATED"}) public val </*0*/ T> kotlin.reflect.KClass<T>.java: java.lang.Class<T>
+public fun test(/*0*/ k: kotlin.reflect.KClass<out MyString /* = kotlin.String */>): kotlin.Unit
+public typealias MyString = kotlin.String

compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java

@@ -9396,6 +9396,11 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
                     runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.kt");
                 }
 
+                @TestMetadata("capturedTypeWithInnerTypealias.kt")
+                public void testCapturedTypeWithInnerTypealias() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeWithInnerTypealias.kt");
+                }
+
                 @TestMetadata("capturedTypeWithTypeVariableSubtyping.kt")
                 public void testCapturedTypeWithTypeVariableSubtyping() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeWithTypeVariableSubtyping.kt");

compiler/tests/org/jetbrains/kotlin/checkers/javac/DiagnosticsUsingJavacTestGenerated.java

@@ -9396,6 +9396,11 @@ public class DiagnosticsUsingJavacTestGenerated extends AbstractDiagnosticsUsing
                     runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeSubstitutedIntoOppositeProjection.kt");
                 }
 
+                @TestMetadata("capturedTypeWithInnerTypealias.kt")
+                public void testCapturedTypeWithInnerTypealias() throws Exception {
+                    runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeWithInnerTypealias.kt");
+                }
+
                 @TestMetadata("capturedTypeWithTypeVariableSubtyping.kt")
                 public void testCapturedTypeWithTypeVariableSubtyping() throws Exception {
                     runTest("compiler/testData/diagnostics/tests/inference/capturedTypes/capturedTypeWithTypeVariableSubtyping.kt");