diff --git a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt index 6e23acdb9c6..98f961730f1 100644 --- a/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt +++ b/compiler/fir/jvm/src/org/jetbrains/kotlin/fir/scopes/jvm/JvmMappedScope.kt @@ -131,7 +131,7 @@ class JvmMappedScope( // NOTE: No-arg constructors @OptIn(ExperimentalStdlibApi::class) - private val additionalHiddenConstructors = buildSet { + private val additionalHiddenConstructors = buildSet { // kotlin.text.String pseudo-constructors should be used instead of java.lang.String constructors listOf( "", diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt index 39d9b33aa38..abf4ff8395c 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirWhenExhaustivenessTransformer.kt @@ -63,7 +63,7 @@ class FirWhenExhaustivenessTransformer(private val bodyResolveComponents: BodyRe val checkers = buildList { exhaustivenessCheckers.filterTo(this) { it.isApplicable(cleanSubjectType, session) } - if (isNotEmpty() && cleanSubjectType.isMarkedNullable) { + if (isNotEmpty() && cleanSubjectType.isMarkedNullable) { add(WhenOnNullableExhaustivenessChecker) } } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt index 7b29715e5d8..216ee58f3be 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/fir/KtDeclarationAndFirDeclarationEqualityChecker.kt @@ -101,7 +101,7 @@ object KtDeclarationAndFirDeclarationEqualityChecker { } @OptIn(ExperimentalStdlibApi::class) - private val classIdToName: Map = buildList { + private val classIdToName: Map = buildList> { StandardClassIds.primitiveArrayTypeByElementType.mapTo(this) { (classId, arrayClassId) -> classId.asString().replace('/', '.') to arrayClassId.asString().replace('/', '.') } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt index 86bb246a4e7..c643e03dac4 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirScopeProvider.kt @@ -162,7 +162,7 @@ internal class KtFirScopeProvider( val firLocalScopes = towerDataContext.localScopes @OptIn(ExperimentalStdlibApi::class) - val allKtScopes = buildList { + val allKtScopes = buildList { implicitReceiverScopes.mapTo(this, ::convertToKtScope) nonLocalScopes.mapTo(this, ::convertToKtScope) firLocalScopes.mapTo(this, ::convertToKtScope)