[FIR][checkers][JS] Expand type aliases to supertypes in FirJsInherit…

…anceClassChecker #KT-66673 Fixed (cherry picked from commit 29efe86)
JetBrains · Mar 19, 2024 · 138c149 · 138c149
1 parent 94a27a3
commit 138c149
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/...org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsInheritanceClassChecker.kt b/...org/jetbrains/kotlin/fir/analysis/js/checkers/declaration/FirJsInheritanceClassChecker.kt
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.unsubstitutedScope
 import org.jetbrains.kotlin.fir.analysis.diagnostics.js.FirJsErrors
 import org.jetbrains.kotlin.fir.analysis.js.checkers.isOverridingExternalWithOptionalParams
 import org.jetbrains.kotlin.fir.declarations.FirClass
+import org.jetbrains.kotlin.fir.declarations.fullyExpandedClass
 import org.jetbrains.kotlin.fir.declarations.utils.isEffectivelyExternal
 import org.jetbrains.kotlin.fir.declarations.utils.isExpect
 import org.jetbrains.kotlin.fir.declarations.utils.superConeTypes
@@ -48,7 +49,7 @@ sealed class FirJsInheritanceClassChecker(mppKind: MppCheckerKind) : FirClassChe
         if (isEffectivelyExternal && declaration.classKind != ClassKind.ANNOTATION_CLASS) {
             val superTypes = declaration.superConeTypes
                 .filterNot { it.isAnyOrNullableAny || it.isThrowableOrNullableThrowable || it.isEnum }
-                .mapNotNull { it.toSymbol(session) }
+                .mapNotNull { it.toSymbol(session)?.fullyExpandedClass(session) }
 
             if (superTypes.any { !it.isEffectivelyExternal(session) }) {
                 reporter.reportOn(declaration.source, FirJsErrors.EXTERNAL_TYPE_EXTENDS_NON_EXTERNAL_TYPE, context)

diff --git a/...estData/diagnostics/testsWithJsStdLib/externalTypeInheritsExternalTypeViaTypeAlias.fir.kt b/...estData/diagnostics/testsWithJsStdLib/externalTypeInheritsExternalTypeViaTypeAlias.fir.kt
diff --git a/...er/testData/diagnostics/testsWithJsStdLib/externalTypeInheritsExternalTypeViaTypeAlias.kt b/...er/testData/diagnostics/testsWithJsStdLib/externalTypeInheritsExternalTypeViaTypeAlias.kt
@@ -1,3 +1,5 @@
+// FIR_IDENTICAL
+
 external interface Base
 
 typealias TypeAlias = Base